From 16332a341801f80d27830d2ea4e683b4ab21167c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 21 四月 2025 18:28:00 +0800
Subject: [PATCH] 工单业务
---
server/src/main/java/com/doumee/api/common/PublicCloudController.java | 2 +
server/src/main/java/com/doumee/api/web/WebCategoryController.java | 8 ++++
server/src/main/java/com/doumee/config/interfaceencryption/EncryptResponseBodyAdvice.java | 1
server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 2
server/src/main/java/com/doumee/api/web/WebWorkOrderController.java | 25 +++++++++++-
server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxConstant.java | 2
server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java | 10 ++--
server/src/main/java/com/doumee/api/web/WebMemberController.java | 10 ++++-
server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxUtil.java | 1
9 files changed, 49 insertions(+), 12 deletions(-)
diff --git a/server/src/main/java/com/doumee/api/common/PublicCloudController.java b/server/src/main/java/com/doumee/api/common/PublicCloudController.java
index fe82346..bf5b3e1 100644
--- a/server/src/main/java/com/doumee/api/common/PublicCloudController.java
+++ b/server/src/main/java/com/doumee/api/common/PublicCloudController.java
@@ -4,6 +4,8 @@
import com.alibaba.fastjson.JSONObject;
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.config.annotation.EncryptionReq;
+import com.doumee.config.annotation.EncryptionResp;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
diff --git a/server/src/main/java/com/doumee/api/web/WebCategoryController.java b/server/src/main/java/com/doumee/api/web/WebCategoryController.java
index c41fc20..0c034c0 100644
--- a/server/src/main/java/com/doumee/api/web/WebCategoryController.java
+++ b/server/src/main/java/com/doumee/api/web/WebCategoryController.java
@@ -1,6 +1,8 @@
package com.doumee.api.web;
import com.doumee.config.Jwt.JwtTokenUtil;
+import com.doumee.config.annotation.EncryptionReq;
+import com.doumee.config.annotation.EncryptionResp;
import com.doumee.config.annotation.LoginRequired;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -38,6 +40,8 @@
@LoginRequired
@GetMapping("/categoryTree")
@ApiOperation("鑾峰彇鍒嗙被绫诲埆鑾峰彇鍒嗙被鏍�")
+ @EncryptionReq
+ @EncryptionResp
public ApiResponse<List<CategoryVO>> categoryVOTree(@RequestParam String categoryType,Integer categoryId, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token){
try {
@@ -53,6 +57,8 @@
@LoginRequired
@GetMapping("/getCategoryVOForGCXTree")
@ApiOperation("鑾峰彇鍒嗙被绫诲埆鑾峰彇鍒嗙被鏍� - 瑙傚療椤�")
+ @EncryptionReq
+ @EncryptionResp
public ApiResponse<List<CategoryVO>> getCategoryVOForGCXTree(@RequestParam Integer categoryId, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token){
try {
@@ -69,6 +75,8 @@
@LoginRequired
@GetMapping("/categoryList")
@ApiOperation("鑾峰彇鍒嗙被绫诲埆鑾峰彇鍒嗙被鍒楄〃")
+ @EncryptionReq
+ @EncryptionResp
public ApiResponse<List<CategoryVO>> categoryList(Integer categoryType,Integer isRoot ,@RequestHeader(JwtTokenUtil.HEADER_KEY) String token){
try {
jwtTokenUtil.getUserInfoByToken(token);
diff --git a/server/src/main/java/com/doumee/api/web/WebMemberController.java b/server/src/main/java/com/doumee/api/web/WebMemberController.java
index 4ad127f..920c993 100644
--- a/server/src/main/java/com/doumee/api/web/WebMemberController.java
+++ b/server/src/main/java/com/doumee/api/web/WebMemberController.java
@@ -54,8 +54,8 @@
@PreventRepeat(limit = 10, lockTime = 10000)
@ApiOperation("H5涓氬姟鐧诲綍")
@PostMapping("/loginH5")
-// @EncryptionReq
-// @EncryptionResp
+ @EncryptionReq
+ @EncryptionResp
public ApiResponse<Member> loginH5 (@RequestBody LoginH5DTO dto) {
try {
//鎷緾ODE鎹wid锛屽厛鏌ヤ笅鏈郴缁熸槸鍚﹀瓨鍦紝瀛樺湪鐩存帴杩斿洖member锛屽惁鍒欑敤qwid鏌ヨ浼佷笟鐢ㄦ埛鏁版嵁锛屾彃鍏ユ暟鎹簱锛坢ember)
@@ -74,6 +74,8 @@
@LoginRequired
@ApiOperation("鏇存柊鐢ㄦ埛閭淇℃伅")
@PostMapping("/upateInfo")
+ @EncryptionReq
+ @EncryptionResp
public ApiResponse upateInfo (@RequestBody UpdEmailDTO updEmailDTO ,@RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
Member user = jwtTokenUtil.getUserInfoByToken(token);
@@ -112,6 +114,8 @@
@ApiOperation("鑾峰彇浼佷笟寰俊JS绛惧悕")
@PostMapping("/getQwSignature")
@ResponseBody
+ @EncryptionReq
+ @EncryptionResp
public ApiResponse<WebQwSingatureVO> getQwSignature(@RequestBody WebQwSingatureDto param) {
try {
String jsapiTicket = systemDictDataBiz.queryByCode(Constants.QYWX,Constants.QYWX_JS_API_TICKET).getCode();
@@ -142,6 +146,8 @@
@LoginRequired
@ApiOperation("鏌ヨ鍙鎶勯�佷汉鍒嗛〉")
@PostMapping("/getCopySendUserPage")
+ @EncryptionReq
+ @EncryptionResp
public ApiResponse<PageData<Member>> getCopySendUserPage (@RequestBody PageWrap<Member> pageWrap) {
pageWrap.getModel().setIsSendCopy(Constants.ONE);
return ApiResponse.success(memberService.findPage(pageWrap));
diff --git a/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java b/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
index 0e86e97..147c29f 100644
--- a/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
+++ b/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
@@ -1,6 +1,8 @@
package com.doumee.api.web;
import com.doumee.config.Jwt.JwtTokenUtil;
+import com.doumee.config.annotation.EncryptionReq;
+import com.doumee.config.annotation.EncryptionResp;
import com.doumee.config.annotation.LoginRequired;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -52,6 +54,8 @@
@LoginRequired
@ApiOperation("椋庨櫓涓婃姤")
@PostMapping("/create")
+ @EncryptionReq
+ @EncryptionResp
public ApiResponse create (@RequestBody Workorder workorder, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
Member user = jwtTokenUtil.getUserInfoByToken(token);
@@ -69,6 +73,8 @@
@LoginRequired
@ApiOperation("閫氱煡浜烘煡璇�")
@PostMapping("/managersList")
+ @EncryptionReq
+ @EncryptionResp
public ApiResponse<List<Managers>> managersList (@RequestBody Managers model, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
@@ -85,6 +91,8 @@
@LoginRequired
@ApiOperation("椋庨櫓涓婃姤璇︽儏")
@GetMapping("/detail")
+ @EncryptionReq
+ @EncryptionResp
public ApiResponse<Workorder> detail (@RequestParam Integer id, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
return ApiResponse.success(workorderService.getDetail(id,jwtTokenUtil.getUserInfoByToken(token)));
@@ -101,6 +109,8 @@
@LoginRequired
@ApiOperation("宸ュ崟鍏抽棴")
@PostMapping("/closeWorkOrder")
+ @EncryptionReq
+ @EncryptionResp
public ApiResponse closeWorkOrder(@RequestBody CloseDTO closeDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
closeDTO.setMember(jwtTokenUtil.getUserInfoByToken(token));
@@ -120,6 +130,8 @@
@LoginRequired
@ApiOperation("宸ュ崟鎸囨淳")
@PostMapping("/passOn")
+ @EncryptionReq
+ @EncryptionResp
public ApiResponse passOn(@RequestBody PassOnDTO passOnDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
passOnDTO.setMember(jwtTokenUtil.getUserInfoByToken(token));
@@ -138,6 +150,8 @@
@LoginRequired
@ApiOperation("宸ュ崟鍌績")
@GetMapping("/urge")
+ @EncryptionReq
+ @EncryptionResp
public ApiResponse urge(@RequestParam Integer workorderId, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
workorderService.urge(workorderId,jwtTokenUtil.getUserInfoByToken(token));
@@ -154,6 +168,8 @@
@LoginRequired
@ApiOperation("宸ュ崟鎶勯��")
@PostMapping("/sendCopy")
+ @EncryptionReq
+ @EncryptionResp
public ApiResponse sendCopy(@RequestBody SendCopyDTO sendCopyDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
sendCopyDTO.setMember(jwtTokenUtil.getUserInfoByToken(token));
@@ -172,6 +188,8 @@
@LoginRequired
@ApiOperation("SHE銆佽穼缁婃粦鎶ヨ〃")
@PostMapping("/getWorkOrderData")
+ @EncryptionReq
+ @EncryptionResp
public ApiResponse<List<WorkOrderDataVO>> getWorkOrderData(@RequestBody OrderDataDTO orderDataDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
@@ -185,10 +203,11 @@
}
-
@LoginRequired
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
+ @EncryptionReq
+ @EncryptionResp
public ApiResponse<PageData<Workorder>> findPage (@RequestBody PageWrap<Workorder> pageWrap,@RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
Member member = jwtTokenUtil.getUserInfoByToken(token);
@@ -200,8 +219,8 @@
e.printStackTrace();
return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
}
-
-
}
+
+
}
diff --git a/server/src/main/java/com/doumee/config/interfaceencryption/EncryptResponseBodyAdvice.java b/server/src/main/java/com/doumee/config/interfaceencryption/EncryptResponseBodyAdvice.java
index 009cf9b..6be1ebc 100644
--- a/server/src/main/java/com/doumee/config/interfaceencryption/EncryptResponseBodyAdvice.java
+++ b/server/src/main/java/com/doumee/config/interfaceencryption/EncryptResponseBodyAdvice.java
@@ -53,6 +53,7 @@
ObjectMapper objectMapper = new ObjectMapper();
objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
String aesEncryptData = AESUtils.encrypt(objectMapper.writeValueAsString(apiResponse.getData()), str);
+
apiResponse.setData(aesEncryptData);
String aesEncryptMessage = AESUtils.encrypt(objectMapper.writeValueAsString(apiResponse.getMessage()), str);
apiResponse.setMessage(aesEncryptMessage + " " + afterDealStr);
diff --git a/server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxConstant.java b/server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxConstant.java
index 9db6254..b8ffc47 100644
--- a/server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxConstant.java
+++ b/server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxConstant.java
@@ -22,7 +22,7 @@
//鑾峰彇鎴愬憳璇︽儏,access_token=璋冪敤鎺ュ彛鍑瘉,userid=鎴愬憳UserID
public final static String[] GET_USER_DETAIL =new String[]{ "/cgi-bin/user/get?access_token=${accesstoken}&userid=${id}","鑾峰彇鎴愬憳璇︽儏"};
//鍙戦�佸簲鐢ㄦ秷鎭�,access_token=璋冪敤鎺ュ彛鍑瘉 POST璇锋眰锛�
- public final static String[] SEND_MSG =new String[]{ "/cgi-bin/message/send?access_token=${accesstoken}","鍙戠敓鎺ㄩ�佹秷鎭�"};
+ public final static String[] SEND_MSG =new String[]{ "/cgi-bin/message/send?access_token=${accesstoken}","鍙戦�佹帹閫佹秷鎭�"};
public final static String[] GET_USER_BY_AUTH_CODE =new String[]{ "/cgi-bin/auth/getuserinfo?access_token=${accesstoken}&code=${code}","鑾峰彇鐢ㄦ埛鐧诲綍韬唤"};
public final static String[] GET_JSAPI_TICKET =new String[]{ "/cgi-bin/get_jsapi_ticket?access_token=${accesstoken}","鑾峰彇浼佷笟 jsapi_ticket"};
diff --git a/server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxUtil.java b/server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxUtil.java
index 2f4f290..36325d6 100644
--- a/server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxUtil.java
+++ b/server/src/main/java/com/doumee/core/utils/qiyeweixin/QywxUtil.java
@@ -88,6 +88,7 @@
String url = interfaceUrl[0].replace("${accesstoken}",token);
QywxSendMsgResponse response = sendHttpRequestSingle(url,interfaceUrl[1],JSONObject.toJSONString(param)
,new TypeReference<QywxSendMsgResponse>(){});
+ log.error("鎺ㄩ�佹秷鎭粨鏋渰}",JSONObject.toJSONString(response));
if(response.getErrcode()!=null && response.getErrcode() ==0){
return response;
}
diff --git a/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 89a00d9..d81bb83 100644
--- a/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -436,7 +436,7 @@
}
String token = systemDictDataBiz.queryByCode(Constants.QYWX,Constants.QYWX_TOKEN).getCode();
//鏍规嵁code鎹㈠尯浼佷笟寰俊ID
- QywxBaseResponse<String> qwIdBaseResponse= QywxUtil.getUserInfoByCode(token,dto.getCode());
+ QywxBaseResponse<String> qwIdBaseResponse = QywxUtil.getUserInfoByCode(token,dto.getCode());
if(Objects.isNull(qwIdBaseResponse)||Objects.isNull(qwIdBaseResponse.getErrcode())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐧诲綍鐮佽В鏋愬け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
diff --git a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
index 9288568..7cc0471 100644
--- a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
@@ -406,8 +406,8 @@
*/
public Integer saveLog(String beforeJson,Workorder afterWorkorder,Integer objType,Integer memberId,String title,String content,String paramr2){
WorkorderLog workorderLog = new WorkorderLog();
- workorderLog.setCreateDate(afterWorkorder.getCreateDate());
- workorderLog.setEditDate(afterWorkorder.getCreateDate());
+ workorderLog.setCreateDate(afterWorkorder.getEditDate());
+ workorderLog.setEditDate(afterWorkorder.getEditDate());
workorderLog.setIsdeleted(Constants.ZERO);
workorderLog.setBeforeContent(beforeJson);
workorderLog.setAfterContent(JSONObject.toJSONString(afterWorkorder));
@@ -857,7 +857,7 @@
}
workorder.setStatus(Constants.WorkOrderStatus.wtsClose.getKey());
qwIds.addAll(Arrays.asList(workorder.getQwnoticeMemberIds().split(",")));
- qwIds.add(workorder.getDealerId());
+ qwIds.add(workorder.getManagerId());
qwIds.remove(closeDTO.getMember().getQwId());
}else{
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"宸ュ崟鐘舵�佸凡娴佽浆");
@@ -867,7 +867,7 @@
workorder.setDealInfo(closeDTO.getInfo());
workorderMapper.updateById(workorder);
//澶勭悊涓婃姤鏃ュ織
- Integer logId = this.saveLog(beforeJson,workorder,Constants.THREE,workorder.getMemberId(),"浠诲姟宸插鐞�",closeDTO.getInfo(),null);
+ Integer logId = this.saveLog(beforeJson,workorder,Constants.THREE,closeDTO.getMember().getId(),"浠诲姟宸插鐞�",closeDTO.getInfo(),null);
List<Multifile> multifileList = closeDTO.getMultifileList();
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
for (Multifile multifile:multifileList) {
@@ -933,7 +933,7 @@
//澶勭悊涓婃姤鏃ュ織
Integer logId = this.saveLog(beforeJson,workorder,
Constants.equalsInteger(passOnDTO.getPassOnType(),Constants.ZERO)?Constants.ONE:Constants.TWO
- ,workorder.getMemberId(),"浠诲姟鍒嗛厤",passOnDTO.getInfo(),paramr2);
+ ,passOnDTO.getMember().getId(),"浠诲姟鍒嗛厤",passOnDTO.getInfo(),paramr2);
List<Multifile> multifileList = passOnDTO.getMultifileList();
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
for (Multifile multifile:multifileList) {
--
Gitblit v1.9.3