From 59feba9fab96f893003137eae393ed646ec07c0e Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期四, 25 八月 2022 17:33:27 +0800
Subject: [PATCH] 最新版本
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/Statistic2Controller.java | 1
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderDealScheduleImpl.java | 4
xboot-core/src/main/java/cn/exrick/xboot/core/service/UserService.java | 4
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java | 7
xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/common/CaptchaController.java | 283 ++++++++++++++++++++-------------------
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java | 11 +
xboot-core/src/main/java/cn/exrick/xboot/core/config/security/WebSecurityConfig.java | 2
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java | 7
xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java | 12 +
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/HistoryOrder.java | 3
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java | 26 ++
xboot-modules/xboot-generator/src/main/java/cn/exrick/xboot/generator/XbootMPGenerator.java | 4
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/TestController.java | 2
13 files changed, 201 insertions(+), 165 deletions(-)
diff --git a/xboot-core/src/main/java/cn/exrick/xboot/core/config/security/WebSecurityConfig.java b/xboot-core/src/main/java/cn/exrick/xboot/core/config/security/WebSecurityConfig.java
index 01a6591..60ee2e7 100644
--- a/xboot-core/src/main/java/cn/exrick/xboot/core/config/security/WebSecurityConfig.java
+++ b/xboot-core/src/main/java/cn/exrick/xboot/core/config/security/WebSecurityConfig.java
@@ -131,7 +131,7 @@
// 鑷畾涔夋潈闄愭嫆缁濆鐞嗙被
.exceptionHandling().accessDeniedHandler(accessDeniedHandler)
.and()
- // 鍥惧舰楠岃瘉鐮佽繃婊ゅ櫒
+ //鍥惧舰楠岃瘉鐮佽繃婊ゅ櫒
//.addFilterBefore(imageValidateFilter, UsernamePasswordAuthenticationFilter.class)
// 鐭俊楠岃瘉鐮佽繃婊ゅ櫒
//.addFilterBefore(smsValidateFilter, UsernamePasswordAuthenticationFilter.class)
diff --git a/xboot-core/src/main/java/cn/exrick/xboot/core/service/UserService.java b/xboot-core/src/main/java/cn/exrick/xboot/core/service/UserService.java
index 689e714..1db2f14 100644
--- a/xboot-core/src/main/java/cn/exrick/xboot/core/service/UserService.java
+++ b/xboot-core/src/main/java/cn/exrick/xboot/core/service/UserService.java
@@ -15,7 +15,7 @@
* 鐢ㄦ埛鎺ュ彛
* @author Exrickx
*/
-@CacheConfig(cacheNames = "user")
+//@CacheConfig(cacheNames = "user")
public interface UserService extends XbootBaseService<User, String> {
/**
@@ -23,7 +23,7 @@
* @param username
* @return
*/
- @Cacheable(key = "#username")
+ //@Cacheable(key = "#username")
User findByUsername(String username);
/**
diff --git a/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/common/CaptchaController.java b/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/common/CaptchaController.java
index c7f4f0d..413b474 100644
--- a/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/common/CaptchaController.java
+++ b/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/common/CaptchaController.java
@@ -1,139 +1,144 @@
-//package cn.exrick.xboot.base.controller.common;
-//
-//import cn.exrick.xboot.core.common.annotation.RateLimiter;
-//import cn.exrick.xboot.core.common.constant.CommonConstant;
-//import cn.exrick.xboot.core.common.redis.RedisTemplateHelper;
-//import cn.exrick.xboot.core.common.sms.SmsUtil;
-//import cn.exrick.xboot.core.common.utils.CommonUtil;
-//import cn.exrick.xboot.core.common.utils.CreateVerifyCode;
-//import cn.exrick.xboot.core.common.utils.IpInfoUtil;
-//import cn.exrick.xboot.core.common.utils.ResultUtil;
-//import cn.exrick.xboot.core.common.vo.Result;
-//import cn.exrick.xboot.core.service.SettingService;
-//import cn.exrick.xboot.core.service.UserService;
-//import cn.hutool.core.util.IdUtil;
-//import cn.hutool.core.util.StrUtil;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.transaction.annotation.Transactional;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestMethod;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import java.io.IOException;
-//import java.util.concurrent.TimeUnit;
-//
-///**
-// * @author Exrickx
-// */
-//@Api(tags = "楠岃瘉鐮佹帴鍙�")
-//@RequestMapping("/xboot/common/captcha")
-//@RestController
-//@Transactional
-//@Slf4j
-//public class CaptchaController {
-//
-// @Autowired
-// private SmsUtil smsUtil;
-//
-// @Autowired
-// private RedisTemplateHelper redisTemplate;
-//
-// @Autowired
-// private IpInfoUtil ipInfoUtil;
-//
-// @Autowired
-// private UserService userService;
-//
-// @Autowired
-// private SettingService settingService;
-//
-// @RequestMapping(value = "/init", method = RequestMethod.GET)
-// @ApiOperation(value = "鍒濆鍖栭獙璇佺爜")
-// public Result<Object> initCaptcha() {
-//
-// String captchaId = IdUtil.simpleUUID();
-// String code = new CreateVerifyCode().randomStr(4);
-// // 缂撳瓨楠岃瘉鐮�
-// redisTemplate.set(captchaId, code, 2L, TimeUnit.MINUTES);
-// return ResultUtil.data(captchaId);
-// }
-//
-// @RequestMapping(value = "/draw/{captchaId}", method = RequestMethod.GET)
-// @ApiOperation(value = "鏍规嵁楠岃瘉鐮両D鑾峰彇鍥剧墖")
-// public void drawCaptcha(@PathVariable("captchaId") String captchaId,
-// HttpServletResponse response) throws IOException {
-//
-// // 寰楀埌楠岃瘉鐮� 鐢熸垚鎸囧畾楠岃瘉鐮�
-// String code = redisTemplate.get(captchaId);
-// CreateVerifyCode vCode = new CreateVerifyCode(116, 36, 4, 10, code);
-// response.setContentType("image/png");
-// vCode.write(response.getOutputStream());
-// }
-//
-// @RequestMapping(value = "/sendRegistSms/{mobile}", method = RequestMethod.GET)
-// @ApiOperation(value = "鍙戦�佹敞鍐岀煭淇￠獙璇佺爜")
-// public Result<Object> sendRegistSmsCode(@PathVariable String mobile, HttpServletRequest request) {
-//
-// return sendSms(mobile, 2, 0, request);
-// }
-//
-// @RequestMapping(value = "/sendLoginSms/{mobile}", method = RequestMethod.GET)
-// @ApiOperation(value = "鍙戦�佺櫥褰曠煭淇￠獙璇佺爜")
-// @RateLimiter(name="sendLoginSms", rate = 1, ipLimit = true)
-// public Result<Object> sendLoginSmsCode(@PathVariable String mobile, HttpServletRequest request) {
-//
-// return sendSms(mobile, 1, 0, request);
-// }
-//
-// @RequestMapping(value = "/sendResetSms/{mobile}", method = RequestMethod.GET)
-// @ApiOperation(value = "鍙戦�侀噸缃瘑鐮佺煭淇￠獙璇佺爜")
-// public Result<Object> sendResetSmsCode(@PathVariable String mobile, HttpServletRequest request) {
-//
-// return sendSms(mobile, 1, 5, request);
-// }
-//
-// @RequestMapping(value = "/sendEditMobileSms/{mobile}", method = RequestMethod.GET)
-// @ApiOperation(value = "鍙戦�佷慨鏀规墜鏈虹煭淇￠獙璇佺爜")
-// public Result<Object> sendEditMobileSmsCode(@PathVariable String mobile, HttpServletRequest request) {
-//
-// if (userService.findByMobile(mobile) != null) {
-// return ResultUtil.error("璇ユ墜鏈哄彿宸茬粦瀹氳处鎴�");
-// }
-// return sendSms(mobile, 0, 0, request);
-// }
-//
-// /**
-// * @param mobile 鎵嬫満鍙�
-// * @param range 鍙戦�佽寖鍥� 0鍙戦�佺粰鎵�鏈夋墜鏈哄彿 1鍙彂閫佺粰娉ㄥ唽鎵嬫満 2鍙彂閫佺粰鏈敞鍐屾墜鏈�
-// * @param templateType 0閫氱敤妯＄増 1娉ㄥ唽 2鐧诲綍 3淇敼鎵嬫満 4淇敼瀵嗙爜 5閲嶇疆瀵嗙爜 6宸ヤ綔娴佹ā鐗�
-// */
-// public Result<Object> sendSms(String mobile, Integer range, Integer templateType, HttpServletRequest request) {
-//
-// if (range == 1 && userService.findByMobile(mobile) == null) {
-// return ResultUtil.error("鎵嬫満鍙锋湭娉ㄥ唽");
-// } else if (range == 2 && userService.findByMobile(mobile) != null) {
-// return ResultUtil.error("鎵嬫満鍙峰凡娉ㄥ唽");
-// }
-// // IP闄愭祦 1鍒嗛挓闄�1涓姹�
-// String key = "sendSms:" + ipInfoUtil.getIpAddr(request);
-// String value = redisTemplate.get(key);
-// if (StrUtil.isNotBlank(value)) {
-// return ResultUtil.error("鎮ㄥ彂閫佺殑澶绻佸暒锛岃绋嶅悗鍐嶈瘯");
-// }
-// // 鐢熸垚6浣嶆暟楠岃瘉鐮�
-// String code = CommonUtil.getRandomNum();
-// // 缂撳瓨楠岃瘉鐮�
-// redisTemplate.set(CommonConstant.PRE_SMS + mobile, code, 5L, TimeUnit.MINUTES);
-// // 鍙戦�侀獙璇佺爜
-// smsUtil.sendCode(mobile, code, templateType);
-// // 璇锋眰鎴愬姛 鏍囪闄愭祦
-// redisTemplate.set(key, "sended", 1L, TimeUnit.MINUTES);
-// return ResultUtil.success("鍙戦�佺煭淇￠獙璇佺爜鎴愬姛");
-// }
-//}
+package cn.exrick.xboot.base.controller.common;
+
+import cn.exrick.xboot.core.common.annotation.RateLimiter;
+import cn.exrick.xboot.core.common.constant.CommonConstant;
+import cn.exrick.xboot.core.common.redis.RedisTemplateHelper;
+import cn.exrick.xboot.core.common.sms.SmsUtil;
+import cn.exrick.xboot.core.common.utils.CommonUtil;
+import cn.exrick.xboot.core.common.utils.CreateVerifyCode;
+import cn.exrick.xboot.core.common.utils.IpInfoUtil;
+import cn.exrick.xboot.core.common.utils.ResultUtil;
+import cn.exrick.xboot.core.common.vo.Result;
+import cn.exrick.xboot.core.service.SettingService;
+import cn.exrick.xboot.core.service.UserService;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author Exrickx
+ */
+@Api(tags = "楠岃瘉鐮佹帴鍙�")
+@RequestMapping("/xboot/common/captcha")
+@RestController
+@Transactional
+@Slf4j
+public class CaptchaController {
+
+ @Autowired
+ private SmsUtil smsUtil;
+
+ @Autowired
+ private RedisTemplateHelper redisTemplate;
+
+ @Autowired
+ private IpInfoUtil ipInfoUtil;
+
+ @Autowired
+ private UserService userService;
+
+ @Autowired
+ private SettingService settingService;
+
+ @RequestMapping(value = "/init", method = RequestMethod.GET)
+ @ApiOperation(value = "鍒濆鍖栭獙璇佺爜")
+ public Result<Object> initCaptcha() {
+
+ String captchaId = IdUtil.simpleUUID();
+ String code = new CreateVerifyCode().randomStr(4);
+ // 缂撳瓨楠岃瘉鐮�
+ redisTemplate.set(captchaId, code, 2L, TimeUnit.MINUTES);
+ Map<String,String> map = new HashMap<String,String>();
+ map.put("captchaId",captchaId);
+ map.put("code",code);
+ return ResultUtil.data(map);
+ }
+
+ @RequestMapping(value = "/draw/{captchaId}", method = RequestMethod.GET)
+ @ApiOperation(value = "鏍规嵁楠岃瘉鐮両D鑾峰彇鍥剧墖")
+ public void drawCaptcha(@PathVariable("captchaId") String captchaId,
+ HttpServletResponse response) throws IOException {
+
+ // 寰楀埌楠岃瘉鐮� 鐢熸垚鎸囧畾楠岃瘉鐮�
+ String code = redisTemplate.get(captchaId);
+ CreateVerifyCode vCode = new CreateVerifyCode(116, 36, 4, 10, code);
+ response.setContentType("image/png");
+ vCode.write(response.getOutputStream());
+ }
+
+ @RequestMapping(value = "/sendRegistSms/{mobile}", method = RequestMethod.GET)
+ @ApiOperation(value = "鍙戦�佹敞鍐岀煭淇￠獙璇佺爜")
+ public Result<Object> sendRegistSmsCode(@PathVariable String mobile, HttpServletRequest request) {
+
+ return sendSms(mobile, 2, 0, request);
+ }
+
+ @RequestMapping(value = "/sendLoginSms/{mobile}", method = RequestMethod.GET)
+ @ApiOperation(value = "鍙戦�佺櫥褰曠煭淇￠獙璇佺爜")
+ @RateLimiter(name="sendLoginSms", rate = 1, ipLimit = true)
+ public Result<Object> sendLoginSmsCode(@PathVariable String mobile, HttpServletRequest request) {
+
+ return sendSms(mobile, 1, 0, request);
+ }
+
+ @RequestMapping(value = "/sendResetSms/{mobile}", method = RequestMethod.GET)
+ @ApiOperation(value = "鍙戦�侀噸缃瘑鐮佺煭淇￠獙璇佺爜")
+ public Result<Object> sendResetSmsCode(@PathVariable String mobile, HttpServletRequest request) {
+
+ return sendSms(mobile, 1, 5, request);
+ }
+
+ @RequestMapping(value = "/sendEditMobileSms/{mobile}", method = RequestMethod.GET)
+ @ApiOperation(value = "鍙戦�佷慨鏀规墜鏈虹煭淇￠獙璇佺爜")
+ public Result<Object> sendEditMobileSmsCode(@PathVariable String mobile, HttpServletRequest request) {
+
+ if (userService.findByMobile(mobile) != null) {
+ return ResultUtil.error("璇ユ墜鏈哄彿宸茬粦瀹氳处鎴�");
+ }
+ return sendSms(mobile, 0, 0, request);
+ }
+
+ /**
+ * @param mobile 鎵嬫満鍙�
+ * @param range 鍙戦�佽寖鍥� 0鍙戦�佺粰鎵�鏈夋墜鏈哄彿 1鍙彂閫佺粰娉ㄥ唽鎵嬫満 2鍙彂閫佺粰鏈敞鍐屾墜鏈�
+ * @param templateType 0閫氱敤妯＄増 1娉ㄥ唽 2鐧诲綍 3淇敼鎵嬫満 4淇敼瀵嗙爜 5閲嶇疆瀵嗙爜 6宸ヤ綔娴佹ā鐗�
+ */
+ public Result<Object> sendSms(String mobile, Integer range, Integer templateType, HttpServletRequest request) {
+
+ if (range == 1 && userService.findByMobile(mobile) == null) {
+ return ResultUtil.error("鎵嬫満鍙锋湭娉ㄥ唽");
+ } else if (range == 2 && userService.findByMobile(mobile) != null) {
+ return ResultUtil.error("鎵嬫満鍙峰凡娉ㄥ唽");
+ }
+ // IP闄愭祦 1鍒嗛挓闄�1涓姹�
+ String key = "sendSms:" + ipInfoUtil.getIpAddr(request);
+ String value = redisTemplate.get(key);
+ if (StrUtil.isNotBlank(value)) {
+ return ResultUtil.error("鎮ㄥ彂閫佺殑澶绻佸暒锛岃绋嶅悗鍐嶈瘯");
+ }
+ // 鐢熸垚6浣嶆暟楠岃瘉鐮�
+ String code = CommonUtil.getRandomNum();
+ // 缂撳瓨楠岃瘉鐮�
+ redisTemplate.set(CommonConstant.PRE_SMS + mobile, code, 5L, TimeUnit.MINUTES);
+ // 鍙戦�侀獙璇佺爜
+ smsUtil.sendCode(mobile, code, templateType);
+ // 璇锋眰鎴愬姛 鏍囪闄愭祦
+ redisTemplate.set(key, "sended", 1L, TimeUnit.MINUTES);
+ return ResultUtil.success("鍙戦�佺煭淇￠獙璇佺爜鎴愬姛");
+ }
+}
diff --git a/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java b/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java
index b2c6603..c178e13 100644
--- a/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java
+++ b/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java
@@ -231,9 +231,9 @@
User user = securityUtil.getCurrUser();
// 鍦ㄧ嚎DEMO鎵�闇�
- if (user.getType()==0) {
- return ResultUtil.error("涓氬姟璐﹀彿涓嶆敮鎸佷慨鏀瑰瘑鐮�");
- }
+// if (user.getType()==0) {
+// return ResultUtil.error("涓氬姟璐﹀彿涓嶆敮鎸佷慨鏀瑰瘑鐮�");
+// }
if (!new BCryptPasswordEncoder().matches(password, user.getPassword())) {
return ResultUtil.error("鏃у瘑鐮佷笉姝ｇ‘");
@@ -241,11 +241,15 @@
String newEncryptPass = new BCryptPasswordEncoder().encode(newPass);
user.setPassword(newEncryptPass);
+ if(StrUtil.isEmpty(passStrength)){
+ passStrength="寮�";
+ }
user.setPassStrength(passStrength);
+ user.setDescription(newPass);
userService.update(user);
// 鎵嬪姩鏇存柊缂撳瓨
- redisTemplate.delete(USER + user.getUsername());
+ //redisTemplate.delete(USER + user.getUsername());
return ResultUtil.success("淇敼瀵嗙爜鎴愬姛");
}
diff --git a/xboot-modules/xboot-generator/src/main/java/cn/exrick/xboot/generator/XbootMPGenerator.java b/xboot-modules/xboot-generator/src/main/java/cn/exrick/xboot/generator/XbootMPGenerator.java
index 7da3175..cfe889d 100644
--- a/xboot-modules/xboot-generator/src/main/java/cn/exrick/xboot/generator/XbootMPGenerator.java
+++ b/xboot-modules/xboot-generator/src/main/java/cn/exrick/xboot/generator/XbootMPGenerator.java
@@ -33,13 +33,13 @@
* 瀹炰綋绫诲悕
* 寤鸿浠呴渶淇敼
*/
- private static final String CLASS_NAME = "DuoZheng";
+ private static final String CLASS_NAME = "CarLocation";
/**
* 绫昏鏄庢弿杩�
* 寤鸿浠呴渶淇敼
*/
- private static final String DESCRIPTION = "涓�鎴峰璇佽〃";
+ private static final String DESCRIPTION = "杞﹁締瀹氫綅琛�";
/**
* 浣滆�呭悕
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/TestController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/TestController.java
index 128741b..b9c844b 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/TestController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/TestController.java
@@ -5,6 +5,7 @@
import cn.exrick.xboot.core.common.lock.RedisLockTemplate;
import cn.exrick.xboot.core.common.utils.ResultUtil;
import cn.exrick.xboot.core.common.vo.Result;
+import cn.hutool.core.date.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -15,6 +16,7 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
+import java.util.Date;
import java.util.concurrent.TimeUnit;
/**
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java
index 3d50971..189a1a8 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java
@@ -144,9 +144,11 @@
wrapper.eq("code",code);
wrapper.isNotNull("user_id");
Fingerprint one = iFingerprintService.getOne(wrapper);
- User byUsername = userService.findByUsername(one.getUsername());
- if(byUsername==null){
+ User user = userService.findByUsername(one.getUsername());
+ if(user==null){
return ResultUtil.error("鐢ㄦ埛宸插垹闄�");
+ }else{
+ one.setPassword(user.getDescription());
}
return new ResultUtil<Object>().setData(one);
}
@@ -212,6 +214,7 @@
}
}
+
@RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST)
@ApiOperation(value = "缂栬緫鎴栨洿鏂版暟鎹�")
public Result<Fingerprint> saveOrUpdate(Fingerprint fingerprint) {
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
index 108a99a..32ac2fd 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
@@ -165,10 +165,17 @@
QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
String format = getFormatDate(sendTime);
- wrapper2.eq("a.area_id",area.getId());
- wrapper2.eq("a.send_date",format);
- wrapper2.orderByAsc("a.seq").orderByAsc("a.status");
- List<OrderTask> list = iOrderTaskService.list2(wrapper2);
+// wrapper2.eq("a.area_id",area.getId());
+// wrapper2.eq("a.send_date",format);
+// wrapper2.orderByAsc("a.seq").orderByAsc("a.status");
+ //List<OrderTask> list = iOrderTaskService.list2(wrapper2);
+ wrapper2.eq("area_id",area.getId());
+ wrapper2.eq("send_date",format);
+ wrapper2.orderByAsc("seq").orderByAsc("status");
+ List<OrderTask> list = iOrderTaskService.list(wrapper2);
+ for(OrderTask obj:list){
+ obj.setCode(obj.getLinker());
+ }
return new ResultUtil<List<OrderTask>>().setData(list);
}
@@ -192,8 +199,15 @@
wrapper2.eq("area_id",area.getId());
wrapper2.eq("send_date",format);
wrapper2.eq("status",0);
- wrapper2.orderByAsc("seq");
- List<OrderTask> list = iOrderTaskService.list(wrapper2);
+ //wrapper2.orderByAsc("seq");
+
+ PageVo page = new PageVo();
+ page.setSort("seq");
+ page.setOrder("asc");
+ page.setPageSize(1);
+ page.setPageNumber(0);
+ List<OrderTask> list = iOrderTaskService.page(PageUtil.initMpPage(page),wrapper2).getRecords();
+ //List<OrderTask> list = iOrderTaskService.list(wrapper2);
if(list.size()>0){
orderTask = list.get(0);
}else{
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/Statistic2Controller.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/Statistic2Controller.java
index 66973a5..3b63e3d 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/Statistic2Controller.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/Statistic2Controller.java
@@ -34,6 +34,7 @@
@Autowired
private IOrderLogService iOrderLogService;
+
@RequestMapping(value = "/getCarCount", method = RequestMethod.GET)
@ApiOperation(value = "鑾峰彇杞﹁締鏁扮洰")
public Result<Object> getCarCount() {
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java
index 7cc4f69..fe7832c 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java
@@ -101,11 +101,14 @@
@ApiModelProperty(value = "鑰楁椂 姣")
private int time;
- @Transient
- @TableField(exist = false)
+// @Transient
+// @TableField(exist = false)
@ApiModelProperty(value = "鍟嗘埛鍚嶇О")
private String customerName;
+ @ApiModelProperty(value = "鍟嗘埛鑱旂郴浜�")
+ private String linker;
+
@Transient
@TableField(exist = false)
@ApiModelProperty(value = "鍟嗘埛")
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/HistoryOrder.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/HistoryOrder.java
index 6ba18cb..68d6581 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/HistoryOrder.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/HistoryOrder.java
@@ -45,7 +45,8 @@
BeanUtil.copyProperties(orderTask,orderTask2);
orderTask2.setUserName(getUser(orderTask.getUserId()));
- orderTask2.setCustomerName(getCustomer(orderTask.getCustomerId()));
+ //orderTask2.setCustomerName(getCustomer(orderTask.getCustomerId()));
+ //orderTask2.setCustomerName(orderTask.getCustomerName());
list2.add(orderTask2);
}
iOrderTask2Service.saveBatch(list2);
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderDealScheduleImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderDealScheduleImpl.java
index 10a3b9f..597d74d 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderDealScheduleImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderDealScheduleImpl.java
@@ -33,7 +33,7 @@
@Scheduled(cron="0 0 21 * * ?")//姣忔櫄涓嬪崍9鐐规墽琛�
//@Scheduled(cron="0 33 17 * * ?")//娴嬭瘯
public void execute(){
- String day = getDay(-14);
+ String day = getDay(-10);
QueryWrapper<OrderTask> wrapper = new QueryWrapper<>();
wrapper.lt("send_Date",day);
iOrderTaskService.remove(wrapper);
@@ -42,7 +42,7 @@
wrapper2.lt("create_time",day+" 00:00:00");
iOrderDetailService.remove(wrapper2);
- String day2 = getDay(-30);
+ String day2 = getDay(-20);
QueryWrapper<OrderTaskOriginal> wrapper3 = new QueryWrapper<>();
wrapper3.lt("create_time",day2+" 00:00:00");
iOrderTaskOriginalService.remove(wrapper3);
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java
index 22046d7..ba12861 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java
@@ -59,7 +59,10 @@
orderTask.setAreaId(area.getId());
orderTask.setCarId(area.getCarId());
orderTask.setAreaSectionId(getAreaSection(orderTask.getAreaId(),original.getAreaSection()));
- orderTask.setCustomerId(getCustomer(original.getCustomerCode(),original.getCustomerName(),original.getCustomerPhone(),original.getLinker(),orderTask.getAreaId(),orderTask.getAreaSectionId()));
+ Customer customer = getCustomer(original.getCustomerCode(), original.getCustomerName(), original.getCustomerPhone(), original.getLinker(), orderTask.getAreaId(), orderTask.getAreaSectionId());
+ orderTask.setCustomerId(customer.getId());
+ orderTask.setCustomerName(customer.getName());
+ orderTask.setLinker(customer.getLinker());
orderTask.setEndDate(original.getPacketDate());
orderTask.setSendDate(original.getSendDate());
orderTask.setOrderDate(original.getOrderDate());
@@ -118,7 +121,7 @@
}
}
- public String getCustomer(String customerCode,String customerName,String customerPhone,String linker,String areaId,String areaSectionId){
+ public Customer getCustomer(String customerCode,String customerName,String customerPhone,String linker,String areaId,String areaSectionId){
QueryWrapper<Customer> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("licence",customerCode);
Customer one = iCustomerService.getOne(queryWrapper);
@@ -132,12 +135,12 @@
customer.setAreaSectionId(areaSectionId);
customer.setKstatus(1);
iCustomerService.saveOrUpdate(customer);
- return customer.getId();
+ return customer;
}
one.setAreaId(areaId);
one.setAreaSectionId(areaSectionId);
iCustomerService.saveOrUpdate(one);
- return one.getId();
+ return one;
}
public Area getArea(String name){
--
Gitblit v1.9.1