From 9cd21a92230d4012f1c46934cda184a106f94cf6 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 30 Jul 2020 11:18:26 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E4=BA=BA=E6=95=B0=E4=B8=BAnull=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ActUserRelationDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0b98a68f39..b845694873 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} - GROUP BY re.ACT_ID + AND re.`STATUS` != 'refused' AND re.`STATUS` != 'cancele' From 515d978eec0bcfa5e4d7c0d625118c40329e9313 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 30 Jul 2020 12:09:58 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=8F=82=E5=8A=A0?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=EF=BC=8C=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ActInfoServiceImpl.java | 33 ++++++++++--------- .../impl/ActUserRelationServiceImpl.java | 13 +++++--- .../epmet/controller/UserRoleController.java | 2 +- 3 files changed, 28 insertions(+), 20 deletions(-) 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 3afeddf4bb..a7a058164f 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 @@ -128,21 +128,24 @@ public class ActInfoServiceImpl extends BaseServiceImpl> listAct(TokenDto tokenDto, ResiActBaseFormDTO formDto) { List list = new ArrayList<>(); formDto.setUserId(tokenDto.getUserId()); - // 查询活动状态是：报名中 signing_up - List signingUp = baseDao.selectListActSigningUp(formDto); - list.addAll(signingUp); - - // 查询活动状态是：已报满 enough - List enough = baseDao.selectListActQuotaIsEnough(formDto); - list.addAll(enough); - - // 查询活动状态是：截止报名 end_sign_up - List endSignUp = baseDao.selectListActEndSignUp(formDto); - list.addAll(endSignUp); - - // 查询活动状态是：已开始 in_progress - List inProgress = baseDao.selectListActInProgress(formDto); - list.addAll(inProgress); + // 列表第一次查询，不是已结束状态的活动，一次性返回 + if (formDto.getPageNo() == NumConstant.ONE){ + // 查询活动状态是：报名中 signing_up + List signingUp = baseDao.selectListActSigningUp(formDto); + list.addAll(signingUp); + + // 查询活动状态是：已报满 enough + List enough = baseDao.selectListActQuotaIsEnough(formDto); + list.addAll(enough); + + // 查询活动状态是：截止报名 end_sign_up + List endSignUp = baseDao.selectListActEndSignUp(formDto); + list.addAll(endSignUp); + + // 查询活动状态是：已开始 in_progress + List inProgress = baseDao.selectListActInProgress(formDto); + list.addAll(inProgress); + } // 查询活动状态是：已结束 finished int pageIndex = (formDto.getPageNo() - NumConstant.ONE) * formDto.getPageSize(); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java index c84e1efa93..de180d3745 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java @@ -299,12 +299,17 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl> userRoleInfo = epmetUserOpenFeignClient.getUserRoleInfoByUserId(userId); - if (userRoleInfo.success()){ - for (UserRoleResultDTO roleResultDTO :userRoleInfo.getData()){ - if (EpmetRoleKeyConstant.REGISTERED_RESI.equals(roleResultDTO.getRoleKey())){ - satisfy = true; + if (null != userRoleInfo){ + if (userRoleInfo.success()){ + for (UserRoleResultDTO roleResultDTO :userRoleInfo.getData()){ + if (EpmetRoleKeyConstant.REGISTERED_RESI.equals(roleResultDTO.getRoleKey())){ + satisfy = true; + } } } + } else { + logger.info(EpmetErrorCode.CANNOT_AUDIT_WARM.getMsg()); + throw new RenException(EpmetErrorCode.CANNOT_AUDIT_WARM.getCode()); } return satisfy; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java index 7a1bbbe99d..90ceb71ea0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java @@ -128,7 +128,7 @@ public class UserRoleController { * @Author zhangyong * @Date 14:24 2020-07-23 **/ - @GetMapping("getuserroleinfobyuserid/{userId}") + @GetMapping(value = "getuserroleinfobyuserid/{userId}") public Result> getUserRoleInfoByUserId(@PathVariable("userId") String userId) { return userRoleService.getUserRoleInfoByUserId(userId); } From 95986bbd22945a4298abdb9f2841a770c31f0447 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 30 Jul 2020 13:25:33 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E9=9D=9E=E5=B1=85=E6=B0=91=E6=8A=A5?= =?UTF-8?q?=E5=90=8D=E6=B4=BB=E5=8A=A8=E5=A4=B1=E8=B4=A5=EF=BC=8C=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E6=8F=90=E7=A4=BA=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/ActUserRelationServiceImpl.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java index de180d3745..3f677f0d5d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java @@ -307,9 +307,6 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl Date: Thu, 30 Jul 2020 13:25:59 +0800 Subject: [PATCH 04/11] =?UTF-8?q?heart:bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/work/TestGrantFormDTO.java | 63 +++++++++++++++++++ .../epmet/controller/WorkActController.java | 6 ++ .../com/epmet/service/WorkActService.java | 2 + .../service/impl/WorkActServiceImpl.java | 34 ++++++++++ 4 files changed, 105 insertions(+) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/TestGrantFormDTO.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/TestGrantFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/TestGrantFormDTO.java new file mode 100644 index 0000000000..4c6e2fe66b --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/TestGrantFormDTO.java @@ -0,0 +1,63 @@ +package com.epmet.dto.form.work; + +import com.alibaba.fastjson.JSON; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 描述一下 + * + * @author yinzuomei@elink-cn.com + * @date 2020/7/30 12:15 + */ +@Data +public class TestGrantFormDTO implements Serializable { + private static final long serialVersionUID = -2643821406956680381L; + public interface AddUserInternalGroup {} + /** + * 当前客户id + */ + @NotBlank(message = "客户id不能为空",groups = AddUserInternalGroup.class) + private String customerId; + /** + * 居民id + */ + @NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class) + private String userId; + /** + * 分值 + */ + @NotNull(message = "分值不能为空",groups = AddUserInternalGroup.class) + private Integer reward; + /** + * 业务id eg：活动id + */ + @NotBlank(message = "业务id不能为空",groups = AddUserInternalGroup.class) + private String sourceId; + /** + * 备注 + */ + @NotBlank(message = "备注不能为空",groups = AddUserInternalGroup.class) + private String remark; + + /** + * 加减分标识 plus/minus + */ + @NotBlank(message = "加减分标识 plus/minus不能为空",groups = AddUserInternalGroup.class) + private String actionFlag; + + TestGrantFormDTO(){ + this.customerId=""; + this.userId=""; + this.sourceId="111"; + this.reward=20; + this.remark="test"; + this.actionFlag="plus"; + } + public static void main(String[] args) { + System.out.println(JSON.toJSON(new TestGrantFormDTO())); + } +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java index 67eb62f18d..175e54bdaf 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java @@ -190,6 +190,12 @@ public class WorkActController { return new Result(); } + @PostMapping("testgrantpoint") + public Result testGrantPoint(@RequestBody TestGrantFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO,TestGrantFormDTO.AddUserInternalGroup.class); + workActService.testGrantPoint(formDTO); + return new Result(); + } /** * @return com.epmet.commons.tools.utils.Result * @param formDTO diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActService.java index 8aca54049d..bc72cc7d67 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActService.java @@ -146,4 +146,6 @@ public interface WorkActService { * @Date 2020/7/27 13:55 **/ PublishActResultDTO rePublish(RePublishFormDTO rePublishFormDTO); + + void testGrantPoint(TestGrantFormDTO formDTO); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java index e93d288699..3d4b26a331 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java @@ -873,6 +873,39 @@ public class WorkActServiceImpl implements WorkActService { } } + @Override + public void testGrantPoint(TestGrantFormDTO formDTO) { + //查询当前用户所属组织信息 + Result userResult = govOrgOpenFeignClient.getAgencyByStaff(loginUserUtil.getLoginUserId()); + String opAgencyId = userResult.getData().getId(); + MqBaseMsgDTO mqBaseMsgDTO = new MqBaseMsgDTO(); + //mq的事件类型 + mqBaseMsgDTO.setEventClass(EventEnum.ACTIVE_SEND_POINT.getEventClass()); + //事件code + mqBaseMsgDTO.setEventTag(EventEnum.ACTIVE_SEND_POINT.getEventTag()); + List basePointEventMsgArrayList = new ArrayList<>(); + BasePointEventMsg basePointEventMsg = new BasePointEventMsg(); + basePointEventMsg.setOpAgencyId(opAgencyId); + basePointEventMsg.setCustomerId(formDTO.getCustomerId()); + basePointEventMsg.setUserId(formDTO.getUserId()); + basePointEventMsg.setActionFlag(formDTO.getActionFlag()); + basePointEventMsg.setPoint(formDTO.getReward()); + basePointEventMsg.setIsCommon(true); + basePointEventMsg.setRemark(formDTO.getRemark()); + basePointEventMsg.setSourceId(formDTO.getSourceId()); + basePointEventMsg.setOperatorId(loginUserUtil.getLoginUserId()); + basePointEventMsgArrayList.add(basePointEventMsg); + mqBaseMsgDTO.setMsg(JSON.toJSONString(basePointEventMsgArrayList)); + logger.info("发送消息入参:"+JSON.toJSON(mqBaseMsgDTO)); + Result result = SendMqMsgUtils.sendMsg(mqBaseMsgDTO); + logger.info("发送消息返参:"+JSON.toJSON(result)); + if (!result.success()) { + logger.error("积分发放失败"); + return; + } + logger.info("积分发方成功"); + } + private void updateHeartUserInfo(ActInfoDTO actInfoDTO) { List actUserRelationDTOList=actUserRelationService.getUserList(actInfoDTO.getId(),StrConstant.EPMETY_STR); for(ActUserRelationDTO actUserRelation:actUserRelationDTOList){ @@ -1082,6 +1115,7 @@ public class WorkActServiceImpl implements WorkActService { return publishActResultDTO; } + private void noticePassedPeople(ActInfoDTO originalActInfo, ActInfoEntity newActInfoEntity) { /* List actUserRelationDTOList=actUserRelationDao.selectAuditingAndPassedList(originalActInfo.getId()); if(null==actUserRelationDTOList||actUserRelationDTOList.size()<1){ From 05db6ad2c8881df1b9fc9cd8463038e8dfd12e38 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Jul 2020 13:28:23 +0800 Subject: [PATCH 05/11] heart+1 --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 5d14e9d5b4..38669e327f 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.11 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.12 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 7b03c74811..cf61c66028 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.11 + 0.0.12 com.epmet epmet-heart From a2e61fb4b425be2ad62bdf1fef84b11e96ee7e8a Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 30 Jul 2020 13:42:10 +0800 Subject: [PATCH 06/11] =?UTF-8?q?POINT=20=20=20USER=20=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PointVerificationLogServiceImpl.java | 14 +++---- .../com/epmet/redis/UserBaseInfoRedis.java | 26 ++++++------ .../service/impl/GridLatestServiceImpl.java | 2 +- .../main/resources/mapper/UserBaseInfoDao.xml | 40 ++++++++++--------- .../main/resources/mapper/UserWechatDao.xml | 8 ++-- 5 files changed, 48 insertions(+), 42 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java index 319b3fa0ce..353751cbc5 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java @@ -189,14 +189,14 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl dataList = - baseDao.selectStaffVerificationLog(verificationParam.getStaffId(),getFirstDayDateOfMonth(date),getLastDayOfMonth(date)); - if(NumConstant.ONE < verificationParam.getPageNo()){ + baseDao.selectStaffVerificationLog(verificationParam.getStaffId(),getFirstDayDateOfMonth(date),getLastDayOfMonth(date)); + if(NumConstant.ONE == verificationParam.getPageNo()){ result.setTotalPoint( dataList.stream().mapToInt(o -> o.getPoint()).sum() ); }else{ - int fromIndex = verificationParam.getPageNo() * verificationParam.getPageSize(); - int toIndex = (verificationParam.getPageNo() + 1) * verificationParam.getPageSize(); + int fromIndex = (verificationParam.getPageNo() - 1) * verificationParam.getPageSize(); + int toIndex = verificationParam.getPageNo() * verificationParam.getPageSize(); if(toIndex > dataList.size()) { toIndex = dataList.size(); } @@ -205,17 +205,17 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl userIds = dataList.stream().map(data -> data.getUserId()).collect(Collectors.toList()); Result> userInfo = - epmetUserOpenFeignClient.queryUserBaseInfo(userIds); + epmetUserOpenFeignClient.queryUserBaseInfo(userIds); boolean userRequestCallback = userInfo.success() && null != userInfo.getData() && !userInfo.getData().isEmpty(); for(int i = NumConstant.ZERO ; i < dataList.size() ; i++){ - WorkPointVerificationDetailResultDTO o = new WorkPointVerificationDetailResultDTO(); + WorkPointVerificationDetailResultDTO o = ConvertUtils.sourceToTarget(dataList.get(i),WorkPointVerificationDetailResultDTO.class); o.setPoint(new StringBuilder("-").append(dataList.get(i).getPoint().toString()).toString()); - o.setRemark(dataList.get(i).getRemark()); if(userRequestCallback) { //如果是陌生人显示微信昵称 o.setUserNickname(userInfo.getData().get(i) == null ? ModuleConstant.EMPTY_STR : (StringUtils.isBlank(userInfo.getData().get(i).getShowName()) ? userInfo.getData().get(i).getNickname() : userInfo.getData().get(i).getShowName())); } + resultObj.add(o); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java index ac442388ad..40b34099a7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java @@ -106,18 +106,19 @@ public class UserBaseInfoRedis { baseInfo.setCustomerId(relation.getCustomerId()); BelongGridNameFormDTO gridParam = new BelongGridNameFormDTO(); gridParam.setGridId(relation.getGridId()); + baseInfo.setRegisteredGridId(relation.getGridId()); Result gridResult = - govOrgOpenFeignClient.getGridNameByGridId(gridParam); + govOrgOpenFeignClient.getGridNameByGridId(gridParam); if(gridResult.success() && null != gridResult.getData() && StringUtils.isNotBlank(gridResult.getData().getBelongsGridName())){ String gridFullName = gridResult.getData().getBelongsGridName(); baseInfo.setRegisteredGridName(gridFullName); StringBuffer buffer = new StringBuffer(gridFullName.split(ModuleConstant.DASH)[NumConstant.ONE]).append(ModuleConstant.DASH).append(baseInfo.getSurname()); - switch(baseInfo.getGender()){ - case NumConstant.ONE_STR : + switch (baseInfo.getGender()) { + case NumConstant.ONE_STR: buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_MALE); break; - case NumConstant.TWO_STR : + case NumConstant.TWO_STR: buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_FEMALE); break; default: @@ -125,18 +126,19 @@ public class UserBaseInfoRedis { } baseInfo.setShowName(buffer.toString()); } - }else{ - //如果没有居民注册记录，说明当前用户是陌生人，需要从陌生人网格访问列表中查询所属的客户Id - LatestGridInfoResultDTO gridLatest = + } + }else{ + //如果没有居民注册记录，说明当前用户是陌生人，需要从陌生人网格访问列表中查询所属的客户Id + LatestGridInfoResultDTO gridLatest = gridLatestDao.selectLatestGridInfoByUserId(userId); - if(null != gridLatest){ - baseInfo.setCustomerId(gridLatest.getCustomerId()); - } + if(null != gridLatest){ + baseInfo.setCustomerId(gridLatest.getCustomerId()); } - set(baseInfo); - return baseInfo; } + set(baseInfo); + return baseInfo; } + return null; } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java index c6012384ba..71c4005717 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java @@ -197,7 +197,7 @@ public class GridLatestServiceImpl extends BaseServiceImpl diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml index cfacc58191..e96b505b09 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml @@ -93,10 +93,10 @@ From c89882fc86d77b94768a52c0aa54a3784ed0b6a4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Jul 2020 14:14:04 +0800 Subject: [PATCH 11/11] heart+1 --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 38669e327f..917a45aa95 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.12 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.13 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 cf61c66028..056fdd1f99 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.12 + 0.0.13 com.epmet epmet-heart