From 3462a19f48a250ab53caa814407ee08007275b55 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Mon, 3 Aug 2020 17:56:26 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5-=20=E6=B4=BB=E5=8A=A8=E5=BD=93=E5=89=8D=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/ActInfoServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 2470f86c76..01b232aa3b 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,6 +23,7 @@ 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; @@ -297,13 +298,12 @@ public class ActInfoServiceImpl extends BaseServiceImpl Date: Tue, 4 Aug 2020 09:39:16 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=9C=80=E6=96=B0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8sql=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml | 2 -- 1 file changed, 2 deletions(-) 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 532a1ec5b2..2c11d426dd 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 @@ -303,7 +303,6 @@ and NOW() then 'end_sign_up' when NOW() - and = ]]> NOW() then 'in_progress' end as actCurrentState FROM act_info i @@ -311,7 +310,6 @@ WHERE i.DEL_FLAG = '0' AND i.CUSTOMER_ID = #{customerId} AND i.ACT_STATUS != 'finished' AND i.ACT_STATUS != 'canceled' - AND ]]> NOW() ORDER BY i.CREATED_TIME DESC LIMIT 0, #{num} From d34509f12aa29b7a8b7fbbf7456b65f50cff3839 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Tue, 4 Aug 2020 09:56:43 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E3=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9E=E5=86=B5=EF=BC=8C=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=8F=91=E9=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/constant/ActMessageConstant.java | 10 ---------- .../epmet/service/impl/ActLiveRecServiceImpl.java | 12 +++++++++--- .../epmet/service/impl/VolunteerInfoServiceImpl.java | 3 --- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActMessageConstant.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActMessageConstant.java index 5fcbb51334..9806de9b80 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActMessageConstant.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActMessageConstant.java @@ -26,16 +26,6 @@ public interface ActMessageConstant { */ String ACT_POINTS_EVENT_REMARK="参与%s"; - /** - * 居民端-用户认证志愿者，发送消息 - */ - String POINTS_EVENT_VOLUNTEER_AUTHENTICATE="用户%s，认证志愿者"; - - /** - * 居民端-添加实况，发送消息 - */ - String ACT_POINTS_EVENT_VOLUNTEER_LIVE="用户%s，添加活动实况,活动:%s"; - /** * 工作端-重新发布活动，通知待审核+已经审核通过的用户 */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java index d1f11ccf68..30d9b151ec 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java @@ -39,6 +39,7 @@ import com.epmet.commons.tools.utils.SendMqMsgUtils; import com.epmet.constant.ActMessageConstant; import com.epmet.dao.ActLivePicDao; import com.epmet.dao.ActLiveRecDao; +import com.epmet.dto.ActInfoDTO; import com.epmet.dto.ActLivePicDTO; import com.epmet.dto.ActLiveRecDTO; import com.epmet.dto.form.resi.ResiActInsertLiveFormDTO; @@ -48,6 +49,7 @@ import com.epmet.entity.ActLivePicEntity; import com.epmet.entity.ActLiveRecEntity; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.redis.ActLiveRecRedis; +import com.epmet.service.ActInfoService; import com.epmet.service.ActLiveRecService; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -77,6 +79,9 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl Date: Tue, 4 Aug 2020 09:59:00 +0800 Subject: [PATCH 04/13] heart+1=>31 --- .../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 7147290341..9cc42e154b 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.30 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.31 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 fd1aeb191c..a2a079992c 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.30 + 0.0.31 com.epmet epmet-heart From 043909d9013dbfb80728be02666b1bcce4687ece Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 4 Aug 2020 10:11:31 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E7=A7=AF=E5=88=86=20=20=2021=20=20=20->?= =?UTF-8?q?=20=20=20=2022?= 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 d1f4e31009..f06ae5ae1a 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.21 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.22 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 14295d4bfd..ef7c14771a 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.21 + 0.0.22 epmet-point com.epmet From 202debaf950317a98a085ae5382008ff1f87064e Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 4 Aug 2020 10:13:46 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E6=B7=BB=E5=8A=A0log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/PublicUserLoginServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 cece305fd2..82c6875518 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 @@ -283,13 +283,16 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { public UserTokenResultDTO register(RegisterFormDTO formDTO) { //1.调用epmet-third服务，完成信息注册 String data = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.REGISTER_URL, JSON.toJSONString(formDTO)).getData(); + logger.info("data数据为："+data); JSONObject toResult = JSON.parseObject(data); Result result = ConvertUtils.mapToEntity(toResult, Result.class); + logger.info("转换的result结果为："+result); if (!result.success()) { logger.error(String.format("调用epmet_third服务初始化用户信息失败,数据来源[%s],手机号[%s],userId:[%S]", formDTO.getSource(), formDTO.getPhone(), formDTO.getUserId())); throw new RenException(result.getCode()); } Object RegisterResult = result.getData(); + logger.info("getData()数据为："+RegisterResult); JSONObject jsonObject = JSON.parseObject(RegisterResult.toString()); RegisterResultDTO resultDTO = ConvertUtils.mapToEntity(jsonObject, RegisterResultDTO.class); From 4e7fff03b6f36a37be9cabb07de0329342154e4b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 4 Aug 2020 10:15:09 +0800 Subject: [PATCH 07/13] =?UTF-8?q?auth=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/deploy/docker-compose-dev.yml | 2 +- epmet-auth/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index acdd543ed8..55b559232f 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.66 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.67 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 16361f102a..b4ca71a0e4 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.66 + 0.3.67 com.epmet epmet-cloud From 74f2558e82713c10f468f325060672b634d5732e Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 4 Aug 2020 10:29:08 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=8D=95=E4=BD=8D=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/result/PointDetailResultDTO.java | 1 + .../main/java/com/epmet/service/impl/PointRuleServiceImpl.java | 1 + 2 files changed, 2 insertions(+) diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointDetailResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointDetailResultDTO.java index cf8dfa8f67..687a8def4a 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointDetailResultDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointDetailResultDTO.java @@ -18,6 +18,7 @@ public class PointDetailResultDTO implements Serializable { private String ruleDesc; private Integer point; private String pointUnit; + private String pointUnitDesc; private Integer upLimit; private Boolean enabledFlag; private String upLimitDesc; diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java index c46ec497b7..9e5d5dea95 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java @@ -131,6 +131,7 @@ public class PointRuleServiceImpl extends BaseServiceImpl Date: Tue, 4 Aug 2020 10:36:31 +0800 Subject: [PATCH 09/13] =?UTF-8?q?paUser=E6=8F=92=E5=85=A5=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0Source?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/PaCustomerServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java index ae9d730829..8ff724fb1d 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java @@ -182,6 +182,7 @@ public class PaCustomerServiceImpl extends BaseServiceImpl Date: Tue, 4 Aug 2020 10:36:53 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/grid/controller/ResiMineGridController.java | 7 ++++--- .../java/com/epmet/feign/EpmetUserOpenFeignClient.java | 2 +- .../java/com/epmet/controller/GridLatestController.java | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java index 641b6b410f..62449677da 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java @@ -50,14 +50,15 @@ public class ResiMineGridController { /** * @return - * @param formDTO + * @param appId * @Author sun * @Description 单客户-获取用户最近访问网格 * @Date 2020/8/3 **/ @GetMapping("latestgridinfo") - public Result latestGridInfo(@LoginUser TokenDto token, @RequestBody LatestGridInfoFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO); + public Result latestGridInfo(@LoginUser TokenDto token, @RequestParam("appId") String appId) { + LatestGridInfoFormDTO formDTO = new LatestGridInfoFormDTO(); + formDTO.setAppId(appId); formDTO.setUserId(token.getUserId()); return new Result().ok(resiMineGridService.latestGridInfo(formDTO)); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index c986552e72..8ea872a683 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -257,6 +257,6 @@ public interface EpmetUserOpenFeignClient { * @Description 单客户-获取用户最近访问网格 * @Date 2020/8/3 **/ - @GetMapping(value = "epmetuser/gridlatest/latestgridinfo") + @PostMapping(value = "epmetuser/gridlatest/latestgridinfo") Result latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java index 61452175ba..ba8fd626ce 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java @@ -138,7 +138,7 @@ public class GridLatestController { * @Description 单客户-根据客户Id和userId查询用户最后一次访问的网格 * @Date 2020/8/3 **/ - @GetMapping("latestgridinfo") + @PostMapping("latestgridinfo") public Result latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO){ return new Result().ok(gridLatestService.latestGridInfo(formDTO)); } From bfd4f21dbe12a49f89ba892224cc4ddb424a96aa Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 4 Aug 2020 10:38:31 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-mine/resi-mine-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-mine/resi-mine-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/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml index facc0b366f..dd54ce0a5f 100644 --- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.36 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.37 ports: - "8094:8094" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index 0f7dd8c6a3..ad8874b1d8 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.36 + 0.3.37 com.epmet resi-mine 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 6c7f840ba8..d409fc8a91 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.105 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.106 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 0876fd15f0..427be0755d 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.105 + 0.3.106 com.epmet epmet-user From 98a9f3aefc8d5ae696dbc66e47eff25f5aa867ed Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 4 Aug 2020 10:44:14 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=B8=AD=E3=80=81?= =?UTF-8?q?=E5=B7=B2=E7=BB=93=E6=9D=9F=E3=80=81=E5=B7=B2=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E7=9A=84=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/work/ActListCommonFormDTO.java | 15 ++++++++++++++- .../com/epmet/dto/form/work/CancelActFormDTO.java | 2 +- .../com/epmet/dto/form/work/TestGrantFormDTO.java | 2 +- .../dto/result/work/CanceledActResultDTO.java | 2 +- .../dto/result/work/FinishedActResultDTO.java | 2 +- .../main/java/com/epmet/dto/result/work/Grid.java | 2 +- .../dto/result/work/InProgressActResultDTO.java | 2 +- .../dto/result/work/PublishActInitResultDTO.java | 2 +- .../epmet/dto/result/work/SponsorResultDTO.java | 2 +- .../src/main/java/com/epmet/dao/ActInfoDao.java | 13 +++++++------ .../epmet/service/impl/WorkActServiceImpl.java | 12 +++++++++--- .../src/main/resources/mapper/ActInfoDao.xml | 9 ++++++--- 12 files changed, 44 insertions(+), 21 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/ActListCommonFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/ActListCommonFormDTO.java index bc89178a5c..f4ad2ca4f1 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/ActListCommonFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/ActListCommonFormDTO.java @@ -2,11 +2,13 @@ package com.epmet.dto.form.work; import lombok.Data; +import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** - * 描述一下 + * 工作端 进行中-活动列表、已取消-活动列表、已结束-活动列表 统一入参DTO * * @author yinzuomei@elink-cn.com * @date 2020/7/23 21:21 @@ -20,4 +22,15 @@ public class ActListCommonFormDTO implements Serializable { */ @NotBlank(message = "客户id不能为空", groups = {AddUserInternalGroup.class }) private String customerId; + + /** + * 页码 + */ + @Min(1) + private Integer pageNo; + + /** + * 每页显示条数 + */ + private Integer pageSize = 20; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/CancelActFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/CancelActFormDTO.java index 1ae524df14..a31924f994 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/CancelActFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/CancelActFormDTO.java @@ -7,7 +7,7 @@ import javax.validation.constraints.NotBlank; import java.io.Serializable; /** - * 描述一下 + * 取消活动入参DTO * * @author yinzuomei@elink-cn.com * @date 2020/7/26 17:23 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 index 4c6e2fe66b..5143bc30ef 100644 --- 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 @@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull; import java.io.Serializable; /** - * 描述一下 + * 测试发放积分入参DTO * * @author yinzuomei@elink-cn.com * @date 2020/7/30 12:15 diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActResultDTO.java index 4c8b013287..17e21fc678 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActResultDTO.java @@ -7,7 +7,7 @@ import java.io.Serializable; import java.util.Date; /** - * 描述一下 + * 工作端：已取消-活动列表返参DTO * * @author yinzuomei@elink-cn.com * @date 2020/7/23 23:09 diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActResultDTO.java index 6a23d0498b..a908287e24 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActResultDTO.java @@ -7,7 +7,7 @@ import java.io.Serializable; import java.util.Date; /** - * 描述一下 + * 工作端：已结束-活动列表 返参DTO * * @author yinzuomei@elink-cn.com * @date 2020/7/23 23:19 diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/Grid.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/Grid.java index 581eac9d9a..870248e90e 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/Grid.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/Grid.java @@ -25,7 +25,7 @@ import java.io.Serializable; /** * 添加组织-接口返参 * - * @author sun + * @author yinzuomei */ @Data public class Grid implements Serializable { diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActResultDTO.java index c7c73f6a96..7f0d214f70 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActResultDTO.java @@ -8,7 +8,7 @@ import java.io.Serializable; import java.util.Date; /** - * 描述一下 + * 工作端：进行中-活动列表返参DTO * * @author yinzuomei@elink-cn.com * @date 2020/7/23 21:23 diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/PublishActInitResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/PublishActInitResultDTO.java index 08c3ff1d97..f71b67943a 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/PublishActInitResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/PublishActInitResultDTO.java @@ -5,7 +5,7 @@ import lombok.Data; import java.io.Serializable; /** - * 描述一下 + * 发布活动初始化接口返参 * * @author yinzuomei@elink-cn.com * @date 2020/7/20 17:49 diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/SponsorResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/SponsorResultDTO.java index ee7006381f..46746686ca 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/SponsorResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/SponsorResultDTO.java @@ -6,7 +6,7 @@ import java.io.Serializable; import java.util.List; /** - * 描述一下 + * 活动主办方 返参DTO * * @author yinzuomei@elink-cn.com * @date 2020/7/23 20:23 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java index e27d70b442..002bd3a6b3 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java @@ -23,6 +23,7 @@ import com.epmet.dto.form.resi.ResiActBaseFormDTO; import com.epmet.dto.form.resi.ResiActDetailFormDTO; import com.epmet.dto.form.resi.ResiLatestActFormDTO; import com.epmet.dto.form.resi.ResiMyActFormDTO; +import com.epmet.dto.form.work.ActListCommonFormDTO; import com.epmet.dto.result.resi.*; import com.epmet.dto.result.work.*; import com.epmet.entity.ActInfoEntity; @@ -228,30 +229,30 @@ public interface ActInfoDao extends BaseDao { /** * @return java.util.List - * @param customerId + * @param actListCommonFormDTO * @author yinzuomei * @description 查询正在进行中的活动列表 * @Date 2020/7/23 21:58 **/ - List selectInprogress(String customerId); + List selectInprogress(ActListCommonFormDTO actListCommonFormDTO); /** * @return java.util.List - * @param customerId + * @param actListCommonFormDTO * @author yinzuomei * @description 已取消-活动列表 * @Date 2020/7/23 23:13 **/ - List selectCanceledList(String customerId); + List selectCanceledList(ActListCommonFormDTO actListCommonFormDTO); /** * @return java.util.List - * @param customerId + * @param actListCommonFormDTO * @author yinzuomei * @description 已结束-活动列表 * @Date 2020/7/23 23:21 **/ - List selectFinishedList(String customerId); + List selectFinishedList(ActListCommonFormDTO actListCommonFormDTO); /** * @return java.util.List 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 a390e9c14e..a627207faa 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 @@ -532,7 +532,9 @@ public class WorkActServiceImpl implements WorkActService { **/ @Override public List queryInProgressList(ActListCommonFormDTO formDTO) { - List list = actInfoDao.selectInprogress(formDTO.getCustomerId()); + int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(); + formDTO.setPageNo(pageIndex); + List list = actInfoDao.selectInprogress(formDTO); Date nowDate = new Date(); for (InProgressActResultDTO inProgressActResultDTO : list) { // 活动状态：报名中：signing_up；截止报名: end_sign_up; 已开始： in_progress; 已报满： enough @@ -596,7 +598,9 @@ public class WorkActServiceImpl implements WorkActService { **/ @Override public List queryCanceledList(ActListCommonFormDTO formDTO) { - return actInfoDao.selectCanceledList(formDTO.getCustomerId()); + int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(); + formDTO.setPageNo(pageIndex); + return actInfoDao.selectCanceledList(formDTO); } /** @@ -608,7 +612,9 @@ public class WorkActServiceImpl implements WorkActService { **/ @Override public List queryFinishedList(ActListCommonFormDTO formDTO) { - return actInfoDao.selectFinishedList(formDTO.getCustomerId()); + int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(); + formDTO.setPageNo(pageIndex); + return actInfoDao.selectFinishedList(formDTO); } /** 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 2c11d426dd..a5de7c102e 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 @@ -473,7 +473,7 @@ - SELECT ai.id AS actId, ai.TITLE AS title, @@ -502,10 +502,11 @@ AND ai.ACT_STATUS = 'published' and ai.CUSTOMER_ID=#{customerId} order by ai.CREATED_TIME desc + limit #{pageNo}, #{pageSize} - SELECT ai.id AS actId, ai.TITLE AS title, @@ -523,10 +524,11 @@ AND ai.CUSTOMER_ID = #{customerId} ORDER BY ai.CREATED_TIME DESC + limit #{pageNo}, #{pageSize} - SELECT ai.id AS actId, ai.TITLE AS title, @@ -544,6 +546,7 @@ AND ai.CUSTOMER_ID = #{customerId} ORDER BY ai.CREATED_TIME DESC + limit #{pageNo}, #{pageSize} From 46269b860498064f19ed9f42198ea1a21f1904cb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 4 Aug 2020 10:47:15 +0800 Subject: [PATCH 13/13] heart+1=>32 --- .../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 9cc42e154b..9f1c5f87b9 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.31 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.32 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 a2a079992c..c599ce9459 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.31 + 0.0.32 com.epmet epmet-heart