积分代码迁移

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit 1a2a620ec318725c7b20ede213d1da28dcac3feb
+Subproject commit 201e33eb2576b5358359b57b55d97cfce2b535dc

epdc-cloud-points/pom.xml

@@ -175,7 +175,7 @@
 
                 <server.port>17129</server.port>
 
-                <spring.redis.index>2</spring.redis.index>
+                <spring.redis.index>8</spring.redis.index>
                 <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
                 <spring.redis.port>10001</spring.redis.port>
                 <spring.redis.password>elink!888</spring.redis.password>

epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java

@@ -438,7 +438,11 @@ public class PointsLogsServiceImpl extends BaseServiceImpl<PointsLogsDao, Points
         pointsLogsEntity.setOperationMode(PointsOperationModeEnum.OPERATION_MODE_WORK_JFHX.getOperationMode());
         pointsLogsEntity.setRuleCode(PointsConstant.ruleWorkScanCodePointsVerification);
         pointsLogsEntity.setBehaviorCode(PointsConstant.behaviorWorkScanCodePointsVerification);
-        pointsLogsEntity.setOperationDesc(behaviorCodeInfoByBehaviorCode.getData().getBehaviorDesc());
+        String operationDesc = ""; // 操作描述
+        if(behaviorCodeInfoByBehaviorCode.getData() != null){
+            operationDesc = behaviorCodeInfoByBehaviorCode.getData().getBehaviorDesc();
+        }
+        pointsLogsEntity.setOperationDesc(operationDesc);
         pointsLogsEntity.setPoints(formDto.getPoints());
         pointsLogsEntity.setOperationType(formDto.getOperationType());
         pointsLogsEntity.setReferenceId(formDto.getUserId());
@@ -473,7 +477,6 @@ public class PointsLogsServiceImpl extends BaseServiceImpl<PointsLogsDao, Points
 
     @Override
     public EpdcVerificationLogsResultDTO listOfVerificationLogs(EpdcWorkVerificationLogsFormDTO formDto) {
-        log.info("+++++++++++++++++++++++++++++++++++=SecurityUserDeptId():" + SecurityUser.getDeptId());
         if (null == SecurityUser.getUser() || null == SecurityUser.getDeptId()) {
             throw new RenException("登陆信息超时，请重新登陆");
         }

epdc-cloud-points/src/main/resources/mapper/PointsLogsDao.xml

@@ -241,7 +241,8 @@
             OPERATION_TIME,
             OPERATION_TYPE,
             POINTS,
-            REMARK
+            REMARK,
+            REAL_NAME
         FROM
             epdc_points_logs
         WHERE