登录记录修改为userId关联

redis增加获取 ditchId 渠道ID

yt-app/app-service/src/main/java/com/ytpm/controller/UserController.java

@@ -44,7 +44,7 @@ public class UserController {
         Map<String, List<YtDyzAdRecord>> userAdMap = ids.stream().collect(
                 Collectors.groupingBy(YtDyzAdRecord::getUserId));
         for (YtDyzUser user : dyzUsers) {
-            user.setLoginRecordList(loginRecordMapper.getLoginRecords(user.getWxOpenId()));
+            user.setLoginRecordList(loginRecordMapper.getLoginRecords(user.getUserId()));
             user.setTodayVideo(userAdMap.containsKey(user.getUserId())?
                     userAdMap.get(user.getUserId()).size():0);
         }
@@ -57,7 +57,7 @@ public class UserController {
     @GetMapping("/getUserInfo")
     public Result<YtDyzUser> getUserInfo(@RequestParam("userId") String userId){
         YtDyzUser user = appUserMapper.selectPrimaryKey(userId);
-        user.setLoginRecordList(loginRecordMapper.getLoginRecords(user.getWxOpenId()));
+        user.setLoginRecordList(loginRecordMapper.getLoginRecords(userId));
         return Result.resultObjOk(user);
     }
 
@@ -68,7 +68,7 @@ public class UserController {
     public ResultTable<YtDyzUser> getUserList(@RequestParam("userIds") String userIds){
         List<YtDyzUser> userList = appUserMapper.getUserList(userIds);
         for (YtDyzUser user : userList) {
-            user.setLoginRecordList(loginRecordMapper.getLoginRecords(user.getWxOpenId()));
+            user.setLoginRecordList(loginRecordMapper.getLoginRecords(user.getUserId()));
         }
         return ResultTable.resultTableOk(new PageInfo<>(userList));
     }

yt-app/app-service/src/main/java/com/ytpm/controller/WxController.java

@@ -97,7 +97,7 @@ public class WxController {
             throw new CustomerException(result.getMessage());
         }
         // 添加用户登录记录
-        addLoginRecord(param,openid);
+        addLoginRecord(param,old.getUserId());
         return Result.resultOk(RepMessage.LOGIN_SUCCESS, old);
     }
 
@@ -151,16 +151,16 @@ public class WxController {
         old.setTodayAnswerCount(questionMapper.getAnswerCount(old.getUserId(),1));
         old.setHistoryAnswerCount(questionMapper.getAnswerCount(old.getUserId(),2));
         old.setAnswerRecordList(questionMapper.getAnswerRecords(old.getUserId()));
-        old.setLoginRecordList(loginRecordMapper.getLoginRecords(old.getWxOpenId()));
+        old.setLoginRecordList(loginRecordMapper.getLoginRecords(old.getUserId()));
     }
 
     /**
      * 增加用户登录记录
      */
-    private void addLoginRecord(WxLoginParam param,String openid) {
+    private void addLoginRecord(WxLoginParam param,String userId) {
         YtDyzLoginRecord loginRecord = new YtDyzLoginRecord();
         loginRecord.setRecordId(IdUtil.fastSimpleUUID());
-        loginRecord.setUserId(openid);
+        loginRecord.setUserId(userId);
         loginRecord.setLoginTime(new Date());
         loginRecord.setDeviceBrand(param.getBrand());
         loginRecord.setDeviceModel(param.getModel());

yt-app/app-service/src/main/java/com/ytpm/dao/LoginRecordMapper.java

@@ -16,5 +16,5 @@ public interface LoginRecordMapper {
     /**
      * 查询用户登录记录
      */
-    List<YtDyzLoginRecord> getLoginRecords(@Param("wxOpenId")String wxOpenId);
+    List<YtDyzLoginRecord> getLoginRecords(@Param("userId")String userId);
 }

yt-app/app-service/src/main/resources/mapper/LoginRecordMapper.xml

@@ -30,6 +30,6 @@
         select
             record_id, user_id, login_time, device_brand, device_model, login_ip, operator, ip_addr
         from yt_dyz_login_record
-        where user_id = #{wxOpenId}
+        where user_id = #{userId}
     </select>
 </mapper>

yt-common/src/main/java/com/ytpm/util/RedisService.java

@@ -219,6 +219,22 @@ public class RedisService {
         return this.getStr(todayKey);
     }
 
+    public long getDitchId(){
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+        LocalDate currentDate = LocalDate.now();
+        LocalDate yesterday = currentDate.minusDays(1);
+        String todayKey = currentDate.format(formatter);
+        String yesterdayKey = yesterday.format(formatter);
+        String prefix = "Ditch_";
+        if(this.hasKey(prefix+todayKey)){
+            this.incr(prefix+todayKey);
+            return Long.parseLong(this.getStr(prefix+todayKey));
+        }
+        this.del(yesterdayKey);
+        this.setStr(prefix+todayKey, todayKey+"01");
+        return Long.parseLong(this.getStr(prefix+todayKey));
+    }
+
     /**
      *
      * 生成业务单编号