From 8cca9b9c083a28cd308492228a514bd83a696098 Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Sat, 7 Dec 2024 23:54:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8A=95=E8=B5=84=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=EF=BC=8C=E8=8C=85=E5=8F=B0=E9=A2=84=E7=BA=A6=EF=BC=8C=E8=87=AA?= =?UTF-8?q?=E6=B5=8B=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invest/controller/IUserController.java | 6 +- .../java/com/ruoyi/invest/domain/ILog.java | 4 +- .../java/com/ruoyi/invest/domain/IUser.java | 4 +- .../com/ruoyi/invest/domain/dto/ILogDto.java | 3 +- .../com/ruoyi/invest/domain/dto/IUserDto.java | 2 +- .../com/ruoyi/invest/mapper/IUserMapper.java | 2 +- .../ruoyi/invest/service/IUserService.java | 2 +- .../service/impl/IMTLogServiceImpl.java | 4 +- .../invest/service/impl/IMTServiceImpl.java | 4 +- .../invest/service/impl/IUserServiceImpl.java | 12 ++- .../java/com/ruoyi/task/CampusIMTTask.java | 81 ------------------- .../resources/mapper/invest/IItemMapper.xml | 6 +- .../resources/mapper/invest/ILogMapper.xml | 4 +- .../resources/mapper/invest/IUserMapper.xml | 4 +- 14 files changed, 33 insertions(+), 105 deletions(-) delete mode 100644 ruoyi-modules/intc-invest/src/main/java/com/ruoyi/task/CampusIMTTask.java diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/IUserController.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/IUserController.java index 8206be4..f7b3a7d 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/IUserController.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/IUserController.java @@ -71,7 +71,7 @@ public class IUserController extends BaseController { */ @GetMapping(value = "/reservation", name = "预约") public R reservation(String mobile) { - IUser user = iUserMapper.selectIUserByMobile(Long.parseLong(mobile)); + IUser user = iUserMapper.selectIUserByMobile((mobile)); if (user == null) { return R.fail("用户不存在"); } @@ -88,7 +88,7 @@ public class IUserController extends BaseController { */ @GetMapping(value = "/travelReward", name = "旅行") public R travelReward(String mobile) { - IUser user = iUserMapper.selectIUserByMobile(Long.parseLong(mobile)); + IUser user = iUserMapper.selectIUserByMobile((mobile)); if (user == null) { return R.fail("用户不存在"); } else { @@ -113,7 +113,7 @@ public class IUserController extends BaseController { */ @GetMapping(value = "/{mobile}", name = "获取I茅台用户详细信息") - public R getInfo(@PathVariable("mobile") Long mobile) { + public R getInfo(@PathVariable("mobile") String mobile) { return R.ok(iUserMapper.selectIUserByMobile(mobile)); } diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/ILog.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/ILog.java index 843569a..bd579d2 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/ILog.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/ILog.java @@ -31,7 +31,7 @@ public class ILog extends BaseEntity /** 用户 */ @ApiModelProperty(value="用户") @Excel(name = "用户") - private Long mobile; + private String mobile; /** 日志记录内容 */ @ApiModelProperty(value="日志记录内容") @@ -52,7 +52,7 @@ public class ILog extends BaseEntity /** 创建者id */ @ApiModelProperty(value="创建者id") @Excel(name = "创建者id") - private Long createUser; + private String createUser; @Override public String toString() { diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IUser.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IUser.java index 853b403..20e9020 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IUser.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IUser.java @@ -23,12 +23,12 @@ public class IUser extends BaseEntity private static final long serialVersionUID = 1L; /** 手机号 */ - private Long mobile; + private String mobile; /** 用户id */ @ApiModelProperty(value="用户id") @Excel(name = "用户id") - private Long userId; + private String userId; /** token */ private String token; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/ILogDto.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/ILogDto.java index 187a4c4..2334990 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/ILogDto.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/ILogDto.java @@ -21,12 +21,13 @@ public class ILogDto implements Serializable /** 用户 */ @ApiModelProperty(value="用户") - private Long mobile; + private String mobile; /** 日志记录内容 */ @ApiModelProperty(value="日志记录内容") private String logContent; + /** 操作状态 */ @ApiModelProperty(value="操作状态") private String status; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/IUserDto.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/IUserDto.java index aa045af..95ccc81 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/IUserDto.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/IUserDto.java @@ -21,7 +21,7 @@ public class IUserDto implements Serializable /** 手机号 */ @ApiModelProperty(value="手机号") - private Long mobile; + private String mobile; /** token */ @ApiModelProperty(value="token") diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/IUserMapper.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/IUserMapper.java index 35f1e5f..416a876 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/IUserMapper.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/IUserMapper.java @@ -20,7 +20,7 @@ public interface IUserMapper * @param mobile 用户管理主键 * @return 用户管理 */ - public IUserVo selectIUserByMobile(Long mobile); + public IUserVo selectIUserByMobile(String mobile); /** * 查询用户管理列表 diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IUserService.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IUserService.java index cf98c31..29fb3fc 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IUserService.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IUserService.java @@ -17,7 +17,7 @@ public interface IUserService { * @param body * @return */ - int insertIUser(Long mobile, String deviceId, JSONObject body); + int insertIUser(String mobile, String deviceId, JSONObject body); /** * 查询预约用户列表 diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IMTLogServiceImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IMTLogServiceImpl.java index f7e7ecc..6c1d73d 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IMTLogServiceImpl.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IMTLogServiceImpl.java @@ -3,14 +3,15 @@ package com.ruoyi.invest.service.impl; import com.ruoyi.common.core.utils.IdWorker; import com.ruoyi.common.security.utils.SecurityUtils; +import com.ruoyi.invest.domain.ILog; import com.ruoyi.invest.domain.dto.ILogDto; import com.ruoyi.invest.domain.vo.ILogVo; -import com.ruoyi.invest.domain.ILog; import com.ruoyi.invest.mapper.ILogMapper; import com.ruoyi.invest.service.IMTLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; @Service @@ -55,6 +56,7 @@ public class IMTLogServiceImpl implements IMTLogService { public int insertILog(ILog iLog) { iLog.setCreateBy(SecurityUtils.getUsername()); + iLog.setCreateTime(new Date()); iLog.setLogId(IdWorker.getId()); return iLogMapper.insertILog(iLog); } diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IMTServiceImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IMTServiceImpl.java index 212971b..81d70d7 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IMTServiceImpl.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IMTServiceImpl.java @@ -148,7 +148,7 @@ public class IMTServiceImpl implements IMTService { HttpRequest request = HttpUtil.createRequest(Method.POST, "https://app.moutai519.com.cn/xhr/front/user/register/login"); - IUser user = iUserMapper.selectIUserByMobile(Long.parseLong(mobile)); + IUser user = iUserMapper.selectIUserByMobile(mobile); if (user != null) { deviceId = user.getDeviceId(); } @@ -163,7 +163,7 @@ public class IMTServiceImpl implements IMTService { if (body.getString("code").equals("2000")) { // logger.info("「登录请求-成功」" + body.toJSONString()); - iUserService.insertIUser(Long.parseLong(mobile), deviceId, body); + iUserService.insertIUser(mobile, deviceId, body); return true; } else { logger.error("「登录请求-失败」" + body.toJSONString()); diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IUserServiceImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IUserServiceImpl.java index 8e3e8c8..a771eb5 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IUserServiceImpl.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IUserServiceImpl.java @@ -25,13 +25,13 @@ public class IUserServiceImpl implements IUserService { @Override - public int insertIUser(Long mobile, String deviceId, JSONObject jsonObject) { + public int insertIUser(String mobile, String deviceId, JSONObject jsonObject) { IUser user = iUserMapper.selectIUserByMobile(mobile); if (user != null) { JSONObject result = jsonObject.getJSONObject("data"); - user.setUserId(result.getLong("userId")); + user.setUserId(result.getString("userId")); user.setToken(result.getString("token")); user.setMobile(mobile); @@ -45,6 +45,8 @@ public class IUserServiceImpl implements IUserService { Date thirtyDaysLater = calendar.getTime(); user.setExpireTime(thirtyDaysLater); user.setCreateUser(SecurityUtils.getUserId()); + user.setUpdateUser(SecurityUtils.getUsername()); + user.setUpdateTime(new Date()); return iUserMapper.updateIUser(user); } else { @@ -53,7 +55,7 @@ public class IUserServiceImpl implements IUserService { } IUser iUser=new IUser(); JSONObject result = jsonObject.getJSONObject("data"); - iUser.setUserId(result.getLong("userId")); + iUser.setUserId(result.getString("userId")); iUser.setToken(result.getString("token")); iUser.setMobile(mobile); @@ -68,6 +70,8 @@ public class IUserServiceImpl implements IUserService { iUser.setExpireTime(thirtyDaysLater); iUser.setCreateUser(SecurityUtils.getUserId()); + iUser.setCreateBy(SecurityUtils.getUsername()); + iUser.setCreateTime(new Date()); return iUserMapper.insertIUser(iUser); } @@ -99,6 +103,8 @@ public class IUserServiceImpl implements IUserService { iUser.setDeviceId(UUID.randomUUID().toString().toLowerCase()); } iUser.setCreateUser(SecurityUtils.getUserId()); + iUser.setCreateBy(SecurityUtils.getUsername()); + iUser.setCreateTime(new Date()); return iUserMapper.insertIUser(iUser); } diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/task/CampusIMTTask.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/task/CampusIMTTask.java deleted file mode 100644 index dda7924..0000000 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/task/CampusIMTTask.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.ruoyi.task; - - -import com.ruoyi.invest.service.IMTService; -import com.ruoyi.invest.service.IUserService; -import lombok.RequiredArgsConstructor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; - -/** - * i茅台定时任务 - */ -@Configuration -@EnableScheduling -@RequiredArgsConstructor -public class CampusIMTTask { - private static final Logger logger = LoggerFactory.getLogger(CampusIMTTask.class); - - private final IMTService imtService; - - private final IUserService iUserService; - - - /** - * 1：10 批量修改用户随机预约的时间 - */ - @Async - @Scheduled(cron = "0 10 1 ? * * ") - public void updateUserMinuteBatch() { - iUserService.updateUserMinuteBatch(); - } - - - /** - * 11点期间，每分钟执行一次批量获得旅行奖励 - */ - @Async - @Scheduled(cron = "0 0/1 11 ? * *") - public void getTravelRewardBatch() { - imtService.getTravelRewardBatch(); - - } - - /** - * 9点期间，每分钟执行一次 - */ - - @Scheduled(cron = "0 0/1 9 ? * *") - public void reservationBatchTask() { - imtService.reservationBatch(); - - } - - - @Scheduled(cron = "0 10,55 7,8 ? * * ") - public void refresh() { - logger.info("「刷新数据」开始刷新版本号，预约item，门店shop列表 "); - try { - imtService.refreshAll(); - } catch (Exception e) { - logger.info("「刷新数据执行报错」%s", e.getMessage()); - } - - } - - - /** - * 18.05分获取申购结果 - */ - @Async - @Scheduled(cron = "0 5 18 ? * * ") - public void appointmentResults() { - imtService.appointmentResults(); - } - - -} \ No newline at end of file diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/IItemMapper.xml b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/IItemMapper.xml index 6e46f00..3419999 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/IItemMapper.xml +++ b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/IItemMapper.xml @@ -21,9 +21,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.del_flag='0' - and a.item_code = #{itemCode} - and a.title = #{title} - and a.content = #{content} + and a.item_code like '%'|| #{itemCode}||'%' + and a.title like '%'|| #{title}||'%' + and a.content like '%'|| #{content}||'%' order by a.create_time desc diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/ILogMapper.xml b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/ILogMapper.xml index a8dadfe..750764d 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/ILogMapper.xml +++ b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/ILogMapper.xml @@ -22,8 +22,8 @@ a.del_flag='0' - and a.mobile = #{mobile} - and a.log_content = #{logContent} + and a.mobile like '%'|| #{mobile}||'%' + and a.log_content like '%'|| #{logContent}||'%' and a.status = #{status} and a.oper_time = #{operTime} diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/IUserMapper.xml b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/IUserMapper.xml index 98ad1ce..213a720 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/IUserMapper.xml +++ b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/IUserMapper.xml @@ -40,7 +40,7 @@ a.del_flag='0' - and a.mobile = #{mobile} + and a.mobile like '%'|| #{mobile}||'%' and a.token = #{token} and a.cookie = #{cookie} and a.device_id = #{deviceId} @@ -63,7 +63,7 @@ order by a.create_time desc - where a.mobile = #{mobile}