From 211c3306b36db4aa48100e977ec0ae25a7ff5404 Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 11 Aug 2020 17:57:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=91=A8=E3=80=81=E6=9C=88=E6=8E=92?= =?UTF-8?q?=E5=90=8D=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=94=A8=E6=88=B7=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E6=97=A5=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/TestController.java | 13 +++-- .../dao/UserPointStatisticalDailyDao.java | 9 ++++ .../UserPointStatisticalDailyService.java | 2 + .../impl/UserPointActionLogServiceImpl.java | 1 + .../UserPointStatisticalDailyServiceImpl.java | 9 +++- .../db/migration/V0.0.2__unixKey.sql | 1 + .../mapper/UserPointStatisticalDailyDao.xml | 52 ++++++++++++++++++- 7 files changed, 82 insertions(+), 5 deletions(-) create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.2__unixKey.sql diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/TestController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/TestController.java index 3418b3a5f3..b3cbf19d45 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/TestController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/TestController.java @@ -4,12 +4,12 @@ import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.Result; +import com.epmet.entity.UserPointStatisticalDailyEntity; +import com.epmet.service.UserPointStatisticalDailyService; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.HashMap; import java.util.Map; @@ -27,6 +27,8 @@ public class TestController { private Logger logger = LogManager.getLogger(TestController.class); @Autowired private LoginUserUtil loginUserUtil; + @Autowired + private UserPointStatisticalDailyService userPointStatisticalDailyService; @GetMapping("test") public Result test(@LoginUser TokenDto tokenDto){ Map map=new HashMap<>(); @@ -42,5 +44,10 @@ public class TestController { result.setData("success"); return result; } + @PostMapping("testinsert") + public Result testInsert(@RequestBody UserPointStatisticalDailyEntity entity){ + userPointStatisticalDailyService.test(entity); + return new Result(); + } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java index 1c3352a090..9f9783797d 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java @@ -53,4 +53,13 @@ public interface UserPointStatisticalDailyDao extends BaseDao【%s】", JSON.toJSON(event))); throw new RenException("无法识别事件类型与积分规则"); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java index 51537b8fac..6be4ae538e 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java @@ -210,13 +210,20 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl + + + + + SELECT replace(uuid(),'-','') AS ID + + + INSERT INTO user_point_statistical_daily + ( + id, + user_id, + date_id, + week_id, + month_id, + quarter_id, + year_id, + action_flag, + customer_id, + point_change, + del_flag, + revision, + created_by, + created_time, + updated_by, + updated_time + ) VALUE ( + #{id}, + #{userId}, + #{dateId}, + #{weekId}, + #{monthId}, + #{quarterId}, + #{yearId}, + #{actionFlag}, + #{customerId}, + #{pointChange}, + '1', + 0, + #{createdBy}, + now(), + #{createdBy}, + now() + + ) ON DUPLICATE KEY UPDATE + POINT_CHANGE = (POINT_CHANGE + #{pointChange}), + UPDATED_TIME = NOW(), + UPDATED_BY = #{createdBy} + + + \ No newline at end of file From e5d541b22d93b48561a699fb150b721c044998cd Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 11 Aug 2020 18:01:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A7=AF=E5=88=86=20+1?= 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 d947ffdaae..b86c424cf9 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.37 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.38 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 7dd73fd3ad..c2eb2f4bd0 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.37 + 0.0.38 epmet-point com.epmet