diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index 55b559232f..ea19dc5393 100644 --- a/epmet-auth/deploy/docker-compose-dev.yml +++ b/epmet-auth/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.67 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.68 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index b4ca71a0e4..dc628f27e9 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.67 + 0.3.68 com.epmet epmet-cloud diff --git a/epmet-auth/src/main/java/com/epmet/redis/CustomerAppWxServiceUtil.java b/epmet-auth/src/main/java/com/epmet/redis/CustomerAppWxServiceUtil.java index e641d17ed6..ddd5d69769 100644 --- a/epmet-auth/src/main/java/com/epmet/redis/CustomerAppWxServiceUtil.java +++ b/epmet-auth/src/main/java/com/epmet/redis/CustomerAppWxServiceUtil.java @@ -13,6 +13,7 @@ import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl; import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl; import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerAppDTO; import com.epmet.dto.CustomerAppRedisDTO; @@ -115,7 +116,12 @@ public class CustomerAppWxServiceUtil implements ApplicationRunner { maServices = maServicesNew; if (appSet != null && result != null) { for (CustomerAppDTO app : result) { - appSet.add(appKey, app); + CustomerAppRedisDTO appRedis = ConvertUtils.sourceToTarget(app, CustomerAppRedisDTO.class); + if(appRedis == null){ + logger.warn("init CustomerAppRedis fail,convert return null,appDB:{}",JSON.toJSONString(app)); + continue; + } + appSet.add(appKey, appRedis); } } } diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java index 52b8fce60b..07d8b24339 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java @@ -71,6 +71,9 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { String data = HttpClientManager.getInstance().sendPostByJSON(ThirdApiConstant.THIRD_PAUSER_SAVEUSER, JSON.toJSONString(dto)).getData(); JSONObject toResult = JSON.parseObject(data); Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (null != toResult.get("code")) { + result.setCode(((Integer) toResult.get("code")).intValue()); + } if (!result.success()) { throw new RenException(PublicUserLoginConstant.SAVE_USER_EXCEPTION); } @@ -165,6 +168,9 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { String data = HttpClientManager.getInstance().sendPostByJSON(ThirdApiConstant.THIRD_PAUSER_CHECKPAUSER, JSON.toJSONString(dto)).getData(); JSONObject toResult = JSON.parseObject(data); Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (null != toResult.get("code")) { + result.setCode(((Integer) toResult.get("code")).intValue()); + } if (!result.success()) { logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getPhone(), result.getCode(), result.getMsg())); throw new RenException(result.getCode()); @@ -211,6 +217,9 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { String data = HttpClientManager.getInstance().sendPostByJSON(ThirdApiConstant.THIRD_PAUSER_CHECKPAUSER, JSON.toJSONString(dto)).getData(); JSONObject toResult = JSON.parseObject(data); Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (null != toResult.get("code")) { + result.setCode(((Integer) toResult.get("code")).intValue()); + } if (!result.success()) { logger.error(String.format("手机验证码登录异常,手机号[%s],code[%s],msg[%s]", formDTO.getPhone(), result.getCode(), result.getMsg())); throw new RenException(result.getCode()); @@ -259,6 +268,9 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { String data1 = HttpClientManager.getInstance().sendPostByJSON(ThirdApiConstant.THIRD_PAUSERVISITED_SAVEUSERVISITED, JSON.toJSONString(visited)).getData(); JSONObject json = JSON.parseObject(data1); Result visitedResult = ConvertUtils.mapToEntity(json, Result.class); + if (null != json.get("code")) { + visitedResult.setCode(((Integer) json.get("code")).intValue()); + } if (!visitedResult.success()) { logger.error(PublicUserLoginConstant.SAVE_VISITED_EXCEPTION); } @@ -281,6 +293,9 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { String data = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.REGISTER_URL, JSON.toJSONString(formDTO)).getData(); JSONObject toResult = JSON.parseObject(data); Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (null != toResult.get("code")) { + result.setCode(((Integer) toResult.get("code")).intValue()); + } if (!result.success()) { logger.error(String.format("调用epmet_third服务初始化用户信息失败,数据来源[%s],手机号[%s],userId:[%S]", formDTO.getSource(), formDTO.getPhone(), formDTO.getUserId())); throw new RenException(result.getCode()); diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index a01706e01d..a7980eebe1 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -510,6 +510,9 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { logger.info("ThirdLoginServiceImpl.getCustomerInfo：httpclient->url:"+AuthHttpUrlConstant.CUSTOMER_MSG_URL+"，结果->"+data); JSONObject toResult = JSON.parseObject(data); Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class); + if (null != toResult.get("code")) { + mapToResult.setCode(((Integer) toResult.get("code")).intValue()); + } if (!mapToResult.success()) { logger.error(String.format("根据appId查询客户Id失败，对应appId->" + appId)); throw new RenException(mapToResult.getMsg()); @@ -532,6 +535,9 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { logger.info("ThirdLoginServiceImpl.getUserWeChat：httpclient->url:"+AuthHttpUrlConstant.RESI_AND_WORK_LOGIN_URL+"，结果->"+data); JSONObject toResult = JSON.parseObject(data); Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class); + if (null != toResult.get("code")) { + mapToResult.setCode(((Integer) toResult.get("code")).intValue()); + } if (!mapToResult.success()) { logger.error("居民端小程序登陆，调用epmet_third服务获取数据失败"); throw new RenException(mapToResult.getCode()); diff --git a/epmet-auth/src/main/resources/bootstrap.yml b/epmet-auth/src/main/resources/bootstrap.yml index f3c4a05e89..2306d2da5b 100644 --- a/epmet-auth/src/main/resources/bootstrap.yml +++ b/epmet-auth/src/main/resources/bootstrap.yml @@ -10,7 +10,7 @@ spring: allow-bean-definition-overriding: true #环境 dev|test|prod profiles: - active: dev + active: @spring.profiles.active@ messages: encoding: UTF-8 basename: i18n/messages_common diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java index 944c8afb2f..a05eac28c6 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java @@ -73,4 +73,6 @@ public interface StrConstant { * 空字符串 */ String EPMETY_STR=""; + + String NULL_STR="null"; } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 23c6567af2..1ca4a859fd 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -86,6 +86,8 @@ public enum EpmetErrorCode { // 活动报名失败，弹窗：志愿者认证 NON_CERTIFIED_VOLUNTEER(8511, "是否认证志愿者，完成报名"), ACT_TIME_CONFLICT(8512, "报名失败。您本次报名活动时间与已报名活动时间间隔较短，为了不影响您已报名的活动，请选择其他时间的活动，谢谢。"), + SIGN_IN_TIME_NO(8513, "签到时间还未到~"), + SIGN_IN_TIME_END(8514, "签到时间已结束~"), // 该错误不会提示给前端，只是后端传输错误信息用。 ACCESS_SQL_FILTER_MISSION_ARGS(8701, "缺少生成权限过滤SQL所需参数"), diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 4a4d89b3c4..9d233f5d09 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.39 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.42 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml index 4d3be03e5d..9fd06da22f 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-statistical-server:0.3.41 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-statistical-server:0.3.42 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActContentFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActContentFormDTO.java index 1297ccb96c..9f7fba3fd0 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActContentFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActContentFormDTO.java @@ -2,7 +2,6 @@ package com.epmet.dto.form.resi; import lombok.Data; -import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import java.io.Serializable; diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActSignInFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActSignInFormDTO.java index f315a04449..edd1acf91d 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActSignInFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActSignInFormDTO.java @@ -17,7 +17,6 @@ package com.epmet.dto.form.resi; -import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import javax.validation.constraints.Min; diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java index fe8ef51b45..555ece4796 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java @@ -142,4 +142,14 @@ public class ResiActDetailResultDTO implements Serializable { * 用户是否已报名该活动 true用户已报名；false用户未报名 */ private Boolean isRegistration; + + /** + * 打卡开始时间（yyyy-MM-dd HH:mm） + */ + private String signInStartTime; + + /** + * 打卡截止时间（yyyy-MM-dd HH:mm） + */ + private String signInEndTime; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActRegistrationResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActRegistrationResultDTO.java index 14e8cbd9b3..0ebb4ae3b2 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActRegistrationResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActRegistrationResultDTO.java @@ -23,7 +23,7 @@ import java.io.Serializable; /** - * 活动内容 + * 活动-错误提示信息 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-07-19 diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index 808e933cd6..a74ba3bc3d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.37 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.40 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml index 2c181a2d06..b3b8fecd49 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.37 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.38 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index dba3114f69..4e75ddecf8 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.37 + 0.0.40 com.epmet epmet-heart diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java index 5b7412b415..684965c721 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java @@ -317,4 +317,18 @@ public class ResiActListController { ValidatorUtils.validateEntity(formDto, ResiActBaseFormDTO.AddUserInternalGroup.class); return actInfoService.actLookBackAssembly(formDto); } + + /** + * 检查是否在 活动签到时间 范围内 + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @Author zhangyong + * @Date 15:03 2020-08-05 + **/ + @PostMapping("checksignintime") + public Result checkSignInTime(@RequestBody ResiActContentFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, ResiActContentFormDTO.AddUserInternalGroup.class); + return actInfoService.checkSignInTime(formDTO); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java index 7fc4eb4963..d1f698480d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java @@ -235,4 +235,14 @@ public interface ActInfoService extends BaseService { * @Date 13:39 2020-07-21 **/ Result> actLookBackAssembly(ResiLatestActFormDTO formDTO); + + /** + * 检查是否在 活动签到时间 范围内 + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @Author zhangyong + * @Date 15:03 2020-08-05 + **/ + Result checkSignInTime(ResiActContentFormDTO formDTO); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java index 6e42b0c56d..2fc4a666cb 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java @@ -23,7 +23,6 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; -import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; @@ -37,7 +36,6 @@ import com.epmet.dto.form.resi.*; import com.epmet.dto.result.resi.*; import com.epmet.entity.ActInfoEntity; import com.epmet.entity.ActUserRelationEntity; -import com.epmet.redis.ActInfoRedis; import com.epmet.service.ActInfoService; import com.epmet.service.ActUserRelationService; import com.epmet.utils.CaculateDistance; @@ -61,9 +59,6 @@ public class ActInfoServiceImpl extends BaseServiceImpl lookBackAct = baseDao.selectListLookBackActAssembly(formDTO); return new Result>().ok(lookBackAct); } + + @Override + public Result checkSignInTime(ResiActContentFormDTO formDTO) { + ResiActRegistrationResultDTO resultDTO = new ResiActRegistrationResultDTO(); + resultDTO.setFlag(NumConstant.ZERO); + Date currentTime = new Date(); + // 查询 活动信息 + ActInfoEntity entity = baseDao.selectById(formDTO.getActId()); + if (currentTime.before(entity.getSignInStartTime())){ + // 签到时间还未到~ + resultDTO.setTip(EpmetErrorCode.SIGN_IN_TIME_NO.getMsg()); + resultDTO.setFlag(EpmetErrorCode.SIGN_IN_TIME_NO.getCode()); + } else if (currentTime.after(entity.getSignInEndTime())){ + // 签到时间已结束~ + resultDTO.setTip(EpmetErrorCode.SIGN_IN_TIME_END.getMsg()); + resultDTO.setFlag(EpmetErrorCode.SIGN_IN_TIME_END.getCode()); + } + return new Result().ok(resultDTO); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java index 9523693d46..3694611f3c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java @@ -342,7 +342,9 @@ public class WorkActUserServiceImpl implements WorkActUserService { if (StringUtils.isNotBlank(userBaseInfo.getIdNum())) { resultDTO.setIdNum(userBaseInfo.getIdNum()); } - resultDTO.setAddress(userBaseInfo.getStreet()+userBaseInfo.getDistrict()+userBaseInfo.getBuildingAddress()); + String address = userBaseInfo.getStreet() + userBaseInfo.getDistrict() + userBaseInfo.getBuildingAddress(); + address = address.replaceAll(StrConstant.NULL_STR, StrConstant.EPMETY_STR); + resultDTO.setAddress(address); } resultDTO.setSignUpTime(actUserRelationDTO.getCreatedTime()); /** diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml index a5de7c102e..17dbb6c169 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml @@ -400,6 +400,8 @@ DATE_FORMAT(i.SIGN_UP_END_TIME,'%Y-%m-%d %H:%i') signUpEndTime, DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime, DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime, + DATE_FORMAT(i.SIGN_IN_START_TIME,'%Y-%m-%d %H:%i') signInStartTime, + DATE_FORMAT(i.SIGN_IN_END_TIME,'%Y-%m-%d %H:%i') signInEndTime, i.ACT_ADDRESS actAddress, i.ACT_QUOTA_CATEGORY actQuotaCategory, -- 活动名额类型（true:固定名额(1) false： 不限制名额(0)） i.ACT_QUOTA actQuota, diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml index 618cfb76fb..17fbb27e9a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml @@ -75,7 +75,7 @@ FROM act_user_relation re WHERE re.DEL_FLAG = '0' AND re.ACT_ID = #{actId} - AND re.`STATUS` != 'refused' AND re.`STATUS` != 'cancele' + AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled' diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml index 497d893625..8c9ba33c2d 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.23 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.24 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 7ee8d4b25d..e1e049d0d1 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.23 + 0.3.24 com.epmet epmet-job diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml index 17fb954689..40fdbfdc04 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.31 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.33 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml index d21875e037..fa710c245b 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-point-server:0.0.31 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-point-server:0.0.33 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 55a2f16d7e..3fda51dcd7 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.0.31 + 0.0.33 epmet-point com.epmet diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRuleController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRuleController.java index 526e56fa46..9027eac8e1 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRuleController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRuleController.java @@ -50,14 +50,13 @@ public class PointRuleController { /** * desc:根据功能id获取积分规则 * - * @param tokenDTO * @param formDTO * @return */ @PostMapping(value = "list") @RequirePermission( requirePermission = RequirePermissionEnum.MORE_POINT_RULE_LIST) - public Result> list( @RequestBody PointRuleListFormDTO formDTO) { - formDTO.setCustomerId("3ef7e4bb195eb9e622d68b52509aa940"); + public Result> list(@LoginUser TokenDto tokenDTO, @RequestBody PointRuleListFormDTO formDTO) { + formDTO.setCustomerId(tokenDTO.getCustomerId()); ValidatorUtils.validateEntity(formDTO); return new Result>().ok(pointRuleService.list(formDTO)); } diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index a509da86ad..63f601776a 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.101 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.105 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 0dd8b4ce55..43277ff9ff 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.101 + 0.0.105 com.epmet @@ -147,6 +147,14 @@ 5.1.12.RELEASE compile + + + + com.aliyun + alibaba-dingtalk-service-sdk + 1.0.1 + + diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java index c977d5d7f4..7f59170729 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java @@ -77,4 +77,11 @@ public interface PaCustomerDao extends BaseDao { * @Description 修改pa_customer表主键值 **/ int updateIdById(ModifyCustomerFormDTO formDTO); + + /** + * @Description 查询客户名称 + * @author zxc + * @date 2020/8/5 3:23 下午 + */ + String selectCustomerName(@Param("customerId") String customerId); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PreAuthTokenDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PreAuthTokenDao.java index defe7f5bb0..0ea7aa0b6c 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PreAuthTokenDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PreAuthTokenDao.java @@ -39,10 +39,10 @@ public interface PreAuthTokenDao extends BaseDao { void insertPreAuthToken(PreAuthTokenFormDTO formDTO); /** - * @Description 逻辑删 pre_auth_code + * @Description 删 pre_auth_code * @param * @author zxc */ - void updateOldPreAuthCode(); + void deleteOldPreAuthCode(); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java index 5994769f3e..9704f71e0a 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java @@ -265,7 +265,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe formDTO.setPreAuthToken(preAuthCode); formDTO.setExpiresInTime(expiresInTime); //先逻辑删除，在插入DB - preAuthTokenDao.updateOldPreAuthCode(); + preAuthTokenDao.deleteOldPreAuthCode(); preAuthTokenDao.insertPreAuthToken(formDTO); //预授权码 放入缓存 redisThird.setPreAuthCode(preAuthCode); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java index d9b753172c..031910a932 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java @@ -3,6 +3,10 @@ package com.epmet.service.impl; import cn.hutool.json.JSONObject; import com.alibaba.fastjson.JSON; import com.alibaba.nacos.client.config.utils.IOUtils; +import com.dingtalk.api.DefaultDingTalkClient; +import com.dingtalk.api.DingTalkClient; +import com.dingtalk.api.request.OapiRobotSendRequest; +import com.dingtalk.api.response.OapiRobotSendResponse; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.HttpClientManager; @@ -24,6 +28,7 @@ import com.epmet.wxapi.constant.WxMaCodeConstant; import com.fasterxml.jackson.core.JsonEncoding; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper; +import com.taobao.api.ApiException; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.dom4j.DocumentException; @@ -70,6 +75,8 @@ public class WarrantServiceImpl implements WarrantService { private MessagePushTextDao messagePushTextDao; @Autowired private RedisThird redisThird; + @Autowired + private PaCustomerDao paCustomerDao; /** * @Description 1.保存代码审核结果 2.更新代码上传结果 @@ -134,25 +141,32 @@ public class WarrantServiceImpl implements WarrantService { codeAuditRecord.setCustomerId(customerId); codeAuditRecord.setAuthAppId(authAppId); codeAuditRecord.setTemplateId(templateId); + String customerName = paCustomerDao.selectCustomerName(customerId); + String client = this.getClient(clientType); //插入 代码审核 记录 log.info(String.format(ThirdRunTimeInfoConstant.CODE_AUDIT_RESULT, xml)); codeAuditRecordDao.insertCodeAuditRecord(codeAuditRecord); // 修改 code_audit_result 中的代码审核结果 // String event = codeAuditRecord.getEvent(); + String reason = codeAuditRecord.getReason(); String codeResult = null; switch (event) { case ModuleConstant.WEAPP_AUDIT_SUCCESS: codeResult = ModuleConstant.AUDIT_SUCCESS; + this.dingDingRobot(reason,null,customerName,client); break; case ModuleConstant.WEAPP_AUDIT_FAIL: codeResult = ModuleConstant.AUDIT_FAILED; + this.dingDingRobot(reason,codeResult,customerName,client); break; case ModuleConstant.WEAPP_AUDIT_DELAY: codeResult = ModuleConstant.DELAY; + this.dingDingRobot(reason,codeResult,customerName,client); break; } String codeCustomerId = codeCustomerDao.selectCodeCustomerId(codeAuditRecord); codeAuditResultDao.updateAuditResult(customerId, codeCustomerId, codeResult); + log.info("消息与事件接收URL【代码审核结果】结束......"); }else { this.replyEventMessage(request,response,event,toUserName,fromUserName); } @@ -165,31 +179,62 @@ public class WarrantServiceImpl implements WarrantService { // messagePushTextDao.insertMessageText(messagePushTextFormDTO); String content = messagePushTextFormDTO.getContent(); log.info(String.format(ThirdRunTimeInfoConstant.CONTENT,content)); - /** * 测试公众号处理用户消息 * 模拟粉丝发送文本消息给专用测试公众号，第三方平台方需根据文本消息的内容进行相应的响应： * 1）微信模推送给第三方平台方：文本消息，其中 Content 字段的内容固定为：TESTCOMPONENT_MSG_TYPE_TEXT * 2）第三方平台方立马回应文本消息并最终触达粉丝：Content 必须固定为：TESTCOMPONENT_MSG_TYPE_TEXT_callback */ - /*if (content.equals(ModuleConstant.TESTCOMPONENT_MSG_TYPE_TEXT)){ - - - }else if (content.startsWith(ModuleConstant.QUERY_AUTH_CODE)){ - // 测试公众号使用客服消息接口处理用户消息 - String contentBefore = content.substring(NumConstant.ZERO, content.indexOf(ThirdRedisKeyConstant.COLON)); - //auth_code - String queryAuthCode = content.substring(contentBefore.length() + NumConstant.ONE, content.length()); - - }*/ - this.processTextMessage(request,response,content,toUserName,fromUserName); } - log.info("消息与事件接收URL【代码审核结果】结束......"); return ModuleConstant.SUCCESS; } + /** + * @Description 钉钉机器人报警 + * @author zxc + * @date 2020/8/5 4:33 下午 + */ + public void dingDingRobot(String result,String event,String customerName,String clientType){ + DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/robot/send?access_token=5b48fcbc3fde24b8ba4696aa062b7f8146479a9d3467dbb1f9cf132ec36b955a"); + OapiRobotSendRequest request = new OapiRobotSendRequest(); + request.setMsgtype("markdown"); + OapiRobotSendRequest.Markdown markdown = new OapiRobotSendRequest.Markdown(); + markdown.setTitle("代码审核结果"); + switch (event){ + case ModuleConstant.WEAPP_AUDIT_SUCCESS: + markdown.setText("代码审核结果: 审核成功\n"+ + "> 客户名称：" + customerName +"\n\n"+ + "> 客户端："+clientType+"\n"); + break; + case ModuleConstant.WEAPP_AUDIT_FAIL: + markdown.setText("代码审核结果: 审核不通过\n"+ + "> 客户名称：" + customerName +"\n\n"+ + "> 客户端："+clientType+"\n\n"+ + "> 不通过原因："+result); + break; + case ModuleConstant.WEAPP_AUDIT_DELAY: + markdown.setText("代码审核结果: 审核延时\n"+ + "> 客户名称：" + customerName +"\n\n"+ + "> 客户端："+clientType+"\n\n"+ + "> 延时原因："+result); + break; + } + request.setMarkdown(markdown); + try { + OapiRobotSendResponse response = client.execute(request); + } catch (ApiException e) { + log.error("机器人生病了......"); + e.printStackTrace(); + } + } + + public String getClient(String clientType){ + String result = clientType == "resi" ? "居民端" : "工作端"; + return result; + } + /** * 方法描述: 类型为enevt的时候，拼接 * @param request @@ -242,7 +287,7 @@ public class WarrantServiceImpl implements WarrantService { public void replyTextMessage(HttpServletRequest request, HttpServletResponse response, String content,String toUserName, String fromUserName) throws DocumentException, IOException { - Long createTime = System.currentTimeMillis() / 1000; + Long createTime = System.currentTimeMillis() / NumConstant.ONE_THOUSAND; StringBuffer sb = new StringBuffer(512); sb.append(""); sb.append(""); @@ -269,7 +314,7 @@ public class WarrantServiceImpl implements WarrantService { // 得到微信授权成功的消息后，应该立刻进行处理！！相关信息只会在首次授权的时候推送过来 //第三方平台【component_access_token】 String componentAccessToken = redisThird.getComponentAccessToken(); - com.alibaba.fastjson.JSONObject jsonObject = new com.alibaba.fastjson.JSONObject(); + JSONObject jsonObject = new JSONObject(); jsonObject.put(ModuleConstant.COMPONENT_APPID, componentAppId); jsonObject.put(ModuleConstant.AUTHORIZATION_CODE, auth_code); String authInfo = HttpClientManager.getInstance().sendPostByJSON(WxMaCodeConstant.API_QUERY_AUTH_URL + componentAccessToken, JSON.toJSONString(jsonObject)).getData(); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml index 7d4c8e69ef..2d09708ba1 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml @@ -71,6 +71,17 @@ + + + UPDATE pa_customer SET is_initialize = #{isInitialize} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PreAuthTokenDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PreAuthTokenDao.xml index a7f7113a92..309d5372ce 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PreAuthTokenDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PreAuthTokenDao.xml @@ -30,9 +30,9 @@ ) - - - update pre_auth_token set del_flag = 1 - + + + delete from pre_auth_token where del_flag = 0 + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml index 0ec938252e..b643b6a136 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.80 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.81 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index d6dfebbf06..d431df354c 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.80 + 0.3.81 com.epmet gov-org diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index 4b37250b73..826e186d7f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -334,7 +334,7 @@ public class AgencyServiceImpl implements AgencyService { //3.查询客户具有指定RoleKey的角色信息 CustomerRoleFormDTO customerRoleForm = new CustomerRoleFormDTO(); customerRoleForm.setCustomerId(agencyDTO.getCustomerId()); - customerRoleForm.setRoleKey(RoleKeyConstants.ROLE_KEY_MANAGER); + customerRoleForm.setRoleKey(RoleKeyConstants.ROLE_KEY_ROOT_MANAGER); Result getRoleResult = epmetUserOpenFeignClient.getRoleOfCustomer(customerRoleForm); if (!getRoleResult.success() || getRoleResult.getData() == null) { log.error("查询客户具有指定RoleKey的角色信息失败:".concat(getRoleResult.toString())); diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml index 2d7934af8e..8a4503945f 100644 --- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.63 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.64 ports: - "8090:8090" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index e46d11bcc9..b05f28236e 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.63 + 0.3.64 com.epmet oper-crm diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerDao.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerDao.java index 49e3525ce9..dea5f2f40b 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerDao.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerDao.java @@ -68,15 +68,6 @@ public interface CustomerDao extends BaseDao { **/ List selectCustomerList(@Param("customerName") String customerName); - /** - * @return int - * @param customerName - * @author yinzuomei - * @description 查询有效客户数据(不区分是否在有效期内)【按名称模糊查询】 - 总记录数 - * @Date 2020/8/5 11:02 - **/ - int selectCountByCustomerName(@Param("customerName") String customerName); - /** * desc：获取未删除的所有用户 * @return diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java index 4e944f2920..06413c8a1e 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java @@ -44,6 +44,7 @@ import com.epmet.feign.OperCustomizeFeignClient; import com.epmet.redis.CustomerRedis; import com.epmet.service.CustomerService; import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -383,12 +384,16 @@ public class CustomerServiceImpl extends BaseServiceImpl list = baseDao.selectCustomerList(formDTO.getCustomerName()); - //PageInfo pi = new PageInfo<>(list); - int total=baseDao.selectCountByCustomerName(formDTO.getCustomerName()); - PageData resultDTO = new PageData(list,total); - return resultDTO; + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()) + .doSelectPageInfo(() -> baseDao.selectCustomerList(formDTO.getCustomerName())); +// List list = baseDao.selectCustomerList(formDTO.getCustomerName()); +// //PageInfo pi = new PageInfo<>(list); +// int total=baseDao.selectCountByCustomerName(formDTO.getCustomerName()); + return new PageData(pageInfo.getList(),pageInfo.getTotal()); } /** @@ -423,6 +428,9 @@ public class CustomerServiceImpl extends BaseServiceImpl - -