From 3c7e6f5e5890926532501c9c75415a1d885f78aa Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 08 十一月 2023 17:33:35 +0800
Subject: [PATCH] bug
---
server/services/src/main/java/com/doumee/biz/system/SystemUserBiz.java | 8 ++++
server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java | 31 ++++-----------
server/platform/src/main/java/com/doumee/api/system/SystemUserController.java | 12 ++++++
server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java | 18 ++++++++
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 2
server/web/src/main/java/com/doumee/api/web/AccountApi.java | 9 ++++
6 files changed, 55 insertions(+), 25 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/system/SystemUserController.java b/server/platform/src/main/java/com/doumee/api/system/SystemUserController.java
index 2b2e7f1..2bf2c72 100644
--- a/server/platform/src/main/java/com/doumee/api/system/SystemUserController.java
+++ b/server/platform/src/main/java/com/doumee/api/system/SystemUserController.java
@@ -24,6 +24,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -106,6 +107,17 @@
return ApiResponse.success(null);
}
+ @Trace(withRequestParameters = false)
+ @ApiOperation("淇敼鐢ㄦ埛鐘舵��")
+ @PostMapping("/updateStatusById")
+ @RequiresPermissions("system:user:update")
+ public ApiResponse updateStatusById(@RequestBody CreateSystemUserDTO systemUser){
+ systemUser.setUpdateUser(this.getLoginUser().getId());
+ systemUser.setUpdateTime(new Date());
+ systemUserBiz.updateStatusById(systemUser);
+ return ApiResponse.success(null);
+ }
+
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("system:user:query")
diff --git a/server/services/src/main/java/com/doumee/biz/system/SystemUserBiz.java b/server/services/src/main/java/com/doumee/biz/system/SystemUserBiz.java
index 5ecc93b..bc08a19 100644
--- a/server/services/src/main/java/com/doumee/biz/system/SystemUserBiz.java
+++ b/server/services/src/main/java/com/doumee/biz/system/SystemUserBiz.java
@@ -56,6 +56,14 @@
*/
void updateById(CreateSystemUserDTO systemUser);
+
+ /**
+ * 淇敼鐢ㄦ埛淇℃伅
+ * @author Eva.Caesar Liu
+ * @date 2022/03/15 09:54
+ */
+ void updateStatusById(CreateSystemUserDTO systemUser);
+
/**
* 鍒涘缓鐢ㄦ埛瑙掕壊
* @author Eva.Caesar Liu
diff --git a/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java b/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
index 1a2cd97..54ba793 100644
--- a/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
+++ b/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
@@ -187,7 +187,7 @@
// throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿宸插瓨鍦�");
// }
// }
- if ("admin".equals(user.getUsername()) && Objects.equal(systemUser.getStatus(),1)){
+ if (user != null && "admin".equals(user.getUsername()) && Objects.equal(systemUser.getStatus(),1)){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瓒呯骇绠＄悊鍛樿处鍙蜂笉鍏佽绂佺敤");
}
// 淇敼鐢ㄦ埛
@@ -220,6 +220,22 @@
}
}
+
+ @Override
+ public void updateStatusById(CreateSystemUserDTO systemUser) {
+
+ SystemUser queryUserDto = new SystemUser();
+ queryUserDto.setId(systemUser.getId());
+ queryUserDto.setDeleted(Constants.ZERO);
+ SystemUser user = systemUserService.findOne(queryUserDto);
+
+ if ("admin".equals(user.getUsername()) && Objects.equal(systemUser.getStatus(),1)){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瓒呯骇绠＄悊鍛樿处鍙蜂笉鍏佽绂佺敤");
+ }
+ // 淇敼鐢ㄦ埛
+ systemUserService.updateById(systemUser);
+ }
+
@Override
@Transactional
public void createUserRole(CreateUserRoleDTO dto) {
diff --git a/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java b/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
index f9ab1dc..67fc991 100644
--- a/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
+++ b/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
@@ -134,8 +134,8 @@
* https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/qrcode-link/qr-code/getUnlimitedQRCode.html
* @return
*/
- public void generateWXMiniCode(Locks locks){
- SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.ACCESS_TOKEN);
+ public void generateWXMiniCode(Locks locks,SystemDictData systemDictData){
+
if(Objects.isNull(systemDictData)){
return;
}
@@ -147,7 +147,8 @@
body.put("env_version", "release");
// 閫忔槑锛屾牴鎹綘鐨勫満鏅嚜琛岃缃産ody鍙傛暟
body.put("is_hyaline", false);
-// body.put("page","pages/index/index");
+ body.put("check_path", false);
+ body.put("page","pages/index/index");
OkHttpClient client = new OkHttpClient().newBuilder().build();
okhttp3.MediaType mediaType = okhttp3.MediaType.parse("application/json");
okhttp3.RequestBody requestBody = okhttp3.RequestBody.create(mediaType, JSONObject.toJSONString(body));
@@ -156,28 +157,14 @@
Response response = client.newCall(request).execute();
if (response.isSuccessful()) {
InputStream inputStream = new ByteArrayInputStream(response.body().bytes());
- int i = inputStream.available(); // 寰楀埌鏂囦欢澶у皬
+
+ // 寰楀埌鏂囦欢澶у皬
+ int i = inputStream.available();
byte[] mFileBody = new byte[i];
- inputStream.read(mFileBody); // 璇绘暟鎹�
+ // 璇绘暟鎹�
+ inputStream.read(mFileBody);
locks.setInfo("data:image/Jpeg;base64," + Base64.getEncoder().encodeToString(mFileBody));
-/*
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- byte[] buffer = new byte[1024];
- int len = -1;
- while ((len = inputStream.read(buffer)) != -1) {
- baos.write(buffer, 0, len);
- }*/
-
-// FileOutputStream out = new FileOutputStream("d:\\test.png");
-// byte[] buffer = new byte[8192];
-// int bytesRead = 0;
-// while ((bytesRead = inputStream.read(buffer, 0, 8192)) != -1) {
-// out.write(buffer, 0, bytesRead);
-// }
-// out.flush();
-// inputStream.close();
-// out.close();
}
} catch (Exception e) {
e.printStackTrace();
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index cca62d8..c9419f4 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -229,7 +229,7 @@
queryWrapper.lambda().eq(Member::getPassword, pageWrap.getModel().getPassword());
}
if (pageWrap.getModel().getCardNo() != null) {
- queryWrapper.lambda().eq(Member::getCardNo, pageWrap.getModel().getCardNo());
+ queryWrapper.lambda().like(Member::getCardNo, pageWrap.getModel().getCardNo());
}
if (pageWrap.getModel().getCardSign() != null) {
queryWrapper.lambda().eq(Member::getCardSign, pageWrap.getModel().getCardSign());
diff --git a/server/web/src/main/java/com/doumee/api/web/AccountApi.java b/server/web/src/main/java/com/doumee/api/web/AccountApi.java
index 4e3d486..ce8e500 100644
--- a/server/web/src/main/java/com/doumee/api/web/AccountApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/AccountApi.java
@@ -1,9 +1,11 @@
package com.doumee.api.web;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.Jwt.JwtPayLoad;
import com.doumee.core.Jwt.JwtTokenUtil;
import com.doumee.core.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
+import com.doumee.core.constants.Constants;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.wx.WxMiniUtilService;
import com.doumee.dao.business.model.Locks;
@@ -11,6 +13,7 @@
import com.doumee.dao.business.web.request.WxPhoneRequest;
import com.doumee.dao.business.web.response.AccountResponse;
import com.doumee.dao.business.web.response.UserResponse;
+import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.MemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -39,6 +42,9 @@
@Autowired
private WxMiniUtilService wxMiniUtilService;
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
// @ApiOperation(value = "鐢ㄦ埛娉ㄥ唽", notes = "灏忕▼搴忕")
// @PostMapping("/userRegister")
@@ -107,7 +113,8 @@
Locks locks = new Locks();
locks.setCode(12);
locks.setSiteId("1005");
- wxMiniUtilService.generateWXMiniCode(locks);
+ SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.ACCESS_TOKEN);
+ wxMiniUtilService.generateWXMiniCode(locks,systemDictData);
return ApiResponse.success("鎿嶄綔鎴愬姛",locks);
}
--
Gitblit v1.9.3