From 01aaee94542e37aeeb3586d0f1eb5a1ffa41f550 Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Tue, 18 Jun 2024 18:19:53 +0800 Subject: [PATCH] =?UTF-8?q?updates=20web=E6=AE=B5=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=BA=BF=E5=B7=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/common/constant/CommonConstant.java | 2 +- .../org/jeecg/common/system/vo/LoginUser.java | 3 +++ .../mini/controller/MiniUserController.java | 23 +++++++++++-------- .../jeecg/modules/system/entity/SysUser.java | 5 ++++ .../modules/web/service/WebUserService.java | 2 +- .../YxHistoryMajorEnrollController.java | 3 ++- .../yx/controller/YxOrderController.java | 20 ++++++++-------- .../impl/YxHistoryMajorEnrollServiceImpl.java | 4 ++++ 8 files changed, 40 insertions(+), 22 deletions(-) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java index 34798c2..6897263 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java @@ -82,7 +82,7 @@ public interface CommonConstant { /** 登录用户Token令牌缓存KEY前缀 */ String PREFIX_USER_TOKEN = "prefix_user_token:"; //token有效期 x小时 - Integer PERFIX_USER_TOEKN_TIME = 3600 * 8; + Integer PERFIX_USER_TOKEN_TIME = 3600 * 8; // /** Token缓存时间：3600秒即一小时 */ // int TOKEN_EXPIRE_TIME = 3600; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java index 99579a0..7bc9c89 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java @@ -133,4 +133,7 @@ public class LoginUser { /**是否是vip*/ @ApiModelProperty(value = "是否是vip") private boolean vipFlag=false; + + /**是否显示历年分差*/ + private String showLinediff; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniUserController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniUserController.java index 357d32d..3fe5550 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniUserController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniUserController.java @@ -38,9 +38,7 @@ import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; import java.security.Security; import java.security.spec.AlgorithmParameterSpec; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; +import java.util.*; /** * @Description @@ -115,7 +113,7 @@ public class MiniUserController { String token = JwtUtil.sign(sysUser.getUsername(), syspassword); // 设置token缓存有效时间 redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); - redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, CommonConstant.PERFIX_USER_TOEKN_TIME); + redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, CommonConstant.PERFIX_USER_TOKEN_TIME); JSONObject obj = new JSONObject(); LoginUser loginUser = new LoginUser(); BeanUtils.copyProperties(sysUser, loginUser); @@ -162,19 +160,26 @@ public class MiniUserController { //用户登录信息 //1.生成token String token = JwtUtil.sign(sysUser.getUsername(), syspassword); - // 设置token缓存有效时间 - redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); - redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, CommonConstant.PERFIX_USER_TOEKN_TIME); JSONObject obj = new JSONObject(); LoginUser loginUser = new LoginUser(); BeanUtils.copyProperties(sysUser, loginUser); + Integer perfixUserToeknTime = CommonConstant.PERFIX_USER_TOKEN_TIME; //获取vip信息 VipDTO vipDTO = miniUserService.getUserVip(sysUser.getId()); if (vipDTO != null) { + if (vipDTO.getValidTime()!=null) { + if ((vipDTO.getValidTime().getTime()-new Date().getTime()) historyScoreControlLineMap = yxHistoryScoreControlLineService.allMaps(); @@ -350,6 +350,7 @@ public class YxHistoryMajorEnrollController extends JeecgController yxHistoryMajorEnrollLambdaQueryWrapper = new LambdaQueryWrapper<>(); List updateList = new ArrayList<>(); List list = ExcelImportUtil.importExcel(file.getInputStream(), YxHistoryMajorEnroll.class, params); + index = 3; for (YxHistoryMajorEnroll yxHistoryMajorEnroll : list) { schoolCode = yxHistoryMajorEnroll.getSchoolCode();//学校代码 schoolName = yxHistoryMajorEnroll.getSchoolName();//学校名称 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxOrderController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxOrderController.java index 5d49126..5a8651c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxOrderController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxOrderController.java @@ -52,7 +52,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; public class YxOrderController extends JeecgController { @Autowired private IYxOrderService yxOrderService; - + /** * 分页列表查询 * @@ -77,7 +77,7 @@ public class YxOrderController extends JeecgController IPage pageList = yxOrderService.page(page, queryWrapper); return Result.OK(pageList); } - + /** * 添加 * @@ -92,7 +92,7 @@ public class YxOrderController extends JeecgController yxOrderService.save(yxOrder); return Result.OK("添加成功！"); } - + /** * 编辑 * @@ -107,7 +107,7 @@ public class YxOrderController extends JeecgController yxOrderService.updateById(yxOrder); return Result.OK("编辑成功!"); } - + /** * 通过id删除 * @@ -122,7 +122,7 @@ public class YxOrderController extends JeecgController yxOrderService.removeById(id); return Result.OK("删除成功!"); } - + /** * 批量删除 * @@ -137,7 +137,7 @@ public class YxOrderController extends JeecgController this.yxOrderService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } - + /** * 通过id查询 * @@ -181,11 +181,11 @@ public class YxOrderController extends JeecgController } public static void main(String[] args) { - List cardList = Arrays.asList("WBUJZDNW","SJJFKPUN","XF4XD7R4","4XDCLM4B","SW7GNQTX","65W4M7FV","Q9R8H2WS","5LZPG9K6","YJQX5R7C","D7Y9N7MX","VN57PUKT","TSQD7PTK","YBQLCU6M","NETTLRT4","Y3PX3NPS","VK7GDXLS","DZEUHGU4","EUUTZ787","JDQ3WFU3","639GJ7YL","E4HW58PF","2QV8KMA8","MLCQALYD","QTL5Y62C","DL5WK3SC","FRUKPW5S","SGG3LNL7","6FK9S48K","62C425W4","P4QJ4DYX","K98WT92P","BCTW6NVF","M5VXDB4G","68XQXFP5","A7RCFDPU","8SWV55PM","GNM4PKYC","B63DWVW2","LM6J7NRW","8934SCJX","MCW2D6SU","EDLJQ4TB","S2CR3CRN","MJWZEVUZ","SFJJCCGX","JGGZWZRK","8MW8MJ3H","3BM6JD2R","4YCF8YN7","EWWBH397","WKK7Q7Z2","24YGVFNJ","ZHQYB7KQ","UGR7UMS6","KJNLBL93","DUERGXGF","ATCZ9HKJ","ERZ8XEBR","VYCTPPDX","87QZ6QLR","W7NMDEUM","3BM4RC3E","GV3VX5DX","2VLMWK7Q","DK88JJFP","Y4VGV9WU","54ENW99K","WLVR4QJ6","JRUEU2KD","2DN6VNQL","7ED4KC3Z","WJRYEVB5","U64PG82T","MVNLNWGB","RVTNWWKK","LT9VDTMH","BN6J3S6L","72W9XW72","FSMNMDG2","25DL3EBJ","DSZ3CJCN","3CHYBSR3","KGDWCE29","DN2955TT","CDQ73LHS","6S5H7DR2","XUQ39ZD4","4FH7QTNS","GXXEEDVB","T3TQ33PK","9PZWNXDP","3NTT3H5R","5EY8YBWE","GNRTE8B8","FJLFEHDF","YCTMYFZN","LYK7SGUP","LZDSQCKG","T48MJDJZ","YVLLYRNE","FXF8XU2L","KFJ5MF3L","TETHRGRL","MPU5GKDX","GPBECMHK","TJ75APUM","CBVDE2KC","N7QLCBJ3","A3XZCGQ8","CF83QJP6","CUYXTQ3K","HA8HDWC4","CPNQEMYR","8RZ4X6TZ","DUR9KJDX","EJCSZK7V","GGQKMF8P","W52JXAC3","DAMV5YKS","P6CKE2MR","YW3ZZYTT","AFZ4FS89","H3JM9Y8E","K86DGUCE","C77RV6WE","7SV6FPEY","MEBJKPZW","TECDYEE9","KVS56TSK","7M64JBBG","XYR9QTDU","EQDZHMS9","NWQU8AWS","TB8QD6L3","ZR28GM4B","MUTFDQES","65P2FGYC","VYR258LJ","JVP9UXX5","TM2C8CUU","KQDUKHZM","566JFZPE","PUQMTDHR","XVB4B2FX","7KY2EYBV","XVBP5CJH","SS2Q5WA4","SMELKJED","J4VNT63V","A24XVXG5","6QW5MS4Y","S3CCK3Y5","BVBQBTSP","S3VPVTGW","GCFE8XEX","B23JDM34","M6SB4PXB","RQ7XBL4E","YJPV5MTB","7QBGXP5X","LSL29FCU","4XN4XGPE","H55SB87N","RYREX848","6UKSCVND","7UQLNRJQ","XN62J2DF","PRV88UPR","E76ZUYP4","6BT5RR3H","25QXP8TP","FG6HE3KM","TS5ABMFP","PWSHYRQW","TNZSXZWS","JSYN2WML","M7RYQCTA","8KQWTKHH","LZJUAZR4","D7JMAJGU","MLJYZN6Q","87BRHTFZ","GAPJJLZS","7223U7BZ","FF2RDPHT","JK62QMFN","THHMHFVK","SSYEE6UW","3G423SLT","J2L6EQ3X","9FBGCUCK","BYMJXDV8","KBL5YC6X","R8WQNJ4G","57HYHTEU","8XC72HNN","26ZZRJ5T","6JFS7RXS","EM9TDBRA","2FXFDBA8"); - int i = 13451; + List cardList = Arrays.asList("L6Y7H6EC","FZWPN5Z6","PDA7LP5J","4PNWVQMH","ZM73LZLE","5VBXTCY3","4SU8D4U3","E7LDUYGD","68H9GASK","XG8WQREJ","RU4NPEN2","QF8B3KTE","YF9WBPFT","GHG3L2JL","HELCWWG7","G2EBJ4U8","R8HB8PUJ","MRD282HL","AWR2N25M","65UGQDJE","QZQ87ZTZ","XP5H6FYV","PCFHUEH4","HTRZZZA7","BEJR5WZU","TL79UAN9","DBGEBQBK","V85XXH54","KJQDRHRP","4M7T32JT","7XPUXGKZ","3GP3MMP2","JM8W8RHS","SC4D7M5M","DEELP4SM","TY553F8F","CRZDPQBR","AAT8WSKK","478FGUFR","X8RPW3WA","B3XCAMJH","ZLDDYJMB","VUW7XCVD","VSBTPGSB","PWZV4T4F","53YDLFB3","EJZSMLHC","2RM9UCB2","GEZ4794S","7FBPTFEM","LWTZ73B9","8QLKK63V","8R6ZSXFR","RFL7Z73W","JBB7ZPEE","G35VEE9K","MSLUWVU6","ETE6B23E","TUNMJKZA","NFXDB2QK","T7J2LHL8","L6BUQYDA","YNSMEMN8","5BW8UPNL","VAP3RH4X","TABR63DR","VDGWWVEY","VQZKZLRM","J3783MAV","5V5WKVHC","37WFEC39","ZPQUZSR3","F946GHUR","HX6Q4MJ8","3YKSZ564","49ED6Y6B","PBQML7FF","YFPLVU5W","LE3M5S8M","8GLS7PBX","2P4DDCDF","44Z2F54Z","8666P62B","BCU7G4HP","RDV3827P","YQJJ83KQ","Y54E3FF6","WP7V2MGB","4P65G6YW","8EXHMUG5","226K6USG","4YZNY5HB","VZ4BNDPB","WG7EA4D5","NSRYL24F","CXVQ9QE7","QL87GML2","DV54RQGK","MRGEPYK5","TP8X3H2H"); + long i = 9852111001l; for (String s : cardList) { - System.out.println("INSERT INTO `yitisheng-test5`.`yx_vip_card` (`id`, `card_num`, `sku_code`,`valid_time`,`create_by`) VALUES" + - " ('"+i+"', '"+s+"', '9999', 7,NULL);"); + System.out.println("INSERT INTO `yitisheng`.`yx_vip_card` (`id`, `card_num`, `sku_code`,`valid_date`,`create_by`) VALUES" + + " ('"+i+"', '"+s+"', '1002', '2024-06-24 12:00:00',NULL);"); i++; } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxHistoryMajorEnrollServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxHistoryMajorEnrollServiceImpl.java index 118a6f3..993720b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxHistoryMajorEnrollServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxHistoryMajorEnrollServiceImpl.java @@ -103,6 +103,10 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl