From 6e08af9959e144df39036223558dd2fa1b0e59a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=B4=AA=E9=BE=99?= <599179587@qq.com>
Date: Mon, 10 Jul 2017 11:41:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.classpath | 36 +
.gitignore | 1 +
.project | 47 +
nb-configuration.xml | 24 +
pom.xml | 299 ++++
.../java/com/ifish/action/AdInfoAction.java | 55 +
.../com/ifish/action/CommodityAction.java | 97 ++
.../java/com/ifish/action/CouponAction.java | 63 +
.../java/com/ifish/action/FileAction.java | 32 +
.../java/com/ifish/action/GoldAction.java | 109 ++
.../java/com/ifish/action/GradeAction.java | 71 +
.../com/ifish/action/IfishDoctorAction.java | 54 +
.../com/ifish/action/IfishGoodsAction.java | 51 +
.../com/ifish/action/InformationAction.java | 76 +
.../java/com/ifish/action/LiveRoomAction.java | 209 +++
.../java/com/ifish/action/PageListAction.java | 85 +
.../java/com/ifish/action/ShopsAction.java | 194 +++
.../com/ifish/action/UpdateUserAction.java | 76 +
.../java/com/ifish/action/UserAction.java | 642 +++++++
.../com/ifish/action/UserActivityAction.java | 56 +
.../java/com/ifish/action/UsersAction.java | 144 ++
.../java/com/ifish/apiVersion/ApiVersion.java | 15 +
.../com/ifish/bean/CommodityInfoBean.java | 308 ++++
.../java/com/ifish/bean/DeviceUserBean.java | 228 +++
.../java/com/ifish/bean/VenderListBean.java | 243 +++
.../java/com/ifish/config/RedisConfig.java | 59 +
src/main/java/com/ifish/dao/AdInfoDao.java | 12 +
src/main/java/com/ifish/dao/BaseDao.java | 37 +
.../java/com/ifish/dao/BrowseRoomDao.java | 14 +
.../java/com/ifish/dao/CameraActiveDao.java | 13 +
src/main/java/com/ifish/dao/CameraDao.java | 13 +
.../java/com/ifish/dao/CameraUserDao.java | 20 +
src/main/java/com/ifish/dao/CommentDao.java | 15 +
src/main/java/com/ifish/dao/CouponDao.java | 12 +
.../java/com/ifish/dao/CouponRecordDao.java | 26 +
.../java/com/ifish/dao/DeviceCameraDao.java | 18 +
src/main/java/com/ifish/dao/DeviceDao.java | 13 +
.../java/com/ifish/dao/DeviceUserDao.java | 25 +
.../java/com/ifish/dao/GoldControlDao.java | 13 +
.../com/ifish/dao/GoldExpendRecordDao.java | 12 +
.../java/com/ifish/dao/GoldGetRecordDao.java | 21 +
src/main/java/com/ifish/dao/GoldRuleDao.java | 12 +
.../java/com/ifish/dao/GradeControlDao.java | 13 +
src/main/java/com/ifish/dao/GradeDao.java | 13 +
.../java/com/ifish/dao/GradeRecordDao.java | 13 +
src/main/java/com/ifish/dao/GradeRuleDao.java | 13 +
.../java/com/ifish/dao/HardwareTypeDao.java | 13 +
.../java/com/ifish/dao/IfishDoctorDao.java | 13 +
.../java/com/ifish/dao/IfishGoodsDao.java | 12 +
src/main/java/com/ifish/dao/IfishShopDao.java | 12 +
.../java/com/ifish/dao/InformationDao.java | 14 +
.../com/ifish/dao/InformationStatsDao.java | 12 +
.../java/com/ifish/dao/LiveBannerDao.java | 13 +
.../java/com/ifish/dao/LiveMessageDao.java | 21 +
src/main/java/com/ifish/dao/LiveRoomDao.java | 62 +
.../java/com/ifish/dao/LiveRoomZanDao.java | 20 +
.../java/com/ifish/dao/LookReportDao.java | 13 +
src/main/java/com/ifish/dao/PushListDao.java | 15 +
.../com/ifish/dao/QuestionsFeedbackDao.java | 13 +
src/main/java/com/ifish/dao/ShopsInfoDao.java | 35 +
.../java/com/ifish/dao/ShopsUserInfoDao.java | 13 +
src/main/java/com/ifish/dao/UeditorDao.java | 13 +
.../java/com/ifish/dao/UserActivityDao.java | 12 +
src/main/java/com/ifish/dao/UserAssetDao.java | 12 +
src/main/java/com/ifish/dao/UserDao.java | 42 +
.../java/com/ifish/dao/VenderListDao.java | 18 +
src/main/java/com/ifish/dao/VersionDao.java | 15 +
.../java/com/ifish/daoImpl/AdInfoDaoImpl.java | 20 +
.../com/ifish/daoImpl/BrowseRoomDaoImpl.java | 25 +
.../ifish/daoImpl/CameraActiveDaoImpl.java | 24 +
.../java/com/ifish/daoImpl/CameraDaoImpl.java | 24 +
.../com/ifish/daoImpl/CameraUserDaoImpl.java | 39 +
.../com/ifish/daoImpl/CommentDaoImpl.java | 31 +
.../java/com/ifish/daoImpl/CouponDaoImpl.java | 22 +
.../ifish/daoImpl/CouponRecordDaoImpl.java | 37 +
.../ifish/daoImpl/DeviceCameraDaoImpl.java | 35 +
.../java/com/ifish/daoImpl/DeviceDaoImpl.java | 24 +
.../com/ifish/daoImpl/DeviceUserDaoImpl.java | 47 +
.../com/ifish/daoImpl/GoldControlDaoImpl.java | 23 +
.../daoImpl/GoldExpendRecordDaoImpl.java | 22 +
.../ifish/daoImpl/GoldGetRecordDaoImpl.java | 31 +
.../java/com/ifish/daoImpl/GoldRuleImpl.java | 23 +
.../ifish/daoImpl/GradeControlDaoImpl.java | 23 +
.../java/com/ifish/daoImpl/GradeDaoImpl.java | 24 +
.../com/ifish/daoImpl/GradeRecordDaoImpl.java | 24 +
.../java/com/ifish/daoImpl/GradeRuleImpl.java | 24 +
.../ifish/daoImpl/HardwareTypeDaoImpl.java | 25 +
.../com/ifish/daoImpl/IfishDoctorDaoImpl.java | 24 +
.../com/ifish/daoImpl/IfishGoodsDaoImpl.java | 22 +
.../com/ifish/daoImpl/IfishShopDaoImpl.java | 22 +
.../com/ifish/daoImpl/InformationDaoImpl.java | 24 +
.../daoImpl/InformationStatsDaoImpl.java | 22 +
.../com/ifish/daoImpl/LiveBannerImpl.java | 24 +
.../com/ifish/daoImpl/LiveMessageDaoImpl.java | 32 +
.../java/com/ifish/daoImpl/LiveRoomImpl.java | 203 +++
.../com/ifish/daoImpl/LiveRoomZanDaoImpl.java | 31 +
.../com/ifish/daoImpl/LookReportDaoImpl.java | 24 +
.../com/ifish/daoImpl/PushListDaoImpl.java | 51 +
.../daoImpl/QuestionsFeedbackDaoImpl.java | 25 +
.../com/ifish/daoImpl/ShopsInfoDaoImpl.java | 78 +
.../ifish/daoImpl/ShopsUserInfoDaoImpl.java | 23 +
.../com/ifish/daoImpl/UeditorDaoImpl.java | 24 +
.../ifish/daoImpl/UserActivityDaoImpl.java | 22 +
.../com/ifish/daoImpl/UserAssetDaoImpl.java | 17 +
.../java/com/ifish/daoImpl/UserDaoImpl.java | 66 +
.../com/ifish/daoImpl/VenderListDaoImpl.java | 41 +
.../com/ifish/daoImpl/VersionDaoImpl.java | 44 +
src/main/java/com/ifish/dto/AdInfoDto.java | 69 +
src/main/java/com/ifish/dto/DeviceDto.java | 205 +++
.../java/com/ifish/dto/DeviceInfoDto.java | 43 +
src/main/java/com/ifish/dto/GoldTaskDto.java | 62 +
src/main/java/com/ifish/dto/GradeInfoDto.java | 62 +
.../java/com/ifish/dto/GwellParamDto.java | 66 +
.../java/com/ifish/dto/IfishGoodsDto.java | 102 ++
.../java/com/ifish/dto/InformationDto.java | 76 +
src/main/java/com/ifish/dto/JsonResult.java | 49 +
.../java/com/ifish/dto/LiveRoomInfoDto.java | 169 ++
.../java/com/ifish/dto/NeteaseParamDto.java | 42 +
src/main/java/com/ifish/dto/PageingDto.java | 62 +
src/main/java/com/ifish/dto/RuleInfoDto.java | 88 +
.../java/com/ifish/dto/RuleRecordDto.java | 68 +
src/main/java/com/ifish/dto/ShopsListDto.java | 143 ++
.../java/com/ifish/dto/ShopsLookUserDto.java | 53 +
src/main/java/com/ifish/dto/ShopsUserDto.java | 68 +
.../java/com/ifish/dto/ShopsUserInfoDto.java | 147 ++
.../java/com/ifish/dto/UserActivityDto.java | 93 +
src/main/java/com/ifish/dto/UserAssetDto.java | 139 ++
src/main/java/com/ifish/dto/UserInfoDto.java | 133 ++
src/main/java/com/ifish/dto/VenderDto.java | 48 +
src/main/java/com/ifish/entity/AdInfo.java | 120 ++
.../java/com/ifish/entity/BrowseRoom.java | 39 +
.../java/com/ifish/entity/BrowseRoomId.java | 52 +
src/main/java/com/ifish/entity/Camera.java | 56 +
.../java/com/ifish/entity/CameraActive.java | 48 +
.../java/com/ifish/entity/CameraUser.java | 72 +
.../java/com/ifish/entity/CameraUserId.java | 52 +
src/main/java/com/ifish/entity/Comment.java | 130 ++
src/main/java/com/ifish/entity/Coupon.java | 155 ++
.../java/com/ifish/entity/CouponRecord.java | 164 ++
src/main/java/com/ifish/entity/Device.java | 152 ++
.../java/com/ifish/entity/DeviceCamera.java | 22 +
.../java/com/ifish/entity/DeviceCameraId.java | 47 +
.../java/com/ifish/entity/DeviceUser.java | 84 +
.../java/com/ifish/entity/DeviceUserId.java | 47 +
.../java/com/ifish/entity/GoldControl.java | 71 +
.../java/com/ifish/entity/GoldControlId.java | 60 +
.../com/ifish/entity/GoldExpendRecord.java | 129 ++
.../java/com/ifish/entity/GoldGetRecord.java | 133 ++
src/main/java/com/ifish/entity/GoldTask.java | 101 ++
src/main/java/com/ifish/entity/Grade.java | 90 +
.../java/com/ifish/entity/GradeControl.java | 71 +
.../java/com/ifish/entity/GradeControlId.java | 60 +
.../java/com/ifish/entity/GradeRecord.java | 115 ++
src/main/java/com/ifish/entity/GradeTask.java | 100 ++
.../java/com/ifish/entity/HardwareType.java | 144 ++
.../java/com/ifish/entity/IfishDoctor.java | 106 ++
.../java/com/ifish/entity/IfishGoods.java | 160 ++
src/main/java/com/ifish/entity/IfishShop.java | 48 +
.../java/com/ifish/entity/Information.java | 142 ++
.../com/ifish/entity/InformationStats.java | 45 +
.../java/com/ifish/entity/LiveBanner.java | 55 +
.../java/com/ifish/entity/LiveMessage.java | 130 ++
src/main/java/com/ifish/entity/LiveRoom.java | 118 ++
.../java/com/ifish/entity/LiveRoomZan.java | 36 +
.../java/com/ifish/entity/LiveRoomZanId.java | 47 +
.../java/com/ifish/entity/LookReport.java | 153 ++
src/main/java/com/ifish/entity/PushList.java | 137 ++
.../com/ifish/entity/QuestionsFeedback.java | 64 +
src/main/java/com/ifish/entity/ShopsInfo.java | 192 ++
.../java/com/ifish/entity/ShopsUserInfo.java | 164 ++
.../com/ifish/entity/ShopsUserInfoId.java | 47 +
src/main/java/com/ifish/entity/Ueditor.java | 85 +
src/main/java/com/ifish/entity/User.java | 293 ++++
.../java/com/ifish/entity/UserActivity.java | 74 +
src/main/java/com/ifish/entity/UserAsset.java | 108 ++
.../java/com/ifish/entity/VenderList.java | 67 +
src/main/java/com/ifish/entity/Version.java | 73 +
.../com/ifish/entity/hbm/BrowseRoom.hbm.xml | 13 +
.../java/com/ifish/entity/hbm/Camera.hbm.xml | 14 +
.../com/ifish/entity/hbm/CameraActive.hbm.xml | 13 +
.../com/ifish/entity/hbm/CameraUser.hbm.xml | 17 +
.../java/com/ifish/entity/hbm/Device.hbm.xml | 26 +
.../com/ifish/entity/hbm/DeviceCamera.hbm.xml | 11 +
.../com/ifish/entity/hbm/DeviceUser.hbm.xml | 17 +
.../com/ifish/entity/hbm/HardwareType.hbm.xml | 25 +
.../com/ifish/entity/hbm/LiveBanner.hbm.xml | 14 +
.../com/ifish/entity/hbm/LookReport.hbm.xml | 22 +
.../com/ifish/entity/hbm/PushList.hbm.xml | 22 +
.../entity/hbm/QuestionsFeedback.hbm.xml | 15 +
.../com/ifish/entity/hbm/ShopsInfo.hbm.xml | 31 +
.../java/com/ifish/entity/hbm/Version.hbm.xml | 16 +
.../com/ifish/enums/ActivityTypeEnum.java | 62 +
src/main/java/com/ifish/enums/AdTypeEnum.java | 43 +
.../java/com/ifish/enums/AddTypeEnum.java | 53 +
.../java/com/ifish/enums/BooleanEnum.java | 29 +
.../com/ifish/enums/GoldExpendTypeEnum.java | 56 +
.../java/com/ifish/enums/GoldGetTypeEnum.java | 73 +
.../com/ifish/enums/GradeGetTypeEnum.java | 39 +
src/main/java/com/ifish/enums/GwellEnum.java | 29 +
.../com/ifish/enums/IfishShopPlaceEnum.java | 55 +
src/main/java/com/ifish/enums/Index1Enum.java | 40 +
src/main/java/com/ifish/enums/Index2Enum.java | 40 +
src/main/java/com/ifish/enums/Index3Enum.java | 40 +
.../ifish/enums/LiveRoomOrderTypeEnum.java | 45 +
.../java/com/ifish/enums/MemberLevelEnum.java | 28 +
.../java/com/ifish/enums/NeteaseEnum.java | 28 +
.../java/com/ifish/enums/PayTourTypeEnum.java | 53 +
.../java/com/ifish/enums/PhoneTypeEnum.java | 29 +
.../java/com/ifish/enums/PushTypeEnum.java | 45 +
src/main/java/com/ifish/enums/ResultEnum.java | 63 +
.../java/com/ifish/enums/RoomStatusEnum.java | 30 +
.../java/com/ifish/enums/SendTypeEnum.java | 34 +
.../java/com/ifish/enums/ShopsStatusEnum.java | 31 +
.../java/com/ifish/enums/SmsSignEnum.java | 32 +
.../java/com/ifish/enums/SmsTemplateEnum.java | 34 +
.../com/ifish/enums/SubDirectoryEnum.java | 40 +
.../java/com/ifish/enums/UeditorTypeEnum.java | 39 +
.../java/com/ifish/enums/UserTypeEnum.java | 29 +
.../com/ifish/exception/ExceptionHandle.java | 37 +
.../com/ifish/exception/IfishException.java | 26 +
src/main/java/com/ifish/gwell/GwellApi.java | 224 +++
.../com/ifish/helper/CameraUserHelper.java | 79 +
.../com/ifish/helper/CameraUserHelperI.java | 35 +
.../com/ifish/helper/CommodityInfoHelper.java | 161 ++
.../ifish/helper/CommodityInfoHelperI.java | 62 +
.../com/ifish/helper/DeviceUserHelper.java | 92 +
.../com/ifish/helper/DeviceUserHelperI.java | 44 +
.../java/com/ifish/helper/FastDFSClient.java | 169 ++
.../java/com/ifish/helper/FastDFSClientI.java | 64 +
.../ifish/helper/HardWareVenderHelper.java | 78 +
.../ifish/helper/HardWareVenderHelperI.java | 34 +
.../java/com/ifish/helper/RedisHelper.java | 140 ++
.../java/com/ifish/helper/RedisHelperI.java | 68 +
.../com/ifish/helper/ShopsInfoHelper.java | 49 +
.../com/ifish/helper/ShopsInfoHelperI.java | 24 +
.../com/ifish/helper/UserActivityHelper.java | 66 +
.../com/ifish/helper/UserActivityHelperI.java | 34 +
.../java/com/ifish/helper/UserHelper.java | 549 ++++++
.../java/com/ifish/helper/UserHelperI.java | 32 +
.../com/ifish/hibernate/HibernateBaseDao.java | 165 ++
.../java/com/ifish/hibernate/Pagination.java | 82 +
.../SecurityValidateInterceptor.java | 69 +
src/main/java/com/ifish/jpush/SmsNumSend.java | 55 +
src/main/java/com/ifish/mail/Mail.java | 200 +++
.../com/ifish/mapper/Tbl_Ad_Info_Mapper.java | 23 +
.../com/ifish/mapper/Tbl_Camera_Mapper.java | 28 +
.../ifish/mapper/Tbl_Camera_User_Mapper.java | 28 +
.../mapper/Tbl_Commodity_Info_Mapper.java | 84 +
.../mapper/Tbl_Commodity_Info_MapperSql.java | 82 +
.../com/ifish/mapper/Tbl_Device_Mapper.java | 28 +
.../ifish/mapper/Tbl_Device_User_Mapper.java | 38 +
.../mapper/Tbl_Hardware_Type_Mapper.java | 28 +
.../ifish/mapper/Tbl_Shops_Info_Mapper.java | 22 +
.../mapper/Tbl_User_Activity_Mapper.java | 37 +
.../com/ifish/mapper/Tbl_User_Mapper.java | 57 +
.../com/ifish/mapper/Tbl_User_MapperSql.java | 92 +
.../ifish/mapper/Tbl_Vender_list_Mapper.java | 27 +
.../com/ifish/netease/CheckSumBuilder.java | 48 +
.../java/com/ifish/netease/NeteaseIM.java | 343 ++++
.../serializer/CustomDateSerializer.java | 21 +
.../com/ifish/serializer/DateSerializer.java | 21 +
.../java/com/ifish/service/AdInfoService.java | 21 +
.../com/ifish/service/AsyncTaskService.java | 29 +
.../java/com/ifish/service/BaseService.java | 138 ++
.../java/com/ifish/service/CacheService.java | 85 +
.../java/com/ifish/service/CameraService.java | 10 +
.../java/com/ifish/service/CouponService.java | 33 +
.../java/com/ifish/service/GoldService.java | 63 +
.../java/com/ifish/service/GradeService.java | 46 +
.../com/ifish/service/IfishDoctorService.java | 25 +
.../com/ifish/service/IfishGoodsService.java | 26 +
.../com/ifish/service/InformationService.java | 55 +
.../com/ifish/service/LiveRoomService.java | 74 +
.../com/ifish/service/PageListService.java | 22 +
.../java/com/ifish/service/ShopsService.java | 71 +
.../ifish/service/UserActivityService.java | 22 +
.../java/com/ifish/service/UserService.java | 83 +
.../ifish/serviceImpl/AdInfoServiceImpl.java | 59 +
.../serviceImpl/AsyncTaskServiceImpl.java | 100 ++
.../ifish/serviceImpl/BaseServiceImpl.java | 1544 +++++++++++++++++
.../ifish/serviceImpl/CacheServiceImpl.java | 190 ++
.../ifish/serviceImpl/CameraServiceImpl.java | 13 +
.../ifish/serviceImpl/CouponServiceImpl.java | 181 ++
.../ifish/serviceImpl/GoldServiceImpl.java | 430 +++++
.../ifish/serviceImpl/GradeServicempl.java | 221 +++
.../serviceImpl/IfishDoctorServiceImpl.java | 139 ++
.../serviceImpl/IfishGoodsServiceImpl.java | 71 +
.../serviceImpl/InformationServiceImpl.java | 197 +++
.../serviceImpl/LiveRoomServiceImpl.java | 554 ++++++
.../serviceImpl/PageListServiceImpl.java | 39 +
.../ifish/serviceImpl/ShopsServiceImpl.java | 475 +++++
.../serviceImpl/UserActivityServiceImpl.java | 82 +
.../ifish/serviceImpl/UserServiceImpl.java | 1072 ++++++++++++
.../java/com/ifish/util/IfishFilePath.java | 90 +
.../java/com/ifish/util/IfishFileUtils.java | 43 +
src/main/java/com/ifish/util/IfishUtil.java | 488 ++++++
src/main/java/com/ifish/util/RedisKey.java | 60 +
src/main/java/com/ifish/util/ResultUtil.java | 66 +
src/main/java/com/ifish/util/StringUtil.java | 229 +++
.../com/ifish/validator/AddValueParam.java | 50 +
.../com/ifish/validator/LiveRoomParam.java | 75 +
.../java/com/ifish/validator/LoginParam.java | 64 +
.../java/com/ifish/validator/PageParam.java | 61 +
.../com/ifish/validator/RegisterParam.java | 106 ++
.../ifish/validator/ShopsUserInfoParam.java | 108 ++
.../com/ifish/validator/ValidateUtil.java | 23 +
src/main/resources/application-context.xml | 101 ++
src/main/resources/ehcache-setting.xml | 50 +
src/main/resources/fdfs_client_ifish7.conf | 7 +
.../resources/fdfs_client_zhangxinyanv5.conf | 8 +
src/main/resources/ifish.properties | 6 +
src/main/resources/jdbc.properties | 29 +
src/main/resources/logback.xml | 38 +
src/main/resources/mybatis-config.xml | 7 +
src/main/resources/property.properties | 34 +
src/main/resources/spring-mybatis.xml | 73 +
src/main/resources/springmvc-servlet.xml | 72 +
src/main/webapp/META-INF/MANIFEST.MF | 3 +
src/main/webapp/META-INF/context.xml | 2 +
.../webapp/WEB-INF/lib/commons-codec-1.4.jar | Bin 0 -> 58160 bytes
.../WEB-INF/lib/fastdfs-client-java-1.25.jar | Bin 0 -> 91061 bytes
.../WEB-INF/lib/mysql-connector-5.1.8.jar | Bin 0 -> 723660 bytes
...o-sdk-java-auto_1444640346387-20151013.jar | Bin 0 -> 543502 bytes
src/main/webapp/WEB-INF/web.xml | 50 +
src/main/webapp/index.jsp | 11 +
src/main/webapp/static/css/jquery.alerts.css | 57 +
src/main/webapp/static/js/jquery-1.8.2.min.js | 2 +
src/main/webapp/static/js/jquery.alert.js | 224 +++
src/main/webapp/static/js/jquery.form.js | 1277 ++++++++++++++
.../serviceImpl/AdInfoServiceImplTest.java | 26 +
.../serviceImpl/GoldServiceImplTest.java | 25 +
.../InformationServiceImplTest.java | 34 +
.../UserActivityServiceImplTest.java | 29 +
.../serviceImpl/UserServiceImplTest.java | 31 +
334 files changed, 26855 insertions(+)
create mode 100644 .classpath
create mode 100644 .gitignore
create mode 100644 .project
create mode 100644 nb-configuration.xml
create mode 100644 pom.xml
create mode 100644 src/main/java/com/ifish/action/AdInfoAction.java
create mode 100644 src/main/java/com/ifish/action/CommodityAction.java
create mode 100644 src/main/java/com/ifish/action/CouponAction.java
create mode 100644 src/main/java/com/ifish/action/FileAction.java
create mode 100644 src/main/java/com/ifish/action/GoldAction.java
create mode 100644 src/main/java/com/ifish/action/GradeAction.java
create mode 100644 src/main/java/com/ifish/action/IfishDoctorAction.java
create mode 100644 src/main/java/com/ifish/action/IfishGoodsAction.java
create mode 100644 src/main/java/com/ifish/action/InformationAction.java
create mode 100644 src/main/java/com/ifish/action/LiveRoomAction.java
create mode 100644 src/main/java/com/ifish/action/PageListAction.java
create mode 100644 src/main/java/com/ifish/action/ShopsAction.java
create mode 100644 src/main/java/com/ifish/action/UpdateUserAction.java
create mode 100644 src/main/java/com/ifish/action/UserAction.java
create mode 100644 src/main/java/com/ifish/action/UserActivityAction.java
create mode 100644 src/main/java/com/ifish/action/UsersAction.java
create mode 100644 src/main/java/com/ifish/apiVersion/ApiVersion.java
create mode 100644 src/main/java/com/ifish/bean/CommodityInfoBean.java
create mode 100644 src/main/java/com/ifish/bean/DeviceUserBean.java
create mode 100644 src/main/java/com/ifish/bean/VenderListBean.java
create mode 100644 src/main/java/com/ifish/config/RedisConfig.java
create mode 100644 src/main/java/com/ifish/dao/AdInfoDao.java
create mode 100644 src/main/java/com/ifish/dao/BaseDao.java
create mode 100644 src/main/java/com/ifish/dao/BrowseRoomDao.java
create mode 100644 src/main/java/com/ifish/dao/CameraActiveDao.java
create mode 100644 src/main/java/com/ifish/dao/CameraDao.java
create mode 100644 src/main/java/com/ifish/dao/CameraUserDao.java
create mode 100644 src/main/java/com/ifish/dao/CommentDao.java
create mode 100644 src/main/java/com/ifish/dao/CouponDao.java
create mode 100644 src/main/java/com/ifish/dao/CouponRecordDao.java
create mode 100644 src/main/java/com/ifish/dao/DeviceCameraDao.java
create mode 100644 src/main/java/com/ifish/dao/DeviceDao.java
create mode 100644 src/main/java/com/ifish/dao/DeviceUserDao.java
create mode 100644 src/main/java/com/ifish/dao/GoldControlDao.java
create mode 100644 src/main/java/com/ifish/dao/GoldExpendRecordDao.java
create mode 100644 src/main/java/com/ifish/dao/GoldGetRecordDao.java
create mode 100644 src/main/java/com/ifish/dao/GoldRuleDao.java
create mode 100644 src/main/java/com/ifish/dao/GradeControlDao.java
create mode 100644 src/main/java/com/ifish/dao/GradeDao.java
create mode 100644 src/main/java/com/ifish/dao/GradeRecordDao.java
create mode 100644 src/main/java/com/ifish/dao/GradeRuleDao.java
create mode 100644 src/main/java/com/ifish/dao/HardwareTypeDao.java
create mode 100644 src/main/java/com/ifish/dao/IfishDoctorDao.java
create mode 100644 src/main/java/com/ifish/dao/IfishGoodsDao.java
create mode 100644 src/main/java/com/ifish/dao/IfishShopDao.java
create mode 100644 src/main/java/com/ifish/dao/InformationDao.java
create mode 100644 src/main/java/com/ifish/dao/InformationStatsDao.java
create mode 100644 src/main/java/com/ifish/dao/LiveBannerDao.java
create mode 100644 src/main/java/com/ifish/dao/LiveMessageDao.java
create mode 100644 src/main/java/com/ifish/dao/LiveRoomDao.java
create mode 100644 src/main/java/com/ifish/dao/LiveRoomZanDao.java
create mode 100644 src/main/java/com/ifish/dao/LookReportDao.java
create mode 100644 src/main/java/com/ifish/dao/PushListDao.java
create mode 100644 src/main/java/com/ifish/dao/QuestionsFeedbackDao.java
create mode 100644 src/main/java/com/ifish/dao/ShopsInfoDao.java
create mode 100644 src/main/java/com/ifish/dao/ShopsUserInfoDao.java
create mode 100644 src/main/java/com/ifish/dao/UeditorDao.java
create mode 100644 src/main/java/com/ifish/dao/UserActivityDao.java
create mode 100644 src/main/java/com/ifish/dao/UserAssetDao.java
create mode 100644 src/main/java/com/ifish/dao/UserDao.java
create mode 100644 src/main/java/com/ifish/dao/VenderListDao.java
create mode 100644 src/main/java/com/ifish/dao/VersionDao.java
create mode 100644 src/main/java/com/ifish/daoImpl/AdInfoDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/BrowseRoomDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/CameraActiveDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/CameraDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/CameraUserDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/CommentDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/CouponDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/CouponRecordDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/DeviceCameraDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/DeviceDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/DeviceUserDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/GoldControlDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/GoldExpendRecordDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/GoldGetRecordDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/GoldRuleImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/GradeControlDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/GradeDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/GradeRecordDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/GradeRuleImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/HardwareTypeDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/IfishDoctorDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/IfishGoodsDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/IfishShopDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/InformationDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/InformationStatsDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/LiveBannerImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/LiveMessageDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/LiveRoomImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/LiveRoomZanDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/LookReportDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/PushListDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/QuestionsFeedbackDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/ShopsInfoDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/ShopsUserInfoDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/UeditorDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/UserActivityDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/UserAssetDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/UserDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/VenderListDaoImpl.java
create mode 100644 src/main/java/com/ifish/daoImpl/VersionDaoImpl.java
create mode 100644 src/main/java/com/ifish/dto/AdInfoDto.java
create mode 100644 src/main/java/com/ifish/dto/DeviceDto.java
create mode 100644 src/main/java/com/ifish/dto/DeviceInfoDto.java
create mode 100644 src/main/java/com/ifish/dto/GoldTaskDto.java
create mode 100644 src/main/java/com/ifish/dto/GradeInfoDto.java
create mode 100644 src/main/java/com/ifish/dto/GwellParamDto.java
create mode 100644 src/main/java/com/ifish/dto/IfishGoodsDto.java
create mode 100644 src/main/java/com/ifish/dto/InformationDto.java
create mode 100644 src/main/java/com/ifish/dto/JsonResult.java
create mode 100644 src/main/java/com/ifish/dto/LiveRoomInfoDto.java
create mode 100644 src/main/java/com/ifish/dto/NeteaseParamDto.java
create mode 100644 src/main/java/com/ifish/dto/PageingDto.java
create mode 100644 src/main/java/com/ifish/dto/RuleInfoDto.java
create mode 100644 src/main/java/com/ifish/dto/RuleRecordDto.java
create mode 100644 src/main/java/com/ifish/dto/ShopsListDto.java
create mode 100644 src/main/java/com/ifish/dto/ShopsLookUserDto.java
create mode 100644 src/main/java/com/ifish/dto/ShopsUserDto.java
create mode 100644 src/main/java/com/ifish/dto/ShopsUserInfoDto.java
create mode 100644 src/main/java/com/ifish/dto/UserActivityDto.java
create mode 100644 src/main/java/com/ifish/dto/UserAssetDto.java
create mode 100644 src/main/java/com/ifish/dto/UserInfoDto.java
create mode 100644 src/main/java/com/ifish/dto/VenderDto.java
create mode 100644 src/main/java/com/ifish/entity/AdInfo.java
create mode 100644 src/main/java/com/ifish/entity/BrowseRoom.java
create mode 100644 src/main/java/com/ifish/entity/BrowseRoomId.java
create mode 100644 src/main/java/com/ifish/entity/Camera.java
create mode 100644 src/main/java/com/ifish/entity/CameraActive.java
create mode 100644 src/main/java/com/ifish/entity/CameraUser.java
create mode 100644 src/main/java/com/ifish/entity/CameraUserId.java
create mode 100644 src/main/java/com/ifish/entity/Comment.java
create mode 100644 src/main/java/com/ifish/entity/Coupon.java
create mode 100644 src/main/java/com/ifish/entity/CouponRecord.java
create mode 100644 src/main/java/com/ifish/entity/Device.java
create mode 100644 src/main/java/com/ifish/entity/DeviceCamera.java
create mode 100644 src/main/java/com/ifish/entity/DeviceCameraId.java
create mode 100644 src/main/java/com/ifish/entity/DeviceUser.java
create mode 100644 src/main/java/com/ifish/entity/DeviceUserId.java
create mode 100644 src/main/java/com/ifish/entity/GoldControl.java
create mode 100644 src/main/java/com/ifish/entity/GoldControlId.java
create mode 100644 src/main/java/com/ifish/entity/GoldExpendRecord.java
create mode 100644 src/main/java/com/ifish/entity/GoldGetRecord.java
create mode 100644 src/main/java/com/ifish/entity/GoldTask.java
create mode 100644 src/main/java/com/ifish/entity/Grade.java
create mode 100644 src/main/java/com/ifish/entity/GradeControl.java
create mode 100644 src/main/java/com/ifish/entity/GradeControlId.java
create mode 100644 src/main/java/com/ifish/entity/GradeRecord.java
create mode 100644 src/main/java/com/ifish/entity/GradeTask.java
create mode 100644 src/main/java/com/ifish/entity/HardwareType.java
create mode 100644 src/main/java/com/ifish/entity/IfishDoctor.java
create mode 100644 src/main/java/com/ifish/entity/IfishGoods.java
create mode 100644 src/main/java/com/ifish/entity/IfishShop.java
create mode 100644 src/main/java/com/ifish/entity/Information.java
create mode 100644 src/main/java/com/ifish/entity/InformationStats.java
create mode 100644 src/main/java/com/ifish/entity/LiveBanner.java
create mode 100644 src/main/java/com/ifish/entity/LiveMessage.java
create mode 100644 src/main/java/com/ifish/entity/LiveRoom.java
create mode 100644 src/main/java/com/ifish/entity/LiveRoomZan.java
create mode 100644 src/main/java/com/ifish/entity/LiveRoomZanId.java
create mode 100644 src/main/java/com/ifish/entity/LookReport.java
create mode 100644 src/main/java/com/ifish/entity/PushList.java
create mode 100644 src/main/java/com/ifish/entity/QuestionsFeedback.java
create mode 100644 src/main/java/com/ifish/entity/ShopsInfo.java
create mode 100644 src/main/java/com/ifish/entity/ShopsUserInfo.java
create mode 100644 src/main/java/com/ifish/entity/ShopsUserInfoId.java
create mode 100644 src/main/java/com/ifish/entity/Ueditor.java
create mode 100644 src/main/java/com/ifish/entity/User.java
create mode 100644 src/main/java/com/ifish/entity/UserActivity.java
create mode 100644 src/main/java/com/ifish/entity/UserAsset.java
create mode 100644 src/main/java/com/ifish/entity/VenderList.java
create mode 100644 src/main/java/com/ifish/entity/Version.java
create mode 100644 src/main/java/com/ifish/entity/hbm/BrowseRoom.hbm.xml
create mode 100644 src/main/java/com/ifish/entity/hbm/Camera.hbm.xml
create mode 100644 src/main/java/com/ifish/entity/hbm/CameraActive.hbm.xml
create mode 100644 src/main/java/com/ifish/entity/hbm/CameraUser.hbm.xml
create mode 100644 src/main/java/com/ifish/entity/hbm/Device.hbm.xml
create mode 100644 src/main/java/com/ifish/entity/hbm/DeviceCamera.hbm.xml
create mode 100644 src/main/java/com/ifish/entity/hbm/DeviceUser.hbm.xml
create mode 100644 src/main/java/com/ifish/entity/hbm/HardwareType.hbm.xml
create mode 100644 src/main/java/com/ifish/entity/hbm/LiveBanner.hbm.xml
create mode 100644 src/main/java/com/ifish/entity/hbm/LookReport.hbm.xml
create mode 100644 src/main/java/com/ifish/entity/hbm/PushList.hbm.xml
create mode 100644 src/main/java/com/ifish/entity/hbm/QuestionsFeedback.hbm.xml
create mode 100644 src/main/java/com/ifish/entity/hbm/ShopsInfo.hbm.xml
create mode 100644 src/main/java/com/ifish/entity/hbm/Version.hbm.xml
create mode 100644 src/main/java/com/ifish/enums/ActivityTypeEnum.java
create mode 100644 src/main/java/com/ifish/enums/AdTypeEnum.java
create mode 100644 src/main/java/com/ifish/enums/AddTypeEnum.java
create mode 100644 src/main/java/com/ifish/enums/BooleanEnum.java
create mode 100644 src/main/java/com/ifish/enums/GoldExpendTypeEnum.java
create mode 100644 src/main/java/com/ifish/enums/GoldGetTypeEnum.java
create mode 100644 src/main/java/com/ifish/enums/GradeGetTypeEnum.java
create mode 100644 src/main/java/com/ifish/enums/GwellEnum.java
create mode 100644 src/main/java/com/ifish/enums/IfishShopPlaceEnum.java
create mode 100644 src/main/java/com/ifish/enums/Index1Enum.java
create mode 100644 src/main/java/com/ifish/enums/Index2Enum.java
create mode 100644 src/main/java/com/ifish/enums/Index3Enum.java
create mode 100644 src/main/java/com/ifish/enums/LiveRoomOrderTypeEnum.java
create mode 100644 src/main/java/com/ifish/enums/MemberLevelEnum.java
create mode 100644 src/main/java/com/ifish/enums/NeteaseEnum.java
create mode 100644 src/main/java/com/ifish/enums/PayTourTypeEnum.java
create mode 100644 src/main/java/com/ifish/enums/PhoneTypeEnum.java
create mode 100644 src/main/java/com/ifish/enums/PushTypeEnum.java
create mode 100644 src/main/java/com/ifish/enums/ResultEnum.java
create mode 100644 src/main/java/com/ifish/enums/RoomStatusEnum.java
create mode 100644 src/main/java/com/ifish/enums/SendTypeEnum.java
create mode 100644 src/main/java/com/ifish/enums/ShopsStatusEnum.java
create mode 100644 src/main/java/com/ifish/enums/SmsSignEnum.java
create mode 100644 src/main/java/com/ifish/enums/SmsTemplateEnum.java
create mode 100644 src/main/java/com/ifish/enums/SubDirectoryEnum.java
create mode 100644 src/main/java/com/ifish/enums/UeditorTypeEnum.java
create mode 100644 src/main/java/com/ifish/enums/UserTypeEnum.java
create mode 100644 src/main/java/com/ifish/exception/ExceptionHandle.java
create mode 100644 src/main/java/com/ifish/exception/IfishException.java
create mode 100644 src/main/java/com/ifish/gwell/GwellApi.java
create mode 100644 src/main/java/com/ifish/helper/CameraUserHelper.java
create mode 100644 src/main/java/com/ifish/helper/CameraUserHelperI.java
create mode 100644 src/main/java/com/ifish/helper/CommodityInfoHelper.java
create mode 100644 src/main/java/com/ifish/helper/CommodityInfoHelperI.java
create mode 100644 src/main/java/com/ifish/helper/DeviceUserHelper.java
create mode 100644 src/main/java/com/ifish/helper/DeviceUserHelperI.java
create mode 100644 src/main/java/com/ifish/helper/FastDFSClient.java
create mode 100644 src/main/java/com/ifish/helper/FastDFSClientI.java
create mode 100644 src/main/java/com/ifish/helper/HardWareVenderHelper.java
create mode 100644 src/main/java/com/ifish/helper/HardWareVenderHelperI.java
create mode 100644 src/main/java/com/ifish/helper/RedisHelper.java
create mode 100644 src/main/java/com/ifish/helper/RedisHelperI.java
create mode 100644 src/main/java/com/ifish/helper/ShopsInfoHelper.java
create mode 100644 src/main/java/com/ifish/helper/ShopsInfoHelperI.java
create mode 100644 src/main/java/com/ifish/helper/UserActivityHelper.java
create mode 100644 src/main/java/com/ifish/helper/UserActivityHelperI.java
create mode 100644 src/main/java/com/ifish/helper/UserHelper.java
create mode 100644 src/main/java/com/ifish/helper/UserHelperI.java
create mode 100644 src/main/java/com/ifish/hibernate/HibernateBaseDao.java
create mode 100644 src/main/java/com/ifish/hibernate/Pagination.java
create mode 100644 src/main/java/com/ifish/interceptor/SecurityValidateInterceptor.java
create mode 100644 src/main/java/com/ifish/jpush/SmsNumSend.java
create mode 100644 src/main/java/com/ifish/mail/Mail.java
create mode 100644 src/main/java/com/ifish/mapper/Tbl_Ad_Info_Mapper.java
create mode 100644 src/main/java/com/ifish/mapper/Tbl_Camera_Mapper.java
create mode 100644 src/main/java/com/ifish/mapper/Tbl_Camera_User_Mapper.java
create mode 100644 src/main/java/com/ifish/mapper/Tbl_Commodity_Info_Mapper.java
create mode 100644 src/main/java/com/ifish/mapper/Tbl_Commodity_Info_MapperSql.java
create mode 100644 src/main/java/com/ifish/mapper/Tbl_Device_Mapper.java
create mode 100644 src/main/java/com/ifish/mapper/Tbl_Device_User_Mapper.java
create mode 100644 src/main/java/com/ifish/mapper/Tbl_Hardware_Type_Mapper.java
create mode 100644 src/main/java/com/ifish/mapper/Tbl_Shops_Info_Mapper.java
create mode 100644 src/main/java/com/ifish/mapper/Tbl_User_Activity_Mapper.java
create mode 100644 src/main/java/com/ifish/mapper/Tbl_User_Mapper.java
create mode 100644 src/main/java/com/ifish/mapper/Tbl_User_MapperSql.java
create mode 100644 src/main/java/com/ifish/mapper/Tbl_Vender_list_Mapper.java
create mode 100644 src/main/java/com/ifish/netease/CheckSumBuilder.java
create mode 100644 src/main/java/com/ifish/netease/NeteaseIM.java
create mode 100644 src/main/java/com/ifish/serializer/CustomDateSerializer.java
create mode 100644 src/main/java/com/ifish/serializer/DateSerializer.java
create mode 100644 src/main/java/com/ifish/service/AdInfoService.java
create mode 100644 src/main/java/com/ifish/service/AsyncTaskService.java
create mode 100644 src/main/java/com/ifish/service/BaseService.java
create mode 100644 src/main/java/com/ifish/service/CacheService.java
create mode 100644 src/main/java/com/ifish/service/CameraService.java
create mode 100644 src/main/java/com/ifish/service/CouponService.java
create mode 100644 src/main/java/com/ifish/service/GoldService.java
create mode 100644 src/main/java/com/ifish/service/GradeService.java
create mode 100644 src/main/java/com/ifish/service/IfishDoctorService.java
create mode 100644 src/main/java/com/ifish/service/IfishGoodsService.java
create mode 100644 src/main/java/com/ifish/service/InformationService.java
create mode 100644 src/main/java/com/ifish/service/LiveRoomService.java
create mode 100644 src/main/java/com/ifish/service/PageListService.java
create mode 100644 src/main/java/com/ifish/service/ShopsService.java
create mode 100644 src/main/java/com/ifish/service/UserActivityService.java
create mode 100644 src/main/java/com/ifish/service/UserService.java
create mode 100644 src/main/java/com/ifish/serviceImpl/AdInfoServiceImpl.java
create mode 100644 src/main/java/com/ifish/serviceImpl/AsyncTaskServiceImpl.java
create mode 100644 src/main/java/com/ifish/serviceImpl/BaseServiceImpl.java
create mode 100644 src/main/java/com/ifish/serviceImpl/CacheServiceImpl.java
create mode 100644 src/main/java/com/ifish/serviceImpl/CameraServiceImpl.java
create mode 100644 src/main/java/com/ifish/serviceImpl/CouponServiceImpl.java
create mode 100644 src/main/java/com/ifish/serviceImpl/GoldServiceImpl.java
create mode 100644 src/main/java/com/ifish/serviceImpl/GradeServicempl.java
create mode 100644 src/main/java/com/ifish/serviceImpl/IfishDoctorServiceImpl.java
create mode 100644 src/main/java/com/ifish/serviceImpl/IfishGoodsServiceImpl.java
create mode 100644 src/main/java/com/ifish/serviceImpl/InformationServiceImpl.java
create mode 100644 src/main/java/com/ifish/serviceImpl/LiveRoomServiceImpl.java
create mode 100644 src/main/java/com/ifish/serviceImpl/PageListServiceImpl.java
create mode 100644 src/main/java/com/ifish/serviceImpl/ShopsServiceImpl.java
create mode 100644 src/main/java/com/ifish/serviceImpl/UserActivityServiceImpl.java
create mode 100644 src/main/java/com/ifish/serviceImpl/UserServiceImpl.java
create mode 100644 src/main/java/com/ifish/util/IfishFilePath.java
create mode 100644 src/main/java/com/ifish/util/IfishFileUtils.java
create mode 100644 src/main/java/com/ifish/util/IfishUtil.java
create mode 100644 src/main/java/com/ifish/util/RedisKey.java
create mode 100644 src/main/java/com/ifish/util/ResultUtil.java
create mode 100644 src/main/java/com/ifish/util/StringUtil.java
create mode 100644 src/main/java/com/ifish/validator/AddValueParam.java
create mode 100644 src/main/java/com/ifish/validator/LiveRoomParam.java
create mode 100644 src/main/java/com/ifish/validator/LoginParam.java
create mode 100644 src/main/java/com/ifish/validator/PageParam.java
create mode 100644 src/main/java/com/ifish/validator/RegisterParam.java
create mode 100644 src/main/java/com/ifish/validator/ShopsUserInfoParam.java
create mode 100644 src/main/java/com/ifish/validator/ValidateUtil.java
create mode 100644 src/main/resources/application-context.xml
create mode 100644 src/main/resources/ehcache-setting.xml
create mode 100644 src/main/resources/fdfs_client_ifish7.conf
create mode 100644 src/main/resources/fdfs_client_zhangxinyanv5.conf
create mode 100644 src/main/resources/ifish.properties
create mode 100644 src/main/resources/jdbc.properties
create mode 100644 src/main/resources/logback.xml
create mode 100644 src/main/resources/mybatis-config.xml
create mode 100644 src/main/resources/property.properties
create mode 100644 src/main/resources/spring-mybatis.xml
create mode 100644 src/main/resources/springmvc-servlet.xml
create mode 100644 src/main/webapp/META-INF/MANIFEST.MF
create mode 100644 src/main/webapp/META-INF/context.xml
create mode 100644 src/main/webapp/WEB-INF/lib/commons-codec-1.4.jar
create mode 100644 src/main/webapp/WEB-INF/lib/fastdfs-client-java-1.25.jar
create mode 100644 src/main/webapp/WEB-INF/lib/mysql-connector-5.1.8.jar
create mode 100644 src/main/webapp/WEB-INF/lib/taobao-sdk-java-auto_1444640346387-20151013.jar
create mode 100644 src/main/webapp/WEB-INF/web.xml
create mode 100644 src/main/webapp/index.jsp
create mode 100644 src/main/webapp/static/css/jquery.alerts.css
create mode 100644 src/main/webapp/static/js/jquery-1.8.2.min.js
create mode 100644 src/main/webapp/static/js/jquery.alert.js
create mode 100644 src/main/webapp/static/js/jquery.form.js
create mode 100644 src/test/java/com/ifish/serviceImpl/AdInfoServiceImplTest.java
create mode 100644 src/test/java/com/ifish/serviceImpl/GoldServiceImplTest.java
create mode 100644 src/test/java/com/ifish/serviceImpl/InformationServiceImplTest.java
create mode 100644 src/test/java/com/ifish/serviceImpl/UserActivityServiceImplTest.java
create mode 100644 src/test/java/com/ifish/serviceImpl/UserServiceImplTest.java
diff --git a/.classpath b/.classpath
new file mode 100644
index 0000000..a25cb9e
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9f97022
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+target/
\ No newline at end of file
diff --git a/.project b/.project
new file mode 100644
index 0000000..fd7063b
--- /dev/null
+++ b/.project
@@ -0,0 +1,47 @@
+
+
+ ifish
+
+
+
+
+
+ org.eclipse.wst.jsdt.core.javascriptValidator
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.wst.common.project.facet.core.builder
+
+
+
+
+ org.eclipse.ui.externaltools.ExternalToolBuilder
+ full,incremental,
+
+
+ LaunchConfigHandle
+ <project>/.externalToolBuilders/org.eclipse.wst.validation.validationbuilder.launch
+
+
+
+
+ org.eclipse.m2e.core.maven2Builder
+
+
+
+
+
+ org.eclipse.jem.workbench.JavaEMFNature
+ org.eclipse.wst.common.modulecore.ModuleCoreNature
+ org.eclipse.jdt.core.javanature
+ org.eclipse.m2e.core.maven2Nature
+ org.eclipse.wst.common.project.facet.core.nature
+ org.eclipse.wst.jsdt.core.jsNature
+
+
diff --git a/nb-configuration.xml b/nb-configuration.xml
new file mode 100644
index 0000000..d8d4a97
--- /dev/null
+++ b/nb-configuration.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+ Tomcat
+
+
+
+ src/main/resources/redis-config.xml
+
+
+
+
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..5ac5917
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,299 @@
+
+ 4.0.0
+ ifish
+ ifish
+ war
+ 0.0.1-SNAPSHOT
+ ifish Maven Webapp
+ http://mvnrepository.com
+
+
+
+ org.springframework
+ spring-core
+ 4.3.8.RELEASE
+ jar
+
+
+
+ org.springframework
+ spring-context
+ 4.1.6.RELEASE
+
+
+
+ org.springframework
+ spring-orm
+ 4.1.6.RELEASE
+
+
+
+ org.aspectj
+ aspectjweaver
+ 1.8.5
+
+
+
+ org.springframework
+ spring-webmvc
+ 4.1.6.RELEASE
+
+
+
+ org.springframework
+ spring-context-support
+ 4.1.6.RELEASE
+
+
+
+
+
+ redis.clients
+ jedis
+ 2.9.0
+
+
+
+ org.hibernate
+ hibernate-core
+ 4.3.11.Final
+
+
+
+ org.jboss.logging
+ jboss-logging-annotations
+ 2.0.1.Final
+
+
+
+ commons-fileupload
+ commons-fileupload
+ 1.3.1
+
+
+
+ c3p0
+ c3p0
+ 0.9.1.2
+
+
+
+ org.apache.commons
+ commons-lang3
+ 3.5
+
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+ 2.5.3
+
+
+
+ org.codehaus.jackson
+ jackson-mapper-asl
+ 1.9.13
+
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ 2.5.3
+
+
+
+ org.slf4j
+ slf4j-api
+ 1.7.12
+
+
+
+ ch.qos.logback
+ logback-core
+ 1.1.2
+
+
+
+ ch.qos.logback
+ logback-classic
+ 1.1.2
+
+
+
+ org.apache.mina
+ mina-core
+ 2.0.7
+
+
+
+ javax.servlet
+ servlet-api
+ 3.0-alpha-1
+
+
+
+ jstl
+ jstl
+ 1.2
+
+
+
+ org.apache.httpcomponents
+ httpclient
+ 4.3.5
+
+
+
+ javax.mail
+ mail
+ 1.4.7
+
+
+
+ com.alibaba
+ fastjson
+ 1.2.28
+
+
+
+ net.sf.ehcache
+ ehcache
+ 2.10.3
+
+
+
+ javax.validation
+ validation-api
+ 1.1.0.Final
+
+
+
+ org.hibernate
+ hibernate-validator
+ 5.2.4.Final
+
+
+
+ junit
+ junit
+ 4.12
+ test
+
+
+
+ org.springframework
+ spring-test
+ 4.1.6.RELEASE
+ test
+
+
+ com
+ taobao-sdk
+ 1.0
+ system
+ ${basedir}/src/main/webapp/WEB-INF/lib/taobao-sdk-java-auto_1444640346387-20151013.jar
+
+
+ org.mybatis
+ mybatis
+ 3.4.4
+
+
+
+ org.mybatis
+ mybatis-spring
+ 1.3.1
+
+
+ org.csource
+ fastdfs-client-java
+ 1.25
+ system
+ ${basedir}/src/main/webapp/WEB-INF/lib/fastdfs-client-java-1.25.jar
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+ 2.5
+ jar
+
+
+ log4j
+ log4j
+ 1.2.17
+ jar
+
+
+ org.springframework.data
+ spring-data-redis
+ 1.7.1.RELEASE
+ jar
+
+
+
+ ifish
+
+
+ org.apache.maven.plugins
+ maven-war-plugin
+ 2.4
+
+
+
+ src/main/webapp
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.5.1
+
+ 1.7
+ 1.7
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 2.19.1
+
+ true
+
+
+
+
+
+ src/main/java
+
+ **/*.hbm.xml
+
+
+
+ src/main/resources
+
+ **/*.xml
+ **/*.properties
+ **/*.conf
+
+
+
+
+
+
+ UTF-8
+
+
+
diff --git a/src/main/java/com/ifish/action/AdInfoAction.java b/src/main/java/com/ifish/action/AdInfoAction.java
new file mode 100644
index 0000000..a91d62e
--- /dev/null
+++ b/src/main/java/com/ifish/action/AdInfoAction.java
@@ -0,0 +1,55 @@
+package com.ifish.action;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.ifish.dto.JsonResult;
+import com.ifish.enums.AdTypeEnum;
+import com.ifish.enums.ResultEnum;
+import com.ifish.exception.IfishException;
+import com.ifish.service.AdInfoService;
+
+/**
+ * 广告信息
+ *
+ * @author Administrator
+ *
+ */
+@Controller
+@RequestMapping(value = "/adInfos")
+@ResponseBody
+public class AdInfoAction {
+
+ @Autowired
+ private AdInfoService adInfoService;
+
+ /**
+ * 根据类型获取广告信息
+ *
+ * @param adType
+ * @return
+ */
+ @RequestMapping(value = "/type/{adType}", method = RequestMethod.GET)
+ public JsonResult> getAdInfosByType(@PathVariable("adType") int adType) {
+ //校验类型
+ AdTypeEnum adTypeEnum = AdTypeEnum.getAdTypeEnum(adType);
+ if (adTypeEnum == null) {
+ throw new IfishException(ResultEnum.error401);
+ }
+ return adInfoService.getAdInfosByType(adTypeEnum);
+ }
+
+ /**
+ * 获取广告信息表最大ID
+ *
+ * @return
+ */
+ @RequestMapping(value = "getMaxInfo", method = RequestMethod.GET)
+ public JsonResult> getMaxInfo() {
+ return adInfoService.getMaxInfo();
+ }
+}
diff --git a/src/main/java/com/ifish/action/CommodityAction.java b/src/main/java/com/ifish/action/CommodityAction.java
new file mode 100644
index 0000000..3e9d9ca
--- /dev/null
+++ b/src/main/java/com/ifish/action/CommodityAction.java
@@ -0,0 +1,97 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.action;
+
+import com.ifish.bean.CommodityInfoBean;
+import com.ifish.dto.JsonResult;
+import com.ifish.dto.PageingDto;
+import com.ifish.enums.ResultEnum;
+import com.ifish.exception.IfishException;
+import com.ifish.helper.CommodityInfoHelperI;
+import com.ifish.helper.RedisHelperI;
+import org.apache.commons.lang3.StringUtils;
+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.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ *
+ * @author Administrator
+ */
+@RestController
+public class CommodityAction {
+
+ @Autowired
+ private CommodityInfoHelperI commodityInfoHelperI;
+
+ /**
+ * 创建商品
+ *
+ * @param commodityInfoBean
+ * @return
+ */
+ @RequestMapping(value = "/createCommodity", method = RequestMethod.POST)
+ public JsonResult> createCommodityInfo(CommodityInfoBean commodityInfoBean, MultipartFile img, MultipartFile video) {
+ return commodityInfoHelperI.createCommodityInfo(commodityInfoBean, img, video);
+ }
+
+ /**
+ * 修改商品
+ *
+ * @param commodityInfoBean
+ * @return
+ */
+ @RequestMapping(value = "/updateCommodity", method = RequestMethod.POST)
+ public JsonResult> updateCommodityInfo(CommodityInfoBean commodityInfoBean) {
+ return commodityInfoHelperI.updateCommodityInfo(commodityInfoBean);
+ }
+
+ /**
+ * 根据商品ID查询商品详情
+ *
+ * @param commodityId
+ * @return
+ */
+ @RequestMapping(value = "/getCommodityById", method = RequestMethod.GET)
+ public JsonResult> getCommodityInfo(Integer commodityId) {
+ return commodityInfoHelperI.getCommodityInfo(commodityId);
+ }
+
+ /**
+ * 根据店铺ID分页获取商品列表
+ *
+ * @param pageSize
+ * @param firstResult
+ * @param shopId
+ * @param commodityState
+ * @return
+ */
+ @RequestMapping(value = "/getCommodityInfoByPage", method = RequestMethod.GET)
+ public PageingDto> getCommodityInfoByPage(Integer pageSize, Integer firstResult, Integer shopId, Integer commodityState, String orderBy) {
+ //参数校验
+ if (firstResult < 0 || (pageSize < 1 || pageSize > 20)) {
+ throw new IfishException(ResultEnum.error401);
+ }
+ if (commodityState == null) {
+ commodityState = 1;
+ }
+ return commodityInfoHelperI.getCommodityInfoByPage(pageSize, firstResult, shopId, commodityState, orderBy);
+ }
+
+ /**
+ * 删除商品
+ *
+ * @param commodityId
+ * @return
+ */
+ @RequestMapping(value = "/deleteCommodityById", method = RequestMethod.POST)
+ public JsonResult> deleteCommodityInfo(Integer commodityId) {
+ return commodityInfoHelperI.deleteCommodityInfo(commodityId);
+ }
+}
diff --git a/src/main/java/com/ifish/action/CouponAction.java b/src/main/java/com/ifish/action/CouponAction.java
new file mode 100644
index 0000000..3496e5a
--- /dev/null
+++ b/src/main/java/com/ifish/action/CouponAction.java
@@ -0,0 +1,63 @@
+package com.ifish.action;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.ifish.dto.JsonResult;
+import com.ifish.dto.PageingDto;
+import com.ifish.enums.ResultEnum;
+import com.ifish.exception.IfishException;
+import com.ifish.service.CouponService;
+import com.ifish.validator.PageParam;
+
+/**
+ * 优惠券
+ * @author Administrator
+ *
+ */
+@RestController
+public class CouponAction {
+
+ @Autowired
+ private CouponService couponService;
+
+ /**
+ * 获取所有有效优惠券
+ * @return
+ */
+ @RequestMapping(value="/validatingCoupons",method=RequestMethod.GET)
+ public JsonResult> getAllValidCoupon(){
+ return couponService.getAllValidCoupon();
+ }
+
+ /**
+ * 兑换优惠券
+ * @param userId
+ * @param couponId
+ * @return
+ */
+ @RequestMapping(value="/exchangeCoupon/{userId}/{couponId}",method=RequestMethod.POST)//
+ public JsonResult> exchangeCoupon(@PathVariable("userId")Integer userId,@PathVariable("couponId")Integer couponId){
+ return couponService.exchangeCoupon(userId, couponId);
+ }
+
+ /**
+ * 分页获取兑换记录
+ * @param param
+ * @return
+ */
+ @RequestMapping(value="/couponRecords",method=RequestMethod.GET)
+ public PageingDto> getCouponRecordByPage(@Validated PageParam param,BindingResult result){
+ //参数校验
+ if(result.hasErrors()){
+ throw new IfishException(ResultEnum.error401);
+ }
+ return couponService.getCouponRecordByPage(param);
+ }
+
+}
diff --git a/src/main/java/com/ifish/action/FileAction.java b/src/main/java/com/ifish/action/FileAction.java
new file mode 100644
index 0000000..865cab1
--- /dev/null
+++ b/src/main/java/com/ifish/action/FileAction.java
@@ -0,0 +1,32 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.action;
+
+import com.ifish.helper.FastDFSClientI;
+import java.io.IOException;
+import javax.servlet.http.HttpServletRequest;
+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;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ *
+ * @author Administrator
+ */
+@RestController
+@RequestMapping("/file")
+public class FileAction {
+
+ @Autowired
+ private FastDFSClientI fastDFSClientI;
+
+ @RequestMapping(value = "/fileupload", method = RequestMethod.POST)
+ public Object testfile(MultipartFile uploadFile, HttpServletRequest request) throws IOException {
+ return fastDFSClientI.uploadFileToFastDFS(uploadFile);
+ }
+}
diff --git a/src/main/java/com/ifish/action/GoldAction.java b/src/main/java/com/ifish/action/GoldAction.java
new file mode 100644
index 0000000..b6ffdbf
--- /dev/null
+++ b/src/main/java/com/ifish/action/GoldAction.java
@@ -0,0 +1,109 @@
+package com.ifish.action;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.ifish.dto.JsonResult;
+import com.ifish.enums.ResultEnum;
+import com.ifish.exception.IfishException;
+import com.ifish.service.GoldService;
+import com.ifish.validator.AddValueParam;
+import com.ifish.validator.PageParam;
+
+/**
+ * 金币
+ * @author Administrator
+ *
+ */
+@Controller
+@RequestMapping("/gold")
+@ResponseBody
+public class GoldAction {
+
+ @Autowired
+ private GoldService goldService;
+
+ /**
+ * 新增金币
+ * @param addValueParam
+ * @param result
+ * @return
+ */
+ @RequestMapping(value="/goldValue.do",method=RequestMethod.POST)
+ public Object addGoldValue(@Validated AddValueParam addValueParam,BindingResult result) {
+ //参数校验
+ if(result.hasErrors()){
+ throw new IfishException(ResultEnum.error401);
+ }
+ return goldService.addGoldValue(addValueParam);
+ }
+
+ /**
+ * 分页金币获取记录
+ * @param pageParam
+ * @param result
+ * @return
+ */
+ @RequestMapping(value="/goldGetRecord.do",method=RequestMethod.GET)
+ public Object getGoldGetRecordByPage(@Validated PageParam pageParam,BindingResult result){
+ //参数校验
+ if(result.hasErrors()){
+ throw new IfishException(ResultEnum.error401);
+ }
+ return goldService.getGoldGetRecordByPage(pageParam);
+ }
+
+ /**
+ * 分页金币消耗记录
+ * @param pageParam
+ * @param result
+ * @return
+ */
+ @RequestMapping(value="/goldExpendRecord.do",method=RequestMethod.GET)
+ public Object getGoldExpendRecordByPage(@Validated PageParam pageParam,BindingResult result){
+ //参数校验
+ if(result.hasErrors()){
+ throw new IfishException(ResultEnum.error401);
+ }
+ return goldService.getGoldExpendRecordByPage(pageParam);
+ }
+
+ /**
+ * 签到
+ * @param userId
+ * @return
+ */
+ @RequestMapping(value="/signin.do",method=RequestMethod.POST)
+ public Object signin(@RequestParam Integer userId) {
+ return goldService.signin(userId);
+ }
+
+ /**
+ * 砸金蛋
+ * @param userId
+ * @return
+ */
+ @RequestMapping(value="/hitGoldenEgg.do",method=RequestMethod.POST)
+ public Object hitGoldenEgg(@RequestParam Integer userId){
+ return goldService.hitGoldenEgg(userId);
+ }
+
+ /**
+ * 爱鱼看看金币打赏
+ * @param userId 打赏人用户ID
+ * @param userId2 被打赏人用户ID
+ * @return
+ */
+ @RequestMapping(value="/liveRoomReward/{userId}/{userId2}",method=RequestMethod.POST)
+ public JsonResult> liveRoomReward(@PathVariable("userId")Integer userId,@PathVariable("userId2")Integer userId2){
+ return goldService.liveRoomReward(userId, userId2);
+ }
+
+}
diff --git a/src/main/java/com/ifish/action/GradeAction.java b/src/main/java/com/ifish/action/GradeAction.java
new file mode 100644
index 0000000..287fca4
--- /dev/null
+++ b/src/main/java/com/ifish/action/GradeAction.java
@@ -0,0 +1,71 @@
+package com.ifish.action;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.ifish.enums.ResultEnum;
+import com.ifish.exception.IfishException;
+import com.ifish.service.GradeService;
+import com.ifish.validator.AddValueParam;
+import com.ifish.validator.PageParam;
+
+/**
+ * 等级
+ * @author Administrator
+ *
+ */
+@Controller
+@RequestMapping("/grade")
+@ResponseBody
+public class GradeAction {
+
+ @Autowired
+ private GradeService gradeService;
+
+ /**
+ * 新增经验值
+ * @param addValueParam
+ * @param result
+ * @return
+ */
+ @RequestMapping(value="/gradeValue.do",method=RequestMethod.POST)
+ public Object addGradeValue(@Validated AddValueParam addValueParam,BindingResult result) {
+ //参数校验
+ if(result.hasErrors()){
+ throw new IfishException(ResultEnum.error401);
+ }
+ return this.gradeService.addGradeValue(addValueParam);
+ }
+
+ /**
+ * 获取规则等级信息
+ * @param version
+ * @return
+ */
+ @RequestMapping(value="/gradeRuleInfo.do",method=RequestMethod.GET)
+ public Object gradeRuleInfo(@RequestParam Integer userId){
+ return this.gradeService.getGradeRuleInfo(userId);
+ }
+
+ /**
+ * 分页经验值获取记录
+ * @param pageParam
+ * @param result
+ * @return
+ */
+ @RequestMapping(value="/gradeRecord.do",method=RequestMethod.GET)
+ public Object getGradeRecordByPage(@Validated PageParam pageParam,BindingResult result){
+ //参数校验
+ if(result.hasErrors()){
+ throw new IfishException(ResultEnum.error401);
+ }
+ return this.gradeService.getGradeRecordByPage(pageParam);
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/ifish/action/IfishDoctorAction.java b/src/main/java/com/ifish/action/IfishDoctorAction.java
new file mode 100644
index 0000000..e449a75
--- /dev/null
+++ b/src/main/java/com/ifish/action/IfishDoctorAction.java
@@ -0,0 +1,54 @@
+package com.ifish.action;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.ifish.dto.JsonResult;
+import com.ifish.entity.IfishDoctor;
+import com.ifish.enums.ResultEnum;
+import com.ifish.exception.IfishException;
+import com.ifish.service.IfishDoctorService;
+
+/**
+ *
+ * @author ggw
+ *
+ */
+@Controller
+@RequestMapping("/ifishDoctor")
+@ResponseBody
+public class IfishDoctorAction {
+
+ @Autowired
+ private IfishDoctorService ifishDoctorService;
+
+ /**
+ * 提交问题
+ * @param ifishDoctor
+ * @return
+ */
+ @RequestMapping(value="/v3/saveIfishDoctor.do",method=RequestMethod.POST)
+ public Object saveIfishDoctor(IfishDoctor ifishDoctor) {
+ return ifishDoctorService.saveIfishDoctor(ifishDoctor);
+ }
+
+ /**
+ * 金币打赏提交问题
+ * @param ifishDoctor
+ * @param result
+ * @return
+ */
+ @RequestMapping(value="/payTourQuestion",method=RequestMethod.POST)
+ public JsonResult> payTourSubmitQuestion(String payTourType,@Validated IfishDoctor ifishDoctor,BindingResult result){
+ if(result.hasErrors()){
+ throw new IfishException(ResultEnum.error401);
+ }
+ return ifishDoctorService.payTourSubmitQuestion(ifishDoctor,payTourType);
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/ifish/action/IfishGoodsAction.java b/src/main/java/com/ifish/action/IfishGoodsAction.java
new file mode 100644
index 0000000..610989b
--- /dev/null
+++ b/src/main/java/com/ifish/action/IfishGoodsAction.java
@@ -0,0 +1,51 @@
+package com.ifish.action;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.ifish.dto.JsonResult;
+import com.ifish.enums.IfishShopPlaceEnum;
+import com.ifish.enums.ResultEnum;
+import com.ifish.exception.IfishException;
+import com.ifish.service.IfishGoodsService;
+
+/**
+ * 商品信息Controller
+ * @author Administrator
+ *
+ */
+@RestController
+public class IfishGoodsAction {
+
+ @Autowired
+ private IfishGoodsService ifishGoodsService;
+
+ /**
+ * 根据位置获取商品信息
+ * @param goodsPlace
+ * @return
+ */
+ @RequestMapping(value="/ifishGoods/type/{goodsType}",method=RequestMethod.GET)
+ public JsonResult> getIfishGoodsByGoodsPlace(@PathVariable("goodsType") Integer goodsPlace){
+ //校验类型
+ IfishShopPlaceEnum shopPlaceEnum = IfishShopPlaceEnum.getAdTypeEnum(goodsPlace);
+ if(shopPlaceEnum==null){
+ throw new IfishException(ResultEnum.error401);
+ }
+ return ifishGoodsService.getIfishGoodsByGoodsPlace(shopPlaceEnum);
+ }
+
+ /**
+ * 增加商品点击数
+ * @param goodsId
+ * @return
+ */
+ @RequestMapping(value="/ifishGoods/{goodsId}/additionClickNum",method=RequestMethod.POST)
+ public JsonResult> addClickNum(@PathVariable("goodsId") Integer goodsId){
+ return ifishGoodsService.addClickNum(goodsId);
+ }
+
+}
diff --git a/src/main/java/com/ifish/action/InformationAction.java b/src/main/java/com/ifish/action/InformationAction.java
new file mode 100644
index 0000000..f24c492
--- /dev/null
+++ b/src/main/java/com/ifish/action/InformationAction.java
@@ -0,0 +1,76 @@
+package com.ifish.action;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.ifish.dto.JsonResult;
+import com.ifish.dto.PageingDto;
+import com.ifish.entity.Comment;
+import com.ifish.enums.ResultEnum;
+import com.ifish.exception.IfishException;
+import com.ifish.service.InformationService;
+import com.ifish.validator.PageParam;
+
+
+@Controller
+@ResponseBody
+public class InformationAction {
+ @Autowired
+ private InformationService informationService;
+
+ /**
+ * 获取用户评论
+ * @param comment
+ * @return
+ */
+ @RequestMapping(value="/information/v3/findCommentsByUeditorId.do",method=RequestMethod.POST)
+ public Object findCommentsByUeditorId(Integer ueditorId,Integer firstResult,Integer pageSize,HttpServletResponse response){
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ return informationService.findCommentsByUeditorId(ueditorId, firstResult, pageSize);
+ }
+
+ /**
+ * 保存评论
+ * @param comment
+ * @return
+ */
+ @RequestMapping(value="/information/v3/saveComment.do",method=RequestMethod.POST)
+ public Object saveComment(Comment comment,HttpServletResponse response){
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ return informationService.saveComment(comment);
+ }
+
+ /**
+ * 分页获取资讯
+ * @param pageParam
+ * @param result
+ * @return
+ */
+ @RequestMapping(value="/informations",method=RequestMethod.GET)
+ public PageingDto> getInformationsByPage(@Validated PageParam pageParam,BindingResult result){
+ //参数校验
+ if(result.hasErrors()){
+ throw new IfishException(ResultEnum.error401);
+ }
+ return informationService.getInformationsByPage(pageParam);
+ }
+
+ /**
+ * 增加点击数
+ * @param infoId
+ * @return
+ */
+ @RequestMapping(value="/informations/{infoId}/additionClickNum",method=RequestMethod.POST)
+ public JsonResult> addClickNum(@PathVariable("infoId") Integer infoId){
+ return informationService.addClickNum(infoId);
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/ifish/action/LiveRoomAction.java b/src/main/java/com/ifish/action/LiveRoomAction.java
new file mode 100644
index 0000000..1d0d209
--- /dev/null
+++ b/src/main/java/com/ifish/action/LiveRoomAction.java
@@ -0,0 +1,209 @@
+package com.ifish.action;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ifish.dto.JsonResult;
+import com.ifish.dto.PageingDto;
+import com.ifish.entity.LiveBanner;
+import com.ifish.entity.LiveMessage;
+import com.ifish.enums.LiveRoomOrderTypeEnum;
+import com.ifish.enums.ResultEnum;
+import com.ifish.enums.SubDirectoryEnum;
+import com.ifish.exception.IfishException;
+import com.ifish.service.LiveRoomService;
+import com.ifish.util.IfishFilePath;
+import com.ifish.util.IfishFileUtils;
+import com.ifish.util.IfishUtil;
+import com.ifish.util.ResultUtil;
+import com.ifish.validator.LiveRoomParam;
+import com.ifish.validator.PageParam;
+
+/**
+ *
+ * @author ggw
+ *
+ */
+@RestController
+public class LiveRoomAction {
+ @Autowired
+ private LiveRoomService liveRoomService;
+
+ /**
+ * 新增直播间
+ * @param liveRoom
+ * @param fileUpload
+ * @return
+ */
+ @RequestMapping(value="/liveRoom/v3/addLiveRoom.do",method=RequestMethod.POST)
+ public JsonResult> addLiveRoom(MultipartFile fileUpload,LiveRoomParam liveRoomParam,BindingResult result){
+ //校验参数
+ if(result.hasErrors() || fileUpload==null){
+ throw new IfishException(ResultEnum.error401);
+ }
+ //上传封面不能大于1M
+ if(fileUpload.getSize()>1048576){
+ throw new IfishException(ResultEnum.warn206);
+ }
+ //新增直播间
+ JSONObject json = liveRoomService.addLiveRoom(liveRoomParam);
+ //图片名称
+ String picName = json.getInteger("roomId")+".png";
+ try {
+ //上传文件
+ IfishFileUtils.uploadFile(IfishFilePath.path_room_img, picName, fileUpload);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ return ResultUtil.success(json);
+ }
+ /**
+ * 修改直播间
+ * @param liveRoom
+ * @param fileUpload
+ * @return
+ */
+ @RequestMapping(value="/liveRoom/v3/updateLiveRoom.do",method=RequestMethod.POST)
+ public JsonResult> updateLiveRoom(MultipartFile fileUpload,@RequestParam("roomId")Integer roomId,LiveRoomParam liveRoomParam,BindingResult result){
+ //校验参数
+ if(result.hasErrors()){
+ throw new IfishException(ResultEnum.error401);
+ }
+ //上传的图片不能大于1M
+ if(fileUpload!=null && fileUpload.getSize()>1048576){
+ throw new IfishException(ResultEnum.warn206);
+ }
+ //更新
+ JsonResult> jsonResult = liveRoomService.updateLiveRoom(roomId,liveRoomParam);
+ //更新文件
+ if(fileUpload!=null){
+ //图片名称
+ String picName = roomId+".png";
+ try {
+ //上传文件
+ IfishFileUtils.uploadFile(IfishFilePath.path_room_img, picName, fileUpload);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return jsonResult;
+ }
+
+ /**
+ * 直播间人气加一
+ * @param roomId
+ * @return
+ */
+ @RequestMapping(value="/liveRoom/v3/popularityValue.do",method=RequestMethod.POST)
+ public Object popularityValue(Integer roomId,Integer userId){
+ return liveRoomService.popularityValue(roomId,userId);
+ }
+
+ /**
+ * 获取直播间信息(修改直播间信息)
+ * @param roomId
+ * @return
+ */
+ @RequestMapping(value="/liveRoom/v3/getLiveRoomInfo.do",method=RequestMethod.POST)
+ public Object getLiveRoomInfo(Integer userId){
+ return liveRoomService.getLiveRoomInfo(userId);
+ }
+
+ /**
+ * 获取直播列表
+ * @param firstResult
+ * @param pageSize
+ * @return
+ */
+ @RequestMapping(value="/liveRoom/v3/getLiveRooms.do",method=RequestMethod.POST)
+ public Object popularityValue(Integer firstResult,Integer pageSize,Integer userId,String orders){
+ return liveRoomService.getLiveRoomsByPage(firstResult, pageSize,userId,orders);
+ }
+
+ /**
+ * 获取直播banner图
+ * @return
+ */
+ @RequestMapping(value="/liveRoom/v3/getLiveBanners.do",method=RequestMethod.POST)
+ public Object getLiveBanners(){
+ List list = liveRoomService.getLiveBanners();
+ if(list!=null){
+ for (LiveBanner liveBanner : list) {
+ liveBanner.setBannerImg(IfishFilePath.getPath(SubDirectoryEnum.banner,liveBanner.getBannerImg()));
+ }
+ return IfishUtil.toJson(ResultEnum.success.getKey(), list);
+ }
+ return IfishUtil.toJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 直播间留言
+ * @param liveMessage
+ * @return
+ */
+ @RequestMapping(value="/liveRoom/v3/leaveMessage.do",method=RequestMethod.POST)
+ public Object leaveMessage(LiveMessage liveMessage){
+ return liveRoomService.leaveMessage(liveMessage);
+ }
+
+ /**
+ * 留言列表
+ * @param liveMessage
+ * @return
+ */
+ @RequestMapping(value="/liveRoom/v3/getLiveMessage.do",method=RequestMethod.POST)
+ public Object getLiveMessageByPage(Integer roomId,Integer firstResult,Integer pageSize){
+ return liveRoomService.getLiveMessageByPage(firstResult, pageSize, roomId);
+ }
+
+ /**
+ * 按类型分页获取直播间信息
+ * @param pageParam
+ * @param result
+ * @return
+ */
+ @RequestMapping(value="/liveRooms",method=RequestMethod.GET)
+ public PageingDto> getLiveRoomByPate(@RequestParam("orderType") Integer orderType,@Validated PageParam pageParam,BindingResult result){
+ //参数校验
+ if(result.hasErrors()){
+ throw new IfishException(ResultEnum.error401);
+ }
+ //按时间倒序
+ if(LiveRoomOrderTypeEnum.one.getKey().equals(orderType)){
+ return liveRoomService.getLiveRoomsByTime(pageParam);
+ }
+ //人气值倒序
+ else if(LiveRoomOrderTypeEnum.two.getKey().equals(orderType)){
+ return liveRoomService.getLiveRoomsByPopularityValue(pageParam);
+ }
+ //后台推荐顺序倒序
+ else if(LiveRoomOrderTypeEnum.three.getKey().equals(orderType)){
+ return liveRoomService.getLiveRoomsByTuijian(pageParam);
+ }
+ else{
+ throw new IfishException(ResultEnum.error402);
+ }
+ }
+
+ /**
+ * 直播间点赞
+ * @param roomId
+ * @param userId
+ * @return
+ */
+ @RequestMapping(value="/liveRoomZan/{roomId}/{userId}",method=RequestMethod.POST)
+ public JsonResult> liveRoomsZan(@PathVariable("roomId")Integer roomId,@PathVariable("userId")Integer userId){
+ return liveRoomService.liveRoomsZan(roomId, userId);
+ }
+
+}
diff --git a/src/main/java/com/ifish/action/PageListAction.java b/src/main/java/com/ifish/action/PageListAction.java
new file mode 100644
index 0000000..53881ff
--- /dev/null
+++ b/src/main/java/com/ifish/action/PageListAction.java
@@ -0,0 +1,85 @@
+package com.ifish.action;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.ifish.dto.ShopsLookUserDto;
+import com.ifish.entity.PushList;
+import com.ifish.hibernate.Pagination;
+import com.ifish.service.PageListService;
+import com.ifish.util.IfishUtil;
+
+/**
+ * @ClassName: PageListAction
+ * @Description: TODO
+ * @author ggw
+ */
+@Controller
+@RequestMapping("/pageList")
+public class PageListAction {
+
+ @Autowired
+ private PageListService pageListService;
+
+ private static Logger log = LoggerFactory.getLogger(PageListAction.class);
+
+ /**
+ * 推送信息列表
+ *
+ * @param createDate
+ * @param userId
+ * @param firstResult
+ * @param pageSize
+ * @return
+ */
+ @RequestMapping("/pushListInf.do")
+ @ResponseBody
+ public Object pushListInf(Integer pushId, Integer userId, Integer firstResult, Integer pageSize) {
+ try {
+ if (firstResult == null) {
+ firstResult = 0;
+ }
+ if (pageSize == null) {
+ pageSize = 10;
+ }
+ Pagination page = this.pageListService.getPushListByPage(pushId, userId, firstResult, pageSize);
+ return IfishUtil.returnPageData(page);
+ } catch (Exception e) {
+ log.error("get pushListInf page information:error message:{}", e.toString());
+ }
+ return null;
+ }
+
+ /**
+ * 看护工作台
+ *
+ * @param createDate
+ * @param userId
+ * @param firstResult
+ * @param pageSize
+ * @return
+ */
+ @RequestMapping("/lookList.do")
+ @ResponseBody
+ public Object lookList(Integer shopsUserId, Integer firstResult, Integer pageSize) {
+ try {
+ if (firstResult == null) {
+ firstResult = 0;
+ }
+ if (pageSize == null) {
+ pageSize = 10;
+ }
+ Pagination page = this.pageListService.getLookListByPage(shopsUserId, firstResult, pageSize);
+ return IfishUtil.returnPageData(page);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("lookList:error message:{}", e.toString());
+ }
+ return null;
+ }
+
+}
diff --git a/src/main/java/com/ifish/action/ShopsAction.java b/src/main/java/com/ifish/action/ShopsAction.java
new file mode 100644
index 0000000..e6d344d
--- /dev/null
+++ b/src/main/java/com/ifish/action/ShopsAction.java
@@ -0,0 +1,194 @@
+package com.ifish.action;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.ifish.dto.JsonResult;
+import com.ifish.dto.PageingDto;
+import com.ifish.entity.ShopsInfo;
+import com.ifish.enums.ResultEnum;
+import com.ifish.exception.IfishException;
+import com.ifish.service.ShopsService;
+import com.ifish.util.IfishUtil;
+import com.ifish.validator.PageParam;
+import com.ifish.validator.ShopsUserInfoParam;
+
+/**
+ *
+ * @author ggw
+ *
+ */
+@RestController
+public class ShopsAction {
+
+ @Autowired
+ private ShopsService shopsService;
+
+ /**
+ * 保存商户信息
+ * @param shopsInfo
+ * @param file1
+ * @param file2
+ * @param file3
+ * @return
+ */
+ @RequestMapping(value="/shops/v3/saveShopsInfo.do",method=RequestMethod.POST)
+ public Object saveShopsInfo(ShopsInfo shopsInfo,MultipartFile file1,MultipartFile file2,MultipartFile file3) {
+ if(file1.getSize()>3145728 || file2.getSize()>3145728 || file3.getSize()>3145728){
+ return IfishUtil.returnJson(ResultEnum.warn206.getKey(), "");
+ }
+ else{
+ return this.shopsService.saveShopsInfo(shopsInfo,file1,file2,file3);
+ }
+ }
+
+ /**
+ * 审核失败后修改商户信息
+ * @param shopsInfo
+ * @param file1
+ * @param file2
+ * @param file3
+ * @return
+ */
+ @RequestMapping(value="/shops/v3/updateShopsInfo.do",method=RequestMethod.POST)
+ public Object updateShopsInfo(ShopsInfo shopsInfo,MultipartFile file1,MultipartFile file2,MultipartFile file3) {
+ if(file1!=null && !file1.isEmpty() && file1.getSize()>3145728){
+ return IfishUtil.returnJson(ResultEnum.warn206.getKey(), "");
+ }
+ if(file2!=null && !file2.isEmpty() && file2.getSize()>3145728){
+ return IfishUtil.returnJson(ResultEnum.warn206.getKey(), "");
+ }
+ if(file3!=null && !file3.isEmpty() && file3.getSize()>3145728){
+ return IfishUtil.returnJson(ResultEnum.warn206.getKey(), "");
+ }
+ else{
+ return this.shopsService.updateShopsInfo(shopsInfo,file1,file2,file3);
+ }
+ }
+
+ /**
+ * 审核成功后修改商户信息
+ * @param shopsInfo
+ * @param file4
+ * @return
+ */
+ @RequestMapping(value="/shops/v3/updateBaseShopsInfo.do",method=RequestMethod.POST)
+ public Object updateBaseShopsInfo(ShopsInfo shopsInfo,MultipartFile file4) {
+ if(file4!=null && !file4.isEmpty() && file4.getSize()>3145728){
+ return IfishUtil.returnJson(ResultEnum.warn206.getKey(), "");
+ }
+ else{
+ return this.shopsService.updateBaseShopsInfo(shopsInfo,file4);
+ }
+ }
+
+ /**
+ * 查询审核状态
+ * @param shopsId
+ * @return
+ */
+ @RequestMapping(value="/shops/v3/getShopsStatus.do",method=RequestMethod.POST)
+ public Object getShopsStatus(Integer shopsId) {
+ return this.shopsService.getShopsStatus(shopsId);
+ }
+
+ /**
+ * 看护商家列表
+ * @param firstResult
+ * @param pageSize
+ * @return
+ */
+ @RequestMapping(value="/shops/v3/getShopsInfo.do",method=RequestMethod.POST)
+ public Object pushListInf(Integer userId,Integer firstResult,Integer pageSize) {
+ return this.shopsService.getShopsInfoByPage(userId,firstResult, pageSize);
+ }
+
+ /**
+ * 选择看护商家
+ * @param shopsUserId
+ * @param userId
+ * @return
+ */
+ @RequestMapping(value="/shops/v3/choiceShops.do",method=RequestMethod.POST)
+ public Object choiceShops(@RequestParam Integer shopsUserId,@RequestParam Integer userId) {
+ return this.shopsService.choiceShops(shopsUserId,userId);
+ }
+
+ /**
+ * 解除看护关系
+ * @param shopsUserId
+ * @param userId
+ * @return
+ */
+ @RequestMapping(value="/shops/v3/removeLook.do",method=RequestMethod.POST)
+ public Object removeLook(Integer userId) {
+ return this.shopsService.removeLook(userId);
+ }
+
+ /**
+ * 获取商家会员信息
+ * @param userId
+ * @param shopsId
+ * @return
+ */
+ @RequestMapping(value="/shopsUserInfo/{userId}/{shopsId}",method=RequestMethod.GET)
+ public JsonResult> getShopsUserInfoById(@PathVariable("userId")Integer userId,@PathVariable("shopsId")Integer shopsId){
+ return shopsService.getShopsUserInfoById(userId, shopsId);
+ }
+
+ /**
+ * 更新商家会员信息
+ * @param userId
+ * @param shopsId
+ * @param result
+ * @param info
+ * @return
+ */
+ @RequestMapping(value="/shopsUserInfo/{userId}/{shopsId}",method=RequestMethod.POST)
+ public JsonResult> updateShopsUserInfo(@PathVariable("userId")Integer userId,
+ @PathVariable("shopsId")Integer shopsId,
+ @Validated ShopsUserInfoParam param,
+ BindingResult result){
+ //参数校验
+ if(result.hasErrors()){
+ throw new IfishException(ResultEnum.error401);
+ }
+ return shopsService.updateShopsUserInfo(userId,shopsId,param);
+ }
+
+ /**
+ * 分页获取商家会员信息
+ * @param pageParam
+ * @param result
+ * @return
+ */
+ @RequestMapping(value="/shopsUserInfo",method=RequestMethod.GET)
+ public PageingDto> getShopsUserInfoById(@RequestParam("shopsId")Integer shopsId,
+ @Validated PageParam pageParam,
+ BindingResult result){
+ //参数校验
+ if(result.hasErrors()){
+ throw new IfishException(ResultEnum.error401);
+ }
+ return shopsService.getShopsUserInfoByPage(shopsId,pageParam);
+ }
+
+ /**
+ * 成为商家会员
+ * @param userId
+ * @param shopsId
+ * @return
+ */
+ @RequestMapping(value="/becomingShopsUser/{userId}/{shopsId}",method=RequestMethod.POST)
+ public JsonResult> becomeShopsUser(@PathVariable("userId")Integer userId,@PathVariable("shopsId")Integer shopsId){
+ return shopsService.becomeShopsUser(userId, shopsId);
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/ifish/action/UpdateUserAction.java b/src/main/java/com/ifish/action/UpdateUserAction.java
new file mode 100644
index 0000000..9a7a15b
--- /dev/null
+++ b/src/main/java/com/ifish/action/UpdateUserAction.java
@@ -0,0 +1,76 @@
+package com.ifish.action;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.ifish.entity.User;
+import com.ifish.enums.ResultEnum;
+import com.ifish.service.BaseService;
+import com.ifish.util.IfishUtil;
+
+/**
+ * @ClassName: UpdateUserAction
+ * @Description: TODO
+ * @author ggw
+ */
+
+@Controller
+@RequestMapping("/updateUser")
+public class UpdateUserAction {
+
+ @Autowired
+ private BaseService baseService;
+
+ private static Logger log = LoggerFactory.getLogger(UpdateUserAction.class);
+
+ @ModelAttribute("user")
+ public User getUser(@RequestParam Integer userId) {
+ return baseService.findById(userId);
+ }
+ /**
+ * 更新用户信息
+ * @param user
+ * @return
+ */
+ @RequestMapping("/updateUser.do")
+ @ResponseBody
+ public Object update(@ModelAttribute("user") User user){
+ try {
+ return baseService.updateInfo(user);
+ } catch (Exception e) {
+ log.error("update userinfo:userId:{},error message:{}",user.getUserId(),e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 上传头像
+ * @param user
+ * @param fileUpload
+ * @return
+ * @throws Exception
+ */
+ @RequestMapping(value = "/uploadFile.do")
+ @ResponseBody
+ public Object upload(@ModelAttribute("user") User user,@RequestParam MultipartFile fileUpload){
+ try {
+ if(fileUpload.getSize()>1048576){
+ return IfishUtil.returnJson(ResultEnum.warn206.getKey(), "");
+ }
+ else{
+ return baseService.uploadFile(user,fileUpload);
+ }
+ } catch (Exception e) {
+ log.error("upload images:userId:{},error message:{}",user.getUserId(),e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+}
diff --git a/src/main/java/com/ifish/action/UserAction.java b/src/main/java/com/ifish/action/UserAction.java
new file mode 100644
index 0000000..158a561
--- /dev/null
+++ b/src/main/java/com/ifish/action/UserAction.java
@@ -0,0 +1,642 @@
+package com.ifish.action;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.ifish.entity.CameraUserId;
+import com.ifish.entity.Device;
+import com.ifish.entity.DeviceUser;
+import com.ifish.entity.QuestionsFeedback;
+import com.ifish.entity.ShopsInfo;
+import com.ifish.entity.User;
+import com.ifish.enums.ResultEnum;
+import com.ifish.helper.UserHelperI;
+import com.ifish.service.BaseService;
+import com.ifish.service.UserService;
+import com.ifish.util.IfishFilePath;
+import com.ifish.util.IfishUtil;
+
+/**
+ * @ClassName:UserAction
+ * @Description:TODO
+ * @author ggw
+ */
+@RestController
+@RequestMapping("/user")
+public class UserAction {
+
+ @Autowired
+ private UserService userService;
+ @Autowired
+ private BaseService baseService;
+ @Autowired
+ private UserHelperI userHelperI;
+
+ private static Logger log = LoggerFactory.getLogger(UserAction.class);
+
+ /**
+ * 获取验证码
+ *
+ * @param sendType
+ * @param phoneNumber
+ * @return
+ */
+ @Deprecated
+ @RequestMapping("/getSecurityCode.do")
+ public Object getSecurityCode(@RequestParam String sendType, @RequestParam String phoneNumber) {
+ try {
+ return this.baseService.getSecurityCode(phoneNumber, sendType);
+ } catch (Exception e) {
+ log.error("send sms:phoneNumber:{},error message:{}", phoneNumber, e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 通过短信验证后新增注册用户信息
+ *
+ * @param user
+ * @return
+ */
+ @Deprecated
+ @RequestMapping("/addUser.do")
+ public Object addUser(User user) {
+ try {
+ return this.baseService.save(user);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("user register:phoneNumber:{},error message:{}", user.getPhoneNumber(), e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 通过短信验证后修改密码
+ *
+ * @param user
+ * @return
+ */
+ @RequestMapping("/resetPassword.do")
+ public Object resetPassword(User user) {
+ try {
+ return this.baseService.resetPassword(user);
+ } catch (Exception e) {
+ log.error("forget password:phoneNumber:{},error message:{}", user.getPhoneNumber(), e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 用户登录
+ */
+ @Deprecated
+ @RequestMapping("/userLogin.do")
+ public Object userLogin(User user) {
+ try {
+ return userHelperI.login(user);
+ } catch (Exception e) {
+ log.error("user login:phoneNumber:{},error message:{}", user.getPhoneNumber(), e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 用户登录
+ */
+ @Deprecated
+ @RequestMapping("/userLoginold.do")
+ public Object userLogin1(User user) {
+ try {
+ return this.baseService.login(user);
+ } catch (Exception e) {
+ log.error("user login:phoneNumber:{},error message:{}", user.getPhoneNumber(), e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 验证原密码后修改密码
+ *
+ * @param oldPassword
+ * @param user
+ * @return
+ */
+ @RequestMapping("/updatePwd.do")
+ public Object updatePwd(@RequestParam String oldPassword, User user) {
+ try {
+ return baseService.updatePwd(user, oldPassword);
+ } catch (Exception e) {
+ log.error("change password:userId:{},error message:{}", user.getUserId(), e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 问题反馈
+ *
+ * @param questionsFeedback
+ * @return
+ */
+ @Deprecated
+ @RequestMapping("/questionsFeedback.do")
+ public Object questionsFeedback(QuestionsFeedback questionsFeedback) {
+ try {
+ return this.baseService.saveQuestionsFeedback(questionsFeedback);
+ } catch (Exception e) {
+ log.error("submit questions:userId:{},error message:{}", questionsFeedback.getUserId(), e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 绑定设备
+ *
+ * @param user
+ * @param macAddress
+ * @return
+ */
+ @Deprecated
+ @RequestMapping("/bindDevice.do")
+ public Object bindDevice(User user, String macAddress) {
+ try {
+ return baseService.bindDevice(user, macAddress.toLowerCase());
+ } catch (Exception e) {
+ log.error("bind device:userId:{},macAddress:{},error message:{}", user.getUserId(), macAddress.toLowerCase(), e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 绑定摄像头
+ *
+ * @param user
+ * @param macAddress
+ * @return
+ */
+ @RequestMapping("/bindCamera.do")
+ public Object bindCamera(Integer userId, String cameraId) {
+ return baseService.bindCamera(userId, cameraId);
+ }
+
+ /**
+ * 关联设备和摄像头
+ *
+ * @param user
+ * @param macAddress
+ * @return
+ */
+ @RequestMapping("/deviceBindCamera.do")
+ public Object deviceBindCamera(Integer deviceId, String cameraId) {
+ try {
+ return baseService.deviceBindCamera(deviceId, cameraId);
+ } catch (Exception e) {
+ log.error("DeviceBindCamera:cameraId:{},error message:{}", deviceId, cameraId, e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 关联设备和摄像头1
+ *
+ * @param user
+ * @param macAddress
+ * @return
+ */
+ @RequestMapping("/deviceBindCamera1.do")
+ public Object deviceBindCamera1(Integer userId, Integer deviceId, String cameraId) {
+ try {
+ return baseService.deviceBindCamera1(userId, deviceId, cameraId);
+ } catch (Exception e) {
+ log.error("DeviceBindCamera1:userId:{},cameraId:{},error message:{}", userId, deviceId, cameraId, e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 激活摄像头
+ *
+ * @param user
+ * @param macAddress
+ * @return
+ */
+ @RequestMapping("/activeCamera.do")
+ public Object activeCamera(String activeCode, String cameraId) {
+ try {
+ return baseService.activeCamera(activeCode, cameraId);
+ } catch (Exception e) {
+ log.error("activeCamera:activeCode:{},cameraId:{},error message:{}", activeCode, cameraId, e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 保存自定义图标
+ *
+ * @param user
+ * @param macAddress
+ * @return
+ */
+ @RequestMapping("/saveCustomIcon.do")
+ public Object saveCustomIcon(DeviceUser deviceUser) {
+ try {
+ return baseService.updateCustomIcon(deviceUser);
+ } catch (Exception e) {
+ log.error("saveCustomIcon:userId:{},deviceId:{},error message:{}", deviceUser.getPriId().getUserId(), deviceUser.getPriId().getDeviceId(), e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 获取单个设备信息
+ *
+ * @param user
+ * @return
+ */
+ @RequestMapping("/getSingleDeviceInf.do")
+ public Object getSingleDeviceInf(DeviceUser deviceUser) {
+ try {
+ return baseService.getSingleDeviceInf(deviceUser);
+ } catch (Exception e) {
+ log.error("get getDeviceInfByMacAddress Information:userId:{},deviceId:{},error message:{}", deviceUser.getPriId().getUserId(), deviceUser.getPriId().getDeviceId(), e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 修改设备信息
+ *
+ * @param deviceUser
+ * @return
+ */
+ @RequestMapping("/updateDeviceUser.do")
+ public Object updateDeviceUser(DeviceUser deviceUser) {
+ try {
+ return baseService.update(deviceUser);
+ } catch (Exception e) {
+ log.error("update device Information:userId:{},deviceId:{},error message:{}", deviceUser.getPriId().getUserId(), deviceUser.getPriId().getDeviceId(), e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 修改摄像头信息
+ *
+ * @param deviceUser
+ * @return
+ */
+ @RequestMapping("/updateCameraUser.do")
+ public Object updateCameraUser(Integer userId, String cameraId, String showName) {
+ try {
+ CameraUserId id = new CameraUserId(userId, cameraId);
+ return baseService.update(id, showName);
+ } catch (Exception e) {
+ log.error("updateCameraUser:userId:{},cameraId:{},error message:{}", userId, cameraId, e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 删除绑定设备
+ *
+ * @param deviceUser
+ * @return
+ */
+ @RequestMapping("/deleteDeviceUser.do")
+ public Object deleteDeviceUser(DeviceUser deviceUser) {
+ try {
+ return baseService.deleteDeviceUser(deviceUser);
+ } catch (Exception e) {
+ log.error("delete the binding device:userId:{},deviceId:{},error message:{}", deviceUser.getPriId().getUserId(), deviceUser.getPriId().getDeviceId(), e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 删除绑定的摄像头
+ *
+ * @param deviceUser
+ * @return
+ */
+ @RequestMapping("/deleteCameraUser.do")
+ public Object deleteCameraUser(Integer userId, String cameraId) {
+ try {
+ return baseService.deleteCameraUser(userId, cameraId);
+ } catch (Exception e) {
+ log.error("delete the binding camera:userId:{},cameraId:{},error message:{}", userId, cameraId, e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 删除设备和摄像头关联
+ *
+ * @param deviceUser
+ * @return
+ */
+ @RequestMapping("/deleteDeviceCamera.do")
+ public Object deleteDeviceCamera(Integer deviceId, String cameraId) {
+ try {
+ return baseService.deleteDeviceCamera(deviceId, cameraId);
+ } catch (Exception e) {
+ log.error("deleteDeviceCamera:deviceId:{},cameraId:{},error message:{}", deviceId, cameraId, e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 扫一扫分享设备
+ *
+ * @param user
+ * @param device
+ * @return
+ */
+ @Deprecated
+ @RequestMapping("/shareDeviceByQrCode.do")
+ public Object shareDeviceByQrCode(Integer userId, Integer deviceId) {
+ try {
+ return baseService.shareDeviceByQrCode(userId, deviceId);
+ } catch (Exception e) {
+ log.error("share device by qrCode:userId:{},deviceId:{},error message:{}", userId, deviceId, e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 获取最新版本信息
+ */
+ @RequestMapping("/getNewestVersion.do")
+ public Object getNewest(String phoneType) {
+ try {
+ return this.baseService.getNewestVersionInf(phoneType.toLowerCase());
+ } catch (Exception e) {
+ log.error("get the latest version information:error message:{}", e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 获取换水提醒信息
+ *
+ * @param deviceId
+ * @return
+ */
+ @RequestMapping("/getRemindWaterInf.do")
+ public Object getRemindWaterInf(Integer deviceId) {
+ try {
+ return this.baseService.getRemindWaterInf(deviceId);
+ } catch (Exception e) {
+ log.error("getRemindWaterInf:deviceId:{},error message:{}", deviceId, e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 设置换水提醒信息
+ *
+ * @param deviceId
+ * @return
+ */
+ @RequestMapping("/setRemindWaterInf.do")
+ public Object setRemindWaterInf(Device device) {
+ try {
+ return this.baseService.setRemindWaterInf(device);
+ } catch (Exception e) {
+ log.error("setRemindWaterInf:deviceId:{},error message:{}", device.getDeviceId(), e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 保存商户信息
+ *
+ * @param shopsInfo
+ * @param file1
+ * @param file2
+ * @param file3
+ * @return
+ */
+ @RequestMapping("/saveShopsInfo.do")
+ public Object saveShopsInfo(ShopsInfo shopsInfo, MultipartFile file1, MultipartFile file2, MultipartFile file3) {
+ try {
+ if (file1.getSize() > 3145728 || file2.getSize() > 3145728 || file3.getSize() > 3145728) {
+ return IfishUtil.returnJson(ResultEnum.warn206.getKey(), "");
+ } else {
+ return this.baseService.saveShopsInfo(shopsInfo, file1, file2, file3);
+ }
+ } catch (Exception e) {
+ log.error("saveShopsInfo:error message:{}", e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 审核失败后修改商户信息
+ *
+ * @param shopsInfo
+ * @param file1
+ * @param file2
+ * @param file3
+ * @return
+ */
+ @RequestMapping("/updateShopsInfo.do")
+ public Object updateShopsInfo(ShopsInfo shopsInfo, MultipartFile file1, MultipartFile file2, MultipartFile file3) {
+ try {
+ if (file1 != null && !file1.isEmpty() && file1.getSize() > 3145728) {
+ return IfishUtil.returnJson(ResultEnum.warn206.getKey(), "");
+ }
+ if (file2 != null && !file2.isEmpty() && file2.getSize() > 3145728) {
+ return IfishUtil.returnJson(ResultEnum.warn206.getKey(), "");
+ }
+ if (file3 != null && !file3.isEmpty() && file3.getSize() > 3145728) {
+ return IfishUtil.returnJson(ResultEnum.warn206.getKey(), "");
+ } else {
+ return this.baseService.updateShopsInfo(shopsInfo, file1, file2, file3);
+ }
+ } catch (Exception e) {
+ log.error("updateShopsInfo:error message:{}", e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 审核成功后修改商户信息
+ *
+ * @param shopsInfo
+ * @param file1
+ * @param file2
+ * @param file3
+ * @return
+ */
+ @RequestMapping("/updateBaseShopsInfo.do")
+ public Object updateBaseShopsInfo(ShopsInfo shopsInfo, MultipartFile file4) {
+ try {
+ if (file4 != null && !file4.isEmpty() && file4.getSize() > 3145728) {
+ return IfishUtil.returnJson(ResultEnum.warn206.getKey(), "");
+ } else {
+ return this.baseService.updateBaseShopsInfo(shopsInfo, file4);
+ }
+ } catch (Exception e) {
+ log.error("updateBaseShopsInfo:error message:{}", e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 查询审核状态
+ *
+ * @param shopsId
+ * @return
+ */
+ @RequestMapping("/getShopsStatus.do")
+ public Object getShopsStatus(Integer shopsId) {
+ try {
+ return this.baseService.getShopsStatus(shopsId);
+ } catch (Exception e) {
+ log.error("getShopsStatus:error message:{}", e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 选择看护商家
+ *
+ * @param phoneNumber
+ * @param userId
+ * @return
+ */
+ @RequestMapping("/choiceShops.do")
+ public Object choiceShops(String phoneNumber, Integer userId) {
+ try {
+ return this.baseService.choiceShops(phoneNumber, userId);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("choiceShops:error message:{}", e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 关闭看护摄像头
+ *
+ * @param cameraId
+ * @param userId
+ * @param status
+ * @return
+ */
+ @RequestMapping("/onoffLook.do")
+ public Object closeLook(String cameraId, Integer userId, String status) {
+ try {
+ return this.baseService.onoffLook(cameraId, userId, status);
+ } catch (Exception e) {
+ log.error("closeLook:error message:{}", e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 生成微信分享页面
+ *
+ * @param title
+ * @param base64
+ * @return
+ */
+ @RequestMapping("/getHtmlFile.do")
+ public Object getHtmlFile(@RequestParam String title, @RequestParam MultipartFile fileUpload) {
+ try {
+ if (fileUpload != null && fileUpload.getSize() > 3145728) {
+ return IfishUtil.returnJson(ResultEnum.warn206.getKey(), "");
+ }
+ String pngName = IfishUtil.uploadFile(fileUpload, IfishFilePath.path_share_img);
+ if (pngName != null && !pngName.equals("")) {
+ String fileName = IfishUtil.getHtmlFile(title, pngName, IfishFilePath.html_name, IfishFilePath.path_share_html);
+ if (fileName != null && !fileName.equals("")) {
+ return IfishUtil.returnJson(ResultEnum.success.getKey(), fileName);
+ }
+ }
+ } catch (Exception e) {
+ log.error("getHtmlFile:error message:{}", e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 生成看护报告
+ *
+ * @param index1
+ * @param index2
+ * @param index3
+ * @param suggestion
+ * @return
+ */
+ @RequestMapping("/getLookReport.do")
+ public Object getLookReport(Integer userId, String index1, String index2, String index3, String suggestion, MultipartFile fileUpload) {
+ try {
+ if (fileUpload != null && fileUpload.getSize() > 3145728) {
+ return IfishUtil.returnJson(ResultEnum.warn206.getKey(), "");
+ }
+ return this.baseService.lookReport(userId, index1, index2, index3, suggestion, fileUpload);
+ } catch (Exception e) {
+ log.error("getLookReport:error message:{}", e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 发送看护报告给用户(旧)
+ *
+ * @param userId
+ * @param fileName
+ * @return
+ */
+ @Deprecated
+ @RequestMapping("/sendReport.do")
+ public Object sendReport(Integer userId, String fileName) {
+ try {
+ return this.baseService.sendReport(userId, fileName);
+ } catch (Exception e) {
+ log.error("sendReport message:{}", e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 发送看护报告给用户(新)
+ *
+ * @param userId
+ * @param fileName
+ * @param reportId
+ * @return
+ */
+ @RequestMapping("/sendReport1.do")
+ public Object sendReport1(Integer userId, String fileName, Integer reportId) {
+ try {
+ return this.baseService.sendReport(userId, fileName, reportId);
+ } catch (Exception e) {
+ log.error("sendReport1 message:{}", e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+ /**
+ * 根据ID查询看护报告详情
+ *
+ * @param reportId
+ * @return
+ */
+ @RequestMapping("/getLookReportById.do")
+ public Object getLookReportById(Integer reportId) {
+ try {
+ return this.baseService.getLookReportById(reportId);
+ } catch (Exception e) {
+ log.error("getLookReportById message:{}", e.toString());
+ }
+ return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+ }
+
+}
diff --git a/src/main/java/com/ifish/action/UserActivityAction.java b/src/main/java/com/ifish/action/UserActivityAction.java
new file mode 100644
index 0000000..992dd54
--- /dev/null
+++ b/src/main/java/com/ifish/action/UserActivityAction.java
@@ -0,0 +1,56 @@
+package com.ifish.action;
+
+import com.ifish.dto.JsonResult;
+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;
+
+import com.ifish.dto.PageingDto;
+import com.ifish.enums.ResultEnum;
+import com.ifish.exception.IfishException;
+import com.ifish.helper.UserActivityHelperI;
+import com.ifish.service.UserActivityService;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 用户动态
+ *
+ * @author Administrator
+ *
+ */
+@RestController
+public class UserActivityAction {
+
+ @Autowired
+ private UserActivityService userActivityService;
+
+ @Autowired
+ private UserActivityHelperI userActivityHelperI;
+
+ /**
+ * 分页获取用户动态
+ *
+ * @param param
+ * @param result
+ * @return
+ */
+ @RequestMapping(value = "/userActivities", method = RequestMethod.GET)
+ public PageingDto> getUserActivityByPage(Integer pageSize, Integer firstResult) {
+ //参数校验
+ if (firstResult < 0 || (pageSize < 1 || pageSize > 20)) {
+ throw new IfishException(ResultEnum.error401);
+ }
+ return userActivityHelperI.getUserActivityByPage(pageSize, firstResult);
+ }
+
+ @RequestMapping(value = "/userActivitiesMaxCount", method = RequestMethod.GET)
+ public JsonResult> getUserActivityMaxCount() {
+ try {
+ return userActivityHelperI.getUserActivityMaxCount();
+ } catch (Exception e) {
+ throw new IfishException(ResultEnum.fail101);
+ }
+
+ }
+}
diff --git a/src/main/java/com/ifish/action/UsersAction.java b/src/main/java/com/ifish/action/UsersAction.java
new file mode 100644
index 0000000..765157f
--- /dev/null
+++ b/src/main/java/com/ifish/action/UsersAction.java
@@ -0,0 +1,144 @@
+package com.ifish.action;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.ifish.dto.JsonResult;
+import com.ifish.entity.User;
+import com.ifish.enums.ResultEnum;
+import com.ifish.exception.IfishException;
+import com.ifish.service.UserService;
+import com.ifish.validator.LoginParam;
+import com.ifish.validator.RegisterParam;
+
+/**
+ * @ClassName:UsersAction
+ * @author ggw
+ */
+
+@RestController
+@RequestMapping("/users")
+public class UsersAction {
+
+ @Autowired
+ private UserService userService;
+
+ /**
+ * 获取验证码
+ * @param sendType
+ * @param phoneNumber
+ * @return
+ */
+ @RequestMapping(value="/v3/getVerificateCode.do",method=RequestMethod.POST)
+ public JsonResult> getVerificateCode(String sendType,String phoneNumber){
+ return userService.getVerificateCode(phoneNumber, sendType);
+ }
+
+ /**
+ * 用户注册
+ * @param version
+ * @param userParam
+ * @param result
+ * @return
+ */
+ @RequestMapping(value={"/v3/register.do","register.do"},method=RequestMethod.POST)
+ public JsonResult> register(@Validated RegisterParam registerParam,BindingResult result) {
+ //参数校验
+ if(result.hasErrors()){
+ throw new IfishException(ResultEnum.error401);
+ }
+ return userService.register(registerParam);
+ }
+
+ /**
+ * 用户登录
+ * @param version
+ * @param userParam
+ * @param result
+ * @return
+ */
+ @RequestMapping(value={"/v3/login.do","/login.do"},method=RequestMethod.POST)
+ public JsonResult> login(@Validated LoginParam loginParam,BindingResult result) {
+ //参数校验
+ if(result.hasErrors()){
+ throw new IfishException(ResultEnum.error401);
+ }
+ return userService.login(loginParam);
+ }
+
+ /**
+ * 登陆验证
+ * @param loginParam
+ * @param result
+ * @return
+ */
+ @RequestMapping(value="/loginValidation",method=RequestMethod.POST)
+ public JsonResult> loginValidate(@Validated LoginParam loginParam,BindingResult result) {
+ //参数校验
+ if(result.hasErrors()){
+ throw new IfishException(ResultEnum.error401);
+ }
+ return userService.loginValidate(loginParam);
+ }
+
+ /**
+ * 更多用户数据
+ * @param userId
+ * @return
+ */
+ @RequestMapping(value="/moreUserData/{userId}",method=RequestMethod.GET)
+ public JsonResult> moreUserData(@PathVariable("userId") Integer userId) {
+ return userService.moreUserData(userId);
+ }
+
+ /**
+ * 绑定设备
+ * @param userId
+ * @param macAddress
+ * @return
+ */
+ @RequestMapping(value="/bindingDevice/{userId}",method=RequestMethod.POST)
+ public JsonResult> bindDevice(@PathVariable("userId") Integer userId,@RequestParam("macAddress") String macAddress) {
+ return userService.bindDevice(userId, macAddress);
+ }
+
+ /**
+ * 扫一扫分享设备
+ * @param userId
+ * @param macAddress
+ * @return
+ */
+ @RequestMapping(value="/sharingDevice/{userId}",method=RequestMethod.POST)
+ public JsonResult> shareDevice(@PathVariable("userId") Integer userId,@RequestParam("deviceId") Integer deviceId) {
+ return userService.shareDevice(userId, deviceId);
+ }
+
+ /**
+ * 修改用户信息
+ * @param user
+ * @return
+ */
+ @RequestMapping(value="/v3/updateInfo.do",method=RequestMethod.POST)
+ public JsonResult> updateInfo(User user) {
+ return userService.updateInfo(user);
+ }
+
+ /**
+ * 上传用户头像
+ * @param userId
+ * @param fileUpload
+ * @return
+ */
+ @RequestMapping(value="/v3/uploadUserImg.do",method=RequestMethod.POST)
+ public JsonResult> uploadUserImg(@RequestParam("userId")Integer userId,MultipartFile fileUpload) {
+ return userService.uploadUserImg(userId,fileUpload);
+ }
+
+}
diff --git a/src/main/java/com/ifish/apiVersion/ApiVersion.java b/src/main/java/com/ifish/apiVersion/ApiVersion.java
new file mode 100644
index 0000000..bb47e53
--- /dev/null
+++ b/src/main/java/com/ifish/apiVersion/ApiVersion.java
@@ -0,0 +1,15 @@
+package com.ifish.apiVersion;
+
+/**
+ * 接口版本号
+ * @author Administrator
+ *
+ */
+public class ApiVersion {
+ //1.0
+ public static final String version1_0 = "1.0";
+ //1.1
+ public static final String version1_1 = "1.1";
+ //1.2
+ public static final String version1_2 = "1.2";
+}
diff --git a/src/main/java/com/ifish/bean/CommodityInfoBean.java b/src/main/java/com/ifish/bean/CommodityInfoBean.java
new file mode 100644
index 0000000..73eae7a
--- /dev/null
+++ b/src/main/java/com/ifish/bean/CommodityInfoBean.java
@@ -0,0 +1,308 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.bean;
+
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ *
+ * @author Administrator
+ */
+@Entity
+@Table(name = "tbl_commodity_info")
+public class CommodityInfoBean implements java.io.Serializable {
+
+ /**
+ * 版本号
+ */
+ private static final long serialVersionUID = -5102166720334127839L;
+
+ /**
+ * 商品详情表ID
+ */
+ @Id
+ @Column(name = "commodity_id", unique = true, nullable = false, length = 10)
+ private Integer commodityId;
+
+ public CommodityInfoBean(Integer commodityId, Integer shopId, Integer userId, String commodityName, String commodityDetail, String commodityImg, String commodityVideo, Integer commodityStatus, Date createTime, Integer click, Integer backstageStatus) {
+ this.commodityId = commodityId;
+ this.shopId = shopId;
+ this.userId = userId;
+ this.commodityName = commodityName;
+ this.commodityDetail = commodityDetail;
+ this.commodityImg = commodityImg;
+ this.commodityVideo = commodityVideo;
+ this.commodityStatus = commodityStatus;
+ this.createTime = createTime;
+ this.click = click;
+ this.backstageStatus = backstageStatus;
+ }
+
+ public CommodityInfoBean() {
+ }
+
+ /**
+ * 店铺ID
+ */
+ @Column(name = "shop_id", nullable = false, length = 10)
+ private Integer shopId;
+
+ /**
+ * 用户ID
+ */
+ @Column(name = "user_id", nullable = false, length = 10)
+ private Integer userId;
+
+ /**
+ * 商品名称
+ */
+ @Column(name = "commodity_name", nullable = false, length = 20)
+ private String commodityName;
+
+ /**
+ * 商品描述
+ */
+ @Column(name = "commodity_detail", nullable = true, length = 100)
+ private String commodityDetail;
+
+ /**
+ * 商品图片
+ */
+ @Column(name = "commodity_img", nullable = true, length = 100)
+ private String commodityImg;
+
+ /**
+ * 商品视频
+ */
+ @Column(name = "commodity_video", nullable = true, length = 100)
+ private String commodityVideo;
+
+ /**
+ * 商品状态(用户管理)
+ */
+ @Column(name = "commodity_status", nullable = false, length = 10)
+ private Integer commodityStatus;
+
+ /**
+ * 创建时间
+ */
+ @Column(name = "create_time", nullable = false)
+ private Date createTime;
+
+ /**
+ * 商品点击数
+ */
+ @Column(name = "click", nullable = true, length = 10)
+ private Integer click;
+
+ /**
+ * 后台管理商品状态
+ */
+ @Column(name = "backstage_status", nullable = false, length = 10)
+ private Integer backstageStatus;
+
+ /**
+ * 获取商品详情表ID
+ *
+ * @return 商品详情表ID
+ */
+ public Integer getCommodityId() {
+ return this.commodityId;
+ }
+
+ /**
+ * 设置商品详情表ID
+ *
+ * @param commodityId 商品详情表ID
+ */
+ public void setCommodityId(Integer commodityId) {
+ this.commodityId = commodityId;
+ }
+
+ /**
+ * 获取店铺ID
+ *
+ * @return 店铺ID
+ */
+ public Integer getShopId() {
+ return this.shopId;
+ }
+
+ /**
+ * 设置店铺ID
+ *
+ * @param shopId 店铺ID
+ */
+ public void setShopId(Integer shopId) {
+ this.shopId = shopId;
+ }
+
+ /**
+ * 获取用户ID
+ *
+ * @return 用户ID
+ */
+ public Integer getUserId() {
+ return this.userId;
+ }
+
+ /**
+ * 设置用户ID
+ *
+ * @param userId 用户ID
+ */
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ /**
+ * 获取商品名称
+ *
+ * @return 商品名称
+ */
+ public String getCommodityName() {
+ return this.commodityName;
+ }
+
+ /**
+ * 设置商品名称
+ *
+ * @param commodityName 商品名称
+ */
+ public void setCommodityName(String commodityName) {
+ this.commodityName = commodityName;
+ }
+
+ /**
+ * 获取商品描述
+ *
+ * @return 商品描述
+ */
+ public String getCommodityDetail() {
+ return this.commodityDetail;
+ }
+
+ /**
+ * 设置商品描述
+ *
+ * @param commodityDetail 商品描述
+ */
+ public void setCommodityDetail(String commodityDetail) {
+ this.commodityDetail = commodityDetail;
+ }
+
+ /**
+ * 获取商品图片
+ *
+ * @return 商品图片
+ */
+ public String getCommodityImg() {
+ return this.commodityImg;
+ }
+
+ /**
+ * 设置商品图片
+ *
+ * @param commodityImg 商品图片
+ */
+ public void setCommodityImg(String commodityImg) {
+ this.commodityImg = commodityImg;
+ }
+
+ /**
+ * 获取商品视频
+ *
+ * @return 商品视频
+ */
+ public String getCommodityVideo() {
+ return this.commodityVideo;
+ }
+
+ /**
+ * 设置商品视频
+ *
+ * @param commodityVideo 商品视频
+ */
+ public void setCommodityVideo(String commodityVideo) {
+ this.commodityVideo = commodityVideo;
+ }
+
+ /**
+ * 获取商品状态(用户管理)
+ *
+ * @return 商品状态(用户管理)
+ */
+ public Integer getCommodityStatus() {
+ return this.commodityStatus;
+ }
+
+ /**
+ * 设置商品状态(用户管理)
+ *
+ * @param commodityStatus 商品状态(用户管理)
+ */
+ public void setCommodityStatus(Integer commodityStatus) {
+ this.commodityStatus = commodityStatus;
+ }
+
+ /**
+ * 获取创建时间
+ *
+ * @return 创建时间
+ */
+ public Date getCreateTime() {
+ return this.createTime;
+ }
+
+ /**
+ * 设置创建时间
+ *
+ * @param createTime 创建时间
+ */
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ /**
+ * 获取商品点击数
+ *
+ * @return 商品点击数
+ */
+ public Integer getClick() {
+ return this.click;
+ }
+
+ /**
+ * 设置商品点击数
+ *
+ * @param click 商品点击数
+ */
+ public void setClick(Integer click) {
+ this.click = click;
+ }
+
+ /**
+ * 获取后台管理商品状态
+ *
+ * @return 后台管理商品状态
+ */
+ public Integer getBackstageStatus() {
+ return this.backstageStatus;
+ }
+
+ /**
+ * 设置后台管理商品状态
+ *
+ * @param backstageStatus 后台管理商品状态
+ */
+ public void setBackstageStatus(Integer backstageStatus) {
+ this.backstageStatus = backstageStatus;
+ }
+}
diff --git a/src/main/java/com/ifish/bean/DeviceUserBean.java b/src/main/java/com/ifish/bean/DeviceUserBean.java
new file mode 100644
index 0000000..bceefcd
--- /dev/null
+++ b/src/main/java/com/ifish/bean/DeviceUserBean.java
@@ -0,0 +1,228 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.bean;
+
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ *
+ * @author Administrator
+ */
+@Entity
+@Table(name = "tbl_device_user")
+public class DeviceUserBean implements java.io.Serializable {
+
+ /**
+ * 版本号
+ */
+ private static final long serialVersionUID = -8887049051247467842L;
+
+ /**
+ *
+ */
+ @Id
+ @Column(name = "user_id", unique = true, nullable = false, length = 10)
+ private Integer userId;
+
+ /**
+ *
+ */
+ @Id
+ @Column(name = "device_id", unique = true, nullable = false, length = 10)
+ private Integer deviceId;
+
+ /**
+ *
+ */
+ @Column(name = "is_master", nullable = true, length = 1)
+ private String isMaster;
+
+ /**
+ *
+ */
+ @Column(name = "show_name", nullable = true, length = 50)
+ private String showName;
+
+ /**
+ *
+ */
+ @Column(name = "create_time", nullable = true)
+ private Date createTime;
+
+ /**
+ *
+ */
+ @Column(name = "update_time", nullable = true)
+ private Date updateTime;
+
+ /**
+ *
+ */
+ @Column(name = "custom_icon_name", nullable = true, length = 100)
+ private String customIconName;
+
+ /**
+ *
+ */
+ @Column(name = "custom_show_name", nullable = true, length = 100)
+ private String customShowName;
+
+ /**
+ * 获取
+ *
+ * @return
+ */
+ public Integer getUserId() {
+ return this.userId;
+ }
+
+ /**
+ * 设置
+ *
+ * @param userId
+ *
+ */
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ /**
+ * 获取
+ *
+ * @return
+ */
+ public Integer getDeviceId() {
+ return this.deviceId;
+ }
+
+ /**
+ * 设置
+ *
+ * @param deviceId
+ *
+ */
+ public void setDeviceId(Integer deviceId) {
+ this.deviceId = deviceId;
+ }
+
+ /**
+ * 获取
+ *
+ * @return
+ */
+ public String getIsMaster() {
+ return this.isMaster;
+ }
+
+ /**
+ * 设置
+ *
+ * @param isMaster
+ *
+ */
+ public void setIsMaster(String isMaster) {
+ this.isMaster = isMaster;
+ }
+
+ /**
+ * 获取
+ *
+ * @return
+ */
+ public String getShowName() {
+ return this.showName;
+ }
+
+ /**
+ * 设置
+ *
+ * @param showName
+ *
+ */
+ public void setShowName(String showName) {
+ this.showName = showName;
+ }
+
+ /**
+ * 获取
+ *
+ * @return
+ */
+ public Date getCreateTime() {
+ return this.createTime;
+ }
+
+ /**
+ * 设置
+ *
+ * @param createTime
+ *
+ */
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ /**
+ * 获取
+ *
+ * @return
+ */
+ public Date getUpdateTime() {
+ return this.updateTime;
+ }
+
+ /**
+ * 设置
+ *
+ * @param updateTime
+ *
+ */
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ /**
+ * 获取
+ *
+ * @return
+ */
+ public String getCustomIconName() {
+ return this.customIconName;
+ }
+
+ /**
+ * 设置
+ *
+ * @param customIconName
+ *
+ */
+ public void setCustomIconName(String customIconName) {
+ this.customIconName = customIconName;
+ }
+
+ /**
+ * 获取
+ *
+ * @return
+ */
+ public String getCustomShowName() {
+ return this.customShowName;
+ }
+
+ /**
+ * 设置
+ *
+ * @param customShowName
+ *
+ */
+ public void setCustomShowName(String customShowName) {
+ this.customShowName = customShowName;
+ }
+}
diff --git a/src/main/java/com/ifish/bean/VenderListBean.java b/src/main/java/com/ifish/bean/VenderListBean.java
new file mode 100644
index 0000000..13c55bc
--- /dev/null
+++ b/src/main/java/com/ifish/bean/VenderListBean.java
@@ -0,0 +1,243 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.bean;
+
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ *
+ * @author Administrator
+ */
+@Entity
+@Table(name = "tbl_vender_list")
+public class VenderListBean implements java.io.Serializable {
+
+ /**
+ * 版本号
+ */
+ private static final long serialVersionUID = 190528374520461795L;
+
+ /**
+ * */
+ @Column(name = "brand_logo", nullable = true, length = 100)
+ private String brandLogo;
+
+ /**
+ * */
+ @Column(name = "brand_name", nullable = false, length = 20)
+ private String brandName;
+
+ /**
+ * */
+ @Column(name = "brand_introduce", nullable = true, length = 100)
+ private String brandIntroduce;
+
+ /**
+ * */
+ @Column(name = "app_show", nullable = true, length = 1)
+ private String appShow;
+
+ /**
+ * */
+ @Id
+ @Column(name = "brand_code", unique = true, nullable = false, length = 20)
+ private String brandCode;
+
+ /**
+ * */
+ @Column(name = "contact_phone", nullable = true, length = 30)
+ private String contactPhone;
+
+ /**
+ * */
+ @Column(name = "contact_address", nullable = true, length = 50)
+ private String contactAddress;
+
+ /**
+ * */
+ @Column(name = "update_time", nullable = true)
+ private Date updateTime;
+
+ /**
+ * */
+ @Column(name = "create_time", nullable = true)
+ private Date createTime;
+
+ /**
+ * 获取
+ *
+ * @return
+ */
+ public String getBrandLogo() {
+ return this.brandLogo;
+ }
+
+ /**
+ * 设置
+ *
+ * @param brandLogo
+ *
+ */
+ public void setBrandLogo(String brandLogo) {
+ this.brandLogo = brandLogo;
+ }
+
+ /**
+ * 获取
+ *
+ * @return
+ */
+ public String getBrandName() {
+ return this.brandName;
+ }
+
+ /**
+ * 设置
+ *
+ * @param brandName
+ *
+ */
+ public void setBrandName(String brandName) {
+ this.brandName = brandName;
+ }
+
+ /**
+ * 获取
+ *
+ * @return
+ */
+ public String getBrandIntroduce() {
+ return this.brandIntroduce;
+ }
+
+ /**
+ * 设置
+ *
+ * @param brandIntroduce
+ *
+ */
+ public void setBrandIntroduce(String brandIntroduce) {
+ this.brandIntroduce = brandIntroduce;
+ }
+
+ /**
+ * 获取
+ *
+ * @return
+ */
+ public String getAppShow() {
+ return this.appShow;
+ }
+
+ /**
+ * 设置
+ *
+ * @param appShow
+ *
+ */
+ public void setAppShow(String appShow) {
+ this.appShow = appShow;
+ }
+
+ /**
+ * 获取
+ *
+ * @return
+ */
+ public String getBrandCode() {
+ return this.brandCode;
+ }
+
+ /**
+ * 设置
+ *
+ * @param brandCode
+ *
+ */
+ public void setBrandCode(String brandCode) {
+ this.brandCode = brandCode;
+ }
+
+ /**
+ * 获取
+ *
+ * @return
+ */
+ public String getContactPhone() {
+ return this.contactPhone;
+ }
+
+ /**
+ * 设置
+ *
+ * @param contactPhone
+ *
+ */
+ public void setContactPhone(String contactPhone) {
+ this.contactPhone = contactPhone;
+ }
+
+ /**
+ * 获取
+ *
+ * @return
+ */
+ public String getContactAddress() {
+ return this.contactAddress;
+ }
+
+ /**
+ * 设置
+ *
+ * @param contactAddress
+ *
+ */
+ public void setContactAddress(String contactAddress) {
+ this.contactAddress = contactAddress;
+ }
+
+ /**
+ * 获取
+ *
+ * @return
+ */
+ public Date getUpdateTime() {
+ return this.updateTime;
+ }
+
+ /**
+ * 设置
+ *
+ * @param updateTime
+ *
+ */
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ /**
+ * 获取
+ *
+ * @return
+ */
+ public Date getCreateTime() {
+ return this.createTime;
+ }
+
+ /**
+ * 设置
+ *
+ * @param createTime
+ *
+ */
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+}
diff --git a/src/main/java/com/ifish/config/RedisConfig.java b/src/main/java/com/ifish/config/RedisConfig.java
new file mode 100644
index 0000000..94b5b84
--- /dev/null
+++ b/src/main/java/com/ifish/config/RedisConfig.java
@@ -0,0 +1,59 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.config;
+
+import com.ifish.util.IfishFilePath;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
+
+/**
+ *
+ * @author Administrator
+ */
+@Configuration
+public class RedisConfig {
+
+ @Bean
+ public RedisConnectionFactory redisCF() {
+ JedisConnectionFactory cf = new JedisConnectionFactory();
+
+// //获取当前操作系统(servers_os为服务器设置的属性JAVA_OPTS=%JAVA_OPTS% -Dservers_os=online84)
+// String servers_os = System.getProperty("servers_os") == null ? "" : System.getProperty("servers_os");
+ if (IfishFilePath.link_img_head.contains("ifish7")) {
+ //114.55.42.84 站点线上服务器
+ cf.setHostName("120.55.190.56");//本机访问
+// cf.setHostName("10.25.172.5");//内网ip地址,用于多服务器负载
+ cf.setPort(3796);
+ cf.setPassword("ifish7myredis");
+ } else {
+ //192.168.1.237 站点测试服务器
+ cf.setHostName("139.196.24.156");
+ cf.setPort(3796);
+ cf.setPassword("ifish7myredis");
+// FileUtil.writeLinesByLog("测试缓存连接");
+ }
+
+ return cf;
+ }
+
+ @Bean
+ public RedisTemplate redisTemplate(RedisConnectionFactory cf) {
+ RedisTemplate redis = new RedisTemplate();
+ redis.setConnectionFactory(cf);
+ return redis;
+ }
+
+ @Bean
+ public StringRedisTemplate stringRedisTemplate(RedisConnectionFactory cf) {
+ StringRedisTemplate redis = new StringRedisTemplate();
+ redis.setConnectionFactory(cf);
+ return redis;
+ }
+}
diff --git a/src/main/java/com/ifish/dao/AdInfoDao.java b/src/main/java/com/ifish/dao/AdInfoDao.java
new file mode 100644
index 0000000..335a082
--- /dev/null
+++ b/src/main/java/com/ifish/dao/AdInfoDao.java
@@ -0,0 +1,12 @@
+package com.ifish.dao;
+
+import com.ifish.entity.AdInfo;
+
+/**
+ * 广告信息
+ * @author Administrator
+ *
+ */
+public interface AdInfoDao extends BaseDao{
+
+}
diff --git a/src/main/java/com/ifish/dao/BaseDao.java b/src/main/java/com/ifish/dao/BaseDao.java
new file mode 100644
index 0000000..352bc19
--- /dev/null
+++ b/src/main/java/com/ifish/dao/BaseDao.java
@@ -0,0 +1,37 @@
+package com.ifish.dao;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.hibernate.criterion.Criterion;
+import org.hibernate.criterion.Order;
+
+import com.ifish.hibernate.Pagination;
+
+/**
+ * @ClassName: BaseDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface BaseDao {
+
+ public T get(ID id);
+
+ public T save(T t);
+
+ public T update(T t);
+
+ public T saveOrUpdate(T t);
+
+ public void delete(T t);
+
+ public List findByProperty(Criterion... criterions);
+
+ public List findByProperty(Order order,Criterion... criterions);
+
+ public T findUniqueByProperty(Criterion... criterions);
+
+ public Pagination findByCriteria(Integer firstResult,Integer pageSize,Order order,Criterion... criterion);
+
+}
diff --git a/src/main/java/com/ifish/dao/BrowseRoomDao.java b/src/main/java/com/ifish/dao/BrowseRoomDao.java
new file mode 100644
index 0000000..205ad1f
--- /dev/null
+++ b/src/main/java/com/ifish/dao/BrowseRoomDao.java
@@ -0,0 +1,14 @@
+package com.ifish.dao;
+
+import com.ifish.entity.BrowseRoom;
+import com.ifish.entity.BrowseRoomId;
+
+/**
+ * @ClassName: BrowseRoomDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface BrowseRoomDao extends BaseDao{
+
+}
diff --git a/src/main/java/com/ifish/dao/CameraActiveDao.java b/src/main/java/com/ifish/dao/CameraActiveDao.java
new file mode 100644
index 0000000..e7b47ce
--- /dev/null
+++ b/src/main/java/com/ifish/dao/CameraActiveDao.java
@@ -0,0 +1,13 @@
+package com.ifish.dao;
+
+import com.ifish.entity.CameraActive;
+
+/**
+ * @ClassName: CameraActiveDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface CameraActiveDao extends BaseDao{
+
+}
diff --git a/src/main/java/com/ifish/dao/CameraDao.java b/src/main/java/com/ifish/dao/CameraDao.java
new file mode 100644
index 0000000..1ff34a8
--- /dev/null
+++ b/src/main/java/com/ifish/dao/CameraDao.java
@@ -0,0 +1,13 @@
+package com.ifish.dao;
+
+import com.ifish.entity.Camera;
+
+/**
+ * @ClassName: CameraDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface CameraDao extends BaseDao{
+
+}
diff --git a/src/main/java/com/ifish/dao/CameraUserDao.java b/src/main/java/com/ifish/dao/CameraUserDao.java
new file mode 100644
index 0000000..453c62c
--- /dev/null
+++ b/src/main/java/com/ifish/dao/CameraUserDao.java
@@ -0,0 +1,20 @@
+package com.ifish.dao;
+
+import com.ifish.entity.CameraUser;
+import com.ifish.entity.CameraUserId;
+
+/**
+ * @ClassName: CameraUserDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface CameraUserDao extends BaseDao{
+
+ /**
+ * 查询用户的摄像头数量
+ * @param userId
+ * @return
+ */
+ public int getCameraNumById(Integer userId);
+}
diff --git a/src/main/java/com/ifish/dao/CommentDao.java b/src/main/java/com/ifish/dao/CommentDao.java
new file mode 100644
index 0000000..c53dc8a
--- /dev/null
+++ b/src/main/java/com/ifish/dao/CommentDao.java
@@ -0,0 +1,15 @@
+package com.ifish.dao;
+
+import com.ifish.entity.Comment;
+
+/**
+ * @ClassName: CommentDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface CommentDao extends BaseDao{
+
+ public Integer getPinglunNum(Integer ueditorId);
+
+}
diff --git a/src/main/java/com/ifish/dao/CouponDao.java b/src/main/java/com/ifish/dao/CouponDao.java
new file mode 100644
index 0000000..9e715b0
--- /dev/null
+++ b/src/main/java/com/ifish/dao/CouponDao.java
@@ -0,0 +1,12 @@
+package com.ifish.dao;
+
+import com.ifish.entity.Coupon;
+
+/**
+ * 优惠券
+ * @author Administrator
+ *
+ */
+public interface CouponDao extends BaseDao {
+
+}
diff --git a/src/main/java/com/ifish/dao/CouponRecordDao.java b/src/main/java/com/ifish/dao/CouponRecordDao.java
new file mode 100644
index 0000000..d953c6f
--- /dev/null
+++ b/src/main/java/com/ifish/dao/CouponRecordDao.java
@@ -0,0 +1,26 @@
+package com.ifish.dao;
+
+import com.ifish.entity.CouponRecord;
+
+/**
+ * 优惠券兑换记录
+ * @author Administrator
+ *
+ */
+public interface CouponRecordDao extends BaseDao {
+
+ /**
+ * 查询兑换券的兑换数量
+ * @param couponId
+ * @return
+ */
+ int getCouponRecordCountByCouponId(Integer couponId);
+
+ /**
+ * 查询用户的兑换数量
+ * @param couponId
+ * @return
+ */
+ int getCouponRecordCountByUser(Integer userId,Integer couponId);
+
+}
diff --git a/src/main/java/com/ifish/dao/DeviceCameraDao.java b/src/main/java/com/ifish/dao/DeviceCameraDao.java
new file mode 100644
index 0000000..ca8760d
--- /dev/null
+++ b/src/main/java/com/ifish/dao/DeviceCameraDao.java
@@ -0,0 +1,18 @@
+package com.ifish.dao;
+
+import java.util.List;
+
+import com.ifish.entity.DeviceCamera;
+import com.ifish.entity.DeviceCameraId;
+
+/**
+ * @ClassName: DeviceCameraDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface DeviceCameraDao extends BaseDao{
+
+ public void removeAll(List list);
+
+}
diff --git a/src/main/java/com/ifish/dao/DeviceDao.java b/src/main/java/com/ifish/dao/DeviceDao.java
new file mode 100644
index 0000000..8ae152a
--- /dev/null
+++ b/src/main/java/com/ifish/dao/DeviceDao.java
@@ -0,0 +1,13 @@
+package com.ifish.dao;
+
+import com.ifish.entity.Device;
+
+/**
+ * @ClassName: DeviceDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface DeviceDao extends BaseDao{
+
+}
diff --git a/src/main/java/com/ifish/dao/DeviceUserDao.java b/src/main/java/com/ifish/dao/DeviceUserDao.java
new file mode 100644
index 0000000..fe0e099
--- /dev/null
+++ b/src/main/java/com/ifish/dao/DeviceUserDao.java
@@ -0,0 +1,25 @@
+package com.ifish.dao;
+
+import java.util.List;
+
+import com.ifish.entity.DeviceUser;
+import com.ifish.entity.DeviceUserId;
+
+/**
+ * @ClassName: DeviceUserDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface DeviceUserDao extends BaseDao{
+
+ public void removeAll(List list);
+
+ /**
+ * 查询用户的设备数量
+ * @param userId
+ * @return
+ */
+ public int getDeviceNumById(Integer userId);
+
+}
diff --git a/src/main/java/com/ifish/dao/GoldControlDao.java b/src/main/java/com/ifish/dao/GoldControlDao.java
new file mode 100644
index 0000000..485e4af
--- /dev/null
+++ b/src/main/java/com/ifish/dao/GoldControlDao.java
@@ -0,0 +1,13 @@
+package com.ifish.dao;
+
+import com.ifish.entity.GoldControl;
+import com.ifish.entity.GoldControlId;
+
+/**
+ * 金币控制信息
+ * @author Administrator
+ *
+ */
+public interface GoldControlDao extends BaseDao {
+
+}
diff --git a/src/main/java/com/ifish/dao/GoldExpendRecordDao.java b/src/main/java/com/ifish/dao/GoldExpendRecordDao.java
new file mode 100644
index 0000000..92ad178
--- /dev/null
+++ b/src/main/java/com/ifish/dao/GoldExpendRecordDao.java
@@ -0,0 +1,12 @@
+package com.ifish.dao;
+
+import com.ifish.entity.GoldExpendRecord;
+
+/**
+ * 金币消耗记录
+ * @author Administrator
+ *
+ */
+public interface GoldExpendRecordDao extends BaseDao{
+
+}
diff --git a/src/main/java/com/ifish/dao/GoldGetRecordDao.java b/src/main/java/com/ifish/dao/GoldGetRecordDao.java
new file mode 100644
index 0000000..32fe85e
--- /dev/null
+++ b/src/main/java/com/ifish/dao/GoldGetRecordDao.java
@@ -0,0 +1,21 @@
+package com.ifish.dao;
+
+import java.math.BigDecimal;
+
+import com.ifish.entity.GoldGetRecord;
+
+/**
+ * 获取金币记录
+ * @author Administrator
+ *
+ */
+public interface GoldGetRecordDao extends BaseDao{
+
+ /**
+ * 打赏金额数量
+ * @param userId
+ * @return
+ */
+ BigDecimal getQuestionPayTourGoldValue(Integer userId);
+
+}
diff --git a/src/main/java/com/ifish/dao/GoldRuleDao.java b/src/main/java/com/ifish/dao/GoldRuleDao.java
new file mode 100644
index 0000000..58adbfe
--- /dev/null
+++ b/src/main/java/com/ifish/dao/GoldRuleDao.java
@@ -0,0 +1,12 @@
+package com.ifish.dao;
+
+import com.ifish.entity.GoldTask;
+
+/**
+ * 金币获取规则
+ * @author Administrator
+ *
+ */
+public interface GoldRuleDao extends BaseDao {
+
+}
diff --git a/src/main/java/com/ifish/dao/GradeControlDao.java b/src/main/java/com/ifish/dao/GradeControlDao.java
new file mode 100644
index 0000000..1257a27
--- /dev/null
+++ b/src/main/java/com/ifish/dao/GradeControlDao.java
@@ -0,0 +1,13 @@
+package com.ifish.dao;
+
+import com.ifish.entity.GradeControl;
+import com.ifish.entity.GradeControlId;
+
+/**
+ * 等级经验控制
+ * @author Administrator
+ *
+ */
+public interface GradeControlDao extends BaseDao {
+
+}
diff --git a/src/main/java/com/ifish/dao/GradeDao.java b/src/main/java/com/ifish/dao/GradeDao.java
new file mode 100644
index 0000000..4978827
--- /dev/null
+++ b/src/main/java/com/ifish/dao/GradeDao.java
@@ -0,0 +1,13 @@
+package com.ifish.dao;
+
+import com.ifish.entity.Grade;
+
+/**
+ * @ClassName: GradeDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface GradeDao extends BaseDao{
+
+}
diff --git a/src/main/java/com/ifish/dao/GradeRecordDao.java b/src/main/java/com/ifish/dao/GradeRecordDao.java
new file mode 100644
index 0000000..9d2e84b
--- /dev/null
+++ b/src/main/java/com/ifish/dao/GradeRecordDao.java
@@ -0,0 +1,13 @@
+package com.ifish.dao;
+
+import com.ifish.entity.GradeRecord;
+
+/**
+ * @ClassName: GradeRecordDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface GradeRecordDao extends BaseDao{
+
+}
diff --git a/src/main/java/com/ifish/dao/GradeRuleDao.java b/src/main/java/com/ifish/dao/GradeRuleDao.java
new file mode 100644
index 0000000..c74c2d1
--- /dev/null
+++ b/src/main/java/com/ifish/dao/GradeRuleDao.java
@@ -0,0 +1,13 @@
+package com.ifish.dao;
+
+import com.ifish.entity.GradeTask;
+
+/**
+ * @ClassName: GradeRuleDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface GradeRuleDao extends BaseDao{
+
+}
diff --git a/src/main/java/com/ifish/dao/HardwareTypeDao.java b/src/main/java/com/ifish/dao/HardwareTypeDao.java
new file mode 100644
index 0000000..fc8ff58
--- /dev/null
+++ b/src/main/java/com/ifish/dao/HardwareTypeDao.java
@@ -0,0 +1,13 @@
+package com.ifish.dao;
+
+import com.ifish.entity.HardwareType;
+
+/**
+ * @ClassName: HardwareTypeDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface HardwareTypeDao extends BaseDao{
+
+}
diff --git a/src/main/java/com/ifish/dao/IfishDoctorDao.java b/src/main/java/com/ifish/dao/IfishDoctorDao.java
new file mode 100644
index 0000000..7670714
--- /dev/null
+++ b/src/main/java/com/ifish/dao/IfishDoctorDao.java
@@ -0,0 +1,13 @@
+package com.ifish.dao;
+
+import com.ifish.entity.IfishDoctor;
+
+/**
+ * @ClassName: IfishDoctorDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface IfishDoctorDao extends BaseDao{
+
+}
diff --git a/src/main/java/com/ifish/dao/IfishGoodsDao.java b/src/main/java/com/ifish/dao/IfishGoodsDao.java
new file mode 100644
index 0000000..35227e8
--- /dev/null
+++ b/src/main/java/com/ifish/dao/IfishGoodsDao.java
@@ -0,0 +1,12 @@
+package com.ifish.dao;
+
+import com.ifish.entity.IfishGoods;
+
+/**
+ * 商品管理dao
+ * @author Administrator
+ *
+ */
+public interface IfishGoodsDao extends BaseDao {
+
+}
diff --git a/src/main/java/com/ifish/dao/IfishShopDao.java b/src/main/java/com/ifish/dao/IfishShopDao.java
new file mode 100644
index 0000000..d485f66
--- /dev/null
+++ b/src/main/java/com/ifish/dao/IfishShopDao.java
@@ -0,0 +1,12 @@
+package com.ifish.dao;
+
+import com.ifish.entity.IfishShop;
+
+/**
+ * 店铺管理dao
+ * @author Administrator
+ *
+ */
+public interface IfishShopDao extends BaseDao {
+
+}
diff --git a/src/main/java/com/ifish/dao/InformationDao.java b/src/main/java/com/ifish/dao/InformationDao.java
new file mode 100644
index 0000000..e51f5fb
--- /dev/null
+++ b/src/main/java/com/ifish/dao/InformationDao.java
@@ -0,0 +1,14 @@
+package com.ifish.dao;
+
+import com.ifish.entity.Information;
+
+
+/**
+ * @ClassName: InformationDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface InformationDao extends BaseDao{
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/ifish/dao/InformationStatsDao.java b/src/main/java/com/ifish/dao/InformationStatsDao.java
new file mode 100644
index 0000000..17cc337
--- /dev/null
+++ b/src/main/java/com/ifish/dao/InformationStatsDao.java
@@ -0,0 +1,12 @@
+package com.ifish.dao;
+
+import com.ifish.entity.InformationStats;
+
+/**
+ * 资讯数据统计
+ * @author Administrator
+ *
+ */
+public interface InformationStatsDao extends BaseDao {
+
+}
diff --git a/src/main/java/com/ifish/dao/LiveBannerDao.java b/src/main/java/com/ifish/dao/LiveBannerDao.java
new file mode 100644
index 0000000..ffb67e0
--- /dev/null
+++ b/src/main/java/com/ifish/dao/LiveBannerDao.java
@@ -0,0 +1,13 @@
+package com.ifish.dao;
+
+import com.ifish.entity.LiveBanner;
+
+/**
+ * @ClassName: LiveBannerDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface LiveBannerDao extends BaseDao{
+
+}
diff --git a/src/main/java/com/ifish/dao/LiveMessageDao.java b/src/main/java/com/ifish/dao/LiveMessageDao.java
new file mode 100644
index 0000000..c5e33ea
--- /dev/null
+++ b/src/main/java/com/ifish/dao/LiveMessageDao.java
@@ -0,0 +1,21 @@
+package com.ifish.dao;
+
+import com.ifish.entity.LiveMessage;
+
+
+/**
+ * @ClassName: LiveMessageDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface LiveMessageDao extends BaseDao{
+
+ /**
+ * 获取直播间评论数
+ * @param roomId
+ * @return
+ */
+ public int getLiveMessageCount(Integer roomId);
+
+}
diff --git a/src/main/java/com/ifish/dao/LiveRoomDao.java b/src/main/java/com/ifish/dao/LiveRoomDao.java
new file mode 100644
index 0000000..93e908e
--- /dev/null
+++ b/src/main/java/com/ifish/dao/LiveRoomDao.java
@@ -0,0 +1,62 @@
+package com.ifish.dao;
+
+import java.util.List;
+
+import com.ifish.dto.LiveRoomInfoDto;
+import com.ifish.entity.LiveRoom;
+import com.ifish.hibernate.Pagination;
+
+/**
+ * @ClassName: LiveRoomDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface LiveRoomDao extends BaseDao{
+
+ /**
+ * 获取离用户最近的5条记录
+ * @param longitude
+ * @param latitude
+ * @return
+ */
+ public List findByDistance(Double longitude,Double latitude);
+
+ /**
+ * 获取用户最近浏览的5条记录
+ * @param userId
+ * @return
+ */
+ public List findByBrowse(Integer userId);
+
+ /**
+ * 获取人气值最高的5条记录
+ * @return
+ */
+ public List findByPopularityValue();
+
+ /**
+ * 根据开播时间倒序
+ * @param firstResult
+ * @param pageSize
+ * @return
+ */
+ public Pagination findByTime(Integer firstResult,Integer pageSize,String orders);
+
+ /**
+ * 根据人气值倒序
+ * @param firstResult
+ * @param pageSize
+ * @return
+ */
+ public Pagination findByPopularityValue(Integer firstResult,Integer pageSize);
+
+ /**
+ * 根据推荐顺序
+ * @param firstResult
+ * @param pageSize
+ * @return
+ */
+ public Pagination getLiveRoomsByTuijian(Integer firstResult,Integer pageSize);
+
+}
diff --git a/src/main/java/com/ifish/dao/LiveRoomZanDao.java b/src/main/java/com/ifish/dao/LiveRoomZanDao.java
new file mode 100644
index 0000000..f6e43e7
--- /dev/null
+++ b/src/main/java/com/ifish/dao/LiveRoomZanDao.java
@@ -0,0 +1,20 @@
+package com.ifish.dao;
+
+import com.ifish.entity.LiveRoomZan;
+import com.ifish.entity.LiveRoomZanId;
+
+/**
+ * 直播间点赞
+ * @author Administrator
+ *
+ */
+public interface LiveRoomZanDao extends BaseDao {
+
+ /**
+ * 点赞数量
+ * @param roomId
+ * @return
+ */
+ public Integer getZanNum(Integer roomId);
+
+}
diff --git a/src/main/java/com/ifish/dao/LookReportDao.java b/src/main/java/com/ifish/dao/LookReportDao.java
new file mode 100644
index 0000000..6d91e69
--- /dev/null
+++ b/src/main/java/com/ifish/dao/LookReportDao.java
@@ -0,0 +1,13 @@
+package com.ifish.dao;
+
+import com.ifish.entity.LookReport;
+
+/**
+ * @ClassName: LookReportDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface LookReportDao extends BaseDao{
+
+}
diff --git a/src/main/java/com/ifish/dao/PushListDao.java b/src/main/java/com/ifish/dao/PushListDao.java
new file mode 100644
index 0000000..e67297b
--- /dev/null
+++ b/src/main/java/com/ifish/dao/PushListDao.java
@@ -0,0 +1,15 @@
+package com.ifish.dao;
+
+import com.ifish.entity.PushList;
+import com.ifish.hibernate.Pagination;
+
+/**
+ * @ClassName: PushListDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface PushListDao extends BaseDao{
+
+ public Pagination findByCriteria(Integer pushId,Integer userId,Integer firstResult,Integer pageSize);
+}
diff --git a/src/main/java/com/ifish/dao/QuestionsFeedbackDao.java b/src/main/java/com/ifish/dao/QuestionsFeedbackDao.java
new file mode 100644
index 0000000..828ec47
--- /dev/null
+++ b/src/main/java/com/ifish/dao/QuestionsFeedbackDao.java
@@ -0,0 +1,13 @@
+package com.ifish.dao;
+
+import com.ifish.entity.QuestionsFeedback;
+
+/**
+ * @ClassName: QuestionsFeedbackDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface QuestionsFeedbackDao extends BaseDao{
+
+}
diff --git a/src/main/java/com/ifish/dao/ShopsInfoDao.java b/src/main/java/com/ifish/dao/ShopsInfoDao.java
new file mode 100644
index 0000000..9bf0e87
--- /dev/null
+++ b/src/main/java/com/ifish/dao/ShopsInfoDao.java
@@ -0,0 +1,35 @@
+package com.ifish.dao;
+
+import java.util.List;
+
+import com.ifish.dto.ShopsListDto;
+import com.ifish.entity.ShopsInfo;
+import com.ifish.hibernate.Pagination;
+
+
+/**
+ * @ClassName: ShopsInfoDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface ShopsInfoDao extends BaseDao{
+
+ /**
+ * 根据距离获取数据
+ * @param longitude
+ * @param latitude
+ * @param firstResult
+ * @param pageSize
+ * @return
+ */
+ public Pagination findByDistance(Double longitude,Double latitude,Integer firstResult,Integer pageSize);
+
+
+ /**
+ * 随机取得用户ID
+ * @return
+ */
+ public List getShopsUserIdByRand(Integer userId);
+
+}
diff --git a/src/main/java/com/ifish/dao/ShopsUserInfoDao.java b/src/main/java/com/ifish/dao/ShopsUserInfoDao.java
new file mode 100644
index 0000000..38a0bb4
--- /dev/null
+++ b/src/main/java/com/ifish/dao/ShopsUserInfoDao.java
@@ -0,0 +1,13 @@
+package com.ifish.dao;
+
+import com.ifish.entity.ShopsUserInfo;
+import com.ifish.entity.ShopsUserInfoId;
+
+/**
+ * 商家会员信息dao
+ * @author Administrator
+ *
+ */
+public interface ShopsUserInfoDao extends BaseDao{
+
+}
diff --git a/src/main/java/com/ifish/dao/UeditorDao.java b/src/main/java/com/ifish/dao/UeditorDao.java
new file mode 100644
index 0000000..38679fc
--- /dev/null
+++ b/src/main/java/com/ifish/dao/UeditorDao.java
@@ -0,0 +1,13 @@
+package com.ifish.dao;
+
+import com.ifish.entity.Ueditor;
+
+/**
+ * @ClassName: UeditorDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface UeditorDao extends BaseDao{
+
+}
diff --git a/src/main/java/com/ifish/dao/UserActivityDao.java b/src/main/java/com/ifish/dao/UserActivityDao.java
new file mode 100644
index 0000000..0427f51
--- /dev/null
+++ b/src/main/java/com/ifish/dao/UserActivityDao.java
@@ -0,0 +1,12 @@
+package com.ifish.dao;
+
+import com.ifish.entity.UserActivity;
+
+/**
+ * 用户动态
+ * @author Administrator
+ *
+ */
+public interface UserActivityDao extends BaseDao{
+
+}
diff --git a/src/main/java/com/ifish/dao/UserAssetDao.java b/src/main/java/com/ifish/dao/UserAssetDao.java
new file mode 100644
index 0000000..f3e2611
--- /dev/null
+++ b/src/main/java/com/ifish/dao/UserAssetDao.java
@@ -0,0 +1,12 @@
+package com.ifish.dao;
+
+import com.ifish.entity.UserAsset;
+
+/**
+ * 用户资产(金币,经验值等信息)
+ * @author Administrator
+ *
+ */
+public interface UserAssetDao extends BaseDao{
+
+}
diff --git a/src/main/java/com/ifish/dao/UserDao.java b/src/main/java/com/ifish/dao/UserDao.java
new file mode 100644
index 0000000..827d803
--- /dev/null
+++ b/src/main/java/com/ifish/dao/UserDao.java
@@ -0,0 +1,42 @@
+package com.ifish.dao;
+
+import java.util.List;
+
+import com.ifish.dto.ShopsLookUserDto;
+import com.ifish.entity.User;
+import com.ifish.hibernate.Pagination;
+
+/**
+ * @ClassName: UserDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface UserDao extends BaseDao{
+
+ /**
+ * 商家看护下的某个用户的所有摄像头
+ * @param shopsUserId
+ * @param firstResult
+ * @param pageSize
+ * @return
+ */
+ public Pagination findByCriteria(Integer shopsUserId,Integer firstResult,Integer pageSize);
+
+
+ /**
+ * 更新用户登陆时间和登陆次数
+ * @param userId
+ * @return
+ */
+ public int executeLoginUpdate(Integer userId,String loginType);
+
+ /**
+ * 获取用户ID
+ * @param userId
+ * @param firstResult
+ * @param maxResults
+ * @return
+ */
+ public List getUserIds(Integer userId,Integer firstResult,int maxResults);
+}
diff --git a/src/main/java/com/ifish/dao/VenderListDao.java b/src/main/java/com/ifish/dao/VenderListDao.java
new file mode 100644
index 0000000..d146eeb
--- /dev/null
+++ b/src/main/java/com/ifish/dao/VenderListDao.java
@@ -0,0 +1,18 @@
+package com.ifish.dao;
+
+import com.ifish.entity.VenderList;
+import com.ifish.hibernate.Pagination;
+
+/**
+ * @ClassName: VenderListDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface VenderListDao extends BaseDao{
+
+ public VenderList getDefaultVenderList();
+
+ public Pagination findByCriteria(Integer firstResult,Integer pageSize);
+
+}
diff --git a/src/main/java/com/ifish/dao/VersionDao.java b/src/main/java/com/ifish/dao/VersionDao.java
new file mode 100644
index 0000000..eaab4c5
--- /dev/null
+++ b/src/main/java/com/ifish/dao/VersionDao.java
@@ -0,0 +1,15 @@
+package com.ifish.dao;
+
+import com.ifish.entity.Version;
+
+/**
+ * @ClassName: UserDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+public interface VersionDao {
+
+ public Version getNewestVersion(String phoneType);
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/AdInfoDaoImpl.java b/src/main/java/com/ifish/daoImpl/AdInfoDaoImpl.java
new file mode 100644
index 0000000..06e2d3e
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/AdInfoDaoImpl.java
@@ -0,0 +1,20 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.AdInfoDao;
+import com.ifish.entity.AdInfo;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * 广告信息
+ */
+@Repository
+public class AdInfoDaoImpl extends HibernateBaseDao implements AdInfoDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return AdInfo.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/BrowseRoomDaoImpl.java b/src/main/java/com/ifish/daoImpl/BrowseRoomDaoImpl.java
new file mode 100644
index 0000000..eaf2c45
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/BrowseRoomDaoImpl.java
@@ -0,0 +1,25 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.BrowseRoomDao;
+import com.ifish.entity.BrowseRoom;
+import com.ifish.entity.BrowseRoomId;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * @ClassName: CameraDaoImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository
+public class BrowseRoomDaoImpl extends HibernateBaseDao implements BrowseRoomDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return BrowseRoom.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/CameraActiveDaoImpl.java b/src/main/java/com/ifish/daoImpl/CameraActiveDaoImpl.java
new file mode 100644
index 0000000..4cbdab1
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/CameraActiveDaoImpl.java
@@ -0,0 +1,24 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.CameraActiveDao;
+import com.ifish.entity.CameraActive;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * @ClassName: CameraActiveDao
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository
+public class CameraActiveDaoImpl extends HibernateBaseDao implements CameraActiveDao {
+
+ @Override
+ public Class getEntityClass() {
+ return CameraActive.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/CameraDaoImpl.java b/src/main/java/com/ifish/daoImpl/CameraDaoImpl.java
new file mode 100644
index 0000000..19cef6a
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/CameraDaoImpl.java
@@ -0,0 +1,24 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.CameraDao;
+import com.ifish.entity.Camera;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * @ClassName: CameraDaoImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository
+public class CameraDaoImpl extends HibernateBaseDao implements CameraDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return Camera.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/CameraUserDaoImpl.java b/src/main/java/com/ifish/daoImpl/CameraUserDaoImpl.java
new file mode 100644
index 0000000..5b63f2b
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/CameraUserDaoImpl.java
@@ -0,0 +1,39 @@
+package com.ifish.daoImpl;
+
+import java.math.BigInteger;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.CameraUserDao;
+import com.ifish.entity.CameraUser;
+import com.ifish.entity.CameraUserId;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * @ClassName: CameraUserDaoImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository
+public class CameraUserDaoImpl extends HibernateBaseDao implements CameraUserDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return CameraUser.class;
+ }
+
+ /**
+ * 查询用户的摄像头数量
+ * @param userId
+ * @return
+ */
+ @Override
+ public int getCameraNumById(Integer userId) {
+ String sql = "select count(*) from tbl_camera_user where user_id=?";
+ int deviceNum = ((BigInteger)this.getSession().createSQLQuery(sql).setInteger(0, userId).uniqueResult()).intValue();
+ return deviceNum;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/CommentDaoImpl.java b/src/main/java/com/ifish/daoImpl/CommentDaoImpl.java
new file mode 100644
index 0000000..7e6e04a
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/CommentDaoImpl.java
@@ -0,0 +1,31 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.CommentDao;
+import com.ifish.entity.Comment;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * @ClassName: CommentDaoImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository()
+public class CommentDaoImpl extends HibernateBaseDao implements CommentDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return Comment.class;
+ }
+
+ @Override
+ public Integer getPinglunNum(Integer ueditorId) {
+ //查询评论数据
+ String sql = "SELECT count(*) FROM tbl_comment where ueditor_id=?";
+ return ((Number)getSession().createSQLQuery(sql).setInteger(0, ueditorId).uniqueResult()).intValue();
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/CouponDaoImpl.java b/src/main/java/com/ifish/daoImpl/CouponDaoImpl.java
new file mode 100644
index 0000000..4bf719e
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/CouponDaoImpl.java
@@ -0,0 +1,22 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.CouponDao;
+import com.ifish.entity.Coupon;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * 优惠券
+ * @author Administrator
+ *
+ */
+@Repository
+public class CouponDaoImpl extends HibernateBaseDao implements CouponDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return Coupon.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/CouponRecordDaoImpl.java b/src/main/java/com/ifish/daoImpl/CouponRecordDaoImpl.java
new file mode 100644
index 0000000..7c88270
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/CouponRecordDaoImpl.java
@@ -0,0 +1,37 @@
+package com.ifish.daoImpl;
+
+import java.math.BigInteger;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.CouponRecordDao;
+import com.ifish.entity.CouponRecord;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * 优惠价兑换记录
+ * @author Administrator
+ *
+ */
+@Repository
+public class CouponRecordDaoImpl extends HibernateBaseDao implements CouponRecordDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return CouponRecord.class;
+ }
+
+ @Override
+ public int getCouponRecordCountByCouponId(Integer couponId) {
+ String sql = "select count(*) from tbl_coupon_record where coupon_id=?";
+ return ((BigInteger)getSession().createSQLQuery(sql).setInteger(0, couponId).uniqueResult()).intValue();
+ }
+
+ @Override
+ public int getCouponRecordCountByUser(Integer userId, Integer couponId) {
+ String sql = "select count(*) from tbl_coupon_record where user_id=? and coupon_id=?";
+ return ((BigInteger)getSession().createSQLQuery(sql).setInteger(0, userId).setInteger(1, couponId).uniqueResult()).intValue();
+ }
+
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/DeviceCameraDaoImpl.java b/src/main/java/com/ifish/daoImpl/DeviceCameraDaoImpl.java
new file mode 100644
index 0000000..bb0529a
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/DeviceCameraDaoImpl.java
@@ -0,0 +1,35 @@
+package com.ifish.daoImpl;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.DeviceCameraDao;
+import com.ifish.entity.DeviceCamera;
+import com.ifish.entity.DeviceCameraId;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * @ClassName: DeviceCameraDaoImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository
+public class DeviceCameraDaoImpl extends HibernateBaseDao implements DeviceCameraDao {
+
+
+ @Override
+ protected Class getEntityClass() {
+ return DeviceCamera.class;
+ }
+
+ @Override
+ public void removeAll(List list) {
+ for (DeviceCamera deviceCamera:list) {
+ delete(deviceCamera);
+ }
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/DeviceDaoImpl.java b/src/main/java/com/ifish/daoImpl/DeviceDaoImpl.java
new file mode 100644
index 0000000..77e704f
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/DeviceDaoImpl.java
@@ -0,0 +1,24 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.DeviceDao;
+import com.ifish.entity.Device;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * @ClassName: DeviceDaoImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository
+public class DeviceDaoImpl extends HibernateBaseDao implements DeviceDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return Device.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/DeviceUserDaoImpl.java b/src/main/java/com/ifish/daoImpl/DeviceUserDaoImpl.java
new file mode 100644
index 0000000..db544aa
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/DeviceUserDaoImpl.java
@@ -0,0 +1,47 @@
+package com.ifish.daoImpl;
+
+import java.math.BigInteger;
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.DeviceUserDao;
+import com.ifish.entity.DeviceUser;
+import com.ifish.entity.DeviceUserId;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * @ClassName: DeviceUserDaoImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository
+public class DeviceUserDaoImpl extends HibernateBaseDao implements DeviceUserDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return DeviceUser.class;
+ }
+
+ @Override
+ public void removeAll(List list) {
+ for (DeviceUser deviceUser:list) {
+ delete(deviceUser);
+ }
+ }
+
+ /**
+ * 查询用户的设备数量
+ * @param userId
+ * @return
+ */
+ @Override
+ public int getDeviceNumById(Integer userId) {
+ String sql = "select count(*) from tbl_device_user where user_id=?";
+ int deviceNum = ((BigInteger)this.getSession().createSQLQuery(sql).setInteger(0, userId).uniqueResult()).intValue();
+ return deviceNum;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/GoldControlDaoImpl.java b/src/main/java/com/ifish/daoImpl/GoldControlDaoImpl.java
new file mode 100644
index 0000000..42fcc77
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/GoldControlDaoImpl.java
@@ -0,0 +1,23 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.GoldControlDao;
+import com.ifish.entity.GoldControl;
+import com.ifish.entity.GoldControlId;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * 金币控制信息
+ * @author Administrator
+ *
+ */
+@Repository
+public class GoldControlDaoImpl extends HibernateBaseDao implements GoldControlDao{
+
+ @Override
+ protected Class getEntityClass() {
+ return GoldControl.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/GoldExpendRecordDaoImpl.java b/src/main/java/com/ifish/daoImpl/GoldExpendRecordDaoImpl.java
new file mode 100644
index 0000000..e0882be
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/GoldExpendRecordDaoImpl.java
@@ -0,0 +1,22 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.GoldExpendRecordDao;
+import com.ifish.entity.GoldExpendRecord;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * 金币消耗记录
+ * @author Administrator
+ *
+ */
+@Repository
+public class GoldExpendRecordDaoImpl extends HibernateBaseDao implements GoldExpendRecordDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return GoldExpendRecord.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/GoldGetRecordDaoImpl.java b/src/main/java/com/ifish/daoImpl/GoldGetRecordDaoImpl.java
new file mode 100644
index 0000000..c940a05
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/GoldGetRecordDaoImpl.java
@@ -0,0 +1,31 @@
+package com.ifish.daoImpl;
+
+import java.math.BigDecimal;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.GoldGetRecordDao;
+import com.ifish.entity.GoldGetRecord;
+import com.ifish.enums.GoldGetTypeEnum;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * 金币获取记录
+ * @author Administrator
+ *
+ */
+@Repository
+public class GoldGetRecordDaoImpl extends HibernateBaseDao implements GoldGetRecordDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return GoldGetRecord.class;
+ }
+
+ @Override
+ public BigDecimal getQuestionPayTourGoldValue(Integer userId) {
+ String sql = "select sum(get_value) from tbl_gold_get_record where get_type=? and user_id=?";
+ return (BigDecimal) getSession().createSQLQuery(sql).setString(0, GoldGetTypeEnum.liveRoomPayTour.getKey()).setInteger(1, userId).uniqueResult();
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/GoldRuleImpl.java b/src/main/java/com/ifish/daoImpl/GoldRuleImpl.java
new file mode 100644
index 0000000..237c32a
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/GoldRuleImpl.java
@@ -0,0 +1,23 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.GoldRuleDao;
+import com.ifish.entity.GoldTask;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * 金币获取规则
+ * @author Administrator
+ *
+ */
+@Repository
+public class GoldRuleImpl extends HibernateBaseDao implements GoldRuleDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return GoldTask.class;
+ }
+
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/GradeControlDaoImpl.java b/src/main/java/com/ifish/daoImpl/GradeControlDaoImpl.java
new file mode 100644
index 0000000..46753f4
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/GradeControlDaoImpl.java
@@ -0,0 +1,23 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.GradeControlDao;
+import com.ifish.entity.GradeControl;
+import com.ifish.entity.GradeControlId;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * 等级信息控制
+ * @author Administrator
+ *
+ */
+@Repository
+public class GradeControlDaoImpl extends HibernateBaseDao implements GradeControlDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return GradeControl.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/GradeDaoImpl.java b/src/main/java/com/ifish/daoImpl/GradeDaoImpl.java
new file mode 100644
index 0000000..1fe43bc
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/GradeDaoImpl.java
@@ -0,0 +1,24 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.GradeDao;
+import com.ifish.entity.Grade;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * @ClassName: GradeDaoImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository
+public class GradeDaoImpl extends HibernateBaseDao implements GradeDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return Grade.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/GradeRecordDaoImpl.java b/src/main/java/com/ifish/daoImpl/GradeRecordDaoImpl.java
new file mode 100644
index 0000000..814ae18
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/GradeRecordDaoImpl.java
@@ -0,0 +1,24 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.GradeRecordDao;
+import com.ifish.entity.GradeRecord;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * @ClassName: GradeRecordDaoImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository
+public class GradeRecordDaoImpl extends HibernateBaseDao implements GradeRecordDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return GradeRecord.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/GradeRuleImpl.java b/src/main/java/com/ifish/daoImpl/GradeRuleImpl.java
new file mode 100644
index 0000000..ee7a7ea
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/GradeRuleImpl.java
@@ -0,0 +1,24 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.GradeRuleDao;
+import com.ifish.entity.GradeTask;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * @ClassName: GradeRuleImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository
+public class GradeRuleImpl extends HibernateBaseDao implements GradeRuleDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return GradeTask.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/HardwareTypeDaoImpl.java b/src/main/java/com/ifish/daoImpl/HardwareTypeDaoImpl.java
new file mode 100644
index 0000000..43d1082
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/HardwareTypeDaoImpl.java
@@ -0,0 +1,25 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.HardwareTypeDao;
+import com.ifish.entity.HardwareType;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * @ClassName: HardwareTypeDaoImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository
+public class HardwareTypeDaoImpl extends HibernateBaseDao implements HardwareTypeDao {
+
+
+ @Override
+ protected Class getEntityClass() {
+ return HardwareType.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/IfishDoctorDaoImpl.java b/src/main/java/com/ifish/daoImpl/IfishDoctorDaoImpl.java
new file mode 100644
index 0000000..2607cd8
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/IfishDoctorDaoImpl.java
@@ -0,0 +1,24 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.IfishDoctorDao;
+import com.ifish.entity.IfishDoctor;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * @ClassName: IfishDoctorDaoImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository
+public class IfishDoctorDaoImpl extends HibernateBaseDao implements IfishDoctorDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return IfishDoctor.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/IfishGoodsDaoImpl.java b/src/main/java/com/ifish/daoImpl/IfishGoodsDaoImpl.java
new file mode 100644
index 0000000..61d3ed8
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/IfishGoodsDaoImpl.java
@@ -0,0 +1,22 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.IfishGoodsDao;
+import com.ifish.entity.IfishGoods;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * 商品管理dao
+ * @author Administrator
+ *
+ */
+@Repository
+public class IfishGoodsDaoImpl extends HibernateBaseDao implements IfishGoodsDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return IfishGoods.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/IfishShopDaoImpl.java b/src/main/java/com/ifish/daoImpl/IfishShopDaoImpl.java
new file mode 100644
index 0000000..b7a4e23
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/IfishShopDaoImpl.java
@@ -0,0 +1,22 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.IfishShopDao;
+import com.ifish.entity.IfishShop;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * 店铺管理dao
+ * @author Administrator
+ *
+ */
+@Repository
+public class IfishShopDaoImpl extends HibernateBaseDao implements IfishShopDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return IfishShop.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/InformationDaoImpl.java b/src/main/java/com/ifish/daoImpl/InformationDaoImpl.java
new file mode 100644
index 0000000..a67c5f0
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/InformationDaoImpl.java
@@ -0,0 +1,24 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.InformationDao;
+import com.ifish.entity.Information;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * @ClassName: InformationDaoImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository("informationDao")
+public class InformationDaoImpl extends HibernateBaseDao implements InformationDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return Information.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/InformationStatsDaoImpl.java b/src/main/java/com/ifish/daoImpl/InformationStatsDaoImpl.java
new file mode 100644
index 0000000..610f27d
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/InformationStatsDaoImpl.java
@@ -0,0 +1,22 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.InformationStatsDao;
+import com.ifish.entity.InformationStats;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * 资讯数据统计
+ * @author Administrator
+ *
+ */
+@Repository
+public class InformationStatsDaoImpl extends HibernateBaseDao implements InformationStatsDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return InformationStats.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/LiveBannerImpl.java b/src/main/java/com/ifish/daoImpl/LiveBannerImpl.java
new file mode 100644
index 0000000..93e00c9
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/LiveBannerImpl.java
@@ -0,0 +1,24 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.LiveBannerDao;
+import com.ifish.entity.LiveBanner;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * @ClassName: LiveBannerImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository
+public class LiveBannerImpl extends HibernateBaseDao implements LiveBannerDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return LiveBanner.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/LiveMessageDaoImpl.java b/src/main/java/com/ifish/daoImpl/LiveMessageDaoImpl.java
new file mode 100644
index 0000000..0597c45
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/LiveMessageDaoImpl.java
@@ -0,0 +1,32 @@
+package com.ifish.daoImpl;
+
+import java.math.BigInteger;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.LiveMessageDao;
+import com.ifish.entity.LiveMessage;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * @ClassName: LiveMessageDaoImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository
+public class LiveMessageDaoImpl extends HibernateBaseDao implements LiveMessageDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return LiveMessage.class;
+ }
+
+ @Override
+ public int getLiveMessageCount(Integer roomId) {
+ String sql = "SELECT COUNT(*) FROM tbl_live_message WHERE room_id=?";
+ return ((BigInteger)getSession().createSQLQuery(sql).setInteger(0, roomId).uniqueResult()).intValue();
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/LiveRoomImpl.java b/src/main/java/com/ifish/daoImpl/LiveRoomImpl.java
new file mode 100644
index 0000000..a590e9b
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/LiveRoomImpl.java
@@ -0,0 +1,203 @@
+package com.ifish.daoImpl;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.SQLQuery;
+import org.hibernate.transform.Transformers;
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.LiveRoomDao;
+import com.ifish.dto.LiveRoomInfoDto;
+import com.ifish.entity.LiveRoom;
+import com.ifish.enums.BooleanEnum;
+import com.ifish.enums.RoomStatusEnum;
+import com.ifish.hibernate.HibernateBaseDao;
+import com.ifish.hibernate.Pagination;
+
+/**
+ * @ClassName: LiveRoomImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository
+public class LiveRoomImpl extends HibernateBaseDao implements LiveRoomDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return LiveRoom.class;
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public List findByDistance(Double longitude,Double latitude) {
+ if(longitude!=null && latitude!=null){
+ String sql = "select l.room_id AS roomId,u.user_id AS userId,u.user_type AS userType,u.nick_name AS nickName,u.user_img AS userImg,u.login_time AS loginTime,c.camera_id AS cameraId,l.room_name AS roomName,l.room_desc AS roomDesc,l.popularity_value AS popularityValue,(TO_DAYS(NOW())-TO_DAYS(l.create_time)) AS numberDays,round(6378.138*2*asin(sqrt(pow(sin((?*pi()/180-u.latitude*pi()/180)/2),2)+cos(?*pi()/180)*cos(u.latitude*pi()/180)* pow(sin((?*pi()/180-u.longitude*pi()/180)/2),2)))*1000) AS distance from tbl_user u LEFT JOIN tbl_camera_user c ON u.user_id=c.user_id LEFT JOIN tbl_live_room l on c.user_id=l.user_id WHERE c.is_live=? AND l.room_status=? HAVING distance IS NOT NULL ORDER BY distance ASC LIMIT 5";
+ return this.getSession().createSQLQuery(sql)
+ .setParameter(0, latitude)
+ .setParameter(1, latitude)
+ .setParameter(2, longitude)
+ .setParameter(3, BooleanEnum.YES.getKey())
+ .setParameter(4, RoomStatusEnum.status1.getKey())
+ .setResultTransformer(Transformers.aliasToBean(LiveRoomInfoDto.class))
+ .list();
+ }
+ else{
+ return new ArrayList();
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public List findByBrowse(Integer userId) {
+ if(userId!=null){
+ String sql = "select l.room_id AS roomId,u.user_id AS userId,u.user_type AS userType,u.nick_name AS nickName,u.user_img AS userImg,u.login_time AS loginTime,c.camera_id AS cameraId,l.room_name AS roomName,l.room_desc AS roomDesc,l.popularity_value AS popularityValue,(TO_DAYS(NOW())-TO_DAYS(l.create_time)) AS numberDays from tbl_browse_room b LEFT JOIN tbl_live_room l ON b.room_id=l.room_id LEFT JOIN tbl_camera_user c ON c.user_id=l.user_id LEFT JOIN tbl_user u ON c.user_id=u.user_id where b.user_id=? AND c.is_live=? AND l.room_status=? ORDER BY b.update_time DESC LIMIT 5";
+ return this.getSession().createSQLQuery(sql)
+ .setParameter(0, userId)
+ .setParameter(1, BooleanEnum.YES.getKey())
+ .setParameter(2, RoomStatusEnum.status1.getKey())
+ .setResultTransformer(Transformers.aliasToBean(LiveRoomInfoDto.class))
+ .list();
+ }
+ else{
+ return new ArrayList();
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public List findByPopularityValue() {
+ String sql = "select l.room_id AS roomId,u.user_id AS userId,u.user_type AS userType,u.nick_name AS nickName,u.user_img AS userImg,u.login_time AS loginTime,c.camera_id AS cameraId,l.room_name AS roomName,l.room_desc AS roomDesc,l.popularity_value AS popularityValue,(TO_DAYS(NOW())-TO_DAYS(l.create_time)) AS numberDays from tbl_user u LEFT JOIN tbl_camera_user c ON u.user_id=c.user_id LEFT JOIN tbl_live_room l ON u.user_id=l.user_id WHERE c.is_live=? AND l.room_status=? ORDER BY l.popularity_value DESC LIMIT 5";
+ return this.getSession().createSQLQuery(sql)
+ .setParameter(0, BooleanEnum.YES.getKey())
+ .setParameter(1, RoomStatusEnum.status1.getKey())
+ .setResultTransformer(Transformers.aliasToBean(LiveRoomInfoDto.class))
+ .list();
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public Pagination findByTime(Integer firstResult,Integer pageSize,String orders) {
+ //综合数据
+ Integer length = 0;
+ String[] strOrder = null;
+ if(orders!=null && orders.length()>0){
+ strOrder = orders.split(",");
+ length = strOrder.length;
+ }
+ //总条数
+ String countSql = "select count(*) from tbl_user u LEFT JOIN tbl_camera_user c ON u.user_id=c.user_id LEFT JOIN tbl_live_room l ON u.user_id=l.user_id WHERE ### c.is_live=? AND l.room_status=? ORDER BY l.create_time DESC";
+ //分页数据
+ String sql = "select l.room_id AS roomId,u.user_id AS userId,u.user_type AS userType,u.nick_name AS nickName,u.user_img AS userImg,u.login_time AS loginTime,l.create_time AS createTime,c.camera_id AS cameraId,l.room_name AS roomName,l.room_desc AS roomDesc,l.popularity_value AS popularityValue,(TO_DAYS(NOW())-TO_DAYS(l.create_time)) AS numberDays from tbl_user u LEFT JOIN tbl_camera_user c ON u.user_id=c.user_id LEFT JOIN tbl_live_room l ON u.user_id=l.user_id WHERE ### c.is_live=? AND l.room_status=? ORDER BY l.create_time DESC LIMIT ?,?";
+ //查询条件去除综合数据
+ Object[] intOrder = new Integer[length];
+ StringBuilder pingjie = new StringBuilder("");
+ if(length>0){
+ pingjie.append("l.room_id NOT IN (");
+ for (int i = 0; i < length; i++) {
+ if(i==0){
+ pingjie.append("?");
+ }
+ else{
+ pingjie.append(",?");
+ }
+ intOrder[i] = Integer.valueOf(strOrder[i]);
+ }
+ pingjie.append(") AND");
+ }
+ countSql = countSql.replaceAll("###", pingjie.toString());
+ sql = sql.replaceAll("###", pingjie.toString());
+ //查询total
+ SQLQuery countQuery = this.getSession().createSQLQuery(countSql);
+ if(length>0){
+ for (int i = 0; i < length; i++) {
+ countQuery.setParameter(i, intOrder[i]);
+ }
+ countQuery.setParameter(length, BooleanEnum.YES.getKey());
+ countQuery.setParameter((length+1), RoomStatusEnum.status1.getKey());
+ }
+ else{
+ countQuery.setParameter(0, BooleanEnum.YES.getKey());
+ countQuery.setParameter(1, RoomStatusEnum.status1.getKey());
+ }
+ int totalCount = ((BigInteger)countQuery.uniqueResult()).intValue();
+ //分页数据
+ SQLQuery query = this.getSession().createSQLQuery(sql);
+ if(length>0){
+ for (int i = 0; i < length; i++) {
+ query.setParameter(i, intOrder[i]);
+ }
+ query.setParameter(length, BooleanEnum.YES.getKey());
+ query.setParameter((length+1), RoomStatusEnum.status1.getKey());
+ query.setParameter((length+2), firstResult);
+ query.setParameter((length+3), pageSize);
+ }
+ else{
+ query.setParameter(0, BooleanEnum.YES.getKey());
+ query.setParameter(1, RoomStatusEnum.status1.getKey());
+ query.setParameter(2, firstResult);
+ query.setParameter(3, pageSize);
+ }
+ List list = query.setResultTransformer(Transformers.aliasToBean(LiveRoomInfoDto.class)).list();
+ //分页封装
+ Pagination page = new Pagination();
+ page.setTotalCount(totalCount);
+ page.setList(list);
+ return page;
+
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public Pagination findByPopularityValue(Integer firstResult,Integer pageSize) {
+ //总条数
+ String countSql = "select count(*) from tbl_user u LEFT JOIN tbl_camera_user c ON u.user_id=c.user_id LEFT JOIN tbl_live_room l ON u.user_id=l.user_id WHERE c.is_live=? AND l.room_status=? ORDER BY l.popularity_value DESC";
+ int totalCount = ((BigInteger) this.getSession().createSQLQuery(countSql)
+ .setParameter(0, BooleanEnum.YES.getKey())
+ .setParameter(1, RoomStatusEnum.status1.getKey())
+ .uniqueResult()).intValue();
+ String sql = "select l.room_id AS roomId,u.user_id AS userId,u.user_type AS userType,u.nick_name AS nickName,u.user_img AS userImg,u.login_time AS loginTime,c.camera_id AS cameraId,l.room_name AS roomName,l.room_desc AS roomDesc,l.popularity_value AS popularityValue,(TO_DAYS(NOW())-TO_DAYS(l.create_time)) AS numberDays from tbl_user u LEFT JOIN tbl_camera_user c ON u.user_id=c.user_id LEFT JOIN tbl_live_room l ON u.user_id=l.user_id WHERE c.is_live=? AND l.room_status=? ORDER BY l.popularity_value DESC LIMIT ?,?";
+ //分页数据
+ List list = this.getSession().createSQLQuery(sql)
+ .setParameter(0, BooleanEnum.YES.getKey())
+ .setParameter(1, RoomStatusEnum.status1.getKey())
+ .setParameter(2, firstResult)
+ .setParameter(3, pageSize)
+ .setResultTransformer(Transformers.aliasToBean(LiveRoomInfoDto.class))
+ .list();
+ //分页封装
+ Pagination page = new Pagination();
+ page.setTotalCount(totalCount);
+ page.setList(list);
+ return page;
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public Pagination getLiveRoomsByTuijian(Integer firstResult, Integer pageSize) {
+ //总条数
+ String countSql = "select count(*) from tbl_user u LEFT JOIN tbl_camera_user c ON u.user_id=c.user_id LEFT JOIN tbl_live_room l ON u.user_id=l.user_id WHERE c.is_live=? AND l.room_status=? ORDER BY l.popularity_value DESC";
+ int totalCount = ((BigInteger) this.getSession().createSQLQuery(countSql)
+ .setParameter(0, BooleanEnum.YES.getKey())
+ .setParameter(1, RoomStatusEnum.status1.getKey())
+ .uniqueResult()).intValue();
+ String sql = "select l.room_id AS roomId,u.user_id AS userId,u.user_type AS userType,u.nick_name AS nickName,u.user_img AS userImg,u.login_time AS loginTime,c.camera_id AS cameraId,l.room_name AS roomName,l.room_desc AS roomDesc,l.popularity_value AS popularityValue,(TO_DAYS(NOW())-TO_DAYS(l.create_time)) AS numberDays from tbl_user u LEFT JOIN tbl_camera_user c ON u.user_id=c.user_id LEFT JOIN tbl_live_room l ON u.user_id=l.user_id WHERE l.is_tuijian='1' AND c.is_live=? AND l.room_status=? ORDER BY l.tuijian_num ASC LIMIT ?,?";
+ //分页数据
+ List list = this.getSession().createSQLQuery(sql)
+ .setParameter(0, BooleanEnum.YES.getKey())
+ .setParameter(1, RoomStatusEnum.status1.getKey())
+ .setParameter(2, firstResult)
+ .setParameter(3, pageSize)
+ .setResultTransformer(Transformers.aliasToBean(LiveRoomInfoDto.class))
+ .list();
+ //分页封装
+ Pagination page = new Pagination();
+ page.setTotalCount(totalCount);
+ page.setList(list);
+ return page;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/LiveRoomZanDaoImpl.java b/src/main/java/com/ifish/daoImpl/LiveRoomZanDaoImpl.java
new file mode 100644
index 0000000..f9c239c
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/LiveRoomZanDaoImpl.java
@@ -0,0 +1,31 @@
+package com.ifish.daoImpl;
+
+import java.math.BigInteger;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.LiveRoomZanDao;
+import com.ifish.entity.LiveRoomZan;
+import com.ifish.entity.LiveRoomZanId;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * 直播间点赞
+ * @author Administrator
+ *
+ */
+@Repository
+public class LiveRoomZanDaoImpl extends HibernateBaseDao implements LiveRoomZanDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return LiveRoomZan.class;
+ }
+
+ @Override
+ public Integer getZanNum(Integer roomId) {
+ String sql = "select count(*) from tbl_live_room_zan where room_id=?";
+ return ((BigInteger)getSession().createSQLQuery(sql).setInteger(0, roomId).uniqueResult()).intValue();
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/LookReportDaoImpl.java b/src/main/java/com/ifish/daoImpl/LookReportDaoImpl.java
new file mode 100644
index 0000000..f93e650
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/LookReportDaoImpl.java
@@ -0,0 +1,24 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.LookReportDao;
+import com.ifish.entity.LookReport;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * @ClassName: LookReportDaoImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository
+public class LookReportDaoImpl extends HibernateBaseDao implements LookReportDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return LookReport.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/PushListDaoImpl.java b/src/main/java/com/ifish/daoImpl/PushListDaoImpl.java
new file mode 100644
index 0000000..508c7cd
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/PushListDaoImpl.java
@@ -0,0 +1,51 @@
+package com.ifish.daoImpl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.criterion.Criterion;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.PushListDao;
+import com.ifish.entity.PushList;
+import com.ifish.enums.PushTypeEnum;
+import com.ifish.hibernate.HibernateBaseDao;
+import com.ifish.hibernate.Pagination;
+
+/**
+ * @ClassName: PushListDaoImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository
+public class PushListDaoImpl extends HibernateBaseDao implements PushListDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return PushList.class;
+ }
+
+ @Override
+ public Pagination findByCriteria(Integer pushId,Integer userId,Integer firstResult, Integer pageSize) {
+ //查询条件
+ List queryList = new ArrayList();
+ if(pushId!=null){
+ Criterion criterion = Restrictions.gt("pushId", pushId);
+ queryList.add(criterion);
+ }
+ if(userId!=null){
+ Criterion criterion = Restrictions.or(Restrictions.eq("userId", userId),Restrictions.eq("pushType", PushTypeEnum.all_push.getKey()));
+ queryList.add(criterion);
+ }
+ else{
+ Criterion criterion = Restrictions.eq("pushType", PushTypeEnum.all_push.getKey());
+ queryList.add(criterion);
+ }
+ return this.findByCriteria(firstResult, pageSize,Order.desc("pushId"), queryList.toArray(new Criterion[queryList.size()]));
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/QuestionsFeedbackDaoImpl.java b/src/main/java/com/ifish/daoImpl/QuestionsFeedbackDaoImpl.java
new file mode 100644
index 0000000..8542acc
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/QuestionsFeedbackDaoImpl.java
@@ -0,0 +1,25 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.QuestionsFeedbackDao;
+import com.ifish.entity.QuestionsFeedback;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * @ClassName: QuestionsFeedbackDaoImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository
+public class QuestionsFeedbackDaoImpl extends HibernateBaseDao implements QuestionsFeedbackDao {
+
+
+ @Override
+ protected Class getEntityClass() {
+ return QuestionsFeedback.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/ShopsInfoDaoImpl.java b/src/main/java/com/ifish/daoImpl/ShopsInfoDaoImpl.java
new file mode 100644
index 0000000..56953a7
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/ShopsInfoDaoImpl.java
@@ -0,0 +1,78 @@
+package com.ifish.daoImpl;
+
+import java.math.BigInteger;
+import java.util.List;
+
+import org.hibernate.transform.Transformers;
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.ShopsInfoDao;
+import com.ifish.dto.ShopsListDto;
+import com.ifish.entity.ShopsInfo;
+import com.ifish.enums.BooleanEnum;
+import com.ifish.enums.ShopsStatusEnum;
+import com.ifish.hibernate.HibernateBaseDao;
+import com.ifish.hibernate.Pagination;
+
+/**
+ * @ClassName: ShopsInfoDaoImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository
+public class ShopsInfoDaoImpl extends HibernateBaseDao implements ShopsInfoDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return ShopsInfo.class;
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public Pagination findByDistance(Double longitude,Double latitude,Integer firstResult, Integer pageSize) {
+ //总条数
+ String countSql = "select count(*) from tbl_shops_info where status=?";
+ int totalCount = ((BigInteger) this.getSession().createSQLQuery(countSql)
+ .setParameter(0, ShopsStatusEnum.status1.getKey())
+ .uniqueResult()).intValue();
+ String sql ="select s.shops_id shopsId,s.is_ping_bi as isPingBi,s.user_id AS userId,u.user_img AS userImg,u.nick_name AS userName,s.shops_name AS shopsName,s.shops_phone AS shopsPhone,s.shops_province AS shopsProvince,s.shops_city AS shopsCity,s.shops_area AS shopsArea,s.shops_address AS shopsAddress,s.picture4 AS picture4,s.remark AS remark,s.weixin_code AS weixinCode,s.shop_link AS shopLink,ifnull(round(6378.138*2*asin(sqrt(pow(sin((?*pi()/180-u.latitude*pi()/180)/2),2)+cos(?*pi()/180)*cos(u.latitude*pi()/180)*pow(sin((?*pi()/180-u.longitude*pi()/180)/2),2)))*1000),99999999999) AS distance from tbl_shops_info s LEFT JOIN tbl_user u ON s.user_id=u.user_id where s.status=? and app_show=? ORDER BY distance ASC LIMIT ?,?";
+ //分页数据
+ List list = this.getSession().createSQLQuery(sql)
+ .setParameter(0, latitude)
+ .setParameter(1, latitude)
+ .setParameter(2, longitude)
+ .setParameter(3, ShopsStatusEnum.status1.getKey())
+ .setParameter(4, BooleanEnum.YES.getKey())
+ .setParameter(5, firstResult)
+ .setParameter(6, pageSize)
+ .setResultTransformer(Transformers.aliasToBean(ShopsListDto.class))
+ .list();
+ String pingbiMsg = "请通过下方咨询联系我";
+ for (ShopsListDto shopsList : list) {
+ if(shopsList.getIsPingBi().equals(BooleanEnum.YES.getKey())){
+ shopsList.setShopsAddress("");
+ shopsList.setShopsPhone(pingbiMsg);
+ shopsList.setWeixinCode(pingbiMsg);
+ shopsList.setShopLink(pingbiMsg);
+ }
+ }
+ //分页封装
+ Pagination page = new Pagination();
+ page.setTotalCount(totalCount);
+ page.setList(list);
+ return page;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public List getShopsUserIdByRand(Integer userId) {
+ String sql = "SELECT user_id FROM tbl_shops_info WHERE status='1' AND user_id!=? AND user_id!=12 AND app_show='1' ORDER BY RAND() LIMIT 9";
+ List list = this.getSession().createSQLQuery(sql).setParameter(0, userId).list();
+ //固定发送给小陈
+ list.add(12);
+ return list;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/ShopsUserInfoDaoImpl.java b/src/main/java/com/ifish/daoImpl/ShopsUserInfoDaoImpl.java
new file mode 100644
index 0000000..0cfa640
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/ShopsUserInfoDaoImpl.java
@@ -0,0 +1,23 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.ShopsUserInfoDao;
+import com.ifish.entity.ShopsUserInfo;
+import com.ifish.entity.ShopsUserInfoId;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * 商家会员信息
+ * @author Administrator
+ *
+ */
+@Repository
+public class ShopsUserInfoDaoImpl extends HibernateBaseDao implements ShopsUserInfoDao{
+
+ @Override
+ protected Class getEntityClass() {
+ return ShopsUserInfo.class;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/ifish/daoImpl/UeditorDaoImpl.java b/src/main/java/com/ifish/daoImpl/UeditorDaoImpl.java
new file mode 100644
index 0000000..470e51b
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/UeditorDaoImpl.java
@@ -0,0 +1,24 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.UeditorDao;
+import com.ifish.entity.Ueditor;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * @ClassName: UeditorDaoImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository()
+public class UeditorDaoImpl extends HibernateBaseDao implements UeditorDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return Ueditor.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/UserActivityDaoImpl.java b/src/main/java/com/ifish/daoImpl/UserActivityDaoImpl.java
new file mode 100644
index 0000000..3cda09d
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/UserActivityDaoImpl.java
@@ -0,0 +1,22 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.UserActivityDao;
+import com.ifish.entity.UserActivity;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * 用户动态
+ * @author Administrator
+ *
+ */
+@Repository
+public class UserActivityDaoImpl extends HibernateBaseDaoimplements UserActivityDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return UserActivity.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/UserAssetDaoImpl.java b/src/main/java/com/ifish/daoImpl/UserAssetDaoImpl.java
new file mode 100644
index 0000000..5c13948
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/UserAssetDaoImpl.java
@@ -0,0 +1,17 @@
+package com.ifish.daoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.UserAssetDao;
+import com.ifish.entity.UserAsset;
+import com.ifish.hibernate.HibernateBaseDao;
+
+@Repository
+public class UserAssetDaoImpl extends HibernateBaseDao implements UserAssetDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return UserAsset.class;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/UserDaoImpl.java b/src/main/java/com/ifish/daoImpl/UserDaoImpl.java
new file mode 100644
index 0000000..7e2b116
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/UserDaoImpl.java
@@ -0,0 +1,66 @@
+package com.ifish.daoImpl;
+
+import java.util.List;
+
+import org.hibernate.Query;
+import org.hibernate.transform.Transformers;
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.UserDao;
+import com.ifish.dto.ShopsLookUserDto;
+import com.ifish.entity.User;
+import com.ifish.enums.BooleanEnum;
+import com.ifish.hibernate.HibernateBaseDao;
+import com.ifish.hibernate.Pagination;
+
+/**
+ * @ClassName: UserDaoImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository
+public class UserDaoImpl extends HibernateBaseDao implements UserDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return User.class;
+ }
+
+
+ @Override
+ public User update(User user) {
+ getSession().update(user);
+ return user;
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public Pagination findByCriteria(Integer shopsUserId,Integer firstResult, Integer pageSize) {
+ String sql = "select u.user_id as userId,u.nick_name as nickName,c.camera_id as cameraId,u.user_img as userImg from tbl_user u LEFT JOIN tbl_camera_user c ON u.user_id=c.user_id where c.is_look=1 and shops_user_id="+shopsUserId;
+ List list = this.getSession().createSQLQuery(sql).setResultTransformer(Transformers.aliasToBean(ShopsLookUserDto.class)).list();
+ Pagination page = new Pagination();
+ page.setTotalCount(list.size());
+ page.setList(list);
+ return page;
+ }
+
+
+ @Override
+ public int executeLoginUpdate(Integer userId,String loginType) {
+ String sql = "update tbl_user set login_count=if(login_count is null,1,login_count+1),login_type=?,login_time=current_timestamp() where user_id=?";
+ Query query = this.getSession().createSQLQuery(sql).setString(0, loginType).setInteger(1, userId);
+ return query.executeUpdate();
+ }
+
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public List getUserIds(Integer userId,Integer firstResult, int maxResults) {
+ String sql = "select user_id from tbl_user where user_id!=? and is_register_netease=? limit ?,?";
+ List list = this.getSession().createSQLQuery(sql).setInteger(0, userId).setString(1, BooleanEnum.YES.getKey()).setInteger(2, firstResult).setInteger(3,maxResults).list();
+ return list;
+ }
+
+}
diff --git a/src/main/java/com/ifish/daoImpl/VenderListDaoImpl.java b/src/main/java/com/ifish/daoImpl/VenderListDaoImpl.java
new file mode 100644
index 0000000..bfe6445
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/VenderListDaoImpl.java
@@ -0,0 +1,41 @@
+package com.ifish.daoImpl;
+
+import org.hibernate.criterion.Criterion;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.VenderListDao;
+import com.ifish.entity.VenderList;
+import com.ifish.enums.BooleanEnum;
+import com.ifish.hibernate.HibernateBaseDao;
+import com.ifish.hibernate.Pagination;
+
+/**
+ * @ClassName: VenderDaoImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository
+public class VenderListDaoImpl extends HibernateBaseDao implements VenderListDao {
+
+ @Override
+ protected Class getEntityClass() {
+ return VenderList.class;
+ }
+
+
+ @Override
+ public Pagination findByCriteria(Integer firstResult, Integer pageSize) {
+ Criterion appShow = Restrictions.eq("appShow", BooleanEnum.YES.getKey());
+ Criterion brandCode = Restrictions.ne("brandCode", "AYQ");
+ return this.findByCriteria(firstResult, pageSize,null, appShow ,brandCode);
+ }
+
+
+ @Override
+ public VenderList getDefaultVenderList() {
+ return this.get("AYQ");
+ }
+}
diff --git a/src/main/java/com/ifish/daoImpl/VersionDaoImpl.java b/src/main/java/com/ifish/daoImpl/VersionDaoImpl.java
new file mode 100644
index 0000000..2c31d2b
--- /dev/null
+++ b/src/main/java/com/ifish/daoImpl/VersionDaoImpl.java
@@ -0,0 +1,44 @@
+package com.ifish.daoImpl;
+
+import org.hibernate.SQLQuery;
+import org.hibernate.transform.Transformers;
+import org.springframework.stereotype.Repository;
+
+import com.ifish.dao.VersionDao;
+import com.ifish.entity.Version;
+import com.ifish.hibernate.HibernateBaseDao;
+
+/**
+ * @ClassName: UserDaoImpl
+ * @Description: TODO
+ * @author ggw
+ *
+ */
+
+@Repository
+public class VersionDaoImpl extends HibernateBaseDao implements VersionDao {
+
+
+ @Override
+ protected Class getEntityClass() {
+ return Version.class;
+ }
+
+ @Override
+ public Version getNewestVersion(String phoneType) {
+ String sql = "select version_id as versionId,version_code as versionCode,phone_type as phoneType,upload_content as uploadContent,app_address as appAddress,is_must_update as isMustUpdate,create_time as createTime from tbl_version where phone_type=? order by versionId desc";
+ SQLQuery query = this.getSession().createSQLQuery(sql);
+ query.setString(0, phoneType);
+ query.addScalar("versionId")
+ .addScalar("versionCode")
+ .addScalar("phoneType")
+ .addScalar("uploadContent")
+ .addScalar("appAddress")
+ .addScalar("isMustUpdate")
+ .addScalar("createTime")
+ .setResultTransformer(Transformers.aliasToBean(Version.class));
+ return (Version) query.list().get(0);
+ }
+
+
+}
diff --git a/src/main/java/com/ifish/dto/AdInfoDto.java b/src/main/java/com/ifish/dto/AdInfoDto.java
new file mode 100644
index 0000000..3891da1
--- /dev/null
+++ b/src/main/java/com/ifish/dto/AdInfoDto.java
@@ -0,0 +1,69 @@
+package com.ifish.dto;
+
+public class AdInfoDto {
+
+ /**
+ * id
+ */
+ private Integer adId;
+ /**
+ * 广告类型
+ */
+ private Integer adType;
+ /**
+ * 广告图片
+ */
+ private String adImage;
+ /**
+ * 广告链接
+ */
+ private String adLink;
+ /**
+ * 排序号
+ */
+ private Integer orderNum;
+
+ public AdInfoDto() {}
+
+ public AdInfoDto(Integer adId, Integer adType, String adImage, String adLink, Integer orderNum) {
+ this.adId = adId;
+ this.adType = adType;
+ this.adImage = adImage;
+ this.adLink = adLink;
+ this.orderNum = orderNum;
+ }
+
+ public Integer getOrderNum() {
+ return orderNum;
+ }
+
+ public void setOrderNum(Integer orderNum) {
+ this.orderNum = orderNum;
+ }
+
+ public Integer getAdId() {
+ return adId;
+ }
+ public void setAdId(Integer adId) {
+ this.adId = adId;
+ }
+ public Integer getAdType() {
+ return adType;
+ }
+ public void setAdType(Integer adType) {
+ this.adType = adType;
+ }
+ public String getAdImage() {
+ return adImage;
+ }
+ public void setAdImage(String adImage) {
+ this.adImage = adImage;
+ }
+ public String getAdLink() {
+ return adLink;
+ }
+ public void setAdLink(String adLink) {
+ this.adLink = adLink;
+ }
+
+}
diff --git a/src/main/java/com/ifish/dto/DeviceDto.java b/src/main/java/com/ifish/dto/DeviceDto.java
new file mode 100644
index 0000000..5e2ff33
--- /dev/null
+++ b/src/main/java/com/ifish/dto/DeviceDto.java
@@ -0,0 +1,205 @@
+package com.ifish.dto;
+
+
+/**
+ * 设备信息dto
+ * @author Administrator
+ *
+ */
+public class DeviceDto {
+ /**
+ * 设备ID
+ */
+ private Integer deviceId;
+ /**
+ * 用户ID
+ */
+ private Integer userId;
+ /**
+ * mac地址
+ */
+ private String macAddress;
+ /**
+ * 是否授权
+ */
+ private String isBlacklist;
+ /**
+ * 显示名称
+ */
+ private String showName;
+ /**
+ * 是否主控
+ */
+ private String isMaster;
+ /**
+ * 硬件类型(后台维护)
+ */
+ private String type;
+ /**
+ * 控制个数
+ */
+ private Integer controlAmount;
+ /**
+ * 有无工作模式
+ */
+ private String isWorkModel;
+ /**
+ * 有无背光
+ */
+ private String isLightness;
+ /**
+ * 有无柜灯
+ */
+ private String isSarkLamp;
+ /**
+ * 是否显示预警设置
+ */
+ private String isPushWendu;
+ /**
+ * 定时器个数
+ */
+ private Integer timerAmount;
+ /**
+ * 今天是否提醒换水
+ */
+ private String todayRemind;
+ /**
+ * 换水提醒开关
+ */
+ private String waterRemind;
+ /**
+ * 下次提醒日期
+ */
+ private String remindDate;
+ /**
+ * 提醒周期
+ */
+ private String remindCycle;
+ /**
+ * 鱼缸厂信息
+ */
+ private VenderDto venderDto;
+
+ public DeviceDto() {}
+
+ public DeviceDto(Integer deviceId, String macAddress, String showName, String isMaster, String type,String isBlacklist) {
+ this.deviceId = deviceId;
+ this.macAddress = macAddress;
+ this.showName = showName;
+ this.isMaster = isMaster;
+ this.type = type;
+ this.isBlacklist = isBlacklist;
+ }
+
+ public Integer getDeviceId() {
+ return deviceId;
+ }
+ public void setDeviceId(Integer deviceId) {
+ this.deviceId = deviceId;
+ }
+ public String getMacAddress() {
+ return macAddress;
+ }
+ public void setMacAddress(String macAddress) {
+ this.macAddress = macAddress;
+ }
+ public String getShowName() {
+ return showName;
+ }
+ public void setShowName(String showName) {
+ this.showName = showName;
+ }
+ public String getIsMaster() {
+ return isMaster;
+ }
+ public void setIsMaster(String isMaster) {
+ this.isMaster = isMaster;
+ }
+ public String getType() {
+ return type;
+ }
+ public void setType(String type) {
+ this.type = type;
+ }
+ public String getTodayRemind() {
+ return todayRemind;
+ }
+ public void setTodayRemind(String todayRemind) {
+ this.todayRemind = todayRemind;
+ }
+ public String getWaterRemind() {
+ return waterRemind;
+ }
+ public void setWaterRemind(String waterRemind) {
+ this.waterRemind = waterRemind;
+ }
+ public String getRemindDate() {
+ return remindDate;
+ }
+ public void setRemindDate(String remindDate) {
+ this.remindDate = remindDate;
+ }
+ public String getRemindCycle() {
+ return remindCycle;
+ }
+ public void setRemindCycle(String remindCycle) {
+ this.remindCycle = remindCycle;
+ }
+ public VenderDto getVenderDto() {
+ return venderDto;
+ }
+ public void setVenderDto(VenderDto venderDto) {
+ this.venderDto = venderDto;
+ }
+ public Integer getControlAmount() {
+ return controlAmount;
+ }
+ public void setControlAmount(Integer controlAmount) {
+ this.controlAmount = controlAmount;
+ }
+ public Integer getTimerAmount() {
+ return timerAmount;
+ }
+ public void setTimerAmount(Integer timerAmount) {
+ this.timerAmount = timerAmount;
+ }
+ public String getIsBlacklist() {
+ return isBlacklist;
+ }
+ public void setIsBlacklist(String isBlacklist) {
+ this.isBlacklist = isBlacklist;
+ }
+ public String getIsWorkModel() {
+ return isWorkModel;
+ }
+ public void setIsWorkModel(String isWorkModel) {
+ this.isWorkModel = isWorkModel;
+ }
+ public String getIsLightness() {
+ return isLightness;
+ }
+ public void setIsLightness(String isLightness) {
+ this.isLightness = isLightness;
+ }
+ public String getIsSarkLamp() {
+ return isSarkLamp;
+ }
+ public void setIsSarkLamp(String isSarkLamp) {
+ this.isSarkLamp = isSarkLamp;
+ }
+ public String getIsPushWendu() {
+ return isPushWendu;
+ }
+ public void setIsPushWendu(String isPushWendu) {
+ this.isPushWendu = isPushWendu;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+}
diff --git a/src/main/java/com/ifish/dto/DeviceInfoDto.java b/src/main/java/com/ifish/dto/DeviceInfoDto.java
new file mode 100644
index 0000000..4db596e
--- /dev/null
+++ b/src/main/java/com/ifish/dto/DeviceInfoDto.java
@@ -0,0 +1,43 @@
+package com.ifish.dto;
+
+import java.util.List;
+
+/**
+ * 设备信息
+ * @author Administrator
+ *
+ */
+public class DeviceInfoDto {
+
+ /**
+ * 设备ID列表
+ */
+ private List deviceIds;
+
+ /**
+ * 设备信息列表
+ */
+ private List> deviceList;
+
+ public DeviceInfoDto(List deviceIds, List> deviceList) {
+ this.deviceIds = deviceIds;
+ this.deviceList = deviceList;
+ }
+
+ public List getDeviceIds() {
+ return deviceIds;
+ }
+
+ public void setDeviceIds(List deviceIds) {
+ this.deviceIds = deviceIds;
+ }
+
+ public List> getDeviceList() {
+ return deviceList;
+ }
+
+ public void setDeviceList(List> deviceList) {
+ this.deviceList = deviceList;
+ }
+
+}
diff --git a/src/main/java/com/ifish/dto/GoldTaskDto.java b/src/main/java/com/ifish/dto/GoldTaskDto.java
new file mode 100644
index 0000000..92fde7d
--- /dev/null
+++ b/src/main/java/com/ifish/dto/GoldTaskDto.java
@@ -0,0 +1,62 @@
+package com.ifish.dto;
+
+/**
+ * 规则信息
+ * @author Administrator
+ *
+ */
+public class GoldTaskDto {
+ /**
+ * 类型
+ */
+ private String ruleType;
+ /**
+ * 加成类型
+ */
+ private String addType;
+ /**
+ * 加成值
+ */
+ private String addValue;
+ /**
+ * 是否完成
+ */
+ private String isFinish;
+
+ public GoldTaskDto() {}
+
+ public GoldTaskDto(String ruleType, String addType, String addValue,
+ String isFinish) {
+ super();
+ this.ruleType = ruleType;
+ this.addType = addType;
+ this.addValue = addValue;
+ this.isFinish = isFinish;
+ }
+
+ public String getRuleType() {
+ return ruleType;
+ }
+ public void setRuleType(String ruleType) {
+ this.ruleType = ruleType;
+ }
+ public String getAddType() {
+ return addType;
+ }
+ public void setAddType(String addType) {
+ this.addType = addType;
+ }
+ public String getAddValue() {
+ return addValue;
+ }
+ public void setAddValue(String addValue) {
+ this.addValue = addValue;
+ }
+ public String getIsFinish() {
+ return isFinish;
+ }
+ public void setIsFinish(String isFinish) {
+ this.isFinish = isFinish;
+ }
+
+}
diff --git a/src/main/java/com/ifish/dto/GradeInfoDto.java b/src/main/java/com/ifish/dto/GradeInfoDto.java
new file mode 100644
index 0000000..383be3c
--- /dev/null
+++ b/src/main/java/com/ifish/dto/GradeInfoDto.java
@@ -0,0 +1,62 @@
+package com.ifish.dto;
+
+/**
+ * 等级信息
+ * @author Administrator
+ *
+ */
+public class GradeInfoDto {
+
+ //等级
+ private Integer gradeNum;
+ //等级名称
+ private String gradeName;
+ //最小值
+ private Integer minValue;
+ //最大值
+ private Integer maxValue;
+ //描述
+ private String remark;
+
+ public GradeInfoDto() {
+ }
+ public GradeInfoDto(Integer gradeNum, String gradeName, Integer minValue,
+ Integer maxValue, String remark) {
+ this.gradeNum = gradeNum;
+ this.gradeName = gradeName;
+ this.minValue = minValue;
+ this.maxValue = maxValue;
+ this.remark = remark;
+ }
+ public Integer getGradeNum() {
+ return gradeNum;
+ }
+ public void setGradeNum(Integer gradeNum) {
+ this.gradeNum = gradeNum;
+ }
+ public String getGradeName() {
+ return gradeName;
+ }
+ public void setGradeName(String gradeName) {
+ this.gradeName = gradeName;
+ }
+ public Integer getMinValue() {
+ return minValue;
+ }
+ public void setMinValue(Integer minValue) {
+ this.minValue = minValue;
+ }
+ public Integer getMaxValue() {
+ return maxValue;
+ }
+ public void setMaxValue(Integer maxValue) {
+ this.maxValue = maxValue;
+ }
+ public String getRemark() {
+ return remark;
+ }
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+}
diff --git a/src/main/java/com/ifish/dto/GwellParamDto.java b/src/main/java/com/ifish/dto/GwellParamDto.java
new file mode 100644
index 0000000..7b755a3
--- /dev/null
+++ b/src/main/java/com/ifish/dto/GwellParamDto.java
@@ -0,0 +1,66 @@
+package com.ifish.dto;
+
+/**
+ * 技威相关参数
+ * @author Administrator
+ *
+ */
+public class GwellParamDto {
+
+ //是否注册技威
+ private String isRegisterGwell;
+ //code1
+ private String P2PVerifyCode1;
+ //code2
+ private String P2PVerifyCode2;
+ //技威userID
+ private String UserID;
+
+ public GwellParamDto(String isRegisterGwell) {
+ this.isRegisterGwell = isRegisterGwell;
+ this.P2PVerifyCode1 = "";
+ this.P2PVerifyCode2 = "";
+ this.UserID = "";
+ }
+
+ public GwellParamDto(String isRegisterGwell, String p2pVerifyCode1,String p2pVerifyCode2, String userID) {
+ this.isRegisterGwell = isRegisterGwell;
+ this.P2PVerifyCode1 = p2pVerifyCode1;
+ this.P2PVerifyCode2 = p2pVerifyCode2;
+ this.UserID = userID;
+ }
+
+
+ public String getIsRegisterGwell() {
+ return isRegisterGwell;
+ }
+
+ public void setIsRegisterGwell(String isRegisterGwell) {
+ this.isRegisterGwell = isRegisterGwell;
+ }
+
+ public String getP2PVerifyCode1() {
+ return P2PVerifyCode1;
+ }
+
+ public void setP2PVerifyCode1(String p2pVerifyCode1) {
+ P2PVerifyCode1 = p2pVerifyCode1;
+ }
+
+ public String getP2PVerifyCode2() {
+ return P2PVerifyCode2;
+ }
+
+ public void setP2PVerifyCode2(String p2pVerifyCode2) {
+ P2PVerifyCode2 = p2pVerifyCode2;
+ }
+
+ public String getUserID() {
+ return UserID;
+ }
+
+ public void setUserID(String userID) {
+ UserID = userID;
+ }
+
+}
diff --git a/src/main/java/com/ifish/dto/IfishGoodsDto.java b/src/main/java/com/ifish/dto/IfishGoodsDto.java
new file mode 100644
index 0000000..0f8b677
--- /dev/null
+++ b/src/main/java/com/ifish/dto/IfishGoodsDto.java
@@ -0,0 +1,102 @@
+package com.ifish.dto;
+
+import java.math.BigDecimal;
+
+/**
+ * 商品信息DTO
+ * @author Administrator
+ *
+ */
+public class IfishGoodsDto {
+
+ /**
+ * 商品ID
+ */
+ private Integer goodsId;
+ /**
+ * 店铺名称
+ */
+ private String shopName;
+ /**
+ * 商品名称
+ */
+ private String goodsName;
+ /**
+ * 是否是淘宝链接
+ */
+ private Integer isTaobaoLink;
+ /**
+ * 商品链接
+ */
+ private String goodsLink;
+ /**
+ * 商铺图片
+ */
+ private String goodsPicture;
+ /**
+ * 原价格
+ */
+ private BigDecimal oriPrice;
+ /**
+ * 优惠价格
+ */
+ private BigDecimal prePrice;
+
+ public IfishGoodsDto(Integer goodsId, String shopName, String goodsName, String goodsLink, BigDecimal oriPrice, BigDecimal prePrice) {
+ this.goodsId = goodsId;
+ this.shopName = shopName;
+ this.goodsName = goodsName;
+ this.goodsLink = goodsLink;
+ this.oriPrice = oriPrice;
+ this.prePrice = prePrice;
+ }
+ public Integer getGoodsId() {
+ return goodsId;
+ }
+ public void setGoodsId(Integer goodsId) {
+ this.goodsId = goodsId;
+ }
+ public String getGoodsName() {
+ return goodsName;
+ }
+ public void setGoodsName(String goodsName) {
+ this.goodsName = goodsName;
+ }
+ public String getGoodsLink() {
+ return goodsLink;
+ }
+ public void setGoodsLink(String goodsLink) {
+ this.goodsLink = goodsLink;
+ }
+ public String getGoodsPicture() {
+ return goodsPicture;
+ }
+ public void setGoodsPicture(String goodsPicture) {
+ this.goodsPicture = goodsPicture;
+ }
+ public BigDecimal getOriPrice() {
+ return oriPrice;
+ }
+ public void setOriPrice(BigDecimal oriPrice) {
+ this.oriPrice = oriPrice;
+ }
+ public BigDecimal getPrePrice() {
+ return prePrice;
+ }
+ public void setPrePrice(BigDecimal prePrice) {
+ this.prePrice = prePrice;
+ }
+ public String getShopName() {
+ return shopName;
+ }
+ public void setShopName(String shopName) {
+ this.shopName = shopName;
+ }
+ public Integer getIsTaobaoLink() {
+ return isTaobaoLink;
+ }
+ public void setIsTaobaoLink(Integer isTaobaoLink) {
+ this.isTaobaoLink = isTaobaoLink;
+ }
+
+}
diff --git a/src/main/java/com/ifish/dto/InformationDto.java b/src/main/java/com/ifish/dto/InformationDto.java
new file mode 100644
index 0000000..5384f6a
--- /dev/null
+++ b/src/main/java/com/ifish/dto/InformationDto.java
@@ -0,0 +1,76 @@
+package com.ifish.dto;
+
+
+/**
+ * 资讯信息封装
+ * @author Administrator
+ *
+ */
+public class InformationDto {
+ //ID
+ private Integer infoId;
+ //链接
+ private String link;
+ //标题
+ private String title;
+ //内容
+ private String contents;
+ //图片
+ private String image;
+ //点击数
+ private Integer clickNum;
+ //评论数
+ private Integer pinglunNum;
+
+ public InformationDto(Integer infoId) {
+ this.infoId = infoId;
+ this.pinglunNum = 0;
+ this.clickNum = 0;
+ }
+
+ public Integer getInfoId() {
+ return infoId;
+ }
+ public void setInfoId(Integer infoId) {
+ this.infoId = infoId;
+ }
+ public String getLink() {
+ return link;
+ }
+ public void setLink(String link) {
+ this.link = link;
+ }
+ public String getTitle() {
+ return title;
+ }
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public Integer getClickNum() {
+ return clickNum;
+ }
+
+ public void setClickNum(Integer clickNum) {
+ this.clickNum = clickNum;
+ }
+ public Integer getPinglunNum() {
+ return pinglunNum;
+ }
+ public void setPinglunNum(Integer pinglunNum) {
+ this.pinglunNum = pinglunNum;
+ }
+ public String getImage() {
+ return image;
+ }
+ public void setImage(String image) {
+ this.image = image;
+ }
+ public String getContents() {
+ return contents;
+ }
+ public void setContents(String contents) {
+ this.contents = contents;
+ }
+
+}
diff --git a/src/main/java/com/ifish/dto/JsonResult.java b/src/main/java/com/ifish/dto/JsonResult.java
new file mode 100644
index 0000000..44b6b4e
--- /dev/null
+++ b/src/main/java/com/ifish/dto/JsonResult.java
@@ -0,0 +1,49 @@
+package com.ifish.dto;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+
+/**
+ * 请求返回json结果
+ * @author Administrator
+ *
+ * @param
+ */
+public class JsonResult {
+ //结果码
+ private String result;
+ //数据
+ private T data;
+
+ public JsonResult(String result, T data) {
+ this.result = result;
+ this.data = data;
+ }
+
+ public JsonResult(String result) {
+ this.result = result;
+ this.data = null;
+ }
+
+ public String getResult() {
+ return result;
+ }
+
+ public void setResult(String result) {
+ this.result = result;
+ }
+
+ public T getData() {
+ return data;
+ }
+
+ public void setData(T data) {
+ this.data = data;
+ }
+
+ @Override
+ public String toString() {
+ //允许null值
+ return JSON.toJSONString(this,SerializerFeature.WriteMapNullValue);
+ }
+}
diff --git a/src/main/java/com/ifish/dto/LiveRoomInfoDto.java b/src/main/java/com/ifish/dto/LiveRoomInfoDto.java
new file mode 100644
index 0000000..780fe76
--- /dev/null
+++ b/src/main/java/com/ifish/dto/LiveRoomInfoDto.java
@@ -0,0 +1,169 @@
+package com.ifish.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 直播间列表
+ * @author Administrator
+ *
+ */
+public class LiveRoomInfoDto implements Serializable{
+
+ private static final long serialVersionUID = 2438713198151455034L;
+ //直播间ID
+ private Integer roomId;
+ //用户ID
+ private Integer userId;
+ //用户类型
+ private String userType;
+ //昵称
+ private String nickName;
+ //用户头像
+ private String userImg;
+ //用户最后一次登录时间
+ private Date loginTime;
+ //摄像头ID
+ private String cameraId;
+ //直播间名称
+ private String roomName;
+ //直播宣言
+ private String roomDesc;
+ //人气值
+ private Integer popularityValue;
+ //活跃度
+ private String liveness;
+ //直播天数
+ private Integer numberDays;
+ //距离
+ private Double distance;
+ //创建时间
+ private Date createTime;
+ //评论数
+ private Integer pinglunNum;
+ //点赞数量
+ private Integer zanNum;
+ //是否点过赞
+ private String isZan;
+ //打赏金币数量
+ private BigDecimal totalGoldValue;
+ //等级
+ private Integer gradeNum;
+
+ public Integer getRoomId() {
+ return roomId;
+ }
+ public void setRoomId(Integer roomId) {
+ this.roomId = roomId;
+ }
+ public String getNickName() {
+ return nickName;
+ }
+ public void setNickName(String nickName) {
+ this.nickName = nickName;
+ }
+ public String getCameraId() {
+ return cameraId;
+ }
+ public void setCameraId(String cameraId) {
+ this.cameraId = cameraId;
+ }
+ public String getRoomName() {
+ return roomName;
+ }
+ public void setRoomName(String roomName) {
+ this.roomName = roomName;
+ }
+ public String getRoomDesc() {
+ return roomDesc;
+ }
+ public void setRoomDesc(String roomDesc) {
+ this.roomDesc = roomDesc;
+ }
+ public Integer getPopularityValue() {
+ return popularityValue;
+ }
+ public void setPopularityValue(Integer popularityValue) {
+ this.popularityValue = popularityValue;
+ }
+ public Integer getNumberDays() {
+ return numberDays;
+ }
+ public void setNumberDays(Integer numberDays) {
+ this.numberDays = numberDays;
+ }
+ public Double getDistance() {
+ return distance;
+ }
+ public void setDistance(Double distance) {
+ this.distance = distance;
+ }
+ public String getUserImg() {
+ return userImg;
+ }
+ public void setUserImg(String userImg) {
+ this.userImg = userImg;
+ }
+ public String getLiveness() {
+ return liveness;
+ }
+ public void setLiveness(String liveness) {
+ this.liveness = liveness;
+ }
+ public Date getLoginTime() {
+ return loginTime;
+ }
+ public void setLoginTime(Date loginTime) {
+ this.loginTime = loginTime;
+ }
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public String getUserType() {
+ return userType;
+ }
+ public void setUserType(String userType) {
+ this.userType = userType;
+ }
+ public Integer getPinglunNum() {
+ return pinglunNum;
+ }
+ public void setPinglunNum(Integer pinglunNum) {
+ this.pinglunNum = pinglunNum;
+ }
+ public String getIsZan() {
+ return isZan;
+ }
+ public void setIsZan(String isZan) {
+ this.isZan = isZan;
+ }
+ public Integer getGradeNum() {
+ return gradeNum;
+ }
+ public void setGradeNum(Integer gradeNum) {
+ this.gradeNum = gradeNum;
+ }
+ public Integer getZanNum() {
+ return zanNum;
+ }
+ public void setZanNum(Integer zanNum) {
+ this.zanNum = zanNum;
+ }
+ public BigDecimal getTotalGoldValue() {
+ return totalGoldValue;
+ }
+ public void setTotalGoldValue(BigDecimal totalGoldValue) {
+ this.totalGoldValue = totalGoldValue;
+ }
+
+}
diff --git a/src/main/java/com/ifish/dto/NeteaseParamDto.java b/src/main/java/com/ifish/dto/NeteaseParamDto.java
new file mode 100644
index 0000000..05a2851
--- /dev/null
+++ b/src/main/java/com/ifish/dto/NeteaseParamDto.java
@@ -0,0 +1,42 @@
+package com.ifish.dto;
+
+/**
+ * 云信相关参数
+ * @author Administrator
+ *
+ */
+public class NeteaseParamDto {
+
+ //是否注册云信
+ private String isRegisterNetease;
+ //云信token
+ private String neteaseToken;
+
+ public NeteaseParamDto(String isRegisterNetease) {
+ this.isRegisterNetease = isRegisterNetease;
+ this.neteaseToken = "";
+ }
+
+ public NeteaseParamDto(String isRegisterNetease, String neteaseToken) {
+ this.isRegisterNetease = isRegisterNetease;
+ this.neteaseToken = neteaseToken;
+ }
+
+ public String getIsRegisterNetease() {
+ return isRegisterNetease;
+ }
+
+ public void setIsRegisterNetease(String isRegisterNetease) {
+ this.isRegisterNetease = isRegisterNetease;
+ }
+
+ public String getNeteaseToken() {
+ return neteaseToken;
+ }
+
+ public void setNeteaseToken(String neteaseToken) {
+ this.neteaseToken = neteaseToken;
+ }
+
+
+}
diff --git a/src/main/java/com/ifish/dto/PageingDto.java b/src/main/java/com/ifish/dto/PageingDto.java
new file mode 100644
index 0000000..d40830c
--- /dev/null
+++ b/src/main/java/com/ifish/dto/PageingDto.java
@@ -0,0 +1,62 @@
+package com.ifish.dto;
+
+import java.util.List;
+
+/**
+ * 分页数据封装
+ * @author Administrator
+ *
+ * @param
+ */
+public class PageingDto{
+
+ private String result;
+
+ private Integer firstResult;
+
+ private Integer total;
+
+ private List data;
+
+ public PageingDto() {}
+
+ public PageingDto(String result, Integer firstResult, Integer total,List data) {
+ this.result = result;
+ this.firstResult = firstResult;
+ this.total = total;
+ this.data = data;
+ }
+
+ public String getResult() {
+ return result;
+ }
+
+ public void setResult(String result) {
+ this.result = result;
+ }
+
+ public Integer getFirstResult() {
+ return firstResult;
+ }
+
+ public void setFirstResult(Integer firstResult) {
+ this.firstResult = firstResult;
+ }
+
+ public Integer getTotal() {
+ return total;
+ }
+
+ public void setTotal(Integer total) {
+ this.total = total;
+ }
+
+ public List getData() {
+ return data;
+ }
+
+ public void setData(List data) {
+ this.data = data;
+ }
+
+}
diff --git a/src/main/java/com/ifish/dto/RuleInfoDto.java b/src/main/java/com/ifish/dto/RuleInfoDto.java
new file mode 100644
index 0000000..596eef8
--- /dev/null
+++ b/src/main/java/com/ifish/dto/RuleInfoDto.java
@@ -0,0 +1,88 @@
+package com.ifish.dto;
+
+/**
+ * 规则信息
+ * @author Administrator
+ *
+ */
+public class RuleInfoDto {
+ /**
+ * 类型
+ */
+ private String ruleType;
+ /**
+ * 名称
+ */
+ private String ruleName;
+ /**
+ * 加成类型
+ */
+ private String addType;
+ /**
+ * 加成值
+ */
+ private String addValue;
+ /**
+ * 描述
+ */
+ private String ruleRemark;
+ /**
+ * 是否完成
+ */
+ private String isFinish;
+
+ public RuleInfoDto() {}
+
+ public RuleInfoDto(String ruleType, String ruleName, String addType,
+ String addValue, String ruleRemark, String isFinish) {
+ this.ruleType = ruleType;
+ this.ruleName = ruleName;
+ this.addType = addType;
+ this.addValue = addValue;
+ this.ruleRemark = ruleRemark;
+ this.isFinish = isFinish;
+ }
+
+
+ public String getRuleName() {
+ return ruleName;
+ }
+
+ public void setRuleName(String ruleName) {
+ this.ruleName = ruleName;
+ }
+
+ public String getRuleRemark() {
+ return ruleRemark;
+ }
+
+ public void setRuleRemark(String ruleRemark) {
+ this.ruleRemark = ruleRemark;
+ }
+
+ public String getRuleType() {
+ return ruleType;
+ }
+ public void setRuleType(String ruleType) {
+ this.ruleType = ruleType;
+ }
+ public String getAddType() {
+ return addType;
+ }
+ public void setAddType(String addType) {
+ this.addType = addType;
+ }
+ public String getAddValue() {
+ return addValue;
+ }
+ public void setAddValue(String addValue) {
+ this.addValue = addValue;
+ }
+ public String getIsFinish() {
+ return isFinish;
+ }
+ public void setIsFinish(String isFinish) {
+ this.isFinish = isFinish;
+ }
+
+}
diff --git a/src/main/java/com/ifish/dto/RuleRecordDto.java b/src/main/java/com/ifish/dto/RuleRecordDto.java
new file mode 100644
index 0000000..bff32cb
--- /dev/null
+++ b/src/main/java/com/ifish/dto/RuleRecordDto.java
@@ -0,0 +1,68 @@
+package com.ifish.dto;
+
+/**
+ * 金币经验加成记录DTO
+ * @author Administrator
+ *
+ */
+public class RuleRecordDto {
+
+ /**
+ * id
+ */
+ private Integer id;
+ /**
+ * 值
+ */
+ private String value;
+ /**
+ * 描述
+ */
+ private String ramark;
+ /**
+ * 记录时间
+ */
+ private String createTime;
+
+ public RuleRecordDto() {}
+
+ public RuleRecordDto(Integer id, String value,String ramark,String createTime) {
+ this.id = id;
+ this.value = value;
+ this.ramark = ramark;
+ this.createTime = createTime;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getRamark() {
+ return ramark;
+ }
+
+ public void setRamark(String ramark) {
+ this.ramark = ramark;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+}
diff --git a/src/main/java/com/ifish/dto/ShopsListDto.java b/src/main/java/com/ifish/dto/ShopsListDto.java
new file mode 100644
index 0000000..e57de72
--- /dev/null
+++ b/src/main/java/com/ifish/dto/ShopsListDto.java
@@ -0,0 +1,143 @@
+package com.ifish.dto;
+
+import java.io.Serializable;
+
+/**
+ * 商家列表
+ * @author Administrator
+ *
+ */
+public class ShopsListDto implements Serializable{
+
+ private static final long serialVersionUID = -669448254021154912L;
+ //ID
+ private Integer shopsId;
+ //用户ID
+ private Integer userId;
+ //头像
+ private String userImg;
+ //店家姓名
+ private String userName;
+ //店铺名称
+ private String shopsName;
+ //店家电话
+ private String shopsPhone;
+ //省
+ private String shopsProvince;
+ //市
+ private String shopsCity;
+ //区
+ private String shopsArea;
+ //店家地址
+ private String shopsAddress;
+ //店铺招牌
+ private String picture4;
+ //备注
+ private String remark;
+ //微信号
+ private String weixinCode;
+ //网店地址
+ private String shopLink;
+ //距离
+ private Double distance;
+ //是否屏蔽微信号
+ private String isPingBi;
+
+ public String getIsPingBi() {
+ return isPingBi;
+ }
+ public void setIsPingBi(String isPingBi) {
+ this.isPingBi = isPingBi;
+ }
+ public Integer getShopsId() {
+ return shopsId;
+ }
+ public void setShopsId(Integer shopsId) {
+ this.shopsId = shopsId;
+ }
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+ public String getUserName() {
+ return userName;
+ }
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+ public String getShopsName() {
+ return shopsName;
+ }
+ public void setShopsName(String shopsName) {
+ this.shopsName = shopsName;
+ }
+ public String getShopsPhone() {
+ return shopsPhone;
+ }
+ public void setShopsPhone(String shopsPhone) {
+ this.shopsPhone = shopsPhone;
+ }
+ public String getShopsProvince() {
+ return shopsProvince;
+ }
+ public void setShopsProvince(String shopsProvince) {
+ this.shopsProvince = shopsProvince;
+ }
+ public String getShopsCity() {
+ return shopsCity;
+ }
+ public void setShopsCity(String shopsCity) {
+ this.shopsCity = shopsCity;
+ }
+ public String getShopsArea() {
+ return shopsArea;
+ }
+ public void setShopsArea(String shopsArea) {
+ this.shopsArea = shopsArea;
+ }
+ public String getShopsAddress() {
+ return shopsAddress;
+ }
+ public void setShopsAddress(String shopsAddress) {
+ this.shopsAddress = shopsAddress;
+ }
+ public String getPicture4() {
+ return picture4;
+ }
+ public void setPicture4(String picture4) {
+ this.picture4 = picture4;
+ }
+ public String getRemark() {
+ return remark;
+ }
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+ public Double getDistance() {
+ return distance;
+ }
+ public void setDistance(Double distance) {
+ this.distance = distance;
+ }
+ public String getUserImg() {
+ return userImg;
+ }
+ public void setUserImg(String userImg) {
+ this.userImg = userImg;
+ }
+ public String getWeixinCode() {
+ return weixinCode;
+ }
+ public void setWeixinCode(String weixinCode) {
+ this.weixinCode = weixinCode;
+ }
+ public String getShopLink() {
+ return shopLink;
+ }
+ public void setShopLink(String shopLink) {
+ this.shopLink = shopLink;
+ }
+
+}
diff --git a/src/main/java/com/ifish/dto/ShopsLookUserDto.java b/src/main/java/com/ifish/dto/ShopsLookUserDto.java
new file mode 100644
index 0000000..b452840
--- /dev/null
+++ b/src/main/java/com/ifish/dto/ShopsLookUserDto.java
@@ -0,0 +1,53 @@
+package com.ifish.dto;
+
+
+/**
+ * 商家看护用户
+ * @author Administrator
+ *
+ */
+public class ShopsLookUserDto{
+
+ /**
+ * 用户ID
+ */
+ private Integer userId;
+ /**
+ * 用户昵称
+ */
+ private String nickName;
+ /**
+ * 摄像头ID
+ */
+ private String cameraId;
+ /**
+ * 头像
+ */
+ private String userImg;
+
+ public String getNickName() {
+ return nickName;
+ }
+ public void setNickName(String nickName) {
+ this.nickName = nickName;
+ }
+ public String getCameraId() {
+ return cameraId;
+ }
+ public void setCameraId(String cameraId) {
+ this.cameraId = cameraId;
+ }
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+ public String getUserImg() {
+ return userImg;
+ }
+ public void setUserImg(String userImg) {
+ this.userImg = userImg;
+ }
+
+}
diff --git a/src/main/java/com/ifish/dto/ShopsUserDto.java b/src/main/java/com/ifish/dto/ShopsUserDto.java
new file mode 100644
index 0000000..80fffbd
--- /dev/null
+++ b/src/main/java/com/ifish/dto/ShopsUserDto.java
@@ -0,0 +1,68 @@
+package com.ifish.dto;
+
+/**
+ * 商家会员分页信息DTO
+ * @author Administrator
+ *
+ */
+public class ShopsUserDto {
+ /**
+ * 用户ID
+ */
+ private Integer userId;
+ /**
+ * 备注名
+ */
+ private String userName;
+ /**
+ * 会员名
+ */
+ private String nickName;
+ /**
+ * 头像
+ */
+ private String userImg;
+ /**
+ * 最后登陆时间
+ */
+ private String loginTime;
+
+ public ShopsUserDto() {}
+
+ public ShopsUserDto(Integer userId, String userName) {
+ this.userId = userId;
+ this.userName = userName;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+ public String getUserName() {
+ return userName;
+ }
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+ public String getNickName() {
+ return nickName;
+ }
+ public void setNickName(String nickName) {
+ this.nickName = nickName;
+ }
+ public String getUserImg() {
+ return userImg;
+ }
+ public void setUserImg(String userImg) {
+ this.userImg = userImg;
+ }
+ public String getLoginTime() {
+ return loginTime;
+ }
+ public void setLoginTime(String loginTime) {
+ this.loginTime = loginTime;
+ }
+
+}
diff --git a/src/main/java/com/ifish/dto/ShopsUserInfoDto.java b/src/main/java/com/ifish/dto/ShopsUserInfoDto.java
new file mode 100644
index 0000000..fb39d4f
--- /dev/null
+++ b/src/main/java/com/ifish/dto/ShopsUserInfoDto.java
@@ -0,0 +1,147 @@
+package com.ifish.dto;
+
+/**
+ * 商家会员详细信息DTO
+ * @author Administrator
+ *
+ */
+public class ShopsUserInfoDto {
+ /**
+ * 用户ID
+ */
+ private Integer userId;
+ /**
+ * 商家ID
+ */
+ private Integer shopsId;
+ /**
+ * 会员等级
+ */
+ private int memberLevel;
+ /**
+ * 用户名称
+ */
+ private String userName;
+ /**
+ * 手机号码
+ */
+ private String phoneNumber;
+ /**
+ * 省
+ */
+ private String province;
+ /**
+ * 市
+ */
+ private String city;
+ /**
+ * 区
+ */
+ private String area;
+ /**
+ * 地址
+ */
+ private String address;
+ /**
+ * 备注
+ */
+ private String remark;
+ /**
+ * 设备个数
+ */
+ private Integer deviceNum;
+ /**
+ * 摄像头个数
+ */
+ private Integer cameraNum;
+
+ public ShopsUserInfoDto() {}
+
+ public ShopsUserInfoDto(Integer userId, Integer shopsId, int memberLevel, Integer deviceNum, Integer cameraNum) {
+ this.userId = userId;
+ this.shopsId = shopsId;
+ this.memberLevel = memberLevel;
+ this.deviceNum = deviceNum;
+ this.cameraNum = cameraNum;
+ }
+
+ public int getMemberLevel() {
+ return memberLevel;
+ }
+ public void setMemberLevel(int memberLevel) {
+ this.memberLevel = memberLevel;
+ }
+ public String getUserName() {
+ return userName;
+ }
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+ public String getPhoneNumber() {
+ return phoneNumber;
+ }
+ public void setPhoneNumber(String phoneNumber) {
+ this.phoneNumber = phoneNumber;
+ }
+ public String getAddress() {
+ return address;
+ }
+ public void setAddress(String address) {
+ this.address = address;
+ }
+ public String getRemark() {
+ return remark;
+ }
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+ public Integer getShopsId() {
+ return shopsId;
+ }
+ public void setShopsId(Integer shopsId) {
+ this.shopsId = shopsId;
+ }
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+ public Integer getDeviceNum() {
+ return deviceNum;
+ }
+ public void setDeviceNum(Integer deviceNum) {
+ this.deviceNum = deviceNum;
+ }
+ public Integer getCameraNum() {
+ return cameraNum;
+ }
+ public void setCameraNum(Integer cameraNum) {
+ this.cameraNum = cameraNum;
+ }
+
+ public String getProvince() {
+ return province;
+ }
+
+ public void setProvince(String province) {
+ this.province = province;
+ }
+
+ public String getCity() {
+ return city;
+ }
+
+ public void setCity(String city) {
+ this.city = city;
+ }
+
+ public String getArea() {
+ return area;
+ }
+
+ public void setArea(String area) {
+ this.area = area;
+ }
+
+}
diff --git a/src/main/java/com/ifish/dto/UserActivityDto.java b/src/main/java/com/ifish/dto/UserActivityDto.java
new file mode 100644
index 0000000..227eb28
--- /dev/null
+++ b/src/main/java/com/ifish/dto/UserActivityDto.java
@@ -0,0 +1,93 @@
+package com.ifish.dto;
+
+import java.util.Date;
+
+/**
+ * 用户动态
+ * @author Administrator
+ *
+ */
+public class UserActivityDto {
+ /**
+ * 动态ID
+ */
+ private Integer activityId;
+ /**
+ * 用户ID
+ */
+ private Integer userId;
+ /**
+ * 头像
+ */
+ private String userImg;
+ /**
+ * 昵称
+ */
+ private String nickName;
+ /**
+ * 等级
+ */
+ private Integer gradeNum;
+ /**
+ * 动态类型
+ */
+ private String activityType;
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ public UserActivityDto() { }
+
+ public UserActivityDto(Integer activityId, Integer userId,String activityType, Date createTime) {
+ this.activityId = activityId;
+ this.userId = userId;
+ this.activityType = activityType;
+ this.createTime = createTime;
+ this.gradeNum = 0;
+ }
+
+ public Integer getActivityId() {
+ return activityId;
+ }
+ public void setActivityId(Integer activityId) {
+ this.activityId = activityId;
+ }
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+ public String getUserImg() {
+ return userImg;
+ }
+ public void setUserImg(String userImg) {
+ this.userImg = userImg;
+ }
+ public String getNickName() {
+ return nickName;
+ }
+ public void setNickName(String nickName) {
+ this.nickName = nickName;
+ }
+ public Integer getGradeNum() {
+ return gradeNum;
+ }
+ public void setGradeNum(Integer gradeNum) {
+ this.gradeNum = gradeNum;
+ }
+ public String getActivityType() {
+ return activityType;
+ }
+ public void setActivityType(String activityType) {
+ this.activityType = activityType;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+}
diff --git a/src/main/java/com/ifish/dto/UserAssetDto.java b/src/main/java/com/ifish/dto/UserAssetDto.java
new file mode 100644
index 0000000..2b0b4b1
--- /dev/null
+++ b/src/main/java/com/ifish/dto/UserAssetDto.java
@@ -0,0 +1,139 @@
+package com.ifish.dto;
+
+import java.math.BigDecimal;
+
+import com.ifish.enums.BooleanEnum;
+
+/**
+ * 用户资产信息(金币,经验值等)
+ * @author Administrator
+ *
+ */
+public class UserAssetDto {
+
+ /**
+ * 经验值
+ */
+ private Integer gradeValue;
+ /**
+ * 等级
+ */
+ private Integer gradeNum;
+ /**
+ * 等级名称
+ */
+ private String gradeName;
+ /**
+ * 金币
+ */
+ private BigDecimal goldValue;
+ /**
+ * 今天是否签到
+ */
+ private String toDaySignin;
+
+ /**
+ * 连续签到天数
+ */
+ private Integer keepSigninNum;
+
+ /**
+ * 最后一次登陆日期
+ */
+ private String lastLoginDate;
+ /**
+ * 是否砸过金蛋(默认砸过)
+ */
+ private String isHitGoldenEgg;
+
+ /**
+ * 所加经验值
+ */
+ private BigDecimal addValue;
+
+
+ public UserAssetDto() {
+ this.gradeValue = 0;
+ this.gradeNum = 7;
+ this.gradeName = "海龙王";
+ this.goldValue = new BigDecimal(0);
+ this.toDaySignin = BooleanEnum.NO.getKey();
+ this.keepSigninNum = 0;
+ this.lastLoginDate = "";
+ this.isHitGoldenEgg = BooleanEnum.YES.getKey();
+ this.addValue = new BigDecimal(0);
+ }
+
+ public Integer getGradeValue() {
+ return gradeValue;
+ }
+
+ public void setGradeValue(Integer gradeValue) {
+ this.gradeValue = gradeValue;
+ }
+
+ public Integer getGradeNum() {
+ return gradeNum;
+ }
+
+ public void setGradeNum(Integer gradeNum) {
+ this.gradeNum = gradeNum;
+ }
+
+ public String getGradeName() {
+ return gradeName;
+ }
+
+ public void setGradeName(String gradeName) {
+ this.gradeName = gradeName;
+ }
+
+ public BigDecimal getGoldValue() {
+ return goldValue;
+ }
+
+ public void setGoldValue(BigDecimal goldValue) {
+ this.goldValue = goldValue;
+ }
+
+ public String getToDaySignin() {
+ return toDaySignin;
+ }
+
+ public void setToDaySignin(String toDaySignin) {
+ this.toDaySignin = toDaySignin;
+ }
+
+ public Integer getKeepSigninNum() {
+ return keepSigninNum;
+ }
+
+ public void setKeepSigninNum(Integer keepSigninNum) {
+ this.keepSigninNum = keepSigninNum;
+ }
+
+ public String getLastLoginDate() {
+ return lastLoginDate;
+ }
+
+ public void setLastLoginDate(String lastLoginDate) {
+ this.lastLoginDate = lastLoginDate;
+ }
+
+ public String getIsHitGoldenEgg() {
+ return isHitGoldenEgg;
+ }
+
+ public void setIsHitGoldenEgg(String isHitGoldenEgg) {
+ this.isHitGoldenEgg = isHitGoldenEgg;
+ }
+
+ public BigDecimal getAddValue() {
+ return addValue;
+ }
+
+ public void setAddValue(BigDecimal addValue) {
+ this.addValue = addValue;
+ }
+
+}
diff --git a/src/main/java/com/ifish/dto/UserInfoDto.java b/src/main/java/com/ifish/dto/UserInfoDto.java
new file mode 100644
index 0000000..4a92d39
--- /dev/null
+++ b/src/main/java/com/ifish/dto/UserInfoDto.java
@@ -0,0 +1,133 @@
+package com.ifish.dto;
+
+
+/**
+ * 用户信息
+ * @author Administrator
+ *
+ */
+public class UserInfoDto {
+
+ /**
+ * 用户ID
+ */
+ private Integer userId;
+ /**
+ * 手机号码
+ */
+ private String phoneNumber;
+ /**
+ * 性别
+ */
+ private String userSex;
+ /**
+ * 签名
+ */
+ private String signature;
+ /**
+ * 用户名
+ */
+ private String nickName;
+ /**
+ * 用户头像
+ */
+ private String userImg;
+ /**
+ * 用户类型(0:普通用户,1:商家用户)
+ */
+ private String userType;
+ /**
+ * 商家用户Id
+ */
+ private Integer shopsUserId;
+ /**
+ * 技威CODE1
+ */
+ private String P2PVerifyCode1;
+ /**
+ * 技威CODE2
+ */
+ private String P2PVerifyCode2;
+ /**
+ * 技威用户ID
+ */
+ private String gwellUserID;
+ /**
+ * 云信token
+ */
+ private String neteaseToken;
+
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+ public String getPhoneNumber() {
+ return phoneNumber;
+ }
+ public void setPhoneNumber(String phoneNumber) {
+ this.phoneNumber = phoneNumber;
+ }
+ public String getUserSex() {
+ return userSex;
+ }
+ public void setUserSex(String userSex) {
+ this.userSex = userSex;
+ }
+ public String getSignature() {
+ return signature;
+ }
+ public void setSignature(String signature) {
+ this.signature = signature;
+ }
+ public String getNickName() {
+ return nickName;
+ }
+ public void setNickName(String nickName) {
+ this.nickName = nickName;
+ }
+ public String getUserImg() {
+ return userImg;
+ }
+ public void setUserImg(String userImg) {
+ this.userImg = userImg;
+ }
+ public String getUserType() {
+ return userType;
+ }
+ public void setUserType(String userType) {
+ this.userType = userType;
+ }
+ public Integer getShopsUserId() {
+ return shopsUserId;
+ }
+ public void setShopsUserId(Integer shopsUserId) {
+ this.shopsUserId = shopsUserId;
+ }
+ public String getP2PVerifyCode1() {
+ return P2PVerifyCode1;
+ }
+ public void setP2PVerifyCode1(String p2pVerifyCode1) {
+ P2PVerifyCode1 = p2pVerifyCode1;
+ }
+ public String getP2PVerifyCode2() {
+ return P2PVerifyCode2;
+ }
+ public void setP2PVerifyCode2(String p2pVerifyCode2) {
+ P2PVerifyCode2 = p2pVerifyCode2;
+ }
+ public String getGwellUserID() {
+ return gwellUserID;
+ }
+ public void setGwellUserID(String gwellUserID) {
+ this.gwellUserID = gwellUserID;
+ }
+ public String getNeteaseToken() {
+ return neteaseToken;
+ }
+ public void setNeteaseToken(String neteaseToken) {
+ this.neteaseToken = neteaseToken;
+ }
+
+}
diff --git a/src/main/java/com/ifish/dto/VenderDto.java b/src/main/java/com/ifish/dto/VenderDto.java
new file mode 100644
index 0000000..5c44663
--- /dev/null
+++ b/src/main/java/com/ifish/dto/VenderDto.java
@@ -0,0 +1,48 @@
+package com.ifish.dto;
+
+
+/**
+ * 鱼缸厂信息dto
+ * @author Administrator
+ *
+ */
+public class VenderDto {
+
+ /**
+ * 厂家名称
+ */
+ private String brandName;
+ /**
+ * 品牌介绍
+ */
+ private String brandIntroduce;
+ /**
+ * logo
+ */
+ private String logo;
+
+ public VenderDto(String brandName, String brandIntroduce, String logo) {
+ this.brandName = brandName;
+ this.brandIntroduce = brandIntroduce;
+ this.logo = logo;
+ }
+ public String getBrandName() {
+ return brandName;
+ }
+ public void setBrandName(String brandName) {
+ this.brandName = brandName;
+ }
+ public String getBrandIntroduce() {
+ return brandIntroduce;
+ }
+ public void setBrandIntroduce(String brandIntroduce) {
+ this.brandIntroduce = brandIntroduce;
+ }
+ public String getLogo() {
+ return logo;
+ }
+ public void setLogo(String logo) {
+ this.logo = logo;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/AdInfo.java b/src/main/java/com/ifish/entity/AdInfo.java
new file mode 100644
index 0000000..776acbb
--- /dev/null
+++ b/src/main/java/com/ifish/entity/AdInfo.java
@@ -0,0 +1,120 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+/**
+ * 广告位信息
+ * @author Administrator
+ *
+ */
+@Entity
+@Table(name="tbl_ad_info")
+public class AdInfo implements Serializable{
+
+ private static final long serialVersionUID = 1658175021665132499L;
+
+ /**
+ * id
+ */
+ @Id
+ @Column(name="ad_id")
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
+ private Integer adId;
+ /**
+ * 是否显示
+ */
+ @Column(name="is_show",length=1)
+ private String isShow;
+ /**
+ * 广告类型
+ */
+ @Column(name="ad_type",nullable=false)
+ private Integer adType;
+ /**
+ * 广告位图片
+ */
+ @Column(name="ad_image",length=20)
+ private String adImage;
+ /**
+ * 广告位链接
+ */
+ @Column(name="ad_link",length=100)
+ private String adLink;
+ /**
+ * 排序
+ */
+ @Column(name="order_num",nullable=false)
+ private Integer orderNum;
+ /**
+ * 更新时间
+ */
+ @Column(name="update_time")
+ @Temporal(TemporalType.TIMESTAMP)
+ private Date updateTime;
+ /**
+ * 创建时间
+ */
+ @Column(name="create_time")
+ @Temporal(TemporalType.TIMESTAMP)
+ private Date createTime;
+
+ public Integer getAdId() {
+ return adId;
+ }
+ public void setAdId(Integer adId) {
+ this.adId = adId;
+ }
+ public Integer getAdType() {
+ return adType;
+ }
+ public void setAdType(Integer adType) {
+ this.adType = adType;
+ }
+ public String getAdImage() {
+ return adImage;
+ }
+ public void setAdImage(String adImage) {
+ this.adImage = adImage;
+ }
+ public String getAdLink() {
+ return adLink;
+ }
+ public void setAdLink(String adLink) {
+ this.adLink = adLink;
+ }
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public String getIsShow() {
+ return isShow;
+ }
+ public void setIsShow(String isShow) {
+ this.isShow = isShow;
+ }
+ public Integer getOrderNum() {
+ return orderNum;
+ }
+ public void setOrderNum(Integer orderNum) {
+ this.orderNum = orderNum;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/BrowseRoom.java b/src/main/java/com/ifish/entity/BrowseRoom.java
new file mode 100644
index 0000000..5860138
--- /dev/null
+++ b/src/main/java/com/ifish/entity/BrowseRoom.java
@@ -0,0 +1,39 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName: tbl_browse_room
+ * @date 2015年7月2日 下午16:40:00
+ *
+ */
+public class BrowseRoom implements Serializable{
+
+ private static final long serialVersionUID = 1866585948782100462L;
+ //ID
+ private BrowseRoomId browseRoomId;
+ //修改时间
+ private Date updateTime;
+ //创建时间
+ private Date createTime;
+ public BrowseRoomId getBrowseRoomId() {
+ return browseRoomId;
+ }
+ public void setBrowseRoomId(BrowseRoomId browseRoomId) {
+ this.browseRoomId = browseRoomId;
+ }
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/BrowseRoomId.java b/src/main/java/com/ifish/entity/BrowseRoomId.java
new file mode 100644
index 0000000..d17faba
--- /dev/null
+++ b/src/main/java/com/ifish/entity/BrowseRoomId.java
@@ -0,0 +1,52 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+
+public class BrowseRoomId implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private Integer roomId;
+ private Integer userId;
+
+ public BrowseRoomId() {
+ }
+
+ public BrowseRoomId(Integer roomId, Integer userId) {
+ this.roomId = roomId;
+ this.userId = userId;
+ }
+
+ public Integer getRoomId() {
+ return roomId;
+ }
+
+ public void setRoomId(Integer roomId) {
+ this.roomId = roomId;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if(obj instanceof BrowseRoomId){
+ BrowseRoomId pk=(BrowseRoomId)obj;
+ if(this.roomId.equals(pk.roomId) && this.userId.equals(pk.userId)){
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ return super.hashCode();
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/Camera.java b/src/main/java/com/ifish/entity/Camera.java
new file mode 100644
index 0000000..d93b5b3
--- /dev/null
+++ b/src/main/java/com/ifish/entity/Camera.java
@@ -0,0 +1,56 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName: tbl_camera
+ * @date 2015年7月2日 下午16:40:00
+ *
+ */
+public class Camera implements Serializable{
+
+ private static final long serialVersionUID = -5292867602998823697L;
+ //ID
+ private String cameraId;
+ //激活码
+ private String activeCode;
+ //激活时间
+ private Date activeTime;
+ //修改时间
+ private Date updateTime;
+ //创建时间
+ private Date createTime;
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public String getCameraId() {
+ return cameraId;
+ }
+ public void setCameraId(String cameraId) {
+ this.cameraId = cameraId;
+ }
+ public String getActiveCode() {
+ return activeCode;
+ }
+ public void setActiveCode(String activeCode) {
+ this.activeCode = activeCode;
+ }
+ public Date getActiveTime() {
+ return activeTime;
+ }
+ public void setActiveTime(Date activeTime) {
+ this.activeTime = activeTime;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/CameraActive.java b/src/main/java/com/ifish/entity/CameraActive.java
new file mode 100644
index 0000000..ad3e5ff
--- /dev/null
+++ b/src/main/java/com/ifish/entity/CameraActive.java
@@ -0,0 +1,48 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName: tbl_camera_active
+ * @date 2015年7月2日 下午16:40:00
+ *
+ */
+public class CameraActive implements Serializable{
+
+ private static final long serialVersionUID = 2069622365188365453L;
+ //激活码
+ private String activeCode;
+ //批次号
+ private String batchCode;
+ //是否使用
+ private String isUsed;
+ //创建时间
+ private Date createTime;
+
+ public String getActiveCode() {
+ return activeCode;
+ }
+ public void setActiveCode(String activeCode) {
+ this.activeCode = activeCode;
+ }
+ public String getBatchCode() {
+ return batchCode;
+ }
+ public void setBatchCode(String batchCode) {
+ this.batchCode = batchCode;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public String getIsUsed() {
+ return isUsed;
+ }
+ public void setIsUsed(String isUsed) {
+ this.isUsed = isUsed;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/CameraUser.java b/src/main/java/com/ifish/entity/CameraUser.java
new file mode 100644
index 0000000..bcd5b44
--- /dev/null
+++ b/src/main/java/com/ifish/entity/CameraUser.java
@@ -0,0 +1,72 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName: tbl_camera_user
+ * @date 2015年7月2日 下午16:40:00
+ *
+ */
+public class CameraUser implements Serializable{
+
+ private static final long serialVersionUID = -5292867602998823697L;
+ //ID
+ private CameraUserId cameraUserId;
+ //1、主控制权,0、被分享者
+ private String isMaster;
+ //显示名称
+ private String showName;
+ //是否看护
+ private String isLook;
+ //是否直播
+ private String isLive;
+ //修改时间
+ private Date updateTime;
+ //创建时间
+ private Date createTime;
+
+ public String getShowName() {
+ return showName;
+ }
+ public void setShowName(String showName) {
+ this.showName = showName;
+ }
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public String getIsMaster() {
+ return isMaster;
+ }
+ public void setIsMaster(String isMaster) {
+ this.isMaster = isMaster;
+ }
+ public CameraUserId getCameraUserId() {
+ return cameraUserId;
+ }
+ public void setCameraUserId(CameraUserId cameraUserId) {
+ this.cameraUserId = cameraUserId;
+ }
+ public String getIsLook() {
+ return isLook;
+ }
+ public void setIsLook(String isLook) {
+ this.isLook = isLook;
+ }
+ public String getIsLive() {
+ return isLive;
+ }
+ public void setIsLive(String isLive) {
+ this.isLive = isLive;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/CameraUserId.java b/src/main/java/com/ifish/entity/CameraUserId.java
new file mode 100644
index 0000000..0c6e140
--- /dev/null
+++ b/src/main/java/com/ifish/entity/CameraUserId.java
@@ -0,0 +1,52 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+
+public class CameraUserId implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private Integer userId;
+ private String cameraId;
+
+ public CameraUserId() {
+ }
+
+ public CameraUserId(Integer userId, String cameraId) {
+ this.userId = userId;
+ this.cameraId = cameraId;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public String getCameraId() {
+ return cameraId;
+ }
+
+ public void setCameraId(String cameraId) {
+ this.cameraId = cameraId;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if(obj instanceof CameraUserId){
+ CameraUserId pk=(CameraUserId)obj;
+ if(this.userId.equals(pk.userId) && this.cameraId.equals(pk.cameraId)){
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ return super.hashCode();
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/Comment.java b/src/main/java/com/ifish/entity/Comment.java
new file mode 100644
index 0000000..ba78997
--- /dev/null
+++ b/src/main/java/com/ifish/entity/Comment.java
@@ -0,0 +1,130 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ifish.serializer.CustomDateSerializer;
+
+/**
+ * @ClassName: tbl_comment
+ * @date 2015年7月2日 下午16:40:00
*
+ */
+@Entity
+@Table(name="tbl_comment")
+public class Comment implements Serializable{
+
+ private static final long serialVersionUID = 1312658178156695378L;
+ /**
+ * ID
+ */
+ @Id
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
+ @Column(name="comment_id")
+ private Integer commentId;
+ /**
+ * 编辑器ID
+ */
+ @Column(name="ueditor_id")
+ private Integer ueditorId;
+ /**
+ * 用户ID
+ */
+ @Column(name="user_id")
+ private Integer userId;
+ /**
+ * 回复用户ID
+ */
+ @Column(name="as_user_id")
+ private Integer asUserId;
+ /**
+ * 回复用户名称
+ */
+ @Transient
+ private String asUserName;
+ /**
+ * 头像
+ */
+ @Transient
+ private String userImg;
+ /**
+ * 用户
+ */
+ @Transient
+ private String userName;
+ /**
+ * 内容
+ */
+ @Column(name="comment_content",nullable=true,length=200)
+ private String commentContent;
+ /**
+ * 创建时间
+ */
+ @JsonSerialize(using = CustomDateSerializer.class)
+ @Column(name="create_time",columnDefinition="timestamp",updatable=false,length=1)
+ private Date createTime;
+
+ public Integer getCommentId() {
+ return commentId;
+ }
+ public void setCommentId(Integer commentId) {
+ this.commentId = commentId;
+ }
+ public Integer getUeditorId() {
+ return ueditorId;
+ }
+ public void setUeditorId(Integer ueditorId) {
+ this.ueditorId = ueditorId;
+ }
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+ public String getCommentContent() {
+ return commentContent;
+ }
+ public void setCommentContent(String commentContent) {
+ this.commentContent = commentContent;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public String getUserImg() {
+ return userImg;
+ }
+ public void setUserImg(String userImg) {
+ this.userImg = userImg;
+ }
+ public String getUserName() {
+ return userName;
+ }
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+ public Integer getAsUserId() {
+ return asUserId;
+ }
+ public void setAsUserId(Integer asUserId) {
+ this.asUserId = asUserId;
+ }
+ public String getAsUserName() {
+ return asUserName;
+ }
+ public void setAsUserName(String asUserName) {
+ this.asUserName = asUserName;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/Coupon.java b/src/main/java/com/ifish/entity/Coupon.java
new file mode 100644
index 0000000..37ee943
--- /dev/null
+++ b/src/main/java/com/ifish/entity/Coupon.java
@@ -0,0 +1,155 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.persistence.Transient;
+
+/**
+ * 优惠券
+ * @author Administrator
+ *
+ */
+@Entity
+@Table(name="tbl_coupon")
+public class Coupon implements Serializable {
+
+ private static final long serialVersionUID = 970686228633163972L;
+ /**
+ * 优惠券ID
+ */
+ @Id
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
+ @Column(name="coupon_id")
+ private Integer couponId;
+ /**
+ * 兑换RMB价值
+ */
+ @Column(name="money_value",nullable=false)
+ private Integer moneyValue;
+ /**
+ * 兑换所需金币
+ */
+ @Column(name="need_gold",precision=6,scale=2,nullable=false)
+ private BigDecimal needGold;
+ /**
+ * 使用兑换券需要消费金额
+ */
+ @Column(name="use_need_money",nullable=false)
+ private Integer useNeedMoney;
+ /**
+ * 用户所能兑换数量
+ */
+ @Column(name="upper_limit")
+ private Integer upperLimit;
+ /**
+ * 优惠券数量
+ */
+ @Column(name="coupon_number")
+ private Integer couponNumber;
+ /**
+ * 文字标签
+ */
+ @Column(name="tag_text",length=20)
+ private String tagText;
+ /**
+ * 有效开始时间
+ */
+ @Column(name="valid_start_date")
+ @Temporal(TemporalType.DATE)
+ private Date validStartDate;
+ /**
+ * 有效结束时间
+ */
+ @Column(name="valid_end_date")
+ @Temporal(TemporalType.DATE)
+ private Date validEndDate;
+ /**
+ * 更新时间
+ */
+ @Column(name="update_time")
+ @Temporal(TemporalType.TIMESTAMP)
+ private Date updateTime;
+ /**
+ * 兑换数量
+ */
+ @Transient
+ private Integer exchangeCount;
+
+ public Integer getCouponId() {
+ return couponId;
+ }
+ public void setCouponId(Integer couponId) {
+ this.couponId = couponId;
+ }
+ public Integer getMoneyValue() {
+ return moneyValue;
+ }
+ public void setMoneyValue(Integer moneyValue) {
+ this.moneyValue = moneyValue;
+ }
+ public BigDecimal getNeedGold() {
+ return needGold;
+ }
+ public void setNeedGold(BigDecimal needGold) {
+ this.needGold = needGold;
+ }
+ public Integer getUseNeedMoney() {
+ return useNeedMoney;
+ }
+ public void setUseNeedMoney(Integer useNeedMoney) {
+ this.useNeedMoney = useNeedMoney;
+ }
+ public String getTagText() {
+ return tagText;
+ }
+ public void setTagText(String tagText) {
+ this.tagText = tagText;
+ }
+ public Date getValidStartDate() {
+ return validStartDate;
+ }
+ public void setValidStartDate(Date validStartDate) {
+ this.validStartDate = validStartDate;
+ }
+ public Date getValidEndDate() {
+ return validEndDate;
+ }
+ public void setValidEndDate(Date validEndDate) {
+ this.validEndDate = validEndDate;
+ }
+ public Integer getUpperLimit() {
+ return upperLimit;
+ }
+ public void setUpperLimit(Integer upperLimit) {
+ this.upperLimit = upperLimit;
+ }
+ public Integer getExchangeCount() {
+ return exchangeCount;
+ }
+ public void setExchangeCount(Integer exchangeCount) {
+ this.exchangeCount = exchangeCount;
+ }
+ public Integer getCouponNumber() {
+ return couponNumber;
+ }
+ public void setCouponNumber(Integer couponNumber) {
+ this.couponNumber = couponNumber;
+ }
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/CouponRecord.java b/src/main/java/com/ifish/entity/CouponRecord.java
new file mode 100644
index 0000000..3e5814d
--- /dev/null
+++ b/src/main/java/com/ifish/entity/CouponRecord.java
@@ -0,0 +1,164 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+/**
+ * 优惠券兑换记录
+ * @author Administrator
+ *
+ */
+@Entity
+@Table(name="tbl_coupon_record")
+public class CouponRecord implements Serializable {
+
+ private static final long serialVersionUID = 5703119042203252824L;
+ /**
+ *记录ID
+ */
+ @Id
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
+ @Column(name="record_id")
+ private Integer recordId;
+ /**
+ * 用户ID
+ */
+ @Column(name="user_id",nullable=false)
+ private Integer userId;
+ /**
+ * 优惠券ID
+ */
+ @Column(name="coupon_id",nullable=false)
+ private Integer couponId;
+ /**
+ * 兑换RMB价值
+ */
+ @Column(name="money_value",nullable=false)
+ private Integer moneyValue;
+ /**
+ * 兑换所需金币
+ */
+ @Column(name="need_gold",precision=6,scale=2,nullable=false)
+ private BigDecimal needGold;
+ /**
+ * 使用兑换券需要消费金额
+ */
+ @Column(name="use_need_money",nullable=false)
+ private Integer useNeedMoney;
+ /**
+ * 文字标签
+ */
+ @Column(name="tag_text",length=20)
+ private String tagText;
+ /**
+ * 有效开始时间
+ */
+ @Column(name="valid_start_date")
+ @Temporal(TemporalType.DATE)
+ private Date validStartDate;
+ /**
+ * 有效结束时间
+ */
+ @Column(name="valid_end_date")
+ @Temporal(TemporalType.DATE)
+ private Date validEndDate;
+ /**
+ * 激活码
+ */
+ @Column(name="activation_code",length=8,nullable=false)
+ private String activationCode;
+ /**
+ * 是否使用过
+ */
+ @Column(name="is_used",nullable=false,length=1)
+ private String isUsed;
+ /**
+ * 创建时间
+ */
+ @Column(name="create_time")
+ @Temporal(TemporalType.TIMESTAMP)
+ private Date createTime;
+
+ public Integer getRecordId() {
+ return recordId;
+ }
+ public void setRecordId(Integer recordId) {
+ this.recordId = recordId;
+ }
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+ public Integer getCouponId() {
+ return couponId;
+ }
+ public void setCouponId(Integer couponId) {
+ this.couponId = couponId;
+ }
+ public String getActivationCode() {
+ return activationCode;
+ }
+ public void setActivationCode(String activationCode) {
+ this.activationCode = activationCode;
+ }
+ public String getIsUsed() {
+ return isUsed;
+ }
+ public void setIsUsed(String isUsed) {
+ this.isUsed = isUsed;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public Date getValidStartDate() {
+ return validStartDate;
+ }
+ public void setValidStartDate(Date validStartDate) {
+ this.validStartDate = validStartDate;
+ }
+ public Date getValidEndDate() {
+ return validEndDate;
+ }
+ public void setValidEndDate(Date validEndDate) {
+ this.validEndDate = validEndDate;
+ }
+ public Integer getMoneyValue() {
+ return moneyValue;
+ }
+ public void setMoneyValue(Integer moneyValue) {
+ this.moneyValue = moneyValue;
+ }
+ public BigDecimal getNeedGold() {
+ return needGold;
+ }
+ public void setNeedGold(BigDecimal needGold) {
+ this.needGold = needGold;
+ }
+ public Integer getUseNeedMoney() {
+ return useNeedMoney;
+ }
+ public void setUseNeedMoney(Integer useNeedMoney) {
+ this.useNeedMoney = useNeedMoney;
+ }
+ public String getTagText() {
+ return tagText;
+ }
+ public void setTagText(String tagText) {
+ this.tagText = tagText;
+ }
+}
diff --git a/src/main/java/com/ifish/entity/Device.java b/src/main/java/com/ifish/entity/Device.java
new file mode 100644
index 0000000..07643bf
--- /dev/null
+++ b/src/main/java/com/ifish/entity/Device.java
@@ -0,0 +1,152 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName: tbl_device
+ * @date 2015年7月2日 下午16:40:00
+ *
+ */
+public class Device implements Serializable{
+
+ private static final long serialVersionUID = -2890074039912965824L;
+ //设备ID
+ private Integer deviceId;
+ //服务器IP
+ private String serverIP;
+ //设备IP
+ private String deviceIP;
+ //设备MAC地址
+ private String macAddress;
+ //登陆次数
+ private Integer loginCount;
+ //厂家
+ private String brandCode;
+ //硬件型号
+ private String hardwareType;
+ //版本
+ private String softwareVersion;
+ //最后一次登陆时间
+ private Date loginTime;
+ //是否是黑名单:1是,0否
+ private String isBlacklist;
+ //首次激活时间
+ private Date firstActivate;
+ //创建时间
+ private Date createTime;
+ //分配日期
+ private Date createDate;
+ //是否开启换水提醒
+ private String waterRemind;
+ //换水提醒日期
+ private Date remindDate;
+ //换水周期
+ private Integer remindCycle;
+ //今天是否需要提醒
+ private String todayRemind;
+
+ public Integer getDeviceId() {
+ return deviceId;
+ }
+ public void setDeviceId(Integer deviceId) {
+ this.deviceId = deviceId;
+ }
+ public String getServerIP() {
+ return serverIP;
+ }
+ public void setServerIP(String serverIP) {
+ this.serverIP = serverIP;
+ }
+ public String getDeviceIP() {
+ return deviceIP;
+ }
+ public void setDeviceIP(String deviceIP) {
+ this.deviceIP = deviceIP;
+ }
+ public String getMacAddress() {
+ return macAddress;
+ }
+ public void setMacAddress(String macAddress) {
+ this.macAddress = macAddress;
+ }
+ public Integer getLoginCount() {
+ return loginCount;
+ }
+ public void setLoginCount(Integer loginCount) {
+ this.loginCount = loginCount;
+ }
+ public Date getLoginTime() {
+ return loginTime;
+ }
+ public void setLoginTime(Date loginTime) {
+ this.loginTime = loginTime;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public String getIsBlacklist() {
+ return isBlacklist;
+ }
+ public void setIsBlacklist(String isBlacklist) {
+ this.isBlacklist = isBlacklist;
+ }
+ public Date getFirstActivate() {
+ return firstActivate;
+ }
+ public void setFirstActivate(Date firstActivate) {
+ this.firstActivate = firstActivate;
+ }
+ public String getHardwareType() {
+ return hardwareType;
+ }
+ public void setHardwareType(String hardwareType) {
+ this.hardwareType = hardwareType;
+ }
+ public String getSoftwareVersion() {
+ return softwareVersion;
+ }
+ public void setSoftwareVersion(String softwareVersion) {
+ this.softwareVersion = softwareVersion;
+ }
+ public String getWaterRemind() {
+ return waterRemind;
+ }
+ public void setWaterRemind(String waterRemind) {
+ this.waterRemind = waterRemind;
+ }
+ public Date getRemindDate() {
+ return remindDate;
+ }
+ public void setRemindDate(Date remindDate) {
+ this.remindDate = remindDate;
+ }
+ public Integer getRemindCycle() {
+ return remindCycle;
+ }
+ public void setRemindCycle(Integer remindCycle) {
+ this.remindCycle = remindCycle;
+ }
+ public String getTodayRemind() {
+ return todayRemind;
+ }
+ public void setTodayRemind(String todayRemind) {
+ this.todayRemind = todayRemind;
+ }
+ public String getBrandCode() {
+ return brandCode;
+ }
+ public void setBrandCode(String brandCode) {
+ this.brandCode = brandCode;
+ }
+ public Date getCreateDate() {
+ return createDate;
+ }
+ public void setCreateDate(Date createDate) {
+ this.createDate = createDate;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/DeviceCamera.java b/src/main/java/com/ifish/entity/DeviceCamera.java
new file mode 100644
index 0000000..38815d7
--- /dev/null
+++ b/src/main/java/com/ifish/entity/DeviceCamera.java
@@ -0,0 +1,22 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+
+/**
+ * @ClassName: tbl_device_camera
+ * @date 2015年7月2日 下午16:40:00
+ *
+ */
+public class DeviceCamera implements Serializable{
+
+ private static final long serialVersionUID = 3231903227046749991L;
+ //ID
+ private DeviceCameraId deviceCameraId;
+
+ public DeviceCameraId getDeviceCameraId() {
+ return deviceCameraId;
+ }
+ public void setDeviceCameraId(DeviceCameraId deviceCameraId) {
+ this.deviceCameraId = deviceCameraId;
+ }
+}
diff --git a/src/main/java/com/ifish/entity/DeviceCameraId.java b/src/main/java/com/ifish/entity/DeviceCameraId.java
new file mode 100644
index 0000000..4cc52eb
--- /dev/null
+++ b/src/main/java/com/ifish/entity/DeviceCameraId.java
@@ -0,0 +1,47 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+
+public class DeviceCameraId implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private Integer deviceId;
+ private String cameraId;
+
+ public DeviceCameraId() {
+ }
+ public DeviceCameraId(Integer deviceId, String cameraId) {
+ this.deviceId = deviceId;
+ this.cameraId = cameraId;
+ }
+ public Integer getDeviceId() {
+ return deviceId;
+ }
+ public void setDeviceId(Integer deviceId) {
+ this.deviceId = deviceId;
+ }
+ public String getCameraId() {
+ return cameraId;
+ }
+ public void setCameraId(String cameraId) {
+ this.cameraId = cameraId;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if(obj instanceof DeviceCameraId){
+ DeviceCameraId pk=(DeviceCameraId)obj;
+ if(this.deviceId.equals(pk.deviceId)&&this.cameraId.equals(pk.cameraId)){
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ return super.hashCode();
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/DeviceUser.java b/src/main/java/com/ifish/entity/DeviceUser.java
new file mode 100644
index 0000000..69251c0
--- /dev/null
+++ b/src/main/java/com/ifish/entity/DeviceUser.java
@@ -0,0 +1,84 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName: tbl_device_user
+ * @date 2015年7月2日 下午16:40:00
+ *
+ */
+public class DeviceUser implements Serializable{
+
+ private static final long serialVersionUID = -6056043883433438749L;
+ //ID
+ private DeviceUserId priId = new DeviceUserId();
+ //1、主控制权,0、被分享者
+ private String isMaster;
+ //显示名称
+ private String showName;
+ //保存的显示图标
+ private String customIconName;
+ //保存的显示名称
+ private String customShowName;
+ //修改时间
+ private Date updateTime;
+ //创建时间
+ private Date createTime;
+
+ public DeviceUser() {}
+
+ public DeviceUser(DeviceUserId priId, String isMaster, String showName) {
+ this.priId = priId;
+ this.isMaster = isMaster;
+ this.showName = showName;
+ this.customIconName = "";
+ this.customShowName = "";
+ this.updateTime = new Date();
+ this.createTime = new Date();
+ }
+
+ public DeviceUserId getPriId() {
+ return priId;
+ }
+ public void setPriId(DeviceUserId priId) {
+ this.priId = priId;
+ }
+ public String getShowName() {
+ return showName;
+ }
+ public void setShowName(String showName) {
+ this.showName = showName;
+ }
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public String getIsMaster() {
+ return isMaster;
+ }
+ public void setIsMaster(String isMaster) {
+ this.isMaster = isMaster;
+ }
+ public String getCustomIconName() {
+ return customIconName;
+ }
+ public void setCustomIconName(String customIconName) {
+ this.customIconName = customIconName;
+ }
+ public String getCustomShowName() {
+ return customShowName;
+ }
+ public void setCustomShowName(String customShowName) {
+ this.customShowName = customShowName;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/DeviceUserId.java b/src/main/java/com/ifish/entity/DeviceUserId.java
new file mode 100644
index 0000000..de09193
--- /dev/null
+++ b/src/main/java/com/ifish/entity/DeviceUserId.java
@@ -0,0 +1,47 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+
+public class DeviceUserId implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private Integer userId;
+ private Integer deviceId;
+
+ public DeviceUserId() {}
+
+ public DeviceUserId(Integer userId, Integer deviceId) {
+ this.userId = userId;
+ this.deviceId = deviceId;
+ }
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+ public Integer getDeviceId() {
+ return deviceId;
+ }
+ public void setDeviceId(Integer deviceId) {
+ this.deviceId = deviceId;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if(obj instanceof DeviceUserId){
+ DeviceUserId pk=(DeviceUserId)obj;
+ if(this.userId.equals(pk.userId)&&this.deviceId.equals(pk.deviceId)){
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ return super.hashCode();
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/GoldControl.java b/src/main/java/com/ifish/entity/GoldControl.java
new file mode 100644
index 0000000..d520a6c
--- /dev/null
+++ b/src/main/java/com/ifish/entity/GoldControl.java
@@ -0,0 +1,71 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 等级控制信息
+ * @author Administrator
+ *
+ */
+@Entity
+@Table(name="tbl_gold_control")
+public class GoldControl implements Serializable{
+
+ private static final long serialVersionUID = -4825126780492039784L;
+ /**
+ * ID
+ */
+ @Id
+ private GoldControlId goldControlId;
+ /**
+ * 控制日期参数
+ */
+ @Column(name="control_param",nullable=false,length=10)
+ private String controlParam;
+
+ /**
+ * 更新日期
+ */
+ @Column(name="update_time",columnDefinition="timestamp")
+ private Date updateTime;
+
+ public GoldControl() {}
+
+ public GoldControl(GoldControlId goldControlId, String controlParam,
+ Date updateTime) {
+ this.goldControlId = goldControlId;
+ this.controlParam = controlParam;
+ this.updateTime = updateTime;
+ }
+
+ public GoldControlId getGoldControlId() {
+ return goldControlId;
+ }
+
+ public void setGoldControlId(GoldControlId goldControlId) {
+ this.goldControlId = goldControlId;
+ }
+
+ public String getControlParam() {
+ return controlParam;
+ }
+
+ public void setControlParam(String controlParam) {
+ this.controlParam = controlParam;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/GoldControlId.java b/src/main/java/com/ifish/entity/GoldControlId.java
new file mode 100644
index 0000000..095e2fe
--- /dev/null
+++ b/src/main/java/com/ifish/entity/GoldControlId.java
@@ -0,0 +1,60 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+
+/**
+ * 金币控制信息ID
+ * @author Administrator
+ *
+ */
+@Embeddable
+public class GoldControlId implements Serializable{
+
+ private static final long serialVersionUID = -728035080350308137L;
+ /**
+ * 用户ID
+ */
+ @Column(name="user_id")
+ private Integer userId;
+ /**
+ * 规则类型
+ */
+ @Column(name="task_type",nullable=false,length=20)
+ private String ruleType;
+
+ public GoldControlId() {}
+
+ public GoldControlId(Integer userId, String ruleType) {
+ this.userId = userId;
+ this.ruleType = ruleType;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public String getRuleType() {
+ return ruleType;
+ }
+
+ public void setRuleType(String ruleType) {
+ this.ruleType = ruleType;
+ }
+
+ @Override
+ public int hashCode() {
+ return super.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return super.equals(obj);
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/GoldExpendRecord.java b/src/main/java/com/ifish/entity/GoldExpendRecord.java
new file mode 100644
index 0000000..07cf10f
--- /dev/null
+++ b/src/main/java/com/ifish/entity/GoldExpendRecord.java
@@ -0,0 +1,129 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ifish.enums.GoldExpendTypeEnum;
+import com.ifish.serializer.CustomDateSerializer;
+
+/**
+ * 获取金币记录
+ * @author Administrator
+ *
+ */
+@Entity
+@Table(name="tbl_gold_expend_record")
+public class GoldExpendRecord implements Serializable{
+
+ private static final long serialVersionUID = 8682996968614095485L;
+ /**
+ * 记录ID
+ */
+ @Id
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
+ @Column(name="record_id")
+ private Integer recordId;
+ /**
+ * 用户ID
+ */
+ @Column(name="user_id",nullable=false)
+ private Integer userId;
+ /**
+ * 消耗方式
+ */
+ @Column(name="expend_type",nullable=false,length=20)
+ private String expendType;
+ /**
+ * 消耗值
+ */
+ @Column(name="expend_value",nullable=false,precision=6,scale=2)
+ private BigDecimal expendValue;
+ /**
+ * ID
+ */
+ @Column(name="relation_id")
+ private Integer relationId;
+ /**
+ * 记录描述
+ */
+ @Column(name="record_remark",nullable=false,length=50)
+ private String recordRemark;
+ /**
+ * 创建时间
+ */
+ @JsonSerialize(using = CustomDateSerializer.class)
+ @Column(name="create_time",nullable=false)
+ @Temporal(TemporalType.TIMESTAMP)
+ private Date createTime;
+
+ public GoldExpendRecord() {}
+
+ public GoldExpendRecord(Integer userId,BigDecimal expendValue,GoldExpendTypeEnum goldExpendType) {
+ this.userId = userId;
+ this.expendValue = expendValue;
+ this.expendType = goldExpendType.getKey();
+ this.recordRemark = goldExpendType.getValue();
+ this.createTime = new Date();
+ }
+
+ public Integer getRecordId() {
+ return recordId;
+ }
+ public void setRecordId(Integer recordId) {
+ this.recordId = recordId;
+ }
+ public String getRecordRemark() {
+ return recordRemark;
+ }
+ public void setRecordRemark(String recordRemark) {
+ this.recordRemark = recordRemark;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public String getExpendType() {
+ return expendType;
+ }
+
+ public void setExpendType(String expendType) {
+ this.expendType = expendType;
+ }
+
+ public BigDecimal getExpendValue() {
+ return expendValue;
+ }
+
+ public void setExpendValue(BigDecimal expendValue) {
+ this.expendValue = expendValue;
+ }
+
+ public Integer getRelationId() {
+ return relationId;
+ }
+
+ public void setRelationId(Integer relationId) {
+ this.relationId = relationId;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/GoldGetRecord.java b/src/main/java/com/ifish/entity/GoldGetRecord.java
new file mode 100644
index 0000000..740c952
--- /dev/null
+++ b/src/main/java/com/ifish/entity/GoldGetRecord.java
@@ -0,0 +1,133 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ifish.enums.GoldGetTypeEnum;
+import com.ifish.serializer.CustomDateSerializer;
+
+/**
+ * 获取金币记录
+ * @author Administrator
+ *
+ */
+@Entity
+@Table(name="tbl_gold_get_record")
+public class GoldGetRecord implements Serializable{
+
+ private static final long serialVersionUID = 8682996968614095485L;
+ /**
+ * 记录ID
+ */
+ @Id
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
+ @Column(name="record_id")
+ private Integer recordId;
+ /**
+ * 用户ID
+ */
+ @Column(name="user_id",nullable=false)
+ private Integer userId;
+ /**
+ * 获取方式
+ */
+ @Column(name="get_type",nullable=false,length=20)
+ private String ruleType;
+ /**
+ * 金币值
+ */
+ @Column(name="get_value",nullable=false,precision=3,scale=2)
+ private BigDecimal addValue;
+ /**
+ * 问题ID
+ */
+ @Column(name="relation_id")
+ private Integer relationId;
+ /**
+ * 记录描述
+ */
+ @Column(name="record_remark",nullable=false,length=50)
+ private String recordRemark;
+ /**
+ * 创建时间
+ */
+ @JsonSerialize(using = CustomDateSerializer.class)
+ @Column(name="create_time",nullable=false)
+ @Temporal(TemporalType.TIMESTAMP)
+ private Date createTime;
+
+ public GoldGetRecord() {}
+
+ public GoldGetRecord(Integer userId, String ruleType,
+ BigDecimal addValue, String recordRemark) {
+ this.userId = userId;
+ this.ruleType = ruleType;
+ this.addValue = addValue;
+ this.recordRemark = recordRemark;
+ this.createTime = new Date();
+ }
+ public GoldGetRecord(Integer userId,BigDecimal addValue,GoldGetTypeEnum goldGetTypeEnum) {
+ this.userId = userId;
+ this.addValue = addValue;
+ this.ruleType = goldGetTypeEnum.getKey();
+ this.recordRemark = goldGetTypeEnum.getValue();
+ this.createTime = new Date();
+ }
+
+ public Integer getRecordId() {
+ return recordId;
+ }
+ public void setRecordId(Integer recordId) {
+ this.recordId = recordId;
+ }
+ public String getRecordRemark() {
+ return recordRemark;
+ }
+ public void setRecordRemark(String recordRemark) {
+ this.recordRemark = recordRemark;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+ public String getRuleType() {
+ return ruleType;
+ }
+ public void setRuleType(String ruleType) {
+ this.ruleType = ruleType;
+ }
+ public BigDecimal getAddValue() {
+ return addValue;
+ }
+ public void setAddValue(BigDecimal addValue) {
+ this.addValue = addValue;
+ }
+ public Integer getRelationId() {
+ return relationId;
+ }
+
+ public void setRelationId(Integer relationId) {
+ this.relationId = relationId;
+ }
+
+
+}
diff --git a/src/main/java/com/ifish/entity/GoldTask.java b/src/main/java/com/ifish/entity/GoldTask.java
new file mode 100644
index 0000000..fd48b1c
--- /dev/null
+++ b/src/main/java/com/ifish/entity/GoldTask.java
@@ -0,0 +1,101 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 获取金币规则
+ * @author Administrator
+ *
+ */
+@Entity
+@Table(name="tbl_gold_task")
+public class GoldTask implements Serializable{
+
+ private static final long serialVersionUID = -3681549432190225803L;
+ /**
+ * 规则类型
+ */
+ @Id
+ @Column(name="task_type",nullable=false,length=20)
+ private String ruleType;
+ /**
+ * 规则名称
+ */
+ @Column(name="task_name",nullable=false,length=20)
+ private String ruleName;
+ /**
+ * 增加金币值
+ */
+ @Column(name="add_value",nullable=false,precision=3,scale=2)
+ private BigDecimal addValue;
+ /**
+ * 加成类型(once:一次,everyDay:每天,everyTime:每次)
+ */
+ @Column(name="add_type",nullable=false,length=20)
+ private String addType;
+ /**
+ * 是否返回app显示(1:是,0:否)
+ */
+ @Column(name="state",nullable=false,length=1)
+ private String state;
+ /**
+ * 排序字段
+ */
+ @Column(name="order_num")
+ private Integer orderNum;
+ /**
+ * 任务描述
+ */
+ @Column(name="task_remark",nullable=false,length=50)
+ private String ruleRemark;
+
+ public String getRuleType() {
+ return ruleType;
+ }
+ public void setRuleType(String ruleType) {
+ this.ruleType = ruleType;
+ }
+ public String getRuleName() {
+ return ruleName;
+ }
+ public void setRuleName(String ruleName) {
+ this.ruleName = ruleName;
+ }
+ public BigDecimal getAddValue() {
+ return addValue;
+ }
+ public void setAddValue(BigDecimal addValue) {
+ this.addValue = addValue;
+ }
+ public String getAddType() {
+ return addType;
+ }
+ public void setAddType(String addType) {
+ this.addType = addType;
+ }
+ public String getState() {
+ return state;
+ }
+ public void setState(String state) {
+ this.state = state;
+ }
+ public String getRuleRemark() {
+ return ruleRemark;
+ }
+ public void setRuleRemark(String ruleRemark) {
+ this.ruleRemark = ruleRemark;
+ }
+ public Integer getOrderNum() {
+ return orderNum;
+ }
+ public void setOrderNum(Integer orderNum) {
+ this.orderNum = orderNum;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/Grade.java b/src/main/java/com/ifish/entity/Grade.java
new file mode 100644
index 0000000..068b2c4
--- /dev/null
+++ b/src/main/java/com/ifish/entity/Grade.java
@@ -0,0 +1,90 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 等级信息
+ * @author Administrator
+ *
+ */
+@Entity
+@Table(name="tbl_grade")
+public class Grade implements Serializable{
+
+ private static final long serialVersionUID = -4501110511210925531L;
+ /**
+ * 等级
+ */
+ @Id
+ @Column(name="grade_num")
+ private Integer gradeNum;
+ /**
+ * 等级名称
+ */
+ @Column(name="grade_name",nullable=false,length=10)
+ private String gradeName;
+ /**
+ * 最小经验值<=
+ */
+ @Column(name="min_value",nullable=false)
+ private Integer minValue;
+ /**
+ * 最大经验值<
+ */
+ @Column(name="max_value",nullable=false)
+ private Integer maxValue;
+ /**
+ * 金币加成
+ */
+ @Column(name="gold_addition",precision=3,scale=2)
+ private BigDecimal goldAddition;
+ /**
+ * 等级描述
+ */
+ @Column(name="grade_remark",nullable=false,length=50)
+ private String gradeRemark;
+
+ public Integer getGradeNum() {
+ return gradeNum;
+ }
+ public void setGradeNum(Integer gradeNum) {
+ this.gradeNum = gradeNum;
+ }
+ public String getGradeName() {
+ return gradeName;
+ }
+ public void setGradeName(String gradeName) {
+ this.gradeName = gradeName;
+ }
+ public Integer getMinValue() {
+ return minValue;
+ }
+ public void setMinValue(Integer minValue) {
+ this.minValue = minValue;
+ }
+ public Integer getMaxValue() {
+ return maxValue;
+ }
+ public void setMaxValue(Integer maxValue) {
+ this.maxValue = maxValue;
+ }
+ public String getGradeRemark() {
+ return gradeRemark;
+ }
+ public void setGradeRemark(String gradeRemark) {
+ this.gradeRemark = gradeRemark;
+ }
+ public BigDecimal getGoldAddition() {
+ return goldAddition;
+ }
+ public void setGoldAddition(BigDecimal goldAddition) {
+ this.goldAddition = goldAddition;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/GradeControl.java b/src/main/java/com/ifish/entity/GradeControl.java
new file mode 100644
index 0000000..b285255
--- /dev/null
+++ b/src/main/java/com/ifish/entity/GradeControl.java
@@ -0,0 +1,71 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 等级控制信息
+ * @author Administrator
+ *
+ */
+@Entity
+@Table(name="tbl_grade_control")
+public class GradeControl implements Serializable{
+
+ private static final long serialVersionUID = 4967272971514676023L;
+ /**
+ * ID
+ */
+ @Id
+ private GradeControlId gradeControlId;
+ /**
+ * 控制日期参数
+ */
+ @Column(name="control_param",nullable=false,length=10)
+ private String controlParam;
+
+ /**
+ * 更新日期
+ */
+ @Column(name="update_time",columnDefinition="timestamp")
+ private Date updateTime;
+
+ public GradeControl() {}
+
+ public GradeControl(GradeControlId gradeControlId, String controlParam,
+ Date updateTime) {
+ this.gradeControlId = gradeControlId;
+ this.controlParam = controlParam;
+ this.updateTime = updateTime;
+ }
+
+ public GradeControlId getGradeControlId() {
+ return gradeControlId;
+ }
+
+ public void setGradeControlId(GradeControlId gradeControlId) {
+ this.gradeControlId = gradeControlId;
+ }
+
+ public String getControlParam() {
+ return controlParam;
+ }
+
+ public void setControlParam(String controlParam) {
+ this.controlParam = controlParam;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/GradeControlId.java b/src/main/java/com/ifish/entity/GradeControlId.java
new file mode 100644
index 0000000..a66f890
--- /dev/null
+++ b/src/main/java/com/ifish/entity/GradeControlId.java
@@ -0,0 +1,60 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+
+/**
+ * 等级控制信息ID
+ * @author Administrator
+ *
+ */
+@Embeddable
+public class GradeControlId implements Serializable{
+
+ private static final long serialVersionUID = -728035080350308137L;
+ /**
+ * 用户ID
+ */
+ @Column(name="user_id")
+ private Integer userId;
+ /**
+ * 规则类型
+ */
+ @Column(name="task_type",nullable=false,length=20)
+ private String ruleType;
+
+ public GradeControlId() {}
+
+ public GradeControlId(Integer userId, String ruleType) {
+ this.userId = userId;
+ this.ruleType = ruleType;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public String getRuleType() {
+ return ruleType;
+ }
+
+ public void setRuleType(String ruleType) {
+ this.ruleType = ruleType;
+ }
+
+ @Override
+ public int hashCode() {
+ return super.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return super.equals(obj);
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/GradeRecord.java b/src/main/java/com/ifish/entity/GradeRecord.java
new file mode 100644
index 0000000..cd95593
--- /dev/null
+++ b/src/main/java/com/ifish/entity/GradeRecord.java
@@ -0,0 +1,115 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ifish.serializer.CustomDateSerializer;
+
+/**
+ * 等级经验值获取记录
+ * @author Administrator
+ *
+ */
+@Entity
+@Table(name="tbl_grade_record")
+public class GradeRecord implements Serializable{
+
+ private static final long serialVersionUID = 4877610293427598136L;
+ /**
+ * 记录ID
+ */
+ @Id
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
+ @Column(name="record_id")
+ private Integer recordId;
+ /**
+ * 用户ID
+ */
+ @Column(name="user_id",nullable=false)
+ private Integer userId;
+ /**
+ * 规则类型
+ */
+ @Column(name="task_type",nullable=false,length=20)
+ private String ruleType;
+ /**
+ * 增加经验值
+ */
+ @Column(name="add_value",nullable=false)
+ private Integer addValue;
+ /**
+ * 记录描述
+ */
+ @Column(name="record_remark",nullable=false,length=50)
+ private String recordRemark;
+ /**
+ * 创建时间
+ */
+ @JsonSerialize(using = CustomDateSerializer.class)
+ @Column(name="create_time",nullable=true)
+ @Temporal(TemporalType.TIMESTAMP)
+ private Date createTime;
+
+ public GradeRecord() {}
+
+ public GradeRecord(Integer userId, String ruleType, Integer addValue,
+ String recordRemark) {
+ this.userId = userId;
+ this.ruleType = ruleType;
+ this.addValue = addValue;
+ this.recordRemark = recordRemark;
+ this.createTime = new Date();
+ }
+
+ public Integer getRecordId() {
+ return recordId;
+ }
+ public void setRecordId(Integer recordId) {
+ this.recordId = recordId;
+ }
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public String getRecordRemark() {
+ return recordRemark;
+ }
+ public void setRecordRemark(String recordRemark) {
+ this.recordRemark = recordRemark;
+ }
+
+ public String getRuleType() {
+ return ruleType;
+ }
+
+ public void setRuleType(String ruleType) {
+ this.ruleType = ruleType;
+ }
+
+ public Integer getAddValue() {
+ return addValue;
+ }
+
+ public void setAddValue(Integer addValue) {
+ this.addValue = addValue;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/GradeTask.java b/src/main/java/com/ifish/entity/GradeTask.java
new file mode 100644
index 0000000..93aa487
--- /dev/null
+++ b/src/main/java/com/ifish/entity/GradeTask.java
@@ -0,0 +1,100 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 获取经验值规则
+ * @author Administrator
+ *
+ */
+@Entity
+@Table(name="tbl_grade_task")
+public class GradeTask implements Serializable{
+
+ private static final long serialVersionUID = 8410405690637553622L;
+ /**
+ * 规则类型
+ */
+ @Id
+ @Column(name="task_type",nullable=false,length=20)
+ private String ruleType;
+ /**
+ * 规则名称
+ */
+ @Column(name="task_name",nullable=false,length=20)
+ private String ruleName;
+ /**
+ * 增加经验值
+ */
+ @Column(name="add_value",nullable=false)
+ private Integer addValue;
+ /**
+ * 加成类型(once:一次,everyDay:每天,everyTime:每次)
+ */
+ @Column(name="add_type",nullable=false,length=20)
+ private String addType;
+ /**
+ * 是否返回app显示(1:是,0:否)
+ */
+ @Column(name="state",nullable=false,length=1)
+ private String state;
+ /**
+ * 排序字段
+ */
+ @Column(name="order_num")
+ private Integer orderNum;
+ /**
+ * 规则描述
+ */
+ @Column(name="task_remark",nullable=false,length=50)
+ private String ruleRemark;
+
+ public String getRuleType() {
+ return ruleType;
+ }
+ public void setRuleType(String ruleType) {
+ this.ruleType = ruleType;
+ }
+ public String getRuleName() {
+ return ruleName;
+ }
+ public void setRuleName(String ruleName) {
+ this.ruleName = ruleName;
+ }
+ public Integer getAddValue() {
+ return addValue;
+ }
+ public void setAddValue(Integer addValue) {
+ this.addValue = addValue;
+ }
+ public String getAddType() {
+ return addType;
+ }
+ public void setAddType(String addType) {
+ this.addType = addType;
+ }
+ public String getState() {
+ return state;
+ }
+ public void setState(String state) {
+ this.state = state;
+ }
+ public Integer getOrderNum() {
+ return orderNum;
+ }
+ public void setOrderNum(Integer orderNum) {
+ this.orderNum = orderNum;
+ }
+ public String getRuleRemark() {
+ return ruleRemark;
+ }
+ public void setRuleRemark(String ruleRemark) {
+ this.ruleRemark = ruleRemark;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/HardwareType.java b/src/main/java/com/ifish/entity/HardwareType.java
new file mode 100644
index 0000000..a79bbb8
--- /dev/null
+++ b/src/main/java/com/ifish/entity/HardwareType.java
@@ -0,0 +1,144 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName: tbl_hardware_type
+ * @date 2015年7月2日 下午16:40:00
+ *
+ */
+public class HardwareType implements Serializable{
+
+ private static final long serialVersionUID = -3276528943627616026L;
+ //类型编号
+ private String hardwareType;
+ //类型名称
+ private String hardwareName;
+ //控制个数
+ private Integer controlAmount;
+ //定时器个数
+ private Integer timerAmount;
+ //是否有模式
+ private String isWorkModel;
+ //是否自定义图标
+ private String isCustomIcon;
+ //显示名称
+ private String allShowName;
+ //默认图标
+ private String defaultIconName;
+ //默认名称
+ private String defaultShowName;
+ //自定义图标根地址
+ private String iconLink;
+ //根地址下图标名称
+ private String allIconName;
+ //描述
+ private String hardwareDesc;
+ //修改时间
+ private Date updateTime;
+ //创建时间
+ private Date createTime;
+ //是否有背光
+ private String isLightness;
+ //是否有柜灯
+ private String isSarkLamp;
+
+ public String getHardwareType() {
+ return hardwareType;
+ }
+ public void setHardwareType(String hardwareType) {
+ this.hardwareType = hardwareType;
+ }
+ public String getHardwareName() {
+ return hardwareName;
+ }
+ public void setHardwareName(String hardwareName) {
+ this.hardwareName = hardwareName;
+ }
+ public String getHardwareDesc() {
+ return hardwareDesc;
+ }
+ public void setHardwareDesc(String hardwareDesc) {
+ this.hardwareDesc = hardwareDesc;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public Integer getControlAmount() {
+ return controlAmount;
+ }
+ public void setControlAmount(Integer controlAmount) {
+ this.controlAmount = controlAmount;
+ }
+ public Integer getTimerAmount() {
+ return timerAmount;
+ }
+ public void setTimerAmount(Integer timerAmount) {
+ this.timerAmount = timerAmount;
+ }
+ public String getIsCustomIcon() {
+ return isCustomIcon;
+ }
+ public void setIsCustomIcon(String isCustomIcon) {
+ this.isCustomIcon = isCustomIcon;
+ }
+ public String getIconLink() {
+ return iconLink;
+ }
+ public void setIconLink(String iconLink) {
+ this.iconLink = iconLink;
+ }
+ public String getAllIconName() {
+ return allIconName;
+ }
+ public void setAllIconName(String allIconName) {
+ this.allIconName = allIconName;
+ }
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+ public String getIsLightness() {
+ return isLightness;
+ }
+ public void setIsLightness(String isLightness) {
+ this.isLightness = isLightness;
+ }
+ public String getIsSarkLamp() {
+ return isSarkLamp;
+ }
+ public void setIsSarkLamp(String isSarkLamp) {
+ this.isSarkLamp = isSarkLamp;
+ }
+ public String getIsWorkModel() {
+ return isWorkModel;
+ }
+ public void setIsWorkModel(String isWorkModel) {
+ this.isWorkModel = isWorkModel;
+ }
+ public String getAllShowName() {
+ return allShowName;
+ }
+ public void setAllShowName(String allShowName) {
+ this.allShowName = allShowName;
+ }
+ public String getDefaultIconName() {
+ return defaultIconName;
+ }
+ public void setDefaultIconName(String defaultIconName) {
+ this.defaultIconName = defaultIconName;
+ }
+ public String getDefaultShowName() {
+ return defaultShowName;
+ }
+ public void setDefaultShowName(String defaultShowName) {
+ this.defaultShowName = defaultShowName;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/IfishDoctor.java b/src/main/java/com/ifish/entity/IfishDoctor.java
new file mode 100644
index 0000000..2e83443
--- /dev/null
+++ b/src/main/java/com/ifish/entity/IfishDoctor.java
@@ -0,0 +1,106 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.NotBlank;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ifish.serializer.CustomDateSerializer;
+
+/**
+ * @ClassName: tbl_fish_doctor
+ * @date 2015年7月2日 下午16:40:00
*
+ */
+@Entity
+@Table(name="tbl_fish_doctor")
+public class IfishDoctor implements Serializable{
+
+ private static final long serialVersionUID = -4328045174375463938L;
+ /**
+ * ID
+ */
+ @Id
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
+ @Column(name="question_id")
+ private Integer questionId;
+ /**
+ * 用户ID
+ */
+ @Column(name="user_id",nullable=true)
+ @NotNull
+ @Min(1)
+ private Integer userId;
+ /**
+ * 是否打赏
+ */
+ @Column(name="is_pay_tour",nullable=false,length=1)
+ private String isPayTour;
+ /**
+ * 打赏金额
+ */
+ @Column(name="pay_tour_sum",nullable=false)
+ private BigDecimal payTourSum;
+ /**
+ * 提问内容
+ */
+ @Column(name="question_content",nullable=true,length=200)
+ @NotBlank
+ @Length(max=200)
+ private String questionContent;
+ /**
+ * 创建时间
+ */
+ @JsonSerialize(using = CustomDateSerializer.class)
+ @Column(name="create_time",columnDefinition="timestamp",updatable=false,length=1)
+ private Date createTime;
+
+ public Integer getQuestionId() {
+ return questionId;
+ }
+ public void setQuestionId(Integer questionId) {
+ this.questionId = questionId;
+ }
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+ public String getQuestionContent() {
+ return questionContent;
+ }
+ public void setQuestionContent(String questionContent) {
+ this.questionContent = questionContent;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public String getIsPayTour() {
+ return isPayTour;
+ }
+ public void setIsPayTour(String isPayTour) {
+ this.isPayTour = isPayTour;
+ }
+ public BigDecimal getPayTourSum() {
+ return payTourSum;
+ }
+ public void setPayTourSum(BigDecimal payTourSum) {
+ this.payTourSum = payTourSum;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/IfishGoods.java b/src/main/java/com/ifish/entity/IfishGoods.java
new file mode 100644
index 0000000..af28c72
--- /dev/null
+++ b/src/main/java/com/ifish/entity/IfishGoods.java
@@ -0,0 +1,160 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * 商品管理
+ * @author Administrator
+ *
+ */
+@Entity
+@Table(name="tbl_ifish_goods")
+public class IfishGoods implements Serializable{
+
+ private static final long serialVersionUID = -5086333556284372931L;
+ /**
+ * 商品ID
+ */
+ @Id
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
+ @Column(name="goods_id")
+ private Integer goodsId;
+ /**
+ * 商品名称
+ */
+ @Column(name="goods_name",nullable=false,length=20)
+ private String goodsName;
+ /**
+ * 是否是淘宝链接
+ */
+ @Column(name="is_taobao_link",nullable=false)
+ private Integer isTaobaoLink;
+ /**
+ * 商品链接
+ */
+ @Column(name="goods_link",nullable=false,length=100)
+ private String goodsLink;
+ /**
+ * 商铺图片
+ */
+ @Column(name="goods_picture",nullable=false,length=20)
+ private String goodsPicture;
+ /**
+ * 原价格
+ */
+ @Column(name="ori_price",nullable=false,scale=2,precision=7)
+ private BigDecimal oriPrice;
+ /**
+ * 优惠价格
+ */
+ @Column(name="pre_price",nullable=false,scale=2,precision=7)
+ private BigDecimal prePrice;
+ /**
+ * 是否显示
+ */
+ @Column(name="is_show",nullable=false)
+ private Integer isShow;
+ /**
+ * 商品位置
+ */
+ @Column(name="goods_place",nullable=false)
+ private Integer goodsPlace;
+ /**
+ * 所属店铺
+ */
+ @Column(name="shop_id",nullable=false)
+ private Integer shopId;
+ /**
+ * 点击量
+ */
+ @Column(name="click_num",nullable=false)
+ private Integer clickNum;
+ /**
+ * 店铺名称
+ */
+ @Transient
+ private String shopName;
+
+ public Integer getGoodsId() {
+ return goodsId;
+ }
+ public void setGoodsId(Integer goodsId) {
+ this.goodsId = goodsId;
+ }
+ public String getGoodsName() {
+ return goodsName;
+ }
+ public void setGoodsName(String goodsName) {
+ this.goodsName = goodsName;
+ }
+ public String getGoodsLink() {
+ return goodsLink;
+ }
+ public void setGoodsLink(String goodsLink) {
+ this.goodsLink = goodsLink;
+ }
+ public String getGoodsPicture() {
+ return goodsPicture;
+ }
+ public void setGoodsPicture(String goodsPicture) {
+ this.goodsPicture = goodsPicture;
+ }
+ public BigDecimal getOriPrice() {
+ return oriPrice;
+ }
+ public void setOriPrice(BigDecimal oriPrice) {
+ this.oriPrice = oriPrice;
+ }
+ public BigDecimal getPrePrice() {
+ return prePrice;
+ }
+ public void setPrePrice(BigDecimal prePrice) {
+ this.prePrice = prePrice;
+ }
+ public Integer getIsShow() {
+ return isShow;
+ }
+ public void setIsShow(Integer isShow) {
+ this.isShow = isShow;
+ }
+ public Integer getGoodsPlace() {
+ return goodsPlace;
+ }
+ public void setGoodsPlace(Integer goodsPlace) {
+ this.goodsPlace = goodsPlace;
+ }
+ public Integer getShopId() {
+ return shopId;
+ }
+ public void setShopId(Integer shopId) {
+ this.shopId = shopId;
+ }
+ public String getShopName() {
+ return shopName;
+ }
+ public void setShopName(String shopName) {
+ this.shopName = shopName;
+ }
+ public Integer getClickNum() {
+ return clickNum;
+ }
+ public void setClickNum(Integer clickNum) {
+ this.clickNum = clickNum;
+ }
+ public Integer getIsTaobaoLink() {
+ return isTaobaoLink;
+ }
+ public void setIsTaobaoLink(Integer isTaobaoLink) {
+ this.isTaobaoLink = isTaobaoLink;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/IfishShop.java b/src/main/java/com/ifish/entity/IfishShop.java
new file mode 100644
index 0000000..bc0dc25
--- /dev/null
+++ b/src/main/java/com/ifish/entity/IfishShop.java
@@ -0,0 +1,48 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 店铺管理
+ * @author Administrator
+ *
+ */
+@Entity
+@Table(name="tbl_ifish_shop")
+public class IfishShop implements Serializable{
+
+ private static final long serialVersionUID = 7045978553607756344L;
+ /**
+ * 店铺ID
+ */
+ @Id
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
+ @Column(name="shop_id")
+ private Integer shopId;
+ /**
+ * 店铺名称
+ */
+ @Column(name="shop_name",nullable=false,length=20)
+ private String shopName;
+
+ public Integer getShopId() {
+ return shopId;
+ }
+ public void setShopId(Integer shopId) {
+ this.shopId = shopId;
+ }
+ public String getShopName() {
+ return shopName;
+ }
+ public void setShopName(String shopName) {
+ this.shopName = shopName;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/Information.java b/src/main/java/com/ifish/entity/Information.java
new file mode 100644
index 0000000..9547cea
--- /dev/null
+++ b/src/main/java/com/ifish/entity/Information.java
@@ -0,0 +1,142 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.persistence.Transient;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ifish.enums.BooleanEnum;
+import com.ifish.serializer.CustomDateSerializer;
+
+/**
+ * @ClassName: tbl_information
+ *
+ */
+@Entity
+@Table(name="tbl_information")
+public class Information implements Serializable{
+
+ private static final long serialVersionUID = 7472598147626976361L;
+ /**
+ * ID
+ */
+ @Id
+ @Column(name="info_id")
+ private Integer infoId;
+ /**
+ * app展示
+ */
+ @Column(name="app_show",length=1)
+ private String appShow;
+ /**
+ * 链接
+ */
+ @Column(name="link",length=100)
+ private String link;
+ /**
+ * 标题
+ */
+ @Column(name="title",length=50)
+ private String title;
+ /**
+ * 内容
+ */
+ @Column(name="contents",length=50)
+ private String contents;
+ /**
+ * 图片
+ */
+ @Column(name="image",length=20)
+ private String image;
+ /**
+ * 编辑器ID
+ */
+ @Column(name="ueditor_id")
+ private Integer ueditorId;
+ /**
+ * 类型
+ */
+ @Column(name="ueditor_type",length=1)
+ private String ueditorType;
+ /**
+ * 创建时间
+ */
+ @JsonSerialize(using=CustomDateSerializer.class)
+ @Column(name="create_time")
+ @Temporal(TemporalType.TIMESTAMP)
+ private Date createTime;
+ /**
+ * 是否拼接用户ID
+ */
+ @Transient
+ private String isAddUserId = BooleanEnum.NO.getKey();
+
+ public Integer getInfoId() {
+ return infoId;
+ }
+ public void setInfoId(Integer infoId) {
+ this.infoId = infoId;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public String getAppShow() {
+ return appShow;
+ }
+ public void setAppShow(String appShow) {
+ this.appShow = appShow;
+ }
+ public String getLink() {
+ return link;
+ }
+ public void setLink(String link) {
+ this.link = link;
+ }
+ public String getTitle() {
+ return title;
+ }
+ public void setTitle(String title) {
+ this.title = title;
+ }
+ public Integer getUeditorId() {
+ return ueditorId;
+ }
+ public void setUeditorId(Integer ueditorId) {
+ this.ueditorId = ueditorId;
+ }
+ public String getIsAddUserId() {
+ return isAddUserId;
+ }
+ public void setIsAddUserId(String isAddUserId) {
+ this.isAddUserId = isAddUserId;
+ }
+ public String getContents() {
+ return contents;
+ }
+ public void setContents(String contents) {
+ this.contents = contents;
+ }
+ public String getUeditorType() {
+ return ueditorType;
+ }
+ public void setUeditorType(String ueditorType) {
+ this.ueditorType = ueditorType;
+ }
+ public String getImage() {
+ return image;
+ }
+ public void setImage(String image) {
+ this.image = image;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/InformationStats.java b/src/main/java/com/ifish/entity/InformationStats.java
new file mode 100644
index 0000000..6d1f1fb
--- /dev/null
+++ b/src/main/java/com/ifish/entity/InformationStats.java
@@ -0,0 +1,45 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 资讯数据统计
+ * @author Administrator
+ *
+ */
+@Entity
+@Table(name="tbl_information_stats")
+public class InformationStats implements Serializable{
+
+ private static final long serialVersionUID = -8449695970790949331L;
+ /**
+ * 资讯ID
+ */
+ @Id
+ @Column(name="info_id",nullable=false)
+ private Integer infoId;
+ /**
+ * 点击量
+ */
+ @Column(name="click_num",nullable=false)
+ private Integer clickNum;
+
+ public Integer getInfoId() {
+ return infoId;
+ }
+ public void setInfoId(Integer infoId) {
+ this.infoId = infoId;
+ }
+ public Integer getClickNum() {
+ return clickNum;
+ }
+ public void setClickNum(Integer clickNum) {
+ this.clickNum = clickNum;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/LiveBanner.java b/src/main/java/com/ifish/entity/LiveBanner.java
new file mode 100644
index 0000000..51733c4
--- /dev/null
+++ b/src/main/java/com/ifish/entity/LiveBanner.java
@@ -0,0 +1,55 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+
+/**
+ * @ClassName: tbl_live_banner
+ * @date 2015年7月2日 下午16:40:00
+ *
+ */
+public class LiveBanner implements Serializable{
+
+ private static final long serialVersionUID = -6459241094002600290L;
+ //ID
+ private Integer bannerId;
+ //是否展示
+ private String appShow;
+ //类型
+ private String bannerType;
+ //链接
+ private String bannerLink;
+ //banner图片
+ private String bannerImg;
+
+ public Integer getBannerId() {
+ return bannerId;
+ }
+ public void setBannerId(Integer bannerId) {
+ this.bannerId = bannerId;
+ }
+ public String getAppShow() {
+ return appShow;
+ }
+ public void setAppShow(String appShow) {
+ this.appShow = appShow;
+ }
+ public String getBannerType() {
+ return bannerType;
+ }
+ public void setBannerType(String bannerType) {
+ this.bannerType = bannerType;
+ }
+ public String getBannerLink() {
+ return bannerLink;
+ }
+ public void setBannerLink(String bannerLink) {
+ this.bannerLink = bannerLink;
+ }
+ public String getBannerImg() {
+ return bannerImg;
+ }
+ public void setBannerImg(String bannerImg) {
+ this.bannerImg = bannerImg;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/LiveMessage.java b/src/main/java/com/ifish/entity/LiveMessage.java
new file mode 100644
index 0000000..7a56dd0
--- /dev/null
+++ b/src/main/java/com/ifish/entity/LiveMessage.java
@@ -0,0 +1,130 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ifish.serializer.CustomDateSerializer;
+
+/**
+ * @ClassName: tbl_live_message
+ * @date 2015年7月2日 下午16:40:00
*
+ */
+@Entity
+@Table(name="tbl_live_message")
+public class LiveMessage implements Serializable{
+
+ private static final long serialVersionUID = -1369523508980093389L;
+ /**
+ * ID
+ */
+ @Id
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
+ @Column(name="message_id")
+ private Integer messageId;
+ /**
+ * 直播间ID
+ */
+ @Column(name="room_id",nullable=true)
+ private Integer roomId;
+ /**
+ * 用户ID
+ */
+ @Column(name="user_id",nullable=true)
+ private Integer userId;
+ /**
+ * @用户ID
+ */
+ @Column(name="as_user_id")
+ private Integer asUserId;
+ /**
+ * @用户名称
+ */
+ @Transient
+ private String asUserName;
+ /**
+ * 头像
+ */
+ @Transient
+ private String userImg;
+ /**
+ * 用户
+ */
+ @Transient
+ private String userName;
+ /**
+ * 内容
+ */
+ @Column(name="message_content",nullable=true,length=200)
+ private String messageContent;
+ /**
+ * 创建时间
+ */
+ @JsonSerialize(using = CustomDateSerializer.class)
+ @Column(name="create_time",columnDefinition="timestamp",updatable=false,length=1)
+ private Date createTime;
+
+ public Integer getMessageId() {
+ return messageId;
+ }
+ public void setMessageId(Integer messageId) {
+ this.messageId = messageId;
+ }
+ public Integer getRoomId() {
+ return roomId;
+ }
+ public void setRoomId(Integer roomId) {
+ this.roomId = roomId;
+ }
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+ public String getMessageContent() {
+ return messageContent;
+ }
+ public void setMessageContent(String messageContent) {
+ this.messageContent = messageContent;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public Integer getAsUserId() {
+ return asUserId;
+ }
+ public void setAsUserId(Integer asUserId) {
+ this.asUserId = asUserId;
+ }
+ public String getAsUserName() {
+ return asUserName;
+ }
+ public void setAsUserName(String asUserName) {
+ this.asUserName = asUserName;
+ }
+ public String getUserImg() {
+ return userImg;
+ }
+ public void setUserImg(String userImg) {
+ this.userImg = userImg;
+ }
+ public String getUserName() {
+ return userName;
+ }
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/LiveRoom.java b/src/main/java/com/ifish/entity/LiveRoom.java
new file mode 100644
index 0000000..aa99647
--- /dev/null
+++ b/src/main/java/com/ifish/entity/LiveRoom.java
@@ -0,0 +1,118 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+/**
+ * @ClassName: tbl_live_room
+ * @date 2015年7月2日 下午16:40:00
+ *
+ */
+@Entity
+@Table(name="tbl_live_room")
+public class LiveRoom implements Serializable{
+
+ private static final long serialVersionUID = -5155435715428041950L;
+ /**
+ * ID
+ */
+ @Id
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
+ @Column(name="room_id")
+ private Integer roomId;
+ /**
+ * 用户ID
+ */
+ @Column(name="user_id",nullable=false)
+ private Integer userId;
+ /**
+ * 直播间名称
+ */
+ @Column(name="room_name",nullable=false)
+ private String roomName;
+ /**
+ * 直播间描述
+ */
+ @Column(name="room_desc")
+ private String roomDesc;
+ /**
+ * 直播间状态
+ */
+ @Column(name="room_status",nullable=false)
+ private String roomStatus;
+ /**
+ * 人气值
+ */
+ @Column(name="popularity_value")
+ private Integer popularityValue;
+ /**
+ * 首次分享
+ */
+ @Column(name="first_share")
+ private String firstShare;
+ /**
+ * 创建时间
+ */
+ @Column(name="create_time")
+ @Temporal(TemporalType.TIMESTAMP)
+ private Date createTime;
+
+ public Integer getRoomId() {
+ return roomId;
+ }
+ public void setRoomId(Integer roomId) {
+ this.roomId = roomId;
+ }
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+ public String getRoomName() {
+ return roomName;
+ }
+ public void setRoomName(String roomName) {
+ this.roomName = roomName;
+ }
+ public String getRoomDesc() {
+ return roomDesc;
+ }
+ public void setRoomDesc(String roomDesc) {
+ this.roomDesc = roomDesc;
+ }
+ public String getRoomStatus() {
+ return roomStatus;
+ }
+ public void setRoomStatus(String roomStatus) {
+ this.roomStatus = roomStatus;
+ }
+ public Integer getPopularityValue() {
+ return popularityValue;
+ }
+ public void setPopularityValue(Integer popularityValue) {
+ this.popularityValue = popularityValue;
+ }
+ public String getFirstShare() {
+ return firstShare;
+ }
+ public void setFirstShare(String firstShare) {
+ this.firstShare = firstShare;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/LiveRoomZan.java b/src/main/java/com/ifish/entity/LiveRoomZan.java
new file mode 100644
index 0000000..8064f2a
--- /dev/null
+++ b/src/main/java/com/ifish/entity/LiveRoomZan.java
@@ -0,0 +1,36 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 直播间点赞
+ * @author Administrator
+ *
+ */
+@Entity
+@Table(name="tbl_live_room_zan")
+public class LiveRoomZan implements Serializable{
+
+ private static final long serialVersionUID = 336837412612295706L;
+ /**
+ * id
+ */
+ @Id
+ LiveRoomZanId id;
+
+ public LiveRoomZan() {}
+ public LiveRoomZan(LiveRoomZanId id) {
+ this.id = id;
+ }
+ public LiveRoomZanId getId() {
+ return id;
+ }
+ public void setId(LiveRoomZanId id) {
+ this.id = id;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/LiveRoomZanId.java b/src/main/java/com/ifish/entity/LiveRoomZanId.java
new file mode 100644
index 0000000..f03b708
--- /dev/null
+++ b/src/main/java/com/ifish/entity/LiveRoomZanId.java
@@ -0,0 +1,47 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+
+/**
+ * 直播间点赞
+ * @author Administrator
+ *
+ */
+@Embeddable
+public class LiveRoomZanId implements Serializable{
+
+ private static final long serialVersionUID = -275072147659071118L;
+ /**
+ * 直播间ID
+ */
+ @Column(name="room_id",nullable=false)
+ private Integer roomId;
+ /**
+ * 用户ID
+ */
+ @Column(name="user_id",nullable=false)
+ private Integer userId;
+
+ public LiveRoomZanId() {}
+ public LiveRoomZanId(Integer roomId, Integer userId) {
+ super();
+ this.roomId = roomId;
+ this.userId = userId;
+ }
+ public Integer getRoomId() {
+ return roomId;
+ }
+ public void setRoomId(Integer roomId) {
+ this.roomId = roomId;
+ }
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/LookReport.java b/src/main/java/com/ifish/entity/LookReport.java
new file mode 100644
index 0000000..770653c
--- /dev/null
+++ b/src/main/java/com/ifish/entity/LookReport.java
@@ -0,0 +1,153 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName: tbl_look_report
+ * @date 2015年7月2日 下午16:40:00
+ *
+ */
+public class LookReport implements Serializable{
+
+ private static final long serialVersionUID = -3068461096525224795L;
+ //ID
+ private Integer reportId;
+ //分享图片
+ private String shareImg;
+ //看护时间
+ private Date timestamp;
+ //水质观察
+ private String index1;
+ //喂食提醒
+ private String index2;
+ //健康状况
+ private String index3;
+ //喂养建议
+ private String suggestion;
+ //得分
+ private String totalIndex;
+ //百分比
+ private String baifenbi;
+ //商家头像
+ private String userImg;
+ //店铺名称
+ private String shopsName;
+ //个性签名
+ private String signature;
+ //创建时间
+ private Date createTime;
+ //html文件名字
+ private String htmlName;
+ //水质观察
+ private String index1Text;
+ //喂食提醒
+ private String index2Text;
+ //健康状况
+ private String index3Text;
+
+
+ public String getShopsName() {
+ return shopsName;
+ }
+ public void setShopsName(String shopsName) {
+ this.shopsName = shopsName;
+ }
+ public Integer getReportId() {
+ return reportId;
+ }
+ public void setReportId(Integer reportId) {
+ this.reportId = reportId;
+ }
+ public String getShareImg() {
+ return shareImg;
+ }
+ public void setShareImg(String shareImg) {
+ this.shareImg = shareImg;
+ }
+ public Date getTimestamp() {
+ return timestamp;
+ }
+ public void setTimestamp(Date timestamp) {
+ this.timestamp = timestamp;
+ }
+ public String getIndex1() {
+ return index1;
+ }
+ public void setIndex1(String index1) {
+ this.index1 = index1;
+ }
+ public String getIndex2() {
+ return index2;
+ }
+ public void setIndex2(String index2) {
+ this.index2 = index2;
+ }
+ public String getIndex3() {
+ return index3;
+ }
+ public void setIndex3(String index3) {
+ this.index3 = index3;
+ }
+ public String getSuggestion() {
+ return suggestion;
+ }
+ public void setSuggestion(String suggestion) {
+ this.suggestion = suggestion;
+ }
+ public String getTotalIndex() {
+ return totalIndex;
+ }
+ public void setTotalIndex(String totalIndex) {
+ this.totalIndex = totalIndex;
+ }
+ public String getBaifenbi() {
+ return baifenbi;
+ }
+ public void setBaifenbi(String baifenbi) {
+ this.baifenbi = baifenbi;
+ }
+ public String getUserImg() {
+ return userImg;
+ }
+ public void setUserImg(String userImg) {
+ this.userImg = userImg;
+ }
+ public String getSignature() {
+ return signature;
+ }
+ public void setSignature(String signature) {
+ this.signature = signature;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public String getHtmlName() {
+ return htmlName;
+ }
+ public void setHtmlName(String htmlName) {
+ this.htmlName = htmlName;
+ }
+ public String getIndex1Text() {
+ return index1Text;
+ }
+ public void setIndex1Text(String index1Text) {
+ this.index1Text = index1Text;
+ }
+ public String getIndex2Text() {
+ return index2Text;
+ }
+ public void setIndex2Text(String index2Text) {
+ this.index2Text = index2Text;
+ }
+ public String getIndex3Text() {
+ return index3Text;
+ }
+ public void setIndex3Text(String index3Text) {
+ this.index3Text = index3Text;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/PushList.java b/src/main/java/com/ifish/entity/PushList.java
new file mode 100644
index 0000000..1d15a71
--- /dev/null
+++ b/src/main/java/com/ifish/entity/PushList.java
@@ -0,0 +1,137 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ifish.serializer.CustomDateSerializer;
+
+/**
+ * @ClassName: tbl_push_list
+ * @date 2015年7月2日 下午16:40:00
+ *
+ */
+public class PushList implements Serializable{
+
+ private static final long serialVersionUID = -6718129027121198763L;
+ //ID
+ private Integer pushId;
+ //用户ID
+ private Integer userId;
+ //设备ID
+ private Integer deviceId;
+ //看护报告ID
+ private Integer reportId;
+ //推送手机类型
+ private String phoneType;
+ //显示名称
+ private String showName;
+ //推送消息类型
+ private String pushType;
+ //推送标题
+ private String pushTitle;
+ //推送内容
+ private String pushContext;
+ //链接
+ private String pushLink;
+ //极光推送状态
+ private String jpushStatus;
+ //云信推送状态
+ private String neteaseStatus;
+ //创建时间
+ private Date createTime;
+
+ public PushList() {}
+
+ public PushList(Integer userId, Integer deviceId, String showName,String pushType,String neteaseStatus,String pushTitle,String pushContext) {
+ this.userId = userId;
+ this.deviceId = deviceId;
+ this.showName = showName;
+ this.pushType = pushType;
+ this.neteaseStatus = neteaseStatus;
+ this.pushTitle = pushTitle;
+ this.pushContext = pushContext;
+ this.createTime = new Date();
+ }
+
+ public Integer getPushId() {
+ return pushId;
+ }
+ public void setPushId(Integer pushId) {
+ this.pushId = pushId;
+ }
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+ public Integer getDeviceId() {
+ return deviceId;
+ }
+ public void setDeviceId(Integer deviceId) {
+ this.deviceId = deviceId;
+ }
+ public String getShowName() {
+ return showName;
+ }
+ public void setShowName(String showName) {
+ this.showName = showName;
+ }
+ public String getPushType() {
+ return pushType;
+ }
+ public void setPushType(String pushType) {
+ this.pushType = pushType;
+ }
+ public String getPushTitle() {
+ return pushTitle;
+ }
+ public void setPushTitle(String pushTitle) {
+ this.pushTitle = pushTitle;
+ }
+ public String getPushContext() {
+ return pushContext;
+ }
+ public void setPushContext(String pushContext) {
+ this.pushContext = pushContext;
+ }
+ @JsonSerialize(using = CustomDateSerializer.class)
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public String getPhoneType() {
+ return phoneType;
+ }
+ public void setPhoneType(String phoneType) {
+ this.phoneType = phoneType;
+ }
+ public String getPushLink() {
+ return pushLink;
+ }
+ public void setPushLink(String pushLink) {
+ this.pushLink = pushLink;
+ }
+ public Integer getReportId() {
+ return reportId;
+ }
+ public void setReportId(Integer reportId) {
+ this.reportId = reportId;
+ }
+ public String getJpushStatus() {
+ return jpushStatus;
+ }
+ public void setJpushStatus(String jpushStatus) {
+ this.jpushStatus = jpushStatus;
+ }
+ public String getNeteaseStatus() {
+ return neteaseStatus;
+ }
+ public void setNeteaseStatus(String neteaseStatus) {
+ this.neteaseStatus = neteaseStatus;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/QuestionsFeedback.java b/src/main/java/com/ifish/entity/QuestionsFeedback.java
new file mode 100644
index 0000000..93abf09
--- /dev/null
+++ b/src/main/java/com/ifish/entity/QuestionsFeedback.java
@@ -0,0 +1,64 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName: tbl_questions_feedback
+ * @date 2015年7月2日 下午16:40:00
+ *
+ */
+public class QuestionsFeedback implements Serializable{
+
+ private static final long serialVersionUID = -2969437537060946970L;
+ //ID
+ private Integer questionId;
+ //用户ID
+ private Integer userId;
+ //问题内容
+ private String questionContent;
+ //回复内容
+ private String questionReply;
+ //回复时间
+ private Date replyTime;
+ //创建时间
+ private Date createTime;
+
+ public Integer getQuestionId() {
+ return questionId;
+ }
+ public void setQuestionId(Integer questionId) {
+ this.questionId = questionId;
+ }
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+ public String getQuestionContent() {
+ return questionContent;
+ }
+ public void setQuestionContent(String questionContent) {
+ this.questionContent = questionContent;
+ }
+ public String getQuestionReply() {
+ return questionReply;
+ }
+ public void setQuestionReply(String questionReply) {
+ this.questionReply = questionReply;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public Date getReplyTime() {
+ return replyTime;
+ }
+ public void setReplyTime(Date replyTime) {
+ this.replyTime = replyTime;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/ShopsInfo.java b/src/main/java/com/ifish/entity/ShopsInfo.java
new file mode 100644
index 0000000..4965ae0
--- /dev/null
+++ b/src/main/java/com/ifish/entity/ShopsInfo.java
@@ -0,0 +1,192 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName: shops_info
+ * @date 2015年7月2日 下午16:40:00
+ *
+ */
+public class ShopsInfo implements Serializable{
+
+ private static final long serialVersionUID = 5256045896328402625L;
+ //ID
+ private Integer shopsId;
+ //用户ID
+ private Integer userId;
+ //店家姓名
+ private String userName;
+ //店铺名称
+ private String shopsName;
+ //店家电话
+ private String shopsPhone;
+ //省
+ private String shopsProvince;
+ //市
+ private String shopsCity;
+ //区
+ private String shopsArea;
+ //店家地址
+ private String shopsAddress;
+ //身份证正面
+ private String picture1;
+ //身份证背面
+ private String picture2;
+ //营业执照
+ private String picture3;
+ //店铺招牌
+ private String picture4;
+ //审核状态
+ private String status;
+ //app显示
+ private String appShow;
+ //不通过原因
+ private String reason;
+ //修改时间
+ private Date updateTime;
+ //创建时间
+ private Date createTime;
+ //会员类型
+ private String typeKey;
+ //备注
+ private String remark;
+ //微信号
+ private String weixinCode;
+ //网店地址
+ private String shopLink;
+
+ public Integer getShopsId() {
+ return shopsId;
+ }
+ public void setShopsId(Integer shopsId) {
+ this.shopsId = shopsId;
+ }
+ public String getUserName() {
+ return userName;
+ }
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+ public String getShopsName() {
+ return shopsName;
+ }
+ public void setShopsName(String shopsName) {
+ this.shopsName = shopsName;
+ }
+ public String getShopsPhone() {
+ return shopsPhone;
+ }
+ public void setShopsPhone(String shopsPhone) {
+ this.shopsPhone = shopsPhone;
+ }
+ public String getShopsAddress() {
+ return shopsAddress;
+ }
+ public void setShopsAddress(String shopsAddress) {
+ this.shopsAddress = shopsAddress;
+ }
+ public String getPicture1() {
+ return picture1;
+ }
+ public void setPicture1(String picture1) {
+ this.picture1 = picture1;
+ }
+ public String getPicture2() {
+ return picture2;
+ }
+ public void setPicture2(String picture2) {
+ this.picture2 = picture2;
+ }
+ public String getPicture3() {
+ return picture3;
+ }
+ public void setPicture3(String picture3) {
+ this.picture3 = picture3;
+ }
+ public String getStatus() {
+ return status;
+ }
+ public void setStatus(String status) {
+ this.status = status;
+ }
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public String getShopsProvince() {
+ return shopsProvince;
+ }
+ public void setShopsProvince(String shopsProvince) {
+ this.shopsProvince = shopsProvince;
+ }
+ public String getShopsCity() {
+ return shopsCity;
+ }
+ public void setShopsCity(String shopsCity) {
+ this.shopsCity = shopsCity;
+ }
+ public String getShopsArea() {
+ return shopsArea;
+ }
+ public void setShopsArea(String shopsArea) {
+ this.shopsArea = shopsArea;
+ }
+ public String getReason() {
+ return reason;
+ }
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+ public String getPicture4() {
+ return picture4;
+ }
+ public void setPicture4(String picture4) {
+ this.picture4 = picture4;
+ }
+ public String getTypeKey() {
+ return typeKey;
+ }
+ public void setTypeKey(String typeKey) {
+ this.typeKey = typeKey;
+ }
+ public String getRemark() {
+ return remark;
+ }
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+ public String getAppShow() {
+ return appShow;
+ }
+ public void setAppShow(String appShow) {
+ this.appShow = appShow;
+ }
+ public String getWeixinCode() {
+ return weixinCode;
+ }
+ public void setWeixinCode(String weixinCode) {
+ this.weixinCode = weixinCode;
+ }
+ public String getShopLink() {
+ return shopLink;
+ }
+ public void setShopLink(String shopLink) {
+ this.shopLink = shopLink;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/ShopsUserInfo.java b/src/main/java/com/ifish/entity/ShopsUserInfo.java
new file mode 100644
index 0000000..0b3e4c6
--- /dev/null
+++ b/src/main/java/com/ifish/entity/ShopsUserInfo.java
@@ -0,0 +1,164 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+/**
+ * 商家会员信息
+ * @author Administrator
+ *
+ */
+@Entity
+@Table(name="tbl_shops_user_info")
+public class ShopsUserInfo implements Serializable {
+
+ private static final long serialVersionUID = -1540472446611945759L;
+ /**
+ * ID
+ */
+ @Id
+ private ShopsUserInfoId id;
+ /**
+ * 会员等级
+ */
+ @Column(name="member_level",nullable=false)
+ private int memberLevel;
+ /**
+ * 用户名称
+ */
+ @Column(name="user_name",nullable=false,length=10)
+ private String userName;
+ /**
+ * 手机号码
+ */
+ @Column(name="phone_number",nullable=false,length=11)
+ private String phoneNumber;
+ /**
+ * 省
+ */
+ @Column(name="province",nullable=false,length=30)
+ private String province;
+ /**
+ * 市
+ */
+ @Column(name="city",nullable=false,length=30)
+ private String city;
+ /**
+ * 区
+ */
+ @Column(name="area",nullable=false,length=30)
+ private String area;
+ /**
+ * 地址
+ */
+ @Column(name="address",nullable=false,length=100)
+ private String address;
+ /**
+ * 备注
+ */
+ @Column(name="remark",nullable=false,length=50)
+ private String remark;
+ /**
+ * 修改时间
+ */
+ @Column(name="update_time")
+ @Temporal(TemporalType.TIMESTAMP)
+ private Date updateTime;
+
+ /**
+ * 创建时间
+ */
+ @Column(name="create_time")
+ @Temporal(TemporalType.TIMESTAMP)
+ private Date createTime;
+
+ public ShopsUserInfo() {}
+
+ public ShopsUserInfo(ShopsUserInfoId id, int memberLevel) {
+ this.id = id;
+ this.memberLevel = memberLevel;
+ }
+
+ public ShopsUserInfoId getId() {
+ return id;
+ }
+ public void setId(ShopsUserInfoId id) {
+ this.id = id;
+ }
+ public int getMemberLevel() {
+ return memberLevel;
+ }
+ public void setMemberLevel(int memberLevel) {
+ this.memberLevel = memberLevel;
+ }
+ public String getAddress() {
+ return address;
+ }
+ public void setAddress(String address) {
+ this.address = address;
+ }
+ public String getRemark() {
+ return remark;
+ }
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+ public String getPhoneNumber() {
+ return phoneNumber;
+ }
+ public void setPhoneNumber(String phoneNumber) {
+ this.phoneNumber = phoneNumber;
+ }
+ public String getUserName() {
+ return userName;
+ }
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public String getProvince() {
+ return province;
+ }
+
+ public void setProvince(String province) {
+ this.province = province;
+ }
+
+ public String getCity() {
+ return city;
+ }
+
+ public void setCity(String city) {
+ this.city = city;
+ }
+
+ public String getArea() {
+ return area;
+ }
+
+ public void setArea(String area) {
+ this.area = area;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/ShopsUserInfoId.java b/src/main/java/com/ifish/entity/ShopsUserInfoId.java
new file mode 100644
index 0000000..d177c65
--- /dev/null
+++ b/src/main/java/com/ifish/entity/ShopsUserInfoId.java
@@ -0,0 +1,47 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+
+/**
+ * 商家用户信息ID
+ * @author Administrator
+ *
+ */
+@Embeddable
+public class ShopsUserInfoId implements Serializable{
+
+ private static final long serialVersionUID = -6202050811830542892L;
+ /**
+ * 商家ID
+ */
+ @Column(name="shops_id",nullable=false)
+ private Integer shopsId;
+ /**
+ * 用户ID
+ */
+ @Column(name="user_id",nullable=false)
+ private Integer userId;
+
+ public ShopsUserInfoId() {}
+
+ public ShopsUserInfoId(Integer shopsId, Integer userId) {
+ this.shopsId = shopsId;
+ this.userId = userId;
+ }
+ public Integer getShopsId() {
+ return shopsId;
+ }
+ public void setShopsId(Integer shopsId) {
+ this.shopsId = shopsId;
+ }
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/Ueditor.java b/src/main/java/com/ifish/entity/Ueditor.java
new file mode 100644
index 0000000..3d8cffe
--- /dev/null
+++ b/src/main/java/com/ifish/entity/Ueditor.java
@@ -0,0 +1,85 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ifish.serializer.CustomDateSerializer;
+
+/**
+ * @ClassName: tbl_ueditor
+ * @date 2015年7月2日 下午16:40:00
*
+ */
+@Entity
+@Table(name="tbl_ueditor")
+public class Ueditor implements Serializable{
+
+ private static final long serialVersionUID = -6939110411331900619L;
+ /**
+ * ID
+ */
+ @Id
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
+ @Column(name="ueditor_id")
+ private Integer ueditorId;
+ /**
+ * 标题
+ */
+ @Column(name="ueditor_title",nullable=true,length=50)
+ private String ueditorTitle;
+ /**
+ * html名称
+ */
+ @Column(name="html_name",length=100)
+ private String htmlName;
+ /**
+ * 信息类型
+ */
+ @Column(name="ueditor_type",nullable=true,length=1)
+ private String ueditorType;
+ /**
+ * 创建时间
+ */
+ @Column(name="create_time",columnDefinition="timestamp",updatable=false,length=1)
+ private Date createTime;
+
+ public Integer getUeditorId() {
+ return ueditorId;
+ }
+ public void setUeditorId(Integer ueditorId) {
+ this.ueditorId = ueditorId;
+ }
+ public String getUeditorTitle() {
+ return ueditorTitle;
+ }
+ public void setUeditorTitle(String ueditorTitle) {
+ this.ueditorTitle = ueditorTitle;
+ }
+ @JsonSerialize(using = CustomDateSerializer.class)
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public String getHtmlName() {
+ return htmlName;
+ }
+ public void setHtmlName(String htmlName) {
+ this.htmlName = htmlName;
+ }
+ public String getUeditorType() {
+ return ueditorType;
+ }
+ public void setUeditorType(String ueditorType) {
+ this.ueditorType = ueditorType;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/User.java b/src/main/java/com/ifish/entity/User.java
new file mode 100644
index 0000000..7715048
--- /dev/null
+++ b/src/main/java/com/ifish/entity/User.java
@@ -0,0 +1,293 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.ifish.serializer.CustomDateSerializer;
+
+/**
+ * 用户信息
+ * @date 2015年7月2日 下午16:40:00
+ *
+ */
+@Entity
+@Table(name="tbl_user")
+public class User implements Serializable{
+
+ private static final long serialVersionUID = 9090213827766125261L;
+ /**
+ * 用户ID
+ */
+ @Id
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
+ @Column(name="user_id")
+ private Integer userId;
+ /**
+ * 用户昵称
+ */
+ @Column(name="nick_name",nullable=false,length=20)
+ private String nickName;
+ /**
+ * 用户密码
+ */
+ @Column(name="user_password",nullable=false,length=32)
+ private String userPassword;
+ /**
+ * 手机号码
+ */
+ @Column(name="phone_number",unique=true,nullable=false,length=11)
+ private String phoneNumber;
+ /**
+ * 用户头像
+ */
+ @Column(name="user_img",length=100)
+ private String userImg;
+ /**
+ * 性别
+ */
+ @Column(name="user_sex",length=1)
+ private String userSex;
+ /**
+ * 个性签名
+ */
+ @Column(name="signature",length=30)
+ private String signature;
+ /**
+ * 注册手机类型
+ */
+ @Column(name="phone_type",updatable=false,length=10)
+ private String phoneType;
+ /**
+ * 登陆手机类型
+ */
+ @Column(name="login_type",updatable=false,length=10)
+ private String loginType;
+ /**
+ * 最后一次登陆
+ */
+ @Column(name="login_time")
+ @Temporal(TemporalType.TIMESTAMP)
+ private Date loginTime;
+ /**
+ * 地址
+ */
+ @Column(name="address",length=200)
+ private String address;
+ /**
+ * 是否注册技威
+ */
+ @Column(name="is_register_gwell",length=1)
+ private String isRegisterGwell;
+ /**
+ * code1
+ */
+ @Column(name="P2PVerify_code1",length=50)
+ private String p2PVerifyCode1;
+ /**
+ * code2
+ */
+ @Column(name="P2PVerify_code2",length=50)
+ private String p2PVerifyCode2;
+ /**
+ * UserID
+ */
+ @Column(name="gwell_userID",length=50)
+ private String gwellUserID;
+ /**
+ * 是否注册云信
+ */
+ @Column(name="is_register_netease",length=1)
+ private String isRegisterNetease;
+ /**
+ * 云信token
+ */
+ @Column(name="netease_token",length=50)
+ private String neteaseToken;
+ /**
+ * 用户类型(0:普通用户,1:商家用户)
+ */
+ @Column(name="user_type",length=10)
+ private String userType;
+ /**
+ * 商家ID
+ */
+ @Column(name="shops_user_id")
+ private Integer shopsUserId;
+ /**
+ * 经度
+ */
+ @Column(name="longitude")
+ private Double longitude;
+ /**
+ * 纬度
+ */
+ @Column(name="latitude")
+ private Double latitude;
+ /**
+ * 修改时间
+ */
+ @JsonSerialize(using = CustomDateSerializer.class)
+ @Column(name="update_time")
+ @Temporal(TemporalType.TIMESTAMP)
+ private Date updateTime;
+ /**
+ * 创建时间
+ */
+ @JsonSerialize(using = CustomDateSerializer.class)
+ @Column(name="create_time",updatable=false)
+ @Temporal(TemporalType.TIMESTAMP)
+ private Date createTime;
+
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+ public String getNickName() {
+ return nickName;
+ }
+ public void setNickName(String nickName) {
+ this.nickName = nickName;
+ }
+
+ public String getUserPassword() {
+ return userPassword;
+ }
+ public void setUserPassword(String userPassword) {
+ this.userPassword = userPassword;
+ }
+ public String getPhoneNumber() {
+ return phoneNumber;
+ }
+ public void setPhoneNumber(String phoneNumber) {
+ this.phoneNumber = phoneNumber;
+ }
+ public String getUserImg() {
+ return userImg;
+ }
+ public void setUserImg(String userImg) {
+ this.userImg = userImg;
+ }
+ public String getUserSex() {
+ return userSex;
+ }
+ public void setUserSex(String userSex) {
+ this.userSex = userSex;
+ }
+ public String getSignature() {
+ return signature;
+ }
+ public void setSignature(String signature) {
+ this.signature = signature;
+ }
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public String getPhoneType() {
+ return phoneType;
+ }
+ public void setPhoneType(String phoneType) {
+ this.phoneType = phoneType;
+ }
+
+ public String getLoginType() {
+ return loginType;
+ }
+
+ public void setLoginType(String loginType) {
+ this.loginType = loginType;
+ }
+ public String getAddress() {
+ return address;
+ }
+ public void setAddress(String address) {
+ this.address = address;
+ }
+ public String getIsRegisterGwell() {
+ return isRegisterGwell;
+ }
+ public void setIsRegisterGwell(String isRegisterGwell) {
+ this.isRegisterGwell = isRegisterGwell;
+ }
+ public String getGwellUserID() {
+ return gwellUserID;
+ }
+ public void setGwellUserID(String gwellUserID) {
+ this.gwellUserID = gwellUserID;
+ }
+ public String getP2PVerifyCode1() {
+ return p2PVerifyCode1;
+ }
+ public void setP2PVerifyCode1(String p2pVerifyCode1) {
+ p2PVerifyCode1 = p2pVerifyCode1;
+ }
+ public String getP2PVerifyCode2() {
+ return p2PVerifyCode2;
+ }
+ public void setP2PVerifyCode2(String p2pVerifyCode2) {
+ p2PVerifyCode2 = p2pVerifyCode2;
+ }
+ public String getUserType() {
+ return userType;
+ }
+ public void setUserType(String userType) {
+ this.userType = userType;
+ }
+ public Integer getShopsUserId() {
+ return shopsUserId;
+ }
+ public void setShopsUserId(Integer shopsUserId) {
+ this.shopsUserId = shopsUserId;
+ }
+ public String getIsRegisterNetease() {
+ return isRegisterNetease;
+ }
+ public void setIsRegisterNetease(String isRegisterNetease) {
+ this.isRegisterNetease = isRegisterNetease;
+ }
+ public String getNeteaseToken() {
+ return neteaseToken;
+ }
+ public void setNeteaseToken(String neteaseToken) {
+ this.neteaseToken = neteaseToken;
+ }
+ public Double getLongitude() {
+ return longitude;
+ }
+ public void setLongitude(Double longitude) {
+ this.longitude = longitude;
+ }
+ public Double getLatitude() {
+ return latitude;
+ }
+ public void setLatitude(Double latitude) {
+ this.latitude = latitude;
+ }
+ public Date getLoginTime() {
+ return loginTime;
+ }
+ public void setLoginTime(Date loginTime) {
+ this.loginTime = loginTime;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/UserActivity.java b/src/main/java/com/ifish/entity/UserActivity.java
new file mode 100644
index 0000000..4156b83
--- /dev/null
+++ b/src/main/java/com/ifish/entity/UserActivity.java
@@ -0,0 +1,74 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+/**
+ * 用户动态
+ * @author Administrator
+ *
+ */
+@Entity
+@Table(name="tbl_user_activity")
+public class UserActivity implements Serializable{
+
+ private static final long serialVersionUID = 1646629105686460668L;
+ /**
+ * 动态ID
+ */
+ @Id
+ @Column(name="activity_id")
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
+ private Integer activityId;
+ /**
+ * 用户ID
+ */
+ @Column(name="user_id",nullable=false)
+ private Integer userId;
+ /**
+ * 动态类型
+ */
+ @Column(name="activity_type",length=20,nullable=false)
+ private String activityType;
+ /**
+ * 创建时间
+ */
+ @Column(name="create_time")
+ @Temporal(TemporalType.TIMESTAMP)
+ private Date createTime;
+
+ public Integer getActivityId() {
+ return activityId;
+ }
+ public void setActivityId(Integer activityId) {
+ this.activityId = activityId;
+ }
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+ public String getActivityType() {
+ return activityType;
+ }
+ public void setActivityType(String activityType) {
+ this.activityType = activityType;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/UserAsset.java b/src/main/java/com/ifish/entity/UserAsset.java
new file mode 100644
index 0000000..1bd45e7
--- /dev/null
+++ b/src/main/java/com/ifish/entity/UserAsset.java
@@ -0,0 +1,108 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 用户资产表(金币,经验值等)
+ * @author Administrator
+ */
+@Entity
+@Table(name="tbl_user_asset")
+public class UserAsset implements Serializable{
+
+ private static final long serialVersionUID = 5604899088149487004L;
+ /**
+ * 用户ID
+ */
+ @Id
+ @Column(name="user_id",nullable=false)
+ private Integer userId;
+ /**
+ * 经验值
+ */
+ @Column(name="grade_value",nullable=false)
+ private Integer gradeValue;
+ /**
+ * 金币
+ */
+ @Column(name="gold_value",nullable=false,precision=9,scale=2)
+ private BigDecimal goldValue;
+ /**
+ * 最后一次签到日期
+ */
+ @Column(name="last_signin_date",nullable=false)
+ private String lastSigninDate;
+ /**
+ * 连续签到天数
+ */
+ @Column(name="keep_signin_num",nullable=false)
+ private Integer keepSigninNum;
+ /**
+ * 最后一次登陆日期
+ */
+ @Column(name="last_login_date",nullable=false)
+ private String lastLoginDate;
+
+ public UserAsset() {}
+
+ public UserAsset(Integer userId) {
+ this.userId = userId;
+ this.gradeValue = 0;
+ this.goldValue = new BigDecimal(0);
+ this.lastSigninDate = "";
+ this.keepSigninNum = 0;
+ this.lastLoginDate = "";
+ }
+
+ public UserAsset(Integer userId,BigDecimal goldValue) {
+ this.userId = userId;
+ this.gradeValue = 0;
+ this.goldValue = goldValue;
+ this.lastSigninDate = "";
+ this.keepSigninNum = 0;
+ this.lastLoginDate = "";
+ }
+ public Integer getUserId() {
+ return userId;
+ }
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+ public Integer getGradeValue() {
+ return gradeValue;
+ }
+ public void setGradeValue(Integer gradeValue) {
+ this.gradeValue = gradeValue;
+ }
+ public BigDecimal getGoldValue() {
+ return goldValue;
+ }
+ public void setGoldValue(BigDecimal goldValue) {
+ this.goldValue = goldValue;
+ }
+ public String getLastSigninDate() {
+ return lastSigninDate;
+ }
+ public void setLastSigninDate(String lastSigninDate) {
+ this.lastSigninDate = lastSigninDate;
+ }
+ public Integer getKeepSigninNum() {
+ return keepSigninNum;
+ }
+ public void setKeepSigninNum(Integer keepSigninNum) {
+ this.keepSigninNum = keepSigninNum;
+ }
+ public String getLastLoginDate() {
+ return lastLoginDate;
+ }
+ public void setLastLoginDate(String lastLoginDate) {
+ this.lastLoginDate = lastLoginDate;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/VenderList.java b/src/main/java/com/ifish/entity/VenderList.java
new file mode 100644
index 0000000..64743df
--- /dev/null
+++ b/src/main/java/com/ifish/entity/VenderList.java
@@ -0,0 +1,67 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @ClassName: tbl_vender_list
+ * @date 2015年7月2日 下午16:40:00
+ *
+ */
+@Entity
+@Table(name="tbl_vender_list")
+public class VenderList implements Serializable{
+
+ private static final long serialVersionUID = 1989223583119300872L;
+ /**
+ * 厂家编号
+ */
+ @Id
+ @Column(name="brand_code",nullable=true,length=20)
+ private String brandCode;
+ /**
+ * 厂家名称
+ */
+ @Column(name="brand_name",nullable=true,length=20)
+ private String brandName;
+ /**
+ * 品牌介绍
+ */
+ @Column(name="brand_introduce",length=100)
+ private String brandIntroduce;
+ /**
+ * logo
+ */
+ @Column(name="brand_logo",length=100)
+ private String logo;
+
+ public String getBrandName() {
+ return brandName;
+ }
+ public void setBrandName(String brandName) {
+ this.brandName = brandName;
+ }
+ public String getBrandIntroduce() {
+ return brandIntroduce;
+ }
+ public void setBrandIntroduce(String brandIntroduce) {
+ this.brandIntroduce = brandIntroduce;
+ }
+ public String getLogo() {
+ return logo;
+ }
+ public void setLogo(String logo) {
+ this.logo = logo;
+ }
+ public String getBrandCode() {
+ return brandCode;
+ }
+ public void setBrandCode(String brandCode) {
+ this.brandCode = brandCode;
+ }
+
+}
diff --git a/src/main/java/com/ifish/entity/Version.java b/src/main/java/com/ifish/entity/Version.java
new file mode 100644
index 0000000..39696e8
--- /dev/null
+++ b/src/main/java/com/ifish/entity/Version.java
@@ -0,0 +1,73 @@
+package com.ifish.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName: tbl_version
+ * @date 2015年7月2日 下午16:40:00
+ *
+ */
+public class Version implements Serializable{
+
+ private static final long serialVersionUID = -6718129027121198763L;
+ //版本ID
+ private Integer versionId;
+ //版本号
+ private String versionCode;
+ //手机类型
+ private String phoneType;
+ //更新类型,1强制升级,0,不强制
+ private String isMustUpdate;
+ //更新内容
+ private String uploadContent;
+ //下载地址
+ private String appAddress;
+ //创建时间
+ private Date createTime;
+
+ public Integer getVersionId() {
+ return versionId;
+ }
+ public void setVersionId(Integer versionId) {
+ this.versionId = versionId;
+ }
+ public String getVersionCode() {
+ return versionCode;
+ }
+ public void setVersionCode(String versionCode) {
+ this.versionCode = versionCode;
+ }
+ public String getUploadContent() {
+ return uploadContent;
+ }
+ public void setUploadContent(String uploadContent) {
+ this.uploadContent = uploadContent;
+ }
+ public String getAppAddress() {
+ return appAddress;
+ }
+ public void setAppAddress(String appAddress) {
+ this.appAddress = appAddress;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public String getIsMustUpdate() {
+ return isMustUpdate;
+ }
+ public void setIsMustUpdate(String isMustUpdate) {
+ this.isMustUpdate = isMustUpdate;
+ }
+ public String getPhoneType() {
+ return phoneType;
+ }
+ public void setPhoneType(String phoneType) {
+ this.phoneType = phoneType;
+ }
+
+
+}
diff --git a/src/main/java/com/ifish/entity/hbm/BrowseRoom.hbm.xml b/src/main/java/com/ifish/entity/hbm/BrowseRoom.hbm.xml
new file mode 100644
index 0000000..9489f1d
--- /dev/null
+++ b/src/main/java/com/ifish/entity/hbm/BrowseRoom.hbm.xml
@@ -0,0 +1,13 @@
+
+
+
+
+ false
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/ifish/entity/hbm/Camera.hbm.xml b/src/main/java/com/ifish/entity/hbm/Camera.hbm.xml
new file mode 100644
index 0000000..a9d3274
--- /dev/null
+++ b/src/main/java/com/ifish/entity/hbm/Camera.hbm.xml
@@ -0,0 +1,14 @@
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/ifish/entity/hbm/CameraActive.hbm.xml b/src/main/java/com/ifish/entity/hbm/CameraActive.hbm.xml
new file mode 100644
index 0000000..67c18d5
--- /dev/null
+++ b/src/main/java/com/ifish/entity/hbm/CameraActive.hbm.xml
@@ -0,0 +1,13 @@
+
+
+
+
+ false
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/ifish/entity/hbm/CameraUser.hbm.xml b/src/main/java/com/ifish/entity/hbm/CameraUser.hbm.xml
new file mode 100644
index 0000000..3067bb2
--- /dev/null
+++ b/src/main/java/com/ifish/entity/hbm/CameraUser.hbm.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/ifish/entity/hbm/Device.hbm.xml b/src/main/java/com/ifish/entity/hbm/Device.hbm.xml
new file mode 100644
index 0000000..79e90f1
--- /dev/null
+++ b/src/main/java/com/ifish/entity/hbm/Device.hbm.xml
@@ -0,0 +1,26 @@
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/ifish/entity/hbm/DeviceCamera.hbm.xml b/src/main/java/com/ifish/entity/hbm/DeviceCamera.hbm.xml
new file mode 100644
index 0000000..d6bb31e
--- /dev/null
+++ b/src/main/java/com/ifish/entity/hbm/DeviceCamera.hbm.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ false
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/ifish/entity/hbm/DeviceUser.hbm.xml b/src/main/java/com/ifish/entity/hbm/DeviceUser.hbm.xml
new file mode 100644
index 0000000..28bb4f1
--- /dev/null
+++ b/src/main/java/com/ifish/entity/hbm/DeviceUser.hbm.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/ifish/entity/hbm/HardwareType.hbm.xml b/src/main/java/com/ifish/entity/hbm/HardwareType.hbm.xml
new file mode 100644
index 0000000..d621b1e
--- /dev/null
+++ b/src/main/java/com/ifish/entity/hbm/HardwareType.hbm.xml
@@ -0,0 +1,25 @@
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/ifish/entity/hbm/LiveBanner.hbm.xml b/src/main/java/com/ifish/entity/hbm/LiveBanner.hbm.xml
new file mode 100644
index 0000000..077adc7
--- /dev/null
+++ b/src/main/java/com/ifish/entity/hbm/LiveBanner.hbm.xml
@@ -0,0 +1,14 @@
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/ifish/entity/hbm/LookReport.hbm.xml b/src/main/java/com/ifish/entity/hbm/LookReport.hbm.xml
new file mode 100644
index 0000000..2d1b70f
--- /dev/null
+++ b/src/main/java/com/ifish/entity/hbm/LookReport.hbm.xml
@@ -0,0 +1,22 @@
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/ifish/entity/hbm/PushList.hbm.xml b/src/main/java/com/ifish/entity/hbm/PushList.hbm.xml
new file mode 100644
index 0000000..5cc5d0a
--- /dev/null
+++ b/src/main/java/com/ifish/entity/hbm/PushList.hbm.xml
@@ -0,0 +1,22 @@
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/ifish/entity/hbm/QuestionsFeedback.hbm.xml b/src/main/java/com/ifish/entity/hbm/QuestionsFeedback.hbm.xml
new file mode 100644
index 0000000..b6e507c
--- /dev/null
+++ b/src/main/java/com/ifish/entity/hbm/QuestionsFeedback.hbm.xml
@@ -0,0 +1,15 @@
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/ifish/entity/hbm/ShopsInfo.hbm.xml b/src/main/java/com/ifish/entity/hbm/ShopsInfo.hbm.xml
new file mode 100644
index 0000000..66fe446
--- /dev/null
+++ b/src/main/java/com/ifish/entity/hbm/ShopsInfo.hbm.xml
@@ -0,0 +1,31 @@
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/ifish/entity/hbm/Version.hbm.xml b/src/main/java/com/ifish/entity/hbm/Version.hbm.xml
new file mode 100644
index 0000000..a75dee8
--- /dev/null
+++ b/src/main/java/com/ifish/entity/hbm/Version.hbm.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/ifish/enums/ActivityTypeEnum.java b/src/main/java/com/ifish/enums/ActivityTypeEnum.java
new file mode 100644
index 0000000..8c45add
--- /dev/null
+++ b/src/main/java/com/ifish/enums/ActivityTypeEnum.java
@@ -0,0 +1,62 @@
+package com.ifish.enums;
+
+/**
+ * 动态类型
+ *
+ * @author Administrator
+ *
+ */
+public enum ActivityTypeEnum {
+ everyDaySignin("everyDaySignin", "每天签到"),
+ readInformation("readInformation", "阅读资讯"),
+ openGoodsLink("openGoodsLink", "查看商品"),
+ roomLeaveMsg("roomLeaveMsg", "爱鱼看看留言"),
+ ifishCommunity("ifishCommunity", "爱鱼圈"),
+ shareIfishApp("shareIfishApp", "分享爱鱼奇"),
+ shareCameraPicture("shareCameraPicture", "图片分享"),
+ shareLookReport("shareLookReport", "看护报告"),
+ rename("rename", "更换姓名"),
+ uploadHeadImg("uploadHeadImg", "上传头像"),
+ openShareCamera("openShareCamera", "开启分享"),
+ choiceLookShops("choiceLookShops", "优选商家"),
+ ifishDoctor("ifishDoctor", "鱼医生"),
+ everyDayLogin("everyDayLogin", "每天登陆"),
+ registerGive("registerGive", "注册赠送"),
+ //升级
+ upgrade("upgrade", "等级提升"),
+ bindDevice("bindDevice", "绑定水族箱"),
+ bindCamera("bindCamera", "绑定摄像头"),
+ //温度预警
+ warningByTemperature("warningByTemperature", "温度预警"),
+ //换水提醒
+ reminderByChangeWater("reminderByChangeWater", "换水提醒"),
+ //商家入驻
+ merchantsSettled("merchantsSettled", "商家入驻");
+
+ private ActivityTypeEnum(String key, String value) {
+ this.key = key;
+ this.value = value;
+ }
+
+ public static boolean getValueByKey(String key) {
+ for (ActivityTypeEnum actype : ActivityTypeEnum.values()) {
+ if (actype.getKey().equals(key)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private String key;
+
+ private String value;
+
+ public String getKey() {
+ return key;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/AdTypeEnum.java b/src/main/java/com/ifish/enums/AdTypeEnum.java
new file mode 100644
index 0000000..3992c81
--- /dev/null
+++ b/src/main/java/com/ifish/enums/AdTypeEnum.java
@@ -0,0 +1,43 @@
+package com.ifish.enums;
+
+public enum AdTypeEnum {
+ one(1,"首页广告位"),
+ two(2,"资讯广告位"),
+ three(3,"优选商家广告位"),
+ four(4,"签到广告位"),
+ five(5,"爱鱼看看广告位"),
+ six(6,"鱼医生广告位"),
+ seven(7,"loading页广告位");
+
+ private AdTypeEnum(Integer key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ //普通方法
+ public static AdTypeEnum getAdTypeEnum(Integer key) {
+ for (AdTypeEnum c : AdTypeEnum.values()) {
+ if (c.getKey().equals(key)) {
+ return c;
+ }
+ }
+ return null;
+ }
+
+ private Integer key;
+ private String value;
+
+ public Integer getKey() {
+ return key;
+ }
+ public void setKey(Integer key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/AddTypeEnum.java b/src/main/java/com/ifish/enums/AddTypeEnum.java
new file mode 100644
index 0000000..84988fe
--- /dev/null
+++ b/src/main/java/com/ifish/enums/AddTypeEnum.java
@@ -0,0 +1,53 @@
+package com.ifish.enums;
+
+import com.alibaba.fastjson.JSONObject;
+
+
+public enum AddTypeEnum {
+ once("once","一次"),
+ everyDay("everyDay","每天"),
+ everyTime("everyTime","每次"),
+ keepSignIn("keepSignIn","连续签到"),
+ addUpSignIn("addUpSignIn","累计签到");
+
+ private AddTypeEnum(String key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ //普通方法
+ public static String getValue(String key) {
+ for (AddTypeEnum c : AddTypeEnum.values()) {
+ if (c.getKey().equals(key)) {
+ return c.getValue();
+ }
+ }
+ return null;
+ }
+
+ //普通方法
+ public static JSONObject getJson() {
+ JSONObject json = new JSONObject();
+ for (AddTypeEnum addTypeEnum : AddTypeEnum.values()) {
+ json.put(addTypeEnum.getKey(), addTypeEnum.getValue());
+ }
+ return json;
+ }
+
+ private String key;
+ private String value;
+
+ public String getKey() {
+ return key;
+ }
+ public void setKey(String key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/BooleanEnum.java b/src/main/java/com/ifish/enums/BooleanEnum.java
new file mode 100644
index 0000000..d2e1851
--- /dev/null
+++ b/src/main/java/com/ifish/enums/BooleanEnum.java
@@ -0,0 +1,29 @@
+package com.ifish.enums;
+
+public enum BooleanEnum {
+ NO("0","否"),
+ YES("1","是");
+
+ private BooleanEnum(String key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ private String key;
+ private String value;
+
+
+ public String getKey() {
+ return key;
+ }
+ public void setKey(String key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/GoldExpendTypeEnum.java b/src/main/java/com/ifish/enums/GoldExpendTypeEnum.java
new file mode 100644
index 0000000..f72519f
--- /dev/null
+++ b/src/main/java/com/ifish/enums/GoldExpendTypeEnum.java
@@ -0,0 +1,56 @@
+package com.ifish.enums;
+
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * 金币消耗方式
+ * @author Administrator
+ *
+ */
+public enum GoldExpendTypeEnum {
+
+ questionPayTour("questionPayTour","鱼医生打赏"),
+ liveRoomPayTour("liveRoomPayTour","爱鱼看看打赏"),
+ exchangeCoupon("exchangeCoupon","兑换优惠券");
+
+ private GoldExpendTypeEnum(String key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ //普通方法
+ public static String getValue(String key) {
+ for (GoldExpendTypeEnum c : GoldExpendTypeEnum.values()) {
+ if (c.getKey().equals(key)) {
+ return c.getValue();
+ }
+ }
+ return null;
+ }
+
+ //普通方法
+ public static JSONObject getJson() {
+ JSONObject json = new JSONObject();
+ for (GoldExpendTypeEnum ruleEnum : GoldExpendTypeEnum.values()) {
+ json.put(ruleEnum.getKey(), ruleEnum.getValue());
+ }
+ return json;
+ }
+
+ private String key;
+ private String value;
+
+ public String getKey() {
+ return key;
+ }
+ public void setKey(String key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/GoldGetTypeEnum.java b/src/main/java/com/ifish/enums/GoldGetTypeEnum.java
new file mode 100644
index 0000000..8377ce7
--- /dev/null
+++ b/src/main/java/com/ifish/enums/GoldGetTypeEnum.java
@@ -0,0 +1,73 @@
+package com.ifish.enums;
+
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * 金币获取方式
+ * @author Administrator
+ *
+ */
+public enum GoldGetTypeEnum {
+ //每天加成
+ everyDaySignin("everyDaySignin","每天签到"),
+ readInformation("readInformation","阅读资讯"),
+ openGoodsLink("openGoodsLink","查看商品"),
+ roomLeaveMsg("roomLeaveMsg","爱鱼看看留言"),
+ ifishCommunity("ifishCommunity","爱鱼圈"),
+ shareCameraPicture("shareCameraPicture","图片分享"),
+ shareLookReport("shareLookReport","看护报告"),
+ hitGoldenEgg("hitGoldenEgg","砸金蛋"),
+ shareIfishApp("shareIfishApp","分享爱鱼奇"),
+ //一次加成
+ rename("rename","更换姓名"),
+ uploadHeadImg("uploadHeadImg","上传头像"),
+ openShareCamera("openShareCamera","开启分享"),
+ choiceLookShops("choiceLookShops","优选商家"),
+ ifishDoctor("ifishDoctor","鱼医生"),
+ //每次加成
+ questionPayTour("questionPayTour","问题打赏"),
+ liveRoomPayTour("liveRoomPayTour","爱鱼看看打赏"),
+ //系统赠送
+ registerGive("registerGive","注册赠送");
+
+ private GoldGetTypeEnum(String key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ //普通方法
+ public static String getValue(String key) {
+ for (GoldGetTypeEnum c : GoldGetTypeEnum.values()) {
+ if (c.getKey().equals(key)) {
+ return c.getValue();
+ }
+ }
+ return null;
+ }
+
+ //普通方法
+ public static JSONObject getJson() {
+ JSONObject json = new JSONObject();
+ for (GoldGetTypeEnum ruleEnum : GoldGetTypeEnum.values()) {
+ json.put(ruleEnum.getKey(), ruleEnum.getValue());
+ }
+ return json;
+ }
+
+ private String key;
+ private String value;
+
+ public String getKey() {
+ return key;
+ }
+ public void setKey(String key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/GradeGetTypeEnum.java b/src/main/java/com/ifish/enums/GradeGetTypeEnum.java
new file mode 100644
index 0000000..938a52a
--- /dev/null
+++ b/src/main/java/com/ifish/enums/GradeGetTypeEnum.java
@@ -0,0 +1,39 @@
+package com.ifish.enums;
+
+/**
+ * 经验获取方式
+ * @author Administrator
+ */
+public enum GradeGetTypeEnum {
+ //一次加成
+ bindDevice("bindDevice","绑定水族箱"),
+ bindCamera("bindCamera","绑定摄像头"),
+ //每天加成
+ everyDayLogin("everyDayLogin","每天登陆");
+
+ private String key;
+ private String value;
+
+ private GradeGetTypeEnum(String key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ public String getKey(String key){
+ for (GradeGetTypeEnum em : GradeGetTypeEnum.values()) {
+ if(em.getKey().equals(key)){
+ return em.getValue();
+ }
+ }
+ return null;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/GwellEnum.java b/src/main/java/com/ifish/enums/GwellEnum.java
new file mode 100644
index 0000000..042dbe0
--- /dev/null
+++ b/src/main/java/com/ifish/enums/GwellEnum.java
@@ -0,0 +1,29 @@
+package com.ifish.enums;
+
+public enum GwellEnum {
+ success("0","注册成功"),//注册成功
+ fail("1","注册失败"),//注册失败
+ repeat("7","邮箱已被注册");//邮箱已被注册
+
+ private GwellEnum(String key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ private String key;
+ private String value;
+
+
+ public String getKey() {
+ return key;
+ }
+ public void setKey(String key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+}
diff --git a/src/main/java/com/ifish/enums/IfishShopPlaceEnum.java b/src/main/java/com/ifish/enums/IfishShopPlaceEnum.java
new file mode 100644
index 0000000..3546878
--- /dev/null
+++ b/src/main/java/com/ifish/enums/IfishShopPlaceEnum.java
@@ -0,0 +1,55 @@
+package com.ifish.enums;
+
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * 商品位置
+ * @author Administrator
+ *
+ */
+public enum IfishShopPlaceEnum {
+ one(1,"首页"),
+ two(2,"鱼医生"),
+ three(3,"探索-爱鱼严选"),
+ fore(4,"商家-进货管理");
+
+ private IfishShopPlaceEnum(Integer key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ //普通方法
+ public static IfishShopPlaceEnum getAdTypeEnum(Integer key) {
+ for (IfishShopPlaceEnum c : IfishShopPlaceEnum.values()) {
+ if (c.getKey().equals(key)) {
+ return c;
+ }
+ }
+ return null;
+ }
+
+ public static JSONObject getJson() {
+ JSONObject json = new JSONObject();
+ for (IfishShopPlaceEnum adTypeEnum : IfishShopPlaceEnum.values()) {
+ json.put(adTypeEnum.getKey().toString(), adTypeEnum.getValue());
+ }
+ return json;
+ }
+
+ private Integer key;
+ private String value;
+
+ public Integer getKey() {
+ return key;
+ }
+ public void setKey(Integer key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/Index1Enum.java b/src/main/java/com/ifish/enums/Index1Enum.java
new file mode 100644
index 0000000..b27a453
--- /dev/null
+++ b/src/main/java/com/ifish/enums/Index1Enum.java
@@ -0,0 +1,40 @@
+package com.ifish.enums;
+
+public enum Index1Enum {
+ number0("0","简直是鱼儿的地狱啊"),
+ number10("10","鱼儿能继续活下去也是个奇迹"),
+ number20("20","还凑合~"),
+ number30("30","良好,棒棒哒");
+
+ private Index1Enum(String key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ private String key;
+ private String value;
+
+ //普通方法
+ public static String getValue(String key) {
+ for (Index1Enum c : Index1Enum.values()) {
+ if (c.getKey().equals(key)) {
+ return c.getValue();
+ }
+ }
+ return null;
+ }
+
+ public String getKey() {
+ return key;
+ }
+ public void setKey(String key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/Index2Enum.java b/src/main/java/com/ifish/enums/Index2Enum.java
new file mode 100644
index 0000000..bf1bed5
--- /dev/null
+++ b/src/main/java/com/ifish/enums/Index2Enum.java
@@ -0,0 +1,40 @@
+package com.ifish.enums;
+
+public enum Index2Enum {
+ number0("0","这是有多久没喂了"),
+ number10("10","喂太少了,鱼儿快饿死啦"),
+ number20("20","喂太多了,以后少喂点"),
+ number30("30","饱食度刚好,赞一个");
+
+ private Index2Enum(String key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ private String key;
+ private String value;
+
+ //普通方法
+ public static String getValue(String key) {
+ for (Index2Enum c : Index2Enum.values()) {
+ if (c.getKey().equals(key)) {
+ return c.getValue();
+ }
+ }
+ return null;
+ }
+
+ public String getKey() {
+ return key;
+ }
+ public void setKey(String key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/Index3Enum.java b/src/main/java/com/ifish/enums/Index3Enum.java
new file mode 100644
index 0000000..98b6b71
--- /dev/null
+++ b/src/main/java/com/ifish/enums/Index3Enum.java
@@ -0,0 +1,40 @@
+package com.ifish.enums;
+
+public enum Index3Enum {
+ number0("0","病怏怏的,快不行了"),
+ number15("15","需要赶紧上药了哦"),
+ number25("25","还好,多观察几天"),
+ number40("40","活蹦乱跳,好着呢");
+
+ private Index3Enum(String key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ private String key;
+ private String value;
+
+ //普通方法
+ public static String getValue(String key) {
+ for (Index3Enum c : Index3Enum.values()) {
+ if (c.getKey().equals(key)) {
+ return c.getValue();
+ }
+ }
+ return null;
+ }
+
+ public String getKey() {
+ return key;
+ }
+ public void setKey(String key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/LiveRoomOrderTypeEnum.java b/src/main/java/com/ifish/enums/LiveRoomOrderTypeEnum.java
new file mode 100644
index 0000000..b0fe3a2
--- /dev/null
+++ b/src/main/java/com/ifish/enums/LiveRoomOrderTypeEnum.java
@@ -0,0 +1,45 @@
+package com.ifish.enums;
+
+
+/**
+ * 直播间排序
+ * @author Administrator
+ *
+ */
+public enum LiveRoomOrderTypeEnum {
+ one(1,"时间倒序"),
+ two(2,"人气值倒序"),
+ three(3,"后台推荐顺序");
+
+ private LiveRoomOrderTypeEnum(Integer key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ //普通方法
+ public static LiveRoomOrderTypeEnum getAdTypeEnum(Integer key) {
+ for (LiveRoomOrderTypeEnum c : LiveRoomOrderTypeEnum.values()) {
+ if (c.getKey().equals(key)) {
+ return c;
+ }
+ }
+ return null;
+ }
+
+ private Integer key;
+ private String value;
+
+ public Integer getKey() {
+ return key;
+ }
+ public void setKey(Integer key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/MemberLevelEnum.java b/src/main/java/com/ifish/enums/MemberLevelEnum.java
new file mode 100644
index 0000000..045fe19
--- /dev/null
+++ b/src/main/java/com/ifish/enums/MemberLevelEnum.java
@@ -0,0 +1,28 @@
+package com.ifish.enums;
+
+/**
+ * 商家会员等级
+ * @author Administrator
+ *
+ */
+public enum MemberLevelEnum {
+ level_1(1,"等级1"),
+ level_2(2,"等级2"),
+ level_3(3,"等级3");
+
+ private MemberLevelEnum(int key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ private int key;
+ private String value;
+
+
+ public int getKey() {
+ return key;
+ }
+ public String getValue() {
+ return value;
+ }
+}
diff --git a/src/main/java/com/ifish/enums/NeteaseEnum.java b/src/main/java/com/ifish/enums/NeteaseEnum.java
new file mode 100644
index 0000000..b0e5062
--- /dev/null
+++ b/src/main/java/com/ifish/enums/NeteaseEnum.java
@@ -0,0 +1,28 @@
+package com.ifish.enums;
+
+public enum NeteaseEnum {
+ status200("200","操作成功"),
+ status414("414","参数错误");
+
+ private NeteaseEnum(String key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ private String key;
+ private String value;
+
+
+ public String getKey() {
+ return key;
+ }
+ public void setKey(String key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+}
diff --git a/src/main/java/com/ifish/enums/PayTourTypeEnum.java b/src/main/java/com/ifish/enums/PayTourTypeEnum.java
new file mode 100644
index 0000000..e786fda
--- /dev/null
+++ b/src/main/java/com/ifish/enums/PayTourTypeEnum.java
@@ -0,0 +1,53 @@
+package com.ifish.enums;
+
+import java.math.BigDecimal;
+
+import com.alibaba.fastjson.JSONObject;
+
+
+public enum PayTourTypeEnum {
+ gold10("0",new BigDecimal(10)),
+ gold20("1",new BigDecimal(20)),
+ gold50("2",new BigDecimal(50));
+
+ private PayTourTypeEnum(String key,BigDecimal value){
+ this.key = key;
+ this.value = value;
+ }
+
+ //普通方法
+ public static BigDecimal getValue(String key) {
+ for (PayTourTypeEnum c : PayTourTypeEnum.values()) {
+ if (c.getKey().equals(key)) {
+ return c.getValue();
+ }
+ }
+ return null;
+ }
+
+ //普通方法
+ public static JSONObject getJson() {
+ JSONObject json = new JSONObject();
+ for (PayTourTypeEnum addTypeEnum : PayTourTypeEnum.values()) {
+ json.put(addTypeEnum.getKey(), addTypeEnum.getValue());
+ }
+ return json;
+ }
+
+ private String key;
+ private BigDecimal value;
+
+ public String getKey() {
+ return key;
+ }
+ public void setKey(String key) {
+ this.key = key;
+ }
+ public BigDecimal getValue() {
+ return value;
+ }
+ public void setValue(BigDecimal value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/PhoneTypeEnum.java b/src/main/java/com/ifish/enums/PhoneTypeEnum.java
new file mode 100644
index 0000000..e5d16a0
--- /dev/null
+++ b/src/main/java/com/ifish/enums/PhoneTypeEnum.java
@@ -0,0 +1,29 @@
+package com.ifish.enums;
+
+public enum PhoneTypeEnum {
+ ios("ios","ios"),
+ android("android","安卓");
+
+ private PhoneTypeEnum(String key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ private String key;
+ private String value;
+
+
+ public String getKey() {
+ return key;
+ }
+ public void setKey(String key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/PushTypeEnum.java b/src/main/java/com/ifish/enums/PushTypeEnum.java
new file mode 100644
index 0000000..d2a30b9
--- /dev/null
+++ b/src/main/java/com/ifish/enums/PushTypeEnum.java
@@ -0,0 +1,45 @@
+package com.ifish.enums;
+
+public enum PushTypeEnum {
+ remove_device("remove_device","解绑通知"),
+ wendu_warn("wendu_warn","温度预警"),
+ qu_reply("qu_reply","问题反馈"),
+ app_update("app_update","IOS更新推送"),
+ remind_water("remind_water","换水提醒"),
+ offline_push("offline_push","离线通知"),
+ send_report("send_report","看护报告"),
+ shops_push("shops_push","看护通知"),
+ all_push("all_push","所有用户推送");
+
+ private PushTypeEnum(String key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ private String key;
+ private String value;
+
+ //普通方法
+ public static String getValue(String key) {
+ for (PushTypeEnum c : PushTypeEnum.values()) {
+ if (c.getKey().equals(key)) {
+ return c.getValue();
+ }
+ }
+ return null;
+ }
+
+ public String getKey() {
+ return key;
+ }
+ public void setKey(String key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/ResultEnum.java b/src/main/java/com/ifish/enums/ResultEnum.java
new file mode 100644
index 0000000..b2693a4
--- /dev/null
+++ b/src/main/java/com/ifish/enums/ResultEnum.java
@@ -0,0 +1,63 @@
+package com.ifish.enums;
+
+/**
+ * 请求结果状态码
+ *
+ * @author ggw
+ *
+ */
+public enum ResultEnum {
+ success("100", "成功"),
+ fail101("101", "失败"),
+ warn201("201", "手机已经注册过"),
+ warn202("202", "手机未注册"),
+ warn203("203", "未知操作"),//获取验证码时
+ warn204("204", "密码不正确"),
+ warn205("205", "图片格式不正确"),
+ warn206("206", "上传图片太大"),
+ warn207("207", "设备不存在"),
+ warn208("208", "激活码已被使用"),
+ warn209("209", "无效的激活码"),
+ warn210("210", "摄像头不存在"),
+ warn211("211", "用户ID不存在"),
+ warn212("212", "请填写正确的商家手机号"),
+ warn213("213", "包含敏感词"),
+ warn214("214", "直播间已存在"),
+ warn215("215", "金币不足"),
+ warn216("216", "金币规则不存在"),
+ warn217("217", "打赏金额错误"),
+ warn218("218", "没有商家"),
+ warn219("219", "优惠券已停止兑换"),
+ warn220("220", "用户能兑换数量达到上限"),
+ warn221("221", "优惠券已全部兑换完"),
+ warn222("222", "请上传正确的商品介绍图"),
+ warn223("223", "请上传正确的商品介绍视频"),
+ error400("400", "安全校验失败"),
+ error401("401", "参数校验失败"),
+ error402("402", "参数不存在");
+
+ private ResultEnum(String key, String value) {
+ this.key = key;
+ this.value = value;
+ }
+
+ private String key;
+ private String value;
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/RoomStatusEnum.java b/src/main/java/com/ifish/enums/RoomStatusEnum.java
new file mode 100644
index 0000000..7daae3a
--- /dev/null
+++ b/src/main/java/com/ifish/enums/RoomStatusEnum.java
@@ -0,0 +1,30 @@
+package com.ifish.enums;
+
+public enum RoomStatusEnum {
+ status0("0","未开播"),
+ status1("1","直播中"),
+ status2("2","被禁播");
+
+ private RoomStatusEnum(String key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ private String key;
+ private String value;
+
+
+ public String getKey() {
+ return key;
+ }
+ public void setKey(String key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/SendTypeEnum.java b/src/main/java/com/ifish/enums/SendTypeEnum.java
new file mode 100644
index 0000000..88d8c85
--- /dev/null
+++ b/src/main/java/com/ifish/enums/SendTypeEnum.java
@@ -0,0 +1,34 @@
+package com.ifish.enums;
+
+/**
+ * 获取验证码操作类型
+ * @author ggw
+ *
+ */
+public enum SendTypeEnum {
+ register("1","注册操作"),
+ findpwd("2","找回密码操作");
+
+ private SendTypeEnum(String key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ private String key;
+ private String value;
+
+
+ public String getKey() {
+ return key;
+ }
+ public void setKey(String key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/ShopsStatusEnum.java b/src/main/java/com/ifish/enums/ShopsStatusEnum.java
new file mode 100644
index 0000000..a206d3a
--- /dev/null
+++ b/src/main/java/com/ifish/enums/ShopsStatusEnum.java
@@ -0,0 +1,31 @@
+package com.ifish.enums;
+
+public enum ShopsStatusEnum {
+ status0("0","审核失败"),
+ status1("1","审核通过"),
+ status2("2","待审核"),
+ status3("3","禁用");
+
+ private ShopsStatusEnum(String key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ private String key;
+ private String value;
+
+
+ public String getKey() {
+ return key;
+ }
+ public void setKey(String key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/SmsSignEnum.java b/src/main/java/com/ifish/enums/SmsSignEnum.java
new file mode 100644
index 0000000..55eb9d7
--- /dev/null
+++ b/src/main/java/com/ifish/enums/SmsSignEnum.java
@@ -0,0 +1,32 @@
+package com.ifish.enums;
+
+public enum SmsSignEnum {
+ sign1("sign1","活动验证"),
+ sign2("sign2","变更验证"),
+ sign3("sign3","登录验证"),
+ sign4("sign4","注册验证"),
+ sign5("sign5","身份验证");
+
+ private SmsSignEnum(String key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ private String key;
+ private String value;
+
+
+ public String getKey() {
+ return key;
+ }
+ public void setKey(String key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/SmsTemplateEnum.java b/src/main/java/com/ifish/enums/SmsTemplateEnum.java
new file mode 100644
index 0000000..9038d30
--- /dev/null
+++ b/src/main/java/com/ifish/enums/SmsTemplateEnum.java
@@ -0,0 +1,34 @@
+package com.ifish.enums;
+
+public enum SmsTemplateEnum {
+ SMS_720021("SMS_720021","身份验证验证码"),
+ SMS_720020("SMS_720020","登陆确认验证码"),
+ SMS_720019("SMS_720019","登陆异常验证码"),
+ SMS_720018("SMS_720018","用户注册验证码"),
+ SMS_720017("SMS_720017","活动确认验证码"),
+ SMS_720016("SMS_720016","修改密码验证码"),
+ SMS_720015("SMS_720015","信息变更验证码");
+
+ private SmsTemplateEnum(String key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ private String key;
+ private String value;
+
+
+ public String getKey() {
+ return key;
+ }
+ public void setKey(String key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/SubDirectoryEnum.java b/src/main/java/com/ifish/enums/SubDirectoryEnum.java
new file mode 100644
index 0000000..c8f93a8
--- /dev/null
+++ b/src/main/java/com/ifish/enums/SubDirectoryEnum.java
@@ -0,0 +1,40 @@
+package com.ifish.enums;
+
+
+/**
+ * 子目录
+ * @author Administrator
+ *
+ */
+public enum SubDirectoryEnum {
+ headImage("app/","头像"),
+ banner("banner/","banner图"),
+ look("look/","看护报告"),
+ ueditorHtml("ueditorHtml/","后台生成的网页"),
+ adInfo("Img/adInfo/","广告图片"),
+ information("Img/information/","资讯图片"),
+ ifishGoods("Img/goods/","商品图片"),
+ ifishCommodity("Img/commodity/","商家商品介绍图");
+
+ private SubDirectoryEnum(String key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ private String key;
+ private String value;
+
+ public String getKey() {
+ return key;
+ }
+ public void setKey(String key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/UeditorTypeEnum.java b/src/main/java/com/ifish/enums/UeditorTypeEnum.java
new file mode 100644
index 0000000..1db448a
--- /dev/null
+++ b/src/main/java/com/ifish/enums/UeditorTypeEnum.java
@@ -0,0 +1,39 @@
+package com.ifish.enums;
+
+import com.alibaba.fastjson.JSONObject;
+
+public enum UeditorTypeEnum {
+ yespinglun("1","可评论"),
+ nopinglun("0","不可评论");
+
+ private UeditorTypeEnum(String key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ private String key;
+ private String value;
+
+ //普通方法
+ public static JSONObject getJson() {
+ JSONObject json = new JSONObject();
+ for (UeditorTypeEnum ueditorTypeEnumEnum : UeditorTypeEnum.values()) {
+ json.put(ueditorTypeEnumEnum.getKey(), ueditorTypeEnumEnum.getValue());
+ }
+ return json;
+ }
+
+ public String getKey() {
+ return key;
+ }
+ public void setKey(String key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/enums/UserTypeEnum.java b/src/main/java/com/ifish/enums/UserTypeEnum.java
new file mode 100644
index 0000000..8b6e318
--- /dev/null
+++ b/src/main/java/com/ifish/enums/UserTypeEnum.java
@@ -0,0 +1,29 @@
+package com.ifish.enums;
+
+public enum UserTypeEnum {
+ userType0("0","普通用户"),
+ userType1("1","商家用户");
+
+ private UserTypeEnum(String key,String value){
+ this.key = key;
+ this.value = value;
+ }
+
+ private String key;
+ private String value;
+
+
+ public String getKey() {
+ return key;
+ }
+ public void setKey(String key) {
+ this.key = key;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/ifish/exception/ExceptionHandle.java b/src/main/java/com/ifish/exception/ExceptionHandle.java
new file mode 100644
index 0000000..ee2cc47
--- /dev/null
+++ b/src/main/java/com/ifish/exception/ExceptionHandle.java
@@ -0,0 +1,37 @@
+package com.ifish.exception;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.ifish.dto.JsonResult;
+import com.ifish.enums.ResultEnum;
+import com.ifish.util.ResultUtil;
+
+/**
+ * 异常处理
+ * @author Administrator
+ */
+@ControllerAdvice
+public class ExceptionHandle{
+
+ private static Logger log = LoggerFactory.getLogger(ExceptionHandle.class);
+
+ @ExceptionHandler(value=Exception.class)
+ @ResponseBody
+ public JsonResult> Handle(Exception e) {
+ log.error("Exception:"+e.toString());
+ e.printStackTrace();
+ //自定义异常
+ if(e instanceof IfishException){
+ IfishException ifishException = (IfishException) e;
+ return ResultUtil.error(ifishException.getResult());
+ }
+ else{
+ return ResultUtil.error(ResultEnum.fail101.getKey());
+ }
+ }
+
+}
diff --git a/src/main/java/com/ifish/exception/IfishException.java b/src/main/java/com/ifish/exception/IfishException.java
new file mode 100644
index 0000000..0e7847b
--- /dev/null
+++ b/src/main/java/com/ifish/exception/IfishException.java
@@ -0,0 +1,26 @@
+package com.ifish.exception;
+
+import com.ifish.enums.ResultEnum;
+
+/**
+ * 自定义异常
+ *
+ * @author Administrator
+ *
+ */
+public class IfishException extends RuntimeException {
+
+ private static final long serialVersionUID = 4182058914725642218L;
+
+ private String result;
+
+ public IfishException(ResultEnum resultEnum) {
+ super(resultEnum.getValue());
+ this.result = resultEnum.getKey();
+ }
+
+ public String getResult() {
+ return result;
+ }
+
+}
diff --git a/src/main/java/com/ifish/gwell/GwellApi.java b/src/main/java/com/ifish/gwell/GwellApi.java
new file mode 100644
index 0000000..740c151
--- /dev/null
+++ b/src/main/java/com/ifish/gwell/GwellApi.java
@@ -0,0 +1,224 @@
+package com.ifish.gwell;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.ifish.enums.GwellEnum;
+import com.ifish.mail.Mail;
+import com.ifish.netease.CheckSumBuilder;
+
+public class GwellApi {
+
+ private static Logger log = LoggerFactory.getLogger(GwellApi.class);
+
+ /**
+ * 注册
+ * @param phoneNumber
+ * @return
+ */
+ public static Map Register(String phoneNumber){
+ String email = getEmail(phoneNumber);
+ String pwd = getPwd(phoneNumber);
+ Map map = new HashMap();
+ URL url = null;
+ HttpURLConnection httpurlconnection = null;
+ try{
+ if(url==null){
+ url = new URL("http://api1.cloudlinks.cn/Users/RegisterCheck.ashx");
+ }
+ if(httpurlconnection==null){
+ //以post方式请求
+ httpurlconnection = (HttpURLConnection)url.openConnection();
+ httpurlconnection.setReadTimeout(30000);
+ httpurlconnection.setConnectTimeout(30000);
+ //是否输入参数
+ httpurlconnection.setDoOutput(true);
+ //提交模式
+ httpurlconnection.setRequestMethod("POST");
+ }
+ StringBuffer params = new StringBuffer();
+ params.append("Email="+email+"&");
+ params.append("Pwd="+pwd+"&");
+ params.append("RePwd="+pwd+"&");
+ params.append("VersionFlag=1&");
+ params.append("CountryCode=&");
+ params.append("IgnoreSafeWarning=1");
+ OutputStream out = httpurlconnection.getOutputStream();
+ out.write(params.toString().getBytes());
+ out.flush();
+ out.close();
+ //获取响应代码
+ int code = httpurlconnection.getResponseCode();
+ if(code==200){
+ //获取页面内容
+ InputStream in= httpurlconnection .getInputStream();
+ BufferedReader breader = new BufferedReader(new InputStreamReader(in,"utf-8"));
+ String jsonStr="";
+ String str = breader.readLine();
+ while(str != null){
+ jsonStr+=str;
+ str = breader.readLine();
+ }
+ breader.close();
+ in.close();
+ //System.out.println(jsonStr);
+ JSONObject json = JSON.parseObject(jsonStr);
+ String error_code = json.getString("error_code");
+ //注册成功
+ if(error_code.equals("0")){
+ String P2PVerifyCode1 = json.getString("P2PVerifyCode1");
+ String P2PVerifyCode2 = json.getString("P2PVerifyCode2");
+ String UserID = json.getString("UserID");
+ map.put("result", GwellEnum.success.getKey());
+ map.put("P2PVerifyCode1", P2PVerifyCode1);
+ map.put("P2PVerifyCode2", P2PVerifyCode2);
+ map.put("UserID", UserID);
+ return map;
+ }
+ //邮箱已被注册
+ else if(error_code.equals("7")){
+ String error = json.getString("error");
+ map.put("result", GwellEnum.repeat.getKey());
+ map.put("error", error);
+ }
+ //失败
+ else if(error_code.equals("1")){
+ //发送邮件
+ Mail.send(phoneNumber+"注册技威失败了", "注册技威失败!错误信息:"+jsonStr);
+ String error = json.getString("error");
+ map.put("result", GwellEnum.fail.getKey());
+ map.put("error", error);
+ return map;
+ }
+ }
+ }
+ catch(Exception e){
+ e.printStackTrace();
+ log.error(e.toString());
+ }
+ finally{
+ if(httpurlconnection!=null){
+ httpurlconnection.disconnect();
+ }
+ }
+ return map;
+ }
+
+
+ /**
+ * 登陆
+ * @param phoneNumber
+ * @return
+ */
+ public static Map Login(String phoneNumber){
+ String email = getEmail(phoneNumber);
+ String pwd = getPwd(phoneNumber);
+ Map map = new HashMap();
+ URL url = null;
+ HttpURLConnection httpurlconnection = null;
+ try{
+ if(url==null){
+ url = new URL("http://api1.cloudlinks.cn/Users/LoginCheck.ashx");
+ }
+ if(httpurlconnection==null){
+ //以post方式请求
+ httpurlconnection = (HttpURLConnection)url.openConnection();
+ httpurlconnection.setReadTimeout(30000);
+ httpurlconnection.setConnectTimeout(30000);
+ //是否输入参数
+ httpurlconnection.setDoOutput(true);
+ //提交模式
+ httpurlconnection.setRequestMethod("POST");
+ }
+ StringBuffer params = new StringBuffer();
+ params.append("User="+email+"&");
+ params.append("Pwd="+pwd+"&");
+ params.append("VersionFlag=1&");
+ params.append("AppVersion=3014666&");
+ params.append("AppOS=3");
+ OutputStream out = httpurlconnection.getOutputStream();
+ out.write(params.toString().getBytes());
+ out.flush();
+ out.close();
+ //获取响应代码
+ int code = httpurlconnection.getResponseCode();
+ if(code==200){
+ //获取页面内容
+ InputStream in= httpurlconnection .getInputStream();
+ BufferedReader breader = new BufferedReader(new InputStreamReader(in,"utf-8"));
+ String jsonStr="";
+ String str = breader.readLine();
+ while(str != null){
+ jsonStr+=str;
+ str = breader.readLine();
+ }
+ breader.close();
+ in.close();
+ //System.out.println(jsonStr);
+ JSONObject json = JSON.parseObject(jsonStr);
+ String error_code = json.getString("error_code");
+ if(error_code.equals("0")){
+ String P2PVerifyCode1 = json.getString("P2PVerifyCode1");
+ String P2PVerifyCode2 = json.getString("P2PVerifyCode2");
+ String UserID = json.getString("UserID");
+ map.put("result", GwellEnum.success.getKey());
+ map.put("P2PVerifyCode1", P2PVerifyCode1);
+ map.put("P2PVerifyCode2", P2PVerifyCode2);
+ map.put("UserID", UserID);
+ return map;
+ }
+ else{
+ String error = json.getString("error");
+ map.put("result", GwellEnum.fail.getKey());
+ map.put("error", error);
+ return map;
+ }
+ }
+ }
+ catch(Exception e){
+ log.error(e.toString());
+ }
+ finally{
+ if(httpurlconnection!=null){
+ httpurlconnection.disconnect();
+ }
+ }
+ return map;
+ }
+
+ /**
+ * 获取用户名
+ * @param phoneNumber
+ * @return
+ */
+ public static String getEmail(String phoneNumber){
+ String email = "ifish7"+phoneNumber+"@ifish7.com";
+ return email;
+ }
+ /**
+ * 获取密码
+ * @param phoneNumber
+ * @return
+ */
+ public static String getPwd(String phoneNumber){
+ String pwd = CheckSumBuilder.getMD5("ifish"+phoneNumber);
+ return pwd;
+ }
+
+
+ public static void main(String[] args) {
+ Register("15216102193");
+ }
+
+}
diff --git a/src/main/java/com/ifish/helper/CameraUserHelper.java b/src/main/java/com/ifish/helper/CameraUserHelper.java
new file mode 100644
index 0000000..c94b0fe
--- /dev/null
+++ b/src/main/java/com/ifish/helper/CameraUserHelper.java
@@ -0,0 +1,79 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.helper;
+
+import com.ifish.entity.Camera;
+import com.ifish.entity.CameraUser;
+import com.ifish.mapper.Tbl_Camera_Mapper;
+import com.ifish.mapper.Tbl_Camera_User_Mapper;
+import com.ifish.util.RedisKey;
+import com.ifish.util.StringUtil;
+import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ *
+ * @author Administrator
+ */
+@Component
+public class CameraUserHelper implements CameraUserHelperI {
+
+ @Autowired
+ private Tbl_Camera_User_Mapper tbl_Camera_User_Mapper;
+
+ @Autowired
+ private Tbl_Camera_Mapper tbl_Camera_Mapper;
+
+ @Autowired
+ private RedisHelperI redisHelperI;
+
+ /**
+ * 根据用户Id获取用户绑定的摄像头
+ *
+ * @param userId
+ * @return
+ */
+ public List getCameraUserListByUserId(Integer userId) throws Exception {
+
+ List cameraUserList = null;
+ String key = RedisKey.CameraUser_key + userId;
+ String redisString = redisHelperI.getRedis(key);
+ if (StringUtils.isNotBlank(redisString)) {
+ cameraUserList = (List) StringUtil.JsonToList(redisString, CameraUser.class);
+ } else {
+ cameraUserList = tbl_Camera_User_Mapper.getCameraUserListByUserId(userId);
+ if (cameraUserList != null && cameraUserList.size() > 0) {
+ redisHelperI.setRedis(key, StringUtil.ObjectToJson(cameraUserList));
+ }
+ }
+ return cameraUserList;
+ }
+
+ /**
+ * 根据摄像头Id获取摄像头信息
+ *
+ * @param cameraId
+ * @return
+ * @throws Exception
+ */
+ public Camera getCameraById(String cameraId) throws Exception {
+ Camera camera = null;
+ String key = RedisKey.CameraUser_key + cameraId;
+ String redisString = redisHelperI.getRedis(key);
+ if (StringUtils.isNotBlank(redisString)) {
+ camera = (Camera) StringUtil.JsonToBean(redisString, Camera.class);
+ } else {
+ camera = tbl_Camera_Mapper.getCameraById(cameraId);
+ if (camera != null && StringUtils.isNotBlank(camera.getCameraId())) {
+ redisHelperI.setRedis(key, StringUtil.ObjectToJson(camera));
+ }
+ }
+ return camera;
+ }
+
+}
diff --git a/src/main/java/com/ifish/helper/CameraUserHelperI.java b/src/main/java/com/ifish/helper/CameraUserHelperI.java
new file mode 100644
index 0000000..f99429e
--- /dev/null
+++ b/src/main/java/com/ifish/helper/CameraUserHelperI.java
@@ -0,0 +1,35 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.helper;
+
+import com.ifish.entity.Camera;
+import com.ifish.entity.CameraUser;
+import java.util.List;
+
+/**
+ *
+ * @author Administrator
+ */
+public interface CameraUserHelperI {
+
+ /**
+ * 根据用户Id获取用户绑定的摄像头
+ *
+ * @param userId
+ * @return
+ */
+ List getCameraUserListByUserId(Integer userId) throws Exception;
+
+ /**
+ * 根据摄像头Id获取摄像头信息
+ *
+ * @param cameraId
+ * @return
+ * @throws Exception
+ */
+ Camera getCameraById(String cameraId) throws Exception;
+
+}
diff --git a/src/main/java/com/ifish/helper/CommodityInfoHelper.java b/src/main/java/com/ifish/helper/CommodityInfoHelper.java
new file mode 100644
index 0000000..7b00cd5
--- /dev/null
+++ b/src/main/java/com/ifish/helper/CommodityInfoHelper.java
@@ -0,0 +1,161 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.helper;
+
+import com.ifish.bean.CommodityInfoBean;
+import com.ifish.dto.JsonResult;
+import com.ifish.dto.PageingDto;
+import com.ifish.enums.ResultEnum;
+import com.ifish.exception.IfishException;
+import com.ifish.mapper.Tbl_Commodity_Info_Mapper;
+import com.ifish.util.IfishFilePath;
+import java.io.File;
+import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+import com.ifish.util.IfishUtil;
+
+/**
+ * 商品管理所有接口方法
+ *
+ * @author Administrator
+ */
+@Component
+public class CommodityInfoHelper implements CommodityInfoHelperI {
+
+ @Autowired
+ private Tbl_Commodity_Info_Mapper tbl_Commodity_Info_Mapper;
+
+ @Autowired
+ private FastDFSClientI fastDFSClientI;
+
+ @Override
+ public JsonResult> createCommodityInfo(CommodityInfoBean commodityInfoBean, MultipartFile img, MultipartFile vedio) {
+ try {
+ //保存图片
+ if (img != null) {
+ if (!img.getOriginalFilename().equals("")) {
+ String filename = String.valueOf(System.currentTimeMillis()) + ".png";
+ File picFile = new File(IfishFilePath.path_commodity + "/" + commodityInfoBean.getUserId(), filename);
+ //不存在则创建
+ if (!picFile.exists()) {
+ picFile.mkdirs();
+ }
+ //保存
+ img.transferTo(picFile);
+ commodityInfoBean.setCommodityImg(filename);
+ } else {
+ return new JsonResult(ResultEnum.warn222.getKey(), "");
+ }
+ } else {
+ return new JsonResult(ResultEnum.warn223.getKey(), "");
+ }
+ //保存视频
+ if (vedio != null) {
+ String url = fastDFSClientI.uploadFileToFastDFS(vedio);
+ if (StringUtils.isNotBlank(url)) {
+ commodityInfoBean.setCommodityVideo(url);
+ } else {
+ return new JsonResult(ResultEnum.warn223.getKey(), "");
+ }
+ } else {
+ return new JsonResult(ResultEnum.warn223.getKey(), "");
+ }
+
+ int i = tbl_Commodity_Info_Mapper.createCommodityInfo(commodityInfoBean);
+ if (i > 0) {
+ int id = commodityInfoBean.getCommodityId();
+ commodityInfoBean = tbl_Commodity_Info_Mapper.getCommodityInfoByID(id);
+ return new JsonResult(ResultEnum.success.getKey(), commodityInfoBean);
+ } else {
+ return new JsonResult(ResultEnum.fail101.getKey(), "");
+ }
+ } catch (Exception e) {
+ return new JsonResult(ResultEnum.error401.getKey(), "");
+ }
+ }
+
+ @Override
+ public JsonResult> updateCommodityInfo(CommodityInfoBean commodityInfoBean) {
+ if (commodityInfoBean.getCommodityId() <= 0) {
+ //ID不能为空
+ return new JsonResult(ResultEnum.error401.getKey(), "");
+ }
+ try {
+ String str = commodityInfoBean.getCommodityName();
+ if (StringUtils.isNotBlank(str)) {
+ commodityInfoBean.setCommodityName(str.substring(str.indexOf(',') + 1, str.length()));
+ }
+ int i = tbl_Commodity_Info_Mapper.updateCommodityInfo(commodityInfoBean);
+ if (i > 0) {
+ int id = commodityInfoBean.getCommodityId();
+ commodityInfoBean = tbl_Commodity_Info_Mapper.getCommodityInfoByID(id);
+ return new JsonResult(ResultEnum.success.getKey(), commodityInfoBean);
+ } else {
+ //修改失败
+ return new JsonResult(ResultEnum.fail101.getKey(), "");
+ }
+ } catch (Exception e) {
+ //修改出错
+ return new JsonResult(ResultEnum.error401.getKey(), "");
+ }
+ }
+
+ @Override
+ public JsonResult> getCommodityInfo(Integer commodityId) {
+ if (commodityId <= 0) {
+ return new JsonResult(ResultEnum.error401.getKey(), "");
+ }
+ try {
+ CommodityInfoBean commodityInfoBean = tbl_Commodity_Info_Mapper.getCommodityInfoByID(commodityId);
+ if (commodityInfoBean != null && commodityInfoBean.getCommodityId() >= 0) {
+ return new JsonResult(ResultEnum.success.getKey(), commodityInfoBean);
+ } else {
+ return new JsonResult(ResultEnum.fail101.getKey(), "");
+ }
+ } catch (Exception e) {
+ return new JsonResult(ResultEnum.error401.getKey(), "");
+ }
+ }
+
+ @Override
+ public PageingDto> getCommodityInfoByPage(Integer pageSize, Integer firstResult, Integer shopId, Integer commodityState, String orderBy) {
+ try {
+ if (StringUtils.isBlank(orderBy)) {
+ orderBy = "create_time";
+ }
+ PageingDto page = new PageingDto<>();
+ List list = tbl_Commodity_Info_Mapper.getCommodityInfoByPage(shopId, firstResult, pageSize, commodityState, orderBy);
+ int count = tbl_Commodity_Info_Mapper.getCommodityInfoCountByPage(shopId, commodityState);
+ page.setTotal(count);
+ page.setFirstResult(firstResult);
+ page.setData(list);
+ page.setResult("100");
+ return page;
+ } catch (Exception e) {
+ throw new IfishException(ResultEnum.fail101);
+ }
+ }
+
+ @Override
+ public JsonResult> deleteCommodityInfo(Integer commodityId) {
+ if (commodityId <= 0) {
+ return new JsonResult(ResultEnum.error401.getKey(), "");
+ }
+ try {
+ int i = tbl_Commodity_Info_Mapper.deleteCommodityInfoById(commodityId);
+ if (i > 0) {
+ return new JsonResult(ResultEnum.success.getKey(), "");
+ } else {
+ return new JsonResult(ResultEnum.fail101.getKey(), "");
+ }
+ } catch (Exception e) {
+ return new JsonResult(ResultEnum.error401.getKey(), "");
+ }
+ }
+}
diff --git a/src/main/java/com/ifish/helper/CommodityInfoHelperI.java b/src/main/java/com/ifish/helper/CommodityInfoHelperI.java
new file mode 100644
index 0000000..d1fc296
--- /dev/null
+++ b/src/main/java/com/ifish/helper/CommodityInfoHelperI.java
@@ -0,0 +1,62 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.helper;
+
+import com.ifish.bean.CommodityInfoBean;
+import com.ifish.dto.JsonResult;
+import com.ifish.dto.PageingDto;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 商品管理所有接口方法
+ *
+ * @author Administrator
+ */
+public interface CommodityInfoHelperI {
+
+ /**
+ * 创建商品
+ *
+ * @param commodityInfoBean
+ * @return
+ */
+ public JsonResult> createCommodityInfo(CommodityInfoBean commodityInfoBean, MultipartFile img, MultipartFile vedio);
+
+ /**
+ * 修改商品
+ *
+ * @param commodityInfoBean
+ * @return
+ */
+ public JsonResult> updateCommodityInfo(CommodityInfoBean commodityInfoBean);
+
+ /**
+ * 根据商品ID查询商品详情
+ *
+ * @param commodityId
+ * @return
+ */
+ public JsonResult> getCommodityInfo(Integer commodityId);
+
+ /**
+ * 根据店铺ID分页获取商品列表
+ *
+ * @param pageSize
+ * @param firstResult
+ * @param shopId
+ * @param commodityState
+ * @return
+ */
+ public PageingDto> getCommodityInfoByPage(Integer pageSize, Integer firstResult, Integer shopId, Integer commodityState, String orderBy);
+
+ /**
+ * 删除商品
+ *
+ * @param commodityId
+ * @return
+ */
+ public JsonResult> deleteCommodityInfo(Integer commodityId);
+}
diff --git a/src/main/java/com/ifish/helper/DeviceUserHelper.java b/src/main/java/com/ifish/helper/DeviceUserHelper.java
new file mode 100644
index 0000000..0b0064f
--- /dev/null
+++ b/src/main/java/com/ifish/helper/DeviceUserHelper.java
@@ -0,0 +1,92 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.helper;
+
+import com.ifish.bean.DeviceUserBean;
+import com.ifish.entity.Device;
+import com.ifish.entity.DeviceCamera;
+import com.ifish.mapper.Tbl_Device_Mapper;
+import com.ifish.mapper.Tbl_Device_User_Mapper;
+import com.ifish.util.RedisKey;
+import com.ifish.util.StringUtil;
+import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ *
+ * @author Administrator
+ */
+@Component
+public class DeviceUserHelper implements DeviceUserHelperI {
+
+ /**
+ * 所有tbl_device_user表的操作方法接口
+ */
+ @Autowired
+ private Tbl_Device_User_Mapper tbl_Device_User_Mapper;
+
+ /**
+ * redis缓存服务器方法接口
+ */
+ @Autowired
+ private RedisHelperI redisHelperI;
+
+ /**
+ * 所有tbl_device表的操作方法接口
+ */
+ @Autowired
+ private Tbl_Device_Mapper tbl_Device_Mapper;
+
+ @Override
+ public List getDeviceUsersByUserId(Integer userId) throws Exception {
+ List deviceUserList = null;
+ String key = RedisKey.DeviceUser_Key + userId;
+ String redisString = redisHelperI.getRedis(key);
+ if (StringUtils.isNotBlank(redisString)) {
+ deviceUserList = (List) StringUtil.JsonToList(redisString, DeviceUserBean.class);
+ } else {
+ deviceUserList = tbl_Device_User_Mapper.getDeviceUsersByUserId(userId);
+ if (deviceUserList != null && deviceUserList.size() > 0) {
+ redisHelperI.setRedis(key, StringUtil.ObjectToJson(deviceUserList));
+ }
+ }
+ return deviceUserList;
+ }
+
+ @Override
+ public List getDeviceCameraListByDeviceId(Integer deviceId) throws Exception {
+ List deviceCameraList = null;
+ String key = RedisKey.DeviceCamera_key + deviceId;
+ String redisString = redisHelperI.getRedis(key);
+ if (StringUtils.isNotBlank(redisString)) {
+ deviceCameraList = (List) StringUtil.JsonToList(redisString, DeviceCamera.class);
+ } else {
+ deviceCameraList = tbl_Device_User_Mapper.getDeviceCameraListByDeviceId(deviceId);
+ if (deviceCameraList != null && deviceCameraList.size() > 0) {
+ redisHelperI.setRedis(key, StringUtil.ObjectToJson(deviceCameraList));
+ }
+ }
+ return deviceCameraList;
+ }
+
+ @Override
+ public Device getDeviceById(Integer deviceId) throws Exception {
+ Device device = null;
+ String key = RedisKey.Device_key + deviceId;
+ String redisString = redisHelperI.getRedis(key);
+ if (StringUtils.isNotBlank(redisString)) {
+ device = (Device) StringUtil.JsonToBean(redisString, Device.class);
+ } else {
+ device = tbl_Device_Mapper.getDeviceById(deviceId);
+ if (device != null && device.getDeviceId() > 0) {
+ redisHelperI.setRedis(key, StringUtil.ObjectToJson(device));
+ }
+ }
+ return device;
+ }
+}
diff --git a/src/main/java/com/ifish/helper/DeviceUserHelperI.java b/src/main/java/com/ifish/helper/DeviceUserHelperI.java
new file mode 100644
index 0000000..deb7634
--- /dev/null
+++ b/src/main/java/com/ifish/helper/DeviceUserHelperI.java
@@ -0,0 +1,44 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.helper;
+
+import com.ifish.bean.DeviceUserBean;
+import com.ifish.entity.Device;
+import com.ifish.entity.DeviceCamera;
+import java.util.List;
+
+/**
+ *
+ * @author Administrator
+ */
+public interface DeviceUserHelperI {
+
+ /**
+ * 根据用户Id获取绑定设备集合
+ *
+ * @param userId
+ * @return
+ */
+ List getDeviceUsersByUserId(Integer userId) throws Exception;
+
+ /**
+ * 根据设备Id获取绑定的摄像头信息
+ *
+ * @param deviceId
+ * @return
+ * @throws Exception
+ */
+ List getDeviceCameraListByDeviceId(Integer deviceId) throws Exception;
+
+ /**
+ * 根据设备Id获取设备详情
+ *
+ * @param deviceId
+ * @return
+ * @throws Exception
+ */
+ Device getDeviceById(Integer deviceId) throws Exception;
+}
diff --git a/src/main/java/com/ifish/helper/FastDFSClient.java b/src/main/java/com/ifish/helper/FastDFSClient.java
new file mode 100644
index 0000000..7c29b61
--- /dev/null
+++ b/src/main/java/com/ifish/helper/FastDFSClient.java
@@ -0,0 +1,169 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.helper;
+
+import com.ifish.dto.JsonResult;
+import com.ifish.enums.ResultEnum;
+import com.ifish.util.IfishFilePath;
+import com.ifish.validator.ValidateUtil;
+import org.codehaus.plexus.util.StringUtils;
+import org.csource.fastdfs.ClientGlobal;
+import org.csource.fastdfs.StorageClient1;
+import org.csource.fastdfs.StorageServer;
+import org.csource.fastdfs.TrackerClient;
+import org.csource.fastdfs.TrackerServer;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * FastDFS分布式文件管理系统接口方法
+ *
+ * @author Administrator
+ */
+@Component
+public class FastDFSClient implements FastDFSClientI {
+
+ private TrackerClient trackerClient = null;
+ private TrackerServer trackerServer = null;
+ private StorageServer storageServer = null;
+ //使用StorageClient1进行上传
+ private StorageClient1 storageClient1 = null;
+
+ public FastDFSClient() throws Exception {
+ //获取classpath路径下配置文件"fdfs_client.conf"的路径
+ //conf直接写相对于classpath的位置,不需要写classpath:
+ String conf = "";
+ if (IfishFilePath.link_img_head.contains("ifish7")) {
+ conf = "fdfs_client_ifish7.conf";
+ } else {
+ conf = "fdfs_client_zhangxinyanv5.conf";
+ }
+
+ String configPath = this.getClass().getClassLoader().getResource(conf).getFile();
+ System.out.println(configPath);
+ ClientGlobal.init(configPath);
+
+ trackerClient = new TrackerClient();
+ trackerServer = trackerClient.getConnection();
+ storageServer = trackerClient.getStoreStorage(trackerServer);
+ storageClient1 = new StorageClient1(trackerServer, storageServer);
+ }
+
+ /**
+ * 上传一个字节型文件
+ *
+ * @param file_buff 字节数组
+ * @param file_ext_name 文件后缀
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public String uploadFile(byte[] file_buff, String file_ext_name) throws Exception {
+
+ String result = "";
+
+ try {
+ result = storageClient1.upload_file1(file_buff, file_ext_name, null);
+ } catch (Exception e) {
+ try {
+ result = storageClient1.upload_file1(file_buff, file_ext_name, null);
+ } catch (Exception a) {
+ return "";
+ }
+ }
+
+ return result;
+ }
+
+ /**
+ * 上传一个本地文件
+ *
+ * @param local_filename 本地文件名(路径+文件名+后缀)
+ * @param file_ext_name 文件后缀
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public String uploadFile(String local_filename, String file_ext_name) throws Exception {
+
+ String result = storageClient1.upload_file1(local_filename, file_ext_name, null);
+
+ return result;
+ }
+
+ /**
+ * 上传一个文件
+ *
+ * @param group_name 指定位置
+ * @param local_filename 本地文件名(路径+文件名+后缀)
+ * @param file_ext_name 文件后缀
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public String uploadFile(String group_name, String local_filename, String file_ext_name) throws Exception {
+
+ String result = storageClient1.upload_file1(group_name, local_filename, file_ext_name, null);
+
+ return result;
+ }
+
+ @Override
+ public JsonResult> uploadFile(MultipartFile file) {
+ try {
+ String type = getFileType(file);
+ if (StringUtils.isBlank(type)) {
+ return null;
+ }
+ byte[] bt = file.getBytes();
+ String url = uploadFile(bt, type);
+ JsonResult js = new JsonResult(ResultEnum.success.getKey(), "http://139.196.24.156:8017/" + url);
+ return js;
+ } catch (Exception e) {
+ JsonResult js = new JsonResult(ResultEnum.fail101.getKey());
+ return js;
+ }
+ }
+
+ public String getFileType(MultipartFile file) {
+ String[] allowTypes = new String[]{".mp4", ".png", ".jpg", ".bmp"};
+ String filename = file.getOriginalFilename();
+ if (StringUtils.isNotBlank(filename)) {
+ for (String allowType : allowTypes) {
+ if (filename.contains(allowType)) {
+ return allowType.replace(".", "");
+ }
+ }
+ }
+ return "";
+ }
+
+ @Override
+ public String uploadFileToFastDFS(MultipartFile file) {
+ try {
+ String type = getFileType(file);
+ if (StringUtils.isBlank(type)) {
+ return null;
+ }
+ byte[] bt = file.getBytes();
+ String url = uploadFile(bt, type);
+ if (url.contains("group1/M00/")) {
+ url = url.replace("group1/M00/", "");
+ } else {
+ return "";
+ }
+ //本地返回测试环境fastfds,线上返回正式服务器部署的fastfds
+ if (ValidateUtil.IsWinOrUnix()) {
+ return IfishFilePath.fastDFS_url_app + url;
+ } else {
+ return IfishFilePath.link_img_head + url;
+ }
+
+ } catch (Exception e) {
+ return "";
+ }
+ }
+}
diff --git a/src/main/java/com/ifish/helper/FastDFSClientI.java b/src/main/java/com/ifish/helper/FastDFSClientI.java
new file mode 100644
index 0000000..9276908
--- /dev/null
+++ b/src/main/java/com/ifish/helper/FastDFSClientI.java
@@ -0,0 +1,64 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.helper;
+
+import com.ifish.dto.JsonResult;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * FastDFS分布式文件管理系统接口方法
+ *
+ * @author Administrator
+ */
+public interface FastDFSClientI {
+
+ /**
+ * 上传一个字节型文件
+ *
+ * @param file_buff 字节数组
+ * @param file_ext_name 文件后缀
+ * @return
+ * @throws Exception
+ */
+ String uploadFile(byte[] file_buff, String file_ext_name) throws Exception;
+
+ /**
+ * 上传一个本地文件
+ *
+ * @param local_filename 本地文件名(路径+文件名+后缀)
+ * @param file_ext_name 文件后缀
+ * @return
+ * @throws Exception
+ */
+ String uploadFile(String local_filename, String file_ext_name) throws Exception;
+
+ /**
+ * 上传一个文件
+ *
+ * @param group_name 指定位置
+ * @param local_filename 本地文件名(路径+文件名+后缀)
+ * @param file_ext_name 文件后缀
+ * @return
+ * @throws Exception
+ */
+ String uploadFile(String group_name, String local_filename, String file_ext_name) throws Exception;
+
+ /**
+ * 上传一个MultipartFile类型文件,返回成功后结果,适用于保存不完整路径方法
+ *
+ * @param file
+ * @return
+ */
+ JsonResult> uploadFile(MultipartFile file);
+
+ /**
+ * 上传一个MultipartFile类型文件,返回成功后文件路径,适用于保存完整路径方法
+ *
+ * @param file
+ * @return
+ */
+ String uploadFileToFastDFS(MultipartFile file);
+}
diff --git a/src/main/java/com/ifish/helper/HardWareVenderHelper.java b/src/main/java/com/ifish/helper/HardWareVenderHelper.java
new file mode 100644
index 0000000..09035d1
--- /dev/null
+++ b/src/main/java/com/ifish/helper/HardWareVenderHelper.java
@@ -0,0 +1,78 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.helper;
+
+import com.ifish.bean.VenderListBean;
+import com.ifish.entity.HardwareType;
+import com.ifish.entity.VenderList;
+import com.ifish.mapper.Tbl_Hardware_Type_Mapper;
+import com.ifish.mapper.Tbl_Vender_list_Mapper;
+import com.ifish.util.RedisKey;
+import com.ifish.util.StringUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ *
+ * @author Administrator
+ */
+@Component
+public class HardWareVenderHelper implements HardWareVenderHelperI {
+
+ /**
+ * 所有tbl_Hardware_Type表的操作方法接口
+ */
+ @Autowired
+ private Tbl_Hardware_Type_Mapper tbl_Hardware_Type_Mapper;
+
+ /**
+ * redis缓存服务器方法接口
+ */
+ @Autowired
+ private RedisHelperI redisHelperI;
+
+ @Autowired
+ private Tbl_Vender_list_Mapper tbl_Vender_list_Mapper;
+
+ @Override
+ public HardwareType getHardwareTypeByTypeCode(String code) throws Exception {
+ HardwareType hardwareType = null;
+ String key = RedisKey.HardWareType_key + code;
+ String redisString = redisHelperI.getRedis(key);
+ if (StringUtils.isNotBlank(redisString)) {
+ hardwareType = (HardwareType) StringUtil.JsonToBean(redisString, HardwareType.class);
+ } else {
+ hardwareType = tbl_Hardware_Type_Mapper.getHardwareTypeByTypeCode(code);
+ if (hardwareType != null && StringUtils.isNotBlank(hardwareType.getHardwareType())) {
+ redisHelperI.setRedis(key, StringUtil.ObjectToJson(hardwareType));
+ }
+ }
+ return hardwareType;
+ }
+
+ @Override
+ public VenderList getVenderListByBrandCode(String code) throws Exception {
+ VenderList venderList = new VenderList();
+ VenderListBean venderListBean = null;
+ String key = RedisKey.VenderList_key + code;
+ String redisString = redisHelperI.getRedis(key);
+ if (StringUtils.isNotBlank(redisString)) {
+ venderList = (VenderList) StringUtil.JsonToBean(redisString, VenderList.class);
+ } else {
+ venderListBean = tbl_Vender_list_Mapper.getVenderListByBrandCode(code);
+ if (venderListBean != null && StringUtils.isNotBlank(venderListBean.getBrandCode())) {
+ venderList.setBrandCode(venderListBean.getBrandCode());
+ venderList.setBrandIntroduce(venderListBean.getBrandIntroduce());
+ venderList.setBrandName(venderListBean.getBrandName());
+ venderList.setLogo(venderListBean.getBrandLogo());
+ redisHelperI.setRedis(key, StringUtil.ObjectToJson(venderList));
+ }
+ }
+ return venderList;
+ }
+
+}
diff --git a/src/main/java/com/ifish/helper/HardWareVenderHelperI.java b/src/main/java/com/ifish/helper/HardWareVenderHelperI.java
new file mode 100644
index 0000000..6850d25
--- /dev/null
+++ b/src/main/java/com/ifish/helper/HardWareVenderHelperI.java
@@ -0,0 +1,34 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.helper;
+
+import com.ifish.entity.HardwareType;
+import com.ifish.entity.VenderList;
+
+/**
+ *
+ * @author Administrator
+ */
+public interface HardWareVenderHelperI {
+
+ /**
+ * 根据设备型号获取设备类型参数
+ *
+ * @param code
+ * @return
+ */
+ HardwareType getHardwareTypeByTypeCode(String code) throws Exception;
+
+ /**
+ * 根据厂家code获取厂家信息
+ *
+ * @param code
+ * @return
+ * @throws Exception
+ */
+ VenderList getVenderListByBrandCode(String code) throws Exception;
+
+}
diff --git a/src/main/java/com/ifish/helper/RedisHelper.java b/src/main/java/com/ifish/helper/RedisHelper.java
new file mode 100644
index 0000000..8efec46
--- /dev/null
+++ b/src/main/java/com/ifish/helper/RedisHelper.java
@@ -0,0 +1,140 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.helper;
+
+import com.ifish.util.IfishUtil;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+/**
+ * redis缓存服务器所有接口方法
+ *
+ * @author Administrator
+ */
+@Component
+public class RedisHelper implements RedisHelperI {
+
+ @Autowired
+ private StringRedisTemplate redis;
+
+ /*
+ *获取缓存值
+ */
+ @Override
+ public String getRedis(String key) {
+ return redis.opsForValue().get(key.toLowerCase());
+ }
+
+ /*
+ *设置缓存(默认时间为1天)
+ */
+ @Override
+ public void setRedis(String key, String value) {
+ if (value == null) {
+ return;
+ }
+ redis.opsForValue().set(key.toLowerCase(), value, IfishUtil.CacheTime_DAYS, TimeUnit.DAYS);
+ }
+
+ /*设置自定义时效缓存
+ *key 缓存名称,value缓存值(string),time(保存时间),unit(时间类型)
+ */
+ @Override
+ public void setRedis(String key, String value, int time, TimeUnit unit) {
+ if (value == null) {
+ return;
+ }
+ redis.opsForValue().set(key.toLowerCase(), value, time, unit);
+ }
+
+ /*
+ *设置按天时效缓存
+ */
+ @Override
+ public void setRedisToDAYS(String key, String value) {
+ if (value == null) {
+ return;
+ }
+ redis.opsForValue().set(key.toLowerCase(), value, IfishUtil.CacheTime_DAYS, TimeUnit.DAYS);
+ }
+
+ /*
+ *设置按时时效缓存
+ */
+ @Override
+ public void setRedisToHOURS(String key, String value) {
+ if (value == null) {
+ return;
+ }
+ redis.opsForValue().set(key.toLowerCase(), value, IfishUtil.CacheTime_HOURS, TimeUnit.HOURS);
+ }
+
+ /*
+ *设置按分时效缓存
+ */
+ @Override
+ public void setRedisToMINUTES(String key, String value) {
+ if (value == null) {
+ return;
+ }
+ redis.opsForValue().set(key.toLowerCase(), value, IfishUtil.CacheTime_MINUTES, TimeUnit.MINUTES);
+ }
+
+ /*
+ *设置按秒时效缓存
+ */
+ @Override
+ public void setRedisToSECONDS(String key, String value) {
+ if (value == null) {
+ return;
+ }
+ redis.opsForValue().set(key.toLowerCase(), value, IfishUtil.CacheTime_SECONDS, TimeUnit.SECONDS);
+ }
+
+ /*
+ *删除缓存值
+ */
+ @Override
+ public void deleteRedis(String key) {
+ redis.delete(key.toLowerCase());
+ }
+
+ /*
+ *删除带前缀的批量缓存
+ *tagkey 缓存前缀
+ *如省份缓存 province:10,前缀为province
+ */
+ @Override
+ public void delRedisByTagKey(String tagkey) {
+ Set set = redis.keys(tagkey.toLowerCase() + "*");
+ Iterator it = set.iterator();
+ while (it.hasNext()) {
+ String keyStr = it.next();
+ redis.delete(keyStr);
+ }
+ }
+
+ /*
+ * 删除当前缓存数据库所有的key
+ * 排除系数设置缓存
+ */
+ @Override
+ public void deleteDBRedis() {
+ Set set = redis.keys("*");
+ Iterator it = set.iterator();
+ while (it.hasNext()) {
+ String keyStr = it.next();
+ //排除系数设置缓存
+ if (!keyStr.contains("recommendsetting:")) {
+ redis.delete(keyStr);
+ }
+ }
+ }
+}
diff --git a/src/main/java/com/ifish/helper/RedisHelperI.java b/src/main/java/com/ifish/helper/RedisHelperI.java
new file mode 100644
index 0000000..7a59d0e
--- /dev/null
+++ b/src/main/java/com/ifish/helper/RedisHelperI.java
@@ -0,0 +1,68 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.helper;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * redis缓存服务器所有接口方法
+ *
+ * @author Administrator
+ */
+public interface RedisHelperI {
+
+ /*
+ *删除带前缀的批量缓存
+ *tagkey 缓存前缀
+ *如省份缓存 province:10,前缀为province
+ */
+ void delRedisByTagKey(String tagkey);
+
+ /*
+ *删除缓存值
+ */
+ void deleteRedis(String key);
+
+ /*
+ *删除当前缓存数据库所有的key
+ */
+ void deleteDBRedis();
+
+ /*
+ *获取缓存值
+ */
+ String getRedis(String key);
+
+ /*
+ *设置缓存(有效时间默认为1天)
+ */
+ void setRedis(String key, String value);
+
+ /*设置自定义时效缓存
+ *key 缓存名称,value缓存值(string),time(保存时间),unit(时间类型)
+ */
+ void setRedis(String key, String value, int time, TimeUnit unit);
+
+ /*
+ *设置按天时效缓存
+ */
+ void setRedisToDAYS(String key, String value);
+
+ /*
+ *设置按时时效缓存
+ */
+ void setRedisToHOURS(String key, String value);
+
+ /*
+ *设置按分时效缓存
+ */
+ void setRedisToMINUTES(String key, String value);
+
+ /*
+ *设置按秒时效缓存
+ */
+ void setRedisToSECONDS(String key, String value);
+}
diff --git a/src/main/java/com/ifish/helper/ShopsInfoHelper.java b/src/main/java/com/ifish/helper/ShopsInfoHelper.java
new file mode 100644
index 0000000..2b2b416
--- /dev/null
+++ b/src/main/java/com/ifish/helper/ShopsInfoHelper.java
@@ -0,0 +1,49 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.helper;
+
+import com.ifish.entity.ShopsInfo;
+import com.ifish.mapper.Tbl_Shops_Info_Mapper;
+import com.ifish.util.RedisKey;
+import com.ifish.util.StringUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ *
+ * @author Administrator
+ */
+@Component
+public class ShopsInfoHelper implements ShopsInfoHelperI {
+
+ /**
+ * tbl_shops_info表操作方法接口
+ */
+ @Autowired
+ private Tbl_Shops_Info_Mapper tbl_Shops_Info_Mapper;
+
+ /**
+ * redis缓存服务器方法接口
+ */
+ @Autowired
+ private RedisHelperI redisHelperI;
+
+ @Override
+ public ShopsInfo getShopsInfoByUserId(Integer userId) throws Exception {
+ ShopsInfo shopsInfo = null;
+ String key = RedisKey.ShopsInfo_Key + userId;
+ String shopString = redisHelperI.getRedis(key);
+ if (StringUtils.isNotBlank(shopString)) {
+ shopsInfo = (ShopsInfo) StringUtil.JsonToBean(shopString, ShopsInfo.class);
+ } else {
+ shopsInfo = tbl_Shops_Info_Mapper.getShopsInfoByUserId(userId);
+ redisHelperI.setRedis(key, StringUtil.ObjectToJson(shopsInfo));
+ }
+ return shopsInfo;
+ }
+
+}
diff --git a/src/main/java/com/ifish/helper/ShopsInfoHelperI.java b/src/main/java/com/ifish/helper/ShopsInfoHelperI.java
new file mode 100644
index 0000000..8871b8d
--- /dev/null
+++ b/src/main/java/com/ifish/helper/ShopsInfoHelperI.java
@@ -0,0 +1,24 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.helper;
+
+import com.ifish.entity.ShopsInfo;
+
+/**
+ *
+ * @author Administrator
+ */
+public interface ShopsInfoHelperI {
+
+ /**
+ * 根据用户Id获取商家信息
+ *
+ * @param userId
+ * @return
+ */
+ public ShopsInfo getShopsInfoByUserId(Integer userId) throws Exception;
+
+}
diff --git a/src/main/java/com/ifish/helper/UserActivityHelper.java b/src/main/java/com/ifish/helper/UserActivityHelper.java
new file mode 100644
index 0000000..4933c8b
--- /dev/null
+++ b/src/main/java/com/ifish/helper/UserActivityHelper.java
@@ -0,0 +1,66 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.ifish.helper;
+
+import com.ifish.dto.JsonResult;
+import com.ifish.dto.PageingDto;
+import com.ifish.entity.Grade;
+import com.ifish.mapper.Tbl_User_Activity_Mapper;
+import com.ifish.service.CacheService;
+import com.ifish.util.IfishUtil;
+import com.ifish.util.ResultUtil;
+import java.util.List;
+import java.util.Map;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 用户动态所有接口方法
+ *
+ * @author Administrator
+ */
+@Component
+public class UserActivityHelper implements UserActivityHelperI {
+
+ @Autowired
+ private Tbl_User_Activity_Mapper tbl_User_Activity_Mapper;
+
+ @Autowired
+ private CacheService cacheService;
+
+ @Override
+ public PageingDto> getUserActivityByPage(Integer pageSize, Integer firstResult) {
+ //分页获取数据
+ List