From a98ea74470f3abebed5f5948988ec9898ee0f65c Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Mon, 3 Aug 2020 13:55:10 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=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 --- .../src/main/java/com/epmet/dao/UserRoleDao.java | 4 ++-- .../main/java/com/epmet/service/impl/UserRoleServiceImpl.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java index 58b864bce3..e91e0c8d46 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java @@ -58,9 +58,9 @@ public interface UserRoleDao extends BaseDao { * 根据用户ID，查询用户所属角色: 多种身份 * * @param userId - * @return com.epmet.commons.tools.utils.Result> + * @return java.util.List * @Author zhangyong * @Date 14:24 2020-07-23 **/ - Result> getUserRoleInfoByUserId(@Param("userId") String userId); + List getUserRoleInfoByUserId(@Param("userId") String userId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java index 4c0eafdad9..9e48e599e2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java @@ -134,7 +134,8 @@ public class UserRoleServiceImpl extends BaseServiceImpl> getUserRoleInfoByUserId(String userId) { - return baseDao.getUserRoleInfoByUserId(userId); + List list = baseDao.getUserRoleInfoByUserId(userId); + return new Result>().ok(list); } } From 34289fa3200457da46a6bcc801c197ed30855f90 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 3 Aug 2020 14:00:26 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E7=A7=AF=E5=88=86=20=20=2017=20->=2018?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-point-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-point/epmet-point-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 b06be7e182..d0fc88fc97 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.17 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.18 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 526f37eaa0..6388663f7d 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.17 + 0.0.18 epmet-point com.epmet From 8765258142b1f485f0984836a0357c3ca1fb0fd3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 3 Aug 2020 14:22:45 +0800 Subject: [PATCH 03/16] =?UTF-8?q?userdetail=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/work/AactUserDetailFormDTO.java | 2 ++ .../src/main/java/com/epmet/dao/ActUserRelationDao.java | 3 ++- .../com/epmet/service/impl/WorkActUserServiceImpl.java | 9 +++++---- .../src/main/resources/mapper/ActUserRelationDao.xml | 5 ++++- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/AactUserDetailFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/AactUserDetailFormDTO.java index 3e653e76c1..07e481fb99 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/AactUserDetailFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/AactUserDetailFormDTO.java @@ -24,4 +24,6 @@ public class AactUserDetailFormDTO implements Serializable { @NotBlank(message = "主键不能为空", groups = {AddUserInternalGroup.class}) private String actUserRelationId; + @NotBlank(message = "当前活动id不能为空", groups = {UserHistoricalActFormDTO.AddUserInternalGroup.class}) + private String currentActId; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java index 7b97d6cf80..1322db3c83 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java @@ -97,11 +97,12 @@ public interface ActUserRelationDao extends BaseDao { /** * @return java.lang.Integer * @param userId + * @param currentActId * @author yinzuomei * @description 报名活动个数（act_user_realation） * @Date 2020/7/23 15:57 **/ - Integer countSignUpActNum(String userId); + Integer countSignUpActNum(@Param("userId")String userId,@Param("currentActId") String currentActId); /** * @return java.lang.Integer 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 a0aa461f52..1fa1472042 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 @@ -348,7 +348,7 @@ public class WorkActUserServiceImpl implements WorkActUserService { ） */ resultDTO.setStatus(actUserRelationDTO.getStatus()); - HistoricalActInfo historicalActInfo=this.getHistoricalActInfo(actUserRelationDTO.getUserId()); + HistoricalActInfo historicalActInfo=this.getHistoricalActInfo(actUserRelationDTO.getUserId(),formDTO.getCurrentActId()); resultDTO.setHistoricalActInfo(historicalActInfo); if(ActConstant.ACT_USER_STATUS_AUDITING.equals(resultDTO.getStatus())){ //被拒绝过，才赋值 @@ -399,7 +399,7 @@ public class WorkActUserServiceImpl implements WorkActUserService { resultDTO.setRealName(userBaseInfoResultDTO.getRealName()); } //参与活动统计值 - HistoricalActInfo historicalActInfo=getHistoricalActInfo(formDTO.getUserId()); + HistoricalActInfo historicalActInfo=getHistoricalActInfo(formDTO.getUserId(),formDTO.getCurrentActId()); resultDTO.setSignInActNum(historicalActInfo.getSignInActNum()); //减去当前的 resultDTO.setSignUpActNum(historicalActInfo.getSignUpActNum()); @@ -639,11 +639,12 @@ public class WorkActUserServiceImpl implements WorkActUserService { /** * @return com.epmet.dto.result.work.HistoricalActInfo * @param userId + * @param currentActId * @author yinzuomei * @description 用户历史活动情况 * @Date 2020/7/23 15:56 **/ - private HistoricalActInfo getHistoricalActInfo(String userId) { + private HistoricalActInfo getHistoricalActInfo(String userId,String currentActId) { HistoricalActInfo historicalActInfo=new HistoricalActInfo(); /** * 实际参加活动个数(已经签到的) @@ -653,7 +654,7 @@ public class WorkActUserServiceImpl implements WorkActUserService { /** * 报名活动个数（act_user_realation） */ - Integer signUpActNum=actUserRelationDao.countSignUpActNum(userId); + Integer signUpActNum=actUserRelationDao.countSignUpActNum(userId,currentActId); historicalActInfo.setSignUpActNum(signUpActNum); /** * 获得积分活动个数 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 9d7e256b9e..618cfb76fb 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 @@ -114,7 +114,7 @@ - SELECT count( 1 ) as total FROM @@ -123,6 +123,9 @@ DEL_FLAG = '0' and acu.STATUS !='auditing' AND acu.USER_ID = #{userId} + + and acu.ACT_ID != #{currentActId} + From ceec9c1abe0019532fed6fc92b523e2f2478d30a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 3 Aug 2020 14:23:21 +0800 Subject: [PATCH 04/16] heart+1=>26 --- .../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 0387c203c3..9379505508 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.25 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.26 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 c0ec2bd194..c44bc98d5b 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.25 + 0.0.26 com.epmet epmet-heart From 8ec1c8a41f489ebf1f4dcdb9ae91ba144a82189f Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Mon, 3 Aug 2020 14:38:32 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E5=8F=82=E4=B8=8E=E6=B4=BB=E5=8A=A8=E4=B8=AA=E6=95=B0=EF=BC=88?= =?UTF-8?q?=E7=AD=BE=E5=88=B0+1=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/ActSignInRecServiceImpl.java | 11 +++++++++++ .../src/main/resources/mapper/HeartUserInfoDao.xml | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInRecServiceImpl.java index c2fdd5c71d..738deca407 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInRecServiceImpl.java @@ -38,6 +38,7 @@ import com.epmet.dao.ActSignInRecDao; import com.epmet.dao.ActUserRelationDao; import com.epmet.dto.ActSignInRecDTO; import com.epmet.dto.ActUserRelationDTO; +import com.epmet.dto.HeartUserInfoDTO; import com.epmet.dto.form.resi.ResiActInsertLiveFormDTO; import com.epmet.dto.form.resi.ResiActSignInFormDTO; import com.epmet.entity.ActSignInPicEntity; @@ -45,6 +46,7 @@ import com.epmet.entity.ActSignInRecEntity; import com.epmet.redis.ActSignInRecRedis; import com.epmet.service.ActLiveRecService; import com.epmet.service.ActSignInRecService; +import com.epmet.service.HeartUserInfoService; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -76,6 +78,9 @@ public class ActSignInRecServiceImpl extends BaseServiceImpl - PARTICIPATION_NUM = #{participationNum}, + PARTICIPATION_NUM = PARTICIPATION_NUM + #{participationNum}, OBTAIN_POINT_NUM = #{obtainPointNum}, From 4d69f7bd47b8f63cd0afd082658d5e22323178b7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 3 Aug 2020 15:10:22 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9handleRRException?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/exception/RenExceptionHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java index 4495417421..5debad3823 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java @@ -54,12 +54,12 @@ public class RenExceptionHandler { */ @ExceptionHandler(RenException.class) public Result handleRRException(RenException ex){ - logger.error(ExceptionUtils.getErrorStackTrace(ex)); if (ex.getCode() > 8000) { Result result=new Result().error(ex.getCode()); result.setData(ex.getMsg()); return result; } + logger.error(ExceptionUtils.getErrorStackTrace(ex)); Result result=new Result().error(); result.setData(ex.getMsg()); return result; From 8ad078bac264ad8a84eb51320be9b05687f3c40f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 3 Aug 2020 15:12:40 +0800 Subject: [PATCH 07/16] =?UTF-8?q?heart=E3=80=81user+1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 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 9379505508..853fa5193d 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.26 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.27 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 c44bc98d5b..2aa8e34cad 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.26 + 0.0.27 com.epmet epmet-heart diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 9b9dc33093..d26dd1fa33 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.102 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.103 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index a8810c4f21..79101b47d9 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.102 + 0.3.103 com.epmet epmet-user From 3479e5cca5f9ba637145f587e5f3e7d29ba9b5e1 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Mon, 3 Aug 2020 15:39:40 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=EF=BC=9A=E5=AE=9E?= =?UTF-8?q?=E9=99=85=E5=8F=82=E4=B8=8E=E6=B4=BB=E5=8A=A8=E4=B8=AA=E6=95=B0?= =?UTF-8?q?=EF=BC=8C=E4=BB=A3=E7=A0=81=E5=B1=8F=E8=94=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/ResiActListController.java | 2 +- .../epmet/service/impl/ActSignInRecServiceImpl.java | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) 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 9310d818b4..5b7412b415 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 @@ -239,7 +239,7 @@ public class ResiActListController { * @Date 11:21 2020-07-28 **/ @PostMapping("checksigninaddress") - public Result cancelSignUp(@RequestBody ResiActCaculateDistanceFormDTO formDTO) { + public Result checkSignInAddress(@RequestBody ResiActCaculateDistanceFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, ResiActCaculateDistanceFormDTO.AddUserInternalGroup.class); return actInfoService.checkSignInAddress(formDTO); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInRecServiceImpl.java index 738deca407..a896694d27 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInRecServiceImpl.java @@ -78,8 +78,8 @@ public class ActSignInRecServiceImpl extends BaseServiceImpl Date: Mon, 3 Aug 2020 15:53:46 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E7=88=B1=E5=BF=83=E6=A6=9C=EF=BC=8C?= =?UTF-8?q?=E5=88=86=E9=92=9F=E8=BD=AC=E5=B0=8F=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/HeartUserInfoDTO.java | 6 +++--- .../com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java | 2 +- .../src/main/resources/mapper/HeartUserInfoDao.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/HeartUserInfoDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/HeartUserInfoDTO.java index 8ea2b28322..f84b5ab64c 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/HeartUserInfoDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/HeartUserInfoDTO.java @@ -55,10 +55,10 @@ public class HeartUserInfoDTO implements Serializable { private Boolean volunteerFlag; /** - * 爱心时长(单位：分钟)（参与并签到了的活动，实际结束-实际开始）签到的。未签到但是有积分的 + * 爱心时长(单位：小时)（参与并签到了的活动，实际结束-实际开始）签到的。未签到但是有积分的 */ - private Integer kindnessTime; + private Double kindnessTime; /** * 实际参与活动个数（签到+1） @@ -100,4 +100,4 @@ public class HeartUserInfoDTO implements Serializable { */ private Date updatedTime; -} \ No newline at end of file +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java index d3d50da078..6fb9a6cadc 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java @@ -51,7 +51,7 @@ public class ResiLeaderboardResultDTO implements Serializable { /** * 爱心时长(单位：小时) */ - private Integer kindnessTime; + private Double kindnessTime; /** * 参加次数 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/HeartUserInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/HeartUserInfoDao.xml index 9df9414e17..fdbea79581 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/HeartUserInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/HeartUserInfoDao.xml @@ -46,7 +46,7 @@ SELECT ui.USER_ID userId, ui.VOLUNTEER_FLAG volunteerFlag, - ui.KINDNESS_TIME kindnessTime, + TRUNCATE(ui.KINDNESS_TIME / 60, 2) kindnessTime, ui.PARTICIPATION_NUM participationNum FROM heart_user_info ui WHERE ui.DEL_FLAG = '0' From 57bc53671b82f7f1360aa7d01e01c19cca5fb796 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 3 Aug 2020 15:56:14 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9heart=5Fuser=5Finfo,?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=BB=93=E6=9D=9F=E5=90=8E=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AE=9E=E9=99=85=E5=8F=82=E4=B8=8E=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=95=B0+1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/HeartUserInfoDTO.java | 2 +- .../com/epmet/entity/HeartUserInfoEntity.java | 2 +- .../epmet/service/impl/WorkActServiceImpl.java | 18 ++++++++++++++++-- .../resources/db/migration/epmet_heart.sql | 2 +- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/HeartUserInfoDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/HeartUserInfoDTO.java index 8ea2b28322..778e30884b 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/HeartUserInfoDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/HeartUserInfoDTO.java @@ -61,7 +61,7 @@ public class HeartUserInfoDTO implements Serializable { private Integer kindnessTime; /** - * 实际参与活动个数（签到+1） + * 实际参与活动个数 */ private Integer participationNum; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/HeartUserInfoEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/HeartUserInfoEntity.java index c7b90074b1..b4368fe26c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/HeartUserInfoEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/HeartUserInfoEntity.java @@ -57,7 +57,7 @@ public class HeartUserInfoEntity extends BaseEpmetEntity { private Integer kindnessTime; /** - * 实际参与活动个数（签到+1） + * 实际参与活动个数 */ private Integer participationNum; 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 c228c937a0..a390e9c14e 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 @@ -819,7 +819,7 @@ public class WorkActServiceImpl implements WorkActService { //act_info表改为已完成 actInfoDTO.setActStatus(ActConstant.ACT_STATUS_FINISHED); actInfoService.update(actInfoDTO); - //发放爱心时长、参与活动并获得积分的次数 + //发放爱心时长、参与活动并获得积分的次数、实际参与活动个数 updateHeartUserInfo(actInfoDTO); //保存结束活动日志 this.saveActOperationRec(actId); @@ -950,8 +950,10 @@ public class WorkActServiceImpl implements WorkActService { if(null==heartUserInfoDTO){ continue; } + boolean updateFlag=false; if(actInfoDTO.getReward()>0){ if(ActConstant.ACT_USER_STATUS_AGREE.equals(actUserRelation.getRewardFlag())){ + updateFlag=true; heartUserInfoDTO.setObtainPointNum(heartUserInfoDTO.getObtainPointNum()+1); } } @@ -959,6 +961,7 @@ public class WorkActServiceImpl implements WorkActService { //爱心时长发放（签到的。未签到但是有积分的） if(ActConstant.ACT_USER_STATUS_SIGNED_IN.equals(actUserRelation.getSignInFlag())){ //已签到的 + updateFlag=true; heartUserInfoDTO.setKindnessTime(heartUserInfoDTO.getKindnessTime()+actInfoDTO.getServiceMin()); UserKindnessTimeLogEntity userKindnessTimeLogEntity=new UserKindnessTimeLogEntity(); userKindnessTimeLogEntity.setActId(actInfoDTO.getId()); @@ -968,6 +971,7 @@ public class WorkActServiceImpl implements WorkActService { }else{ //未签到，但是有积分的 if(ActConstant.ACT_USER_STATUS_AGREE.equals(actUserRelation.getRewardFlag())){ + updateFlag=true; heartUserInfoDTO.setKindnessTime(heartUserInfoDTO.getKindnessTime()+actInfoDTO.getServiceMin()); UserKindnessTimeLogEntity userKindnessTimeLogEntity=new UserKindnessTimeLogEntity(); userKindnessTimeLogEntity.setActId(actInfoDTO.getId()); @@ -977,7 +981,17 @@ public class WorkActServiceImpl implements WorkActService { } } } - if(actInfoDTO.getReward()>0||actInfoDTO.getServiceMin()>0){ + //审核通过并且已经签到的更新实际参与活动数，+1 + if (ActConstant.ACT_USER_STATUS_SIGNED_IN.equals(actUserRelation.getSignInFlag()) + && ActConstant.ACT_USER_STATUS_PASSED.equals(actUserRelation.getStatus())) { + updateFlag = true; + if (null != heartUserInfoDTO.getParticipationNum() && heartUserInfoDTO.getParticipationNum() >= 0) { + heartUserInfoDTO.setParticipationNum(heartUserInfoDTO.getParticipationNum() + 1); + } else if (null == heartUserInfoDTO.getParticipationNum()) { + heartUserInfoDTO.setParticipationNum(NumConstant.ONE); + } + } + if (updateFlag) { heartUserInfoService.update(heartUserInfoDTO); } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/epmet_heart.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/epmet_heart.sql index 1cc390bad2..7cc204d675 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/epmet_heart.sql +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/epmet_heart.sql @@ -350,7 +350,7 @@ CREATE TABLE `heart_user_info` ( `USER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户id', `VOLUNTEER_FLAG` tinyint(1) NOT NULL COMMENT '1是志愿者，0不是志愿者（志愿者注册成功后需要来更新值）', `KINDNESS_TIME` int(11) NOT NULL DEFAULT 0 COMMENT '爱心时长(单位：分钟)（参与并签到了的活动，实际结束-实际开始）签到的。未签到但是有积分的\r\n', - `PARTICIPATION_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '实际参与活动个数（签到+1）', + `PARTICIPATION_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '实际参与活动个数', `OBTAIN_POINT_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '参与活动并获得积分的次数（结束活动时，如果给用户发放积分则该数值+1）', `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记', `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁', From ed313f4f1ab80b7a7f419b05cf32ad63c0b1a5fa Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 3 Aug 2020 15:57:40 +0800 Subject: [PATCH 11/16] heart+1=>28 --- .../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 853fa5193d..e51f7274fc 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.27 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.28 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 2aa8e34cad..2a1a3505ce 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.27 + 0.0.28 com.epmet epmet-heart From c11bf967942b7a813aa16f90dde9f6e25021e542 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Mon, 3 Aug 2020 16:04:21 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E7=88=B1=E5=BF=83=E6=A6=9C-=E6=97=B6?= =?UTF-8?q?=E9=95=BF=EF=BC=9A=E5=B0=8F=E6=97=B6=E8=BD=AC=E5=88=86=E9=92=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/HeartUserInfoDTO.java | 4 ++-- .../com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java | 4 ++-- .../src/main/resources/mapper/HeartUserInfoDao.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/HeartUserInfoDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/HeartUserInfoDTO.java index aae39255a7..1aab8cb7f9 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/HeartUserInfoDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/HeartUserInfoDTO.java @@ -55,10 +55,10 @@ public class HeartUserInfoDTO implements Serializable { private Boolean volunteerFlag; /** - * 爱心时长(单位：小时)（参与并签到了的活动，实际结束-实际开始）签到的。未签到但是有积分的 + * 爱心时长(单位：分钟)（参与并签到了的活动，实际结束-实际开始）签到的。未签到但是有积分的 */ - private Double kindnessTime; + private Integer kindnessTime; /** * 实际参与活动个数 diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java index 6fb9a6cadc..44964cfd73 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java @@ -49,9 +49,9 @@ public class ResiLeaderboardResultDTO implements Serializable { private Boolean volunteerFlag; /** - * 爱心时长(单位：小时) + * 爱心时长(单位：分钟) */ - private Double kindnessTime; + private Integer kindnessTime; /** * 参加次数 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/HeartUserInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/HeartUserInfoDao.xml index fdbea79581..9df9414e17 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/HeartUserInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/HeartUserInfoDao.xml @@ -46,7 +46,7 @@ SELECT ui.USER_ID userId, ui.VOLUNTEER_FLAG volunteerFlag, - TRUNCATE(ui.KINDNESS_TIME / 60, 2) kindnessTime, + ui.KINDNESS_TIME kindnessTime, ui.PARTICIPATION_NUM participationNum FROM heart_user_info ui WHERE ui.DEL_FLAG = '0' From 8b18a68a780b7be9b936f801442061bbdf7d423c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 3 Aug 2020 16:19:59 +0800 Subject: [PATCH 13/16] heart+1=>29 --- .../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 e51f7274fc..6ccb3197a1 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.28 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.29 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 2a1a3505ce..54bb0afbeb 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.28 + 0.0.29 com.epmet epmet-heart From c350808244a08f214d77321b6b14267f9ad20a6a Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 3 Aug 2020 16:25:10 +0800 Subject: [PATCH 14/16] =?UTF-8?q?api=E8=AE=A2=E9=98=85=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9A=82=E6=97=B6=E6=B3=A8=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/config/MqSubcribeConfig.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/config/MqSubcribeConfig.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/config/MqSubcribeConfig.java index 0a9c628604..c1433be7d9 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/config/MqSubcribeConfig.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/config/MqSubcribeConfig.java @@ -6,9 +6,7 @@ import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -17,20 +15,21 @@ import java.util.Map; /** * desc:订阅积分事件 */ -@Component +//@Component public class MqSubcribeConfig { private Logger logger = LogManager.getLogger(MqSubcribeConfig.class); private String mqServer = "https://epmet-dev.elinkservice.cn/estos/mq-subscriber/subscribe"; private String token = "1cfcbb5ade1e3202855ee5819983d773"; - @PostConstruct + //todo 由于api订阅报错 暂时通过页面订阅 + //@PostConstruct private void subscribe() { MqSubscribeFormDTO event = new MqSubscribeFormDTO(); - event.setBelongAppId("202007161443499985fa2d397436d10356542134c8f008c48"); - event.setEventClass("epmet_heart"); - event.setEventTag("active_send_point"); - String callbackUrl = "http://192.168.1.119/point/callback/sendPoint"; + event.setBelongAppId("202007151206522723ab739c43c73afe1e696f88ef4ee45a9"); + event.setEventClass("test_event_cls_1"); + event.setEventTag("test_event_1"); + String callbackUrl = "http://118.190.150.119/testpub/test/post"; //callbackUrl = ""; event.setCallbackUrl(callbackUrl); List subscribeFormDTOList = new ArrayList<>(); From e889d0952755e535a512664d919f4c0140052c27 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 3 Aug 2020 16:32:31 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=AB=AF=E6=B6=88=E6=81=AF=E6=B5=AE=E7=AA=97=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?selectMyMessageList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/UserMessageDao.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml index e10f36499c..fa4266f1e7 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml @@ -40,10 +40,8 @@ user_message WHERE del_flag = '0' - AND ( - CUSTOMER_ID = #{customerId} - AND GRID_ID = #{gridId} - AND USER_ID = #{userId}) + AND CUSTOMER_ID = #{customerId} + AND USER_ID = #{userId} ORDER BY CREATED_TIME DESC LIMIT #{pageNo}, #{pageSize} From 8a8d6a0b9e51aa573c3d4522024a82781f63603f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 3 Aug 2020 16:34:21 +0800 Subject: [PATCH 16/16] point\message+1 --- .../epmet-message-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-message/epmet-message-server/pom.xml | 2 +- .../epmet-point-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-point/epmet-point-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml index 8d318e5d3f..7270990fd3 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.25 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.26 ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index e48a0d177e..7de41867a5 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.25 + 0.3.26 com.epmet epmet-message 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 d0fc88fc97..303753d2d5 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.18 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.19 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 6388663f7d..c69724dee4 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.18 + 0.0.19 epmet-point com.epmet