From f5ff2c22cb11686b95c1c0c70e8c5098c01a9c99 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 11 四月 2025 17:36:29 +0800
Subject: [PATCH] 工单业务
---
server/src/main/java/com/doumee/api/common/PublicCloudController.java | 363 ++++++++++++++++++++++++++++++++++++++++
server/src/main/java/com/doumee/api/web/WebCategoryController.java | 8
server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 23 +-
server/src/main/java/com/doumee/api/web/WebWorkOrderController.java | 53 ++++-
server/src/main/java/com/doumee/core/constants/Constants.java | 1
server/src/main/java/com/doumee/api/business/WorkorderController.java | 2
server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java | 34 +++
server/src/main/java/com/doumee/config/swagger/SwaggerConfig.java | 15 +
server/src/main/java/com/doumee/dao/business/model/Workorder.java | 16 +
server/src/main/java/com/doumee/service/business/WorkorderService.java | 2
server/src/main/java/com/doumee/api/web/WebMemberController.java | 6
11 files changed, 482 insertions(+), 41 deletions(-)
diff --git a/server/src/main/java/com/doumee/api/business/WorkorderController.java b/server/src/main/java/com/doumee/api/business/WorkorderController.java
index 28822c1..a3c17a1 100644
--- a/server/src/main/java/com/doumee/api/business/WorkorderController.java
+++ b/server/src/main/java/com/doumee/api/business/WorkorderController.java
@@ -80,6 +80,6 @@
@GetMapping("/{id}")
@RequiresPermissions("business:workorder:query")
public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(workorderService.getDetail(id));
+ return ApiResponse.success(workorderService.getDetail(id,null));
}
}
diff --git a/server/src/main/java/com/doumee/api/common/PublicCloudController.java b/server/src/main/java/com/doumee/api/common/PublicCloudController.java
new file mode 100644
index 0000000..4ecc8da
--- /dev/null
+++ b/server/src/main/java/com/doumee/api/common/PublicCloudController.java
@@ -0,0 +1,363 @@
+package com.doumee.api.common;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.doumee.api.BaseController;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.annotation.trace.Trace;
+import com.doumee.core.constants.Constants;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.utils.DateUtil;
+import com.doumee.core.utils.FtpUtil;
+import com.doumee.dao.system.model.SystemDictData;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.util.*;
+
+/**
+ * @author Eva.Caesar Liu
+ * @date 2023/02/14 11:14
+ */
+@Api(tags = "鍏叡涓婁紶鎺ュ彛")
+@Trace(exclude = true)
+@RestController
+@RequestMapping("/web/public")
+@Slf4j
+public class PublicCloudController extends BaseController {
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
+
+ public static FtpUtil ftp = null;
+
+ @ApiOperation(value = "鎵归噺涓婁紶鏂囦欢鍒癋TP")
+ @RequestMapping(method= RequestMethod.POST,value="/uploadBatch")
+ @ResponseBody
+ public void uploadBatch(HttpServletRequest request, HttpServletResponse response, String folder) throws Exception {
+ if(Objects.isNull(folder)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ SystemDictData folderData = systemDictDataBiz.queryByCode(Constants.FTP,folder);
+ if(Objects.isNull(folderData)||StringUtils.isBlank(folderData.getCode())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐩爣鏂囦欢澶归敊璇�");
+ }
+ folder = systemDictDataBiz.queryByCode(Constants.FTP,folder).getCode();
+ String prefixPath = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode();
+ response.setCharacterEncoding("UTF-8");
+ response.setContentType("text/html;charset=UTF-8");
+ Map<String, Object> context = new HashMap<>();
+ try {
+ if(ftp == null){
+ ftp = new FtpUtil(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_HOST).getCode(),
+ Integer.parseInt(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_PORT).getCode()),
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_USERNAME).getCode(),
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_PWD).getCode());
+ }else{
+ ftp.connect();
+ }
+
+ context.put("success", true);
+ context.put("code", 200);
+ context.put("errno",0);
+ CommonsMultipartResolver multipartResovler = new CommonsMultipartResolver();
+ if (multipartResovler.isMultipart(request)) {
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ List<MultipartFile> fileList = multipartRequest.getFiles("file");
+ Iterator<String> it = multipartRequest.getFileNames();
+ JSONArray jsonArray = new JSONArray();
+
+ if (fileList.size() > 0) {
+ //閬嶅巻鏂囦欢鍒楄〃
+ Iterator<MultipartFile> fileIte = fileList.iterator();
+ Integer index = Constants.ONE;
+ while (fileIte.hasNext()) {
+ //鑾峰緱姣忎竴涓枃浠�
+ MultipartFile file = fileIte.next();
+ String originname = file.getOriginalFilename();
+ InputStream is = file.getInputStream();
+ String endType = originname.substring(originname.lastIndexOf("."), originname.length());
+ String date = DateUtil.getNowShortDate();
+ String fName = date + "/" + UUID.randomUUID() + endType;
+ String fileName = folder + fName;
+ boolean r = ftp.uploadInputstreamBatch(is, fileName, Constants.equalsInteger(index ,fileList.size()),index);
+ if (r) {
+ JSONObject fileJSON = new JSONObject();
+ fileJSON.put("url", prefixPath + fileName);
+ fileJSON.put("imgaddr", fName);
+ fileJSON.put("imgname", fileName);
+ fileJSON.put("originname", originname);
+ jsonArray.add(fileJSON);
+ }
+ index = index + 1;
+ }
+
+ }
+
+// while (it.hasNext()) {
+// MultipartFile file = multipartRequest.getFile(it.next());
+// String originname = file.getOriginalFilename();
+// is = file.getInputStream();
+// String endType = originname.substring(originname.lastIndexOf("."),originname.length());
+// String date = DateUtil.getNowShortDate();
+// String fName = date+"/"+ UUID.randomUUID()+endType;
+// String fileName = folder+"/"+fName;
+// boolean r = ftp.uploadInputstream(is,fileName);
+// if(r){
+// JSONObject fileJSON = new JSONObject();
+// fileJSON.put("url", prefixPath+fileName);
+// fileJSON.put("imgaddr", fName);
+// fileJSON.put("imgname", fileName);
+// fileJSON.put("originname", originname);
+// jsonArray.add(fileJSON);
+// }
+// }
+ context.put("data",jsonArray);
+ }
+ } catch (Exception e) {
+ log.error("銆愪笂浼燜TP澶辫触銆�======================"+e.getMessage());
+ context.put("code", 0);
+ context.put("message", "涓婁紶澶辫触");
+ context.put("errno",0);
+ writerJson(response, context);
+ return;
+
+ }
+ writerJson(response, context);
+ return;
+ }
+
+ @ApiOperation(value = "涓婁紶鏂囦欢鍒癋TP")
+ @RequestMapping(method= RequestMethod.POST,value="/upload")
+ @ResponseBody
+ public void upload(HttpServletRequest request, HttpServletResponse response, String folder) throws Exception {
+// folder = systemDictDataBiz.queryByCode(Constants.FTP,folder).getCode();
+ Date d1 = new Date();
+ log.error("鎬诲緱涓婁紶鏂囦欢鎴愬姛=============寮�濮�========="+DateUtil.getPlusTime2(d1));
+ folder =StringUtils.defaultString(folder).replace("/", "");
+ String prefixPath = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode();
+ InputStream is = null;
+ response.setCharacterEncoding("UTF-8");
+ response.setContentType("text/html;charset=UTF-8");
+ Map<String, Object> context = new HashMap<>();
+ try {
+ if(ftp == null){
+ ftp = new FtpUtil(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_HOST).getCode(),
+ Integer.parseInt(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_PORT).getCode()),
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_USERNAME).getCode(),
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_PWD).getCode());
+ }else{
+ ftp.connect();
+ }
+
+ CommonsMultipartResolver multipartResovler = new CommonsMultipartResolver();
+ if (multipartResovler.isMultipart(request)) {
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ Iterator<String> it = multipartRequest.getFileNames();
+ while (it.hasNext()) {
+ MultipartFile file = multipartRequest.getFile(it.next());
+ String originname = file.getOriginalFilename();
+ is = file.getInputStream();
+ String endType = ".jpg";
+ if(originname.indexOf(".")>0){
+ endType=originname.substring(originname.lastIndexOf("."),originname.length());
+ }
+ String date = DateUtil.getNowShortDate();
+ String fName = date+"/"+ UUID.randomUUID()+endType;
+ String fileName = folder+"/"+fName;
+ boolean r = ftp.uploadInputstream(is,fileName);
+ if(r){
+ context.put("success", true);
+ context.put("code", 200);
+ context.put("errno",0);
+ JSONObject fileJSON = new JSONObject();
+// fileJSON.put("prefixPath", prefixPath);
+// fileJSON.put("folder", folder);
+ fileJSON.put("url", prefixPath+fileName);
+ fileJSON.put("imgaddr", fName);
+ fileJSON.put("imgname", fileName);
+ fileJSON.put("originname", originname);
+ context.put("data",fileJSON);
+ context.put("message","璇锋眰鎴愬姛");
+ writerJson(response, context);
+ Date d2= new Date();
+ log.error("鎬荤殑涓婁紶鏂囦欢鎴愬姛=============缁撴潫========="+DateUtil.getPlusTime2(d2) +"鑰楁椂绉掞細"+( (d2.getTime()-d1.getTime()) /1000));
+ return;
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.error("銆愪笂浼燜TP澶辫触銆�======================"+e.getMessage());
+ }
+ context.put("code", 0);
+ context.put("message", "涓婁紶澶辫触");
+ context.put("errno",0);
+ writerJson(response, context);
+ return;
+ }
+
+
+ public static void writerJson(HttpServletResponse response, Object object) {
+ response.setContentType("application/json");
+ writer(response, JSONObject.toJSONString(object));
+ }
+
+ private static void writer(HttpServletResponse response, String str) {
+ try {
+ StringBuffer result = new StringBuffer();
+ //璁剧疆椤甸潰涓嶇紦瀛�
+ response.setHeader("Pragma", "No-cache");
+ response.setHeader("Cache-Control", "no-cache");
+ response.setCharacterEncoding("UTF-8");
+ PrintWriter out = null;
+ out = response.getWriter();
+ out.print(str);
+ out.flush();
+ out.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ public void uploadFileLocal(HttpServletRequest request, String folder, HttpServletResponse response, String rootPath,String dir) throws Exception {
+ response.setCharacterEncoding("UTF-8");
+ response.setContentType("text/html;charset=UTF-8");
+ CommonsMultipartResolver multipartResovler = new CommonsMultipartResolver();
+ Map<String, Object> context = new HashMap<>();
+ if (multipartResovler.isMultipart(request)) {
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ Iterator<String> it = multipartRequest.getFileNames();
+ while (it.hasNext()) {
+ MultipartFile file = multipartRequest.getFile((String) it.next());// file
+ // =
+ // (CommonsMultipartFile)
+ // multipartRequest.getFile((String)
+ // it.next());
+ if (file != null) {
+ if (file.getSize() > 200 * 1024 * 1024L) {
+ context.put("code", 4000);
+ context.put("message", "涓婁紶鏂囦欢杩囧ぇ");
+ return;
+ }
+ System.out.println(file.getOriginalFilename());
+ if (file.getOriginalFilename() == null) {
+ context.put("code", 4000);
+ context.put("message", "鏂囦欢鍚嶄笉鍙负绌�");
+ return;
+ }
+ /*
+ * if(file.getOriginalFilename().contains(",")||file.getOriginalFilename().
+ * contains(" ")){ sendFailureMessage(response,"鏂囦欢鍚嶇О鏈夎,涓嶅彲鍚湁閫楀彿绛夌壒娈婂瓧绗�"); }
+ */
+
+ String nowDate = DateUtil.getNowShortDate();
+ folder += nowDate + "/";
+ String strDirPath = rootPath + folder;
+ File dirPath = new File(strDirPath);
+ if (!dirPath.exists()) {
+ dirPath.mkdirs();
+ }
+ String uploadFileName = file.getOriginalFilename();
+ String x = UUID.randomUUID().toString().replace("-", "")
+ + uploadFileName.substring(uploadFileName.lastIndexOf("."));
+ String fileName = folder + x;
+ String fileNames = nowDate + "/" + x;
+ uploadFileName = uploadFileName.replace(" ", "");
+ uploadFileName = uploadFileName.replace("锛�", ",");
+ uploadFileName = uploadFileName.replaceAll(",", "-");
+ System.err.println("R:" + fileName);
+ String fileAndPath = dir + fileName;
+ System.err.println("A:" + fileAndPath);
+ // 鍒ゆ柇濡傛灉涓存椂鐩綍涓瓨鍦ㄧ浉鍚屽悕绉扮殑鏂囦欢鍏堝垹闄わ紝鍦ㄤ笂浼�
+ File tempFile = new File(rootPath + fileName);
+ if (tempFile.isFile() && tempFile.exists()) {
+ tempFile.getAbsoluteFile().delete();
+ }
+ // 涓婁紶鍒版湇鍔″櫒涓存椂鏂囦欢澶�
+ file.transferTo(tempFile);
+ // 杞Щ鍒癋TP鏈嶅姟鍣�
+ String nfix = "";
+ if (null != uploadFileName) {
+ nfix = uploadFileName.substring(uploadFileName.lastIndexOf("."));
+ }
+
+ if (StringUtils.equalsIgnoreCase(nfix, ".exe")) {
+ context.put("code", 4000);
+ context.put("message", "瀵逛笉璧凤紝鏂囦欢鏍煎紡\".exe\"涓婁紶鏈夎锛�");
+ return;
+ }
+ if (StringUtils.equalsIgnoreCase(nfix, ".dll")) {
+ context.put("code", 4000);
+ context.put("message", "瀵逛笉璧凤紝鏂囦欢鏍煎紡\".dll\"涓婁紶鏈夎锛�");
+ return;
+ }
+
+ String remoteName = fileName;
+ String remoteFileName = fileAndPath;
+
+ /* Map map = new HashMap();
+ map.put("url", remoteFileName);
+ map.put("alt", uploadFileName);
+ map.put("href", remoteFileName);
+ List maps = Arrays.asList(remoteFileName);*/
+
+ if (true) {
+ // 鍏抽棴FTP娴�
+ // 绉诲姩鎴愬姛,杩斿洖鏂囦欢鍚�
+
+ /*context.put("error", 0);
+ context.put("url", remoteFileName);
+ context.put("fullurl", remoteFileName);
+ context.put("fname", uploadFileName);
+ context.put("data", maps);
+ context.put("halfurl", fileNames);*/
+
+ context.put("success", true);
+ context.put("code", 200);
+ context.put("errno",0);
+ JSONObject fileJSON = new JSONObject();
+ fileJSON.put("url", remoteFileName);
+ fileJSON.put("imgaddr", fileNames);
+ fileJSON.put("imgname", uploadFileName);
+ fileJSON.put("originname", uploadFileName);
+ context.put("data",fileJSON);
+ context.put("message","璇锋眰鎴愬姛");
+
+ writerJson(response, context);
+ return;
+ } else {
+ // 绉诲姩澶辫触
+ context.put("code", 0);
+ context.put("message", "涓婁紶澶辫触");
+ writerJson(response, context);
+ }
+ }
+ context.put("code", 0);
+ context.put("message", "涓婁紶澶辫触");
+ writerJson(response, context);
+ return;
+ }
+ }
+ context.put("code", 0);
+ context.put("message", "涓婁紶澶辫触");
+ writerJson(response, context);
+ return;
+ }
+}
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 7d7ef0d..3cab702 100644
--- a/server/src/main/java/com/doumee/api/web/WebCategoryController.java
+++ b/server/src/main/java/com/doumee/api/web/WebCategoryController.java
@@ -38,9 +38,9 @@
@LoginRequired
@GetMapping("/categoryTree")
@ApiOperation("鑾峰彇鍒嗙被绫诲埆鑾峰彇鍒嗙被鏍�")
- public ApiResponse<List<CategoryVO>> categoryVOTree(@RequestParam String categoryType, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange){
+ public ApiResponse<List<CategoryVO>> categoryVOTree(@RequestParam String categoryType, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token){
try {
- ServerHttpRequest request = serverWebExchange.getRequest();
+
jwtTokenUtil.getUserInfoByToken(token);
return ApiResponse.success(categoryService.getCategoryVOTree(categoryType));
}catch (BusinessException e){
@@ -54,9 +54,9 @@
@LoginRequired
@GetMapping("/categoryList")
@ApiOperation("鑾峰彇鍒嗙被绫诲埆鑾峰彇鍒嗙被鍒楄〃")
- public ApiResponse<List<CategoryVO>> categoryList(Integer categoryType, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange){
+ public ApiResponse<List<CategoryVO>> categoryList(Integer categoryType, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token){
try {
- ServerHttpRequest request = serverWebExchange.getRequest();
+
jwtTokenUtil.getUserInfoByToken(token);
return ApiResponse.success(categoryService.getCategoryVOList(categoryType));
}catch (BusinessException e){
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 b34efe3..24cca6a 100644
--- a/server/src/main/java/com/doumee/api/web/WebMemberController.java
+++ b/server/src/main/java/com/doumee/api/web/WebMemberController.java
@@ -37,9 +37,8 @@
@PreventRepeat(limit = 10, lockTime = 10000)
@ApiOperation("H5涓氬姟鐧诲綍")
@PostMapping("/loginH5")
- public ApiResponse<Member> loginH5 (@Validated @RequestBody LoginH5DTO dto, ServerWebExchange serverWebExchange) {
+ public ApiResponse<Member> loginH5 (@RequestBody LoginH5DTO dto) {
try {
- ServerHttpRequest request = serverWebExchange.getRequest();
//鎷緾ODE鎹wid锛屽厛鏌ヤ笅鏈郴缁熸槸鍚﹀瓨鍦紝瀛樺湪鐩存帴杩斿洖member锛屽惁鍒欑敤qwid鏌ヨ浼佷笟鐢ㄦ埛鏁版嵁锛屾彃鍏ユ暟鎹簱锛坢ember)
Member user = memberService.getUserInfo(dto);
String token = jwtTokenUtil.generateToken(user);
@@ -56,9 +55,8 @@
@LoginRequired
@ApiOperation("鏇存柊鐢ㄦ埛閭淇℃伅")
@PostMapping("/upateInfo")
- public ApiResponse upateInfo (@RequestBody UpdEmailDTO updEmailDTO ,@RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+ public ApiResponse upateInfo (@RequestBody UpdEmailDTO updEmailDTO ,@RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
- ServerHttpRequest request = serverWebExchange.getRequest();
Member user = jwtTokenUtil.getUserInfoByToken(token);
updEmailDTO.setUserId(user.getId());
memberService.updEmail(updEmailDTO);
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 4497389..ba0b08a 100644
--- a/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
+++ b/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
@@ -5,6 +5,8 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Managers;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Workorder;
@@ -16,6 +18,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.java.Log;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.server.ServerWebExchange;
@@ -49,9 +52,9 @@
@LoginRequired
@ApiOperation("椋庨櫓涓婃姤")
@PostMapping("/create")
- public ApiResponse create (@RequestBody Workorder workorder, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+ public ApiResponse create (@RequestBody Workorder workorder, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
- ServerHttpRequest request = serverWebExchange.getRequest();
+
Member user = jwtTokenUtil.getUserInfoByToken(token);
workorder.setMemberId(user.getId());
workorderService.create(workorder);
@@ -68,9 +71,9 @@
@LoginRequired
@ApiOperation("閫氱煡浜烘煡璇�")
@PostMapping("/managersList")
- public ApiResponse<List<Managers>> managersList (@RequestBody Managers model, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+ public ApiResponse<List<Managers>> managersList (@RequestBody Managers model, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
- ServerHttpRequest request = serverWebExchange.getRequest();
+
return ApiResponse.success(managersService.findList(model));
}catch (BusinessException e){
return ApiResponse.failed(e.getCode(),e.getMessage());
@@ -84,10 +87,10 @@
@LoginRequired
@ApiOperation("椋庨櫓涓婃姤璇︽儏")
@GetMapping("/detail")
- public ApiResponse<Workorder> detail (@RequestParam Integer id, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+ public ApiResponse<Workorder> detail (@RequestParam Integer id, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
- ServerHttpRequest request = serverWebExchange.getRequest();
- return ApiResponse.success(workorderService.getDetail(id));
+
+ return ApiResponse.success(workorderService.getDetail(id,jwtTokenUtil.getUserInfoByToken(token)));
}catch (BusinessException e){
return ApiResponse.failed(e.getCode(),e.getMessage());
}catch (Exception e){
@@ -101,9 +104,8 @@
@LoginRequired
@ApiOperation("宸ュ崟鍏抽棴")
@PostMapping("/closeWorkOrder")
- public ApiResponse closeWorkOrder(@RequestBody CloseDTO closeDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+ public ApiResponse closeWorkOrder(@RequestBody CloseDTO closeDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
- ServerHttpRequest request = serverWebExchange.getRequest();
closeDTO.setMember(jwtTokenUtil.getUserInfoByToken(token));
workorderService.closeWorkOrder(closeDTO);
return ApiResponse.success("鎿嶄綔鎴愬姛");
@@ -121,9 +123,9 @@
@LoginRequired
@ApiOperation("宸ュ崟鎸囨淳")
@PostMapping("/passOn")
- public ApiResponse passOn(@RequestBody PassOnDTO passOnDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+ public ApiResponse passOn(@RequestBody PassOnDTO passOnDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
- ServerHttpRequest request = serverWebExchange.getRequest();
+
passOnDTO.setMember(jwtTokenUtil.getUserInfoByToken(token));
workorderService.passOn(passOnDTO);
return ApiResponse.success("鎿嶄綔鎴愬姛");
@@ -140,9 +142,9 @@
@LoginRequired
@ApiOperation("宸ュ崟鍌績")
@GetMapping("/urge")
- public ApiResponse urge(@RequestParam Integer workorderId, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+ public ApiResponse urge(@RequestParam Integer workorderId, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
- ServerHttpRequest request = serverWebExchange.getRequest();
+
workorderService.urge(workorderId,jwtTokenUtil.getUserInfoByToken(token));
return ApiResponse.success("鎿嶄綔鎴愬姛");
}catch (BusinessException e){
@@ -157,9 +159,9 @@
@LoginRequired
@ApiOperation("宸ュ崟鎶勯��")
@PostMapping("/sendCopy")
- public ApiResponse sendCopy(@RequestParam SendCopyDTO sendCopyDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+ public ApiResponse sendCopy(@RequestParam SendCopyDTO sendCopyDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
- ServerHttpRequest request = serverWebExchange.getRequest();
+
sendCopyDTO.setMember(jwtTokenUtil.getUserInfoByToken(token));
workorderService.sendCopy(sendCopyDTO);
return ApiResponse.success("鎿嶄綔鎴愬姛");
@@ -176,9 +178,9 @@
@LoginRequired
@ApiOperation("SHE銆佽穼缁婃粦鎶ヨ〃")
@PostMapping("/getWorkOrderData")
- public ApiResponse<List<WorkOrderDataVO>> getWorkOrderData(@RequestBody OrderDataDTO orderDataDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+ public ApiResponse<List<WorkOrderDataVO>> getWorkOrderData(@RequestBody OrderDataDTO orderDataDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
- ServerHttpRequest request = serverWebExchange.getRequest();
+
return ApiResponse.success(workorderService.getWorkOrderData(orderDataDTO));
}catch (BusinessException e){
return ApiResponse.failed(e.getCode(),e.getMessage());
@@ -190,5 +192,22 @@
+ @LoginRequired
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/page")
+ public ApiResponse<PageData<Workorder>> findPage (@RequestBody PageWrap<Workorder> pageWrap,@RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
+ try {
+ Member member = jwtTokenUtil.getUserInfoByToken(token);
+ pageWrap.getModel().setQwId(member.getQwId());
+ return ApiResponse.success(workorderService.findPage(pageWrap));
+ }catch (BusinessException e){
+ return ApiResponse.failed(e.getCode(),e.getMessage());
+ }catch (Exception e){
+ e.printStackTrace();
+ return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
+ }
+
+
+ }
}
diff --git a/server/src/main/java/com/doumee/config/swagger/SwaggerConfig.java b/server/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
index 1703ca1..5deebde 100644
--- a/server/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
+++ b/server/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
@@ -74,6 +74,21 @@
.paths(PathSelectors.any())
.build();
}
+
+ @Bean
+ public Docket getDocket2() {
+ return new Docket(DocumentationType.SWAGGER_2)
+ .apiInfo(this.getApiInfo()).groupName("Web涓氬姟鎺ュ彛")
+ .host(host)
+ .enable(enabled)
+ .select()
+ .apis( basePackage("com.doumee.api.web"))
+ // 璁剧疆闇�瑕佽鎵弿鐨勭被锛岃繖閲岃缃负娣诲姞浜咢Api娉ㄨВ鐨勭被
+// .apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
+ .paths(PathSelectors.any())
+ .build();
+ }
+
/**
* 閲嶅啓basePackage鏂规硶锛屼娇鑳藉瀹炵幇澶氬寘璁块棶锛屽鍒惰创涓婂幓
* @author teavamc
diff --git a/server/src/main/java/com/doumee/core/constants/Constants.java b/server/src/main/java/com/doumee/core/constants/Constants.java
index 01a637e..265f93c 100644
--- a/server/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/src/main/java/com/doumee/core/constants/Constants.java
@@ -32,6 +32,7 @@
public static boolean DEALING_COMPANY_SYNC = false ;
public static boolean DEALING_MEMBER_SYNC = false ;
public static final String WORKORDER_FILE_PATH ="WORKORDER_FILE_PATH" ;
+ public static final String WORKORDER_LOG_FILE_PATH ="WORKORDER_LOG_FILE_PATH" ;
public static final String REDIS_TOKEN_KEY = "token_";
/**
diff --git a/server/src/main/java/com/doumee/dao/business/model/Workorder.java b/server/src/main/java/com/doumee/dao/business/model/Workorder.java
index 404c62a..8a9d440 100644
--- a/server/src/main/java/com/doumee/dao/business/model/Workorder.java
+++ b/server/src/main/java/com/doumee/dao/business/model/Workorder.java
@@ -228,11 +228,25 @@
@ApiModelProperty("DCA闂鍚嶇О")
@TableField(exist = false)
private String problemName;
- @ApiModelProperty("鐢ㄦ埛")
+ @ApiModelProperty("鐢ㄦ埛鎵嬫満鍙�")
@TableField(exist = false)
private String memberPhone;
+ @ApiModelProperty(value = "鏄惁鍙叧闂寜閽細0=鍚︼紱1=鏄紱", example = "0")
+ @TableField(exist = false)
+ private Integer closeButton;
+ @ApiModelProperty(value = "鏄惁鍙浆浜ゆ寜閽細0=鍚︼紱1=鏄紱", example = "0")
+ @TableField(exist = false)
+ private Integer passOnButton;
+
+ @ApiModelProperty(value = "鎴戠殑宸ュ崟:0=鍚︼紱1=鏄紙鏌ヨ浣跨敤锛�", example = "0")
+ @TableField(exist = false)
+ private Integer myWorkOrder;
+
+ @ApiModelProperty(value = "鎴戠殑宸ュ崟锛堟煡璇娇鐢級",hidden = true)
+ @TableField(exist = false)
+ private String qwId;
@ApiModelProperty(value = "涓嶇鍚堥棶棰樺垪琛�")
@TableField(exist = false)
diff --git a/server/src/main/java/com/doumee/service/business/WorkorderService.java b/server/src/main/java/com/doumee/service/business/WorkorderService.java
index 6cbc456..f093ecd 100644
--- a/server/src/main/java/com/doumee/service/business/WorkorderService.java
+++ b/server/src/main/java/com/doumee/service/business/WorkorderService.java
@@ -108,7 +108,7 @@
* @param id
* @return
*/
- Workorder getDetail(Integer id);
+ Workorder getDetail(Integer id,Member member);
/**
* 姣忓ぉ鍒濆鍖栧伐鍗曠紪鍙穋ode
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 051b031..d0dea26 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
@@ -410,17 +410,18 @@
}
String token = systemDictDataBiz.queryByCode(Constants.QYWX,Constants.QYWX_TOKEN).getCode();
//鏍规嵁code鎹㈠尯浼佷笟寰俊ID
- QywxBaseResponse<String> qwIdBaseResponse= QywxUtil.getUserInfoByCode(token,dto.getCode());
- if(Objects.isNull(qwIdBaseResponse)||Objects.isNull(qwIdBaseResponse.getErrcode())){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐧诲綍鐮佽В鏋愬け璐ワ紝璇疯仈绯荤鐞嗗憳");
- }
- if(Constants.equalsInteger(qwIdBaseResponse.getErrcode(),Constants.ZERO)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐧诲綍澶辫触锛�"+qwIdBaseResponse.getErrmsg());
- }
- if(Objects.isNull(qwIdBaseResponse.getData())){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐢ㄦ埛淇℃伅瑙ｆ瀽澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- String qwId = qwIdBaseResponse.getData();
+ QywxBaseResponse<String> qwIdBaseResponse= null;// QywxUtil.getUserInfoByCode(token,dto.getCode());
+// if(Objects.isNull(qwIdBaseResponse)||Objects.isNull(qwIdBaseResponse.getErrcode())){
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐧诲綍鐮佽В鏋愬け璐ワ紝璇疯仈绯荤鐞嗗憳");
+// }
+// if(Constants.equalsInteger(qwIdBaseResponse.getErrcode(),Constants.ZERO)){
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐧诲綍澶辫触锛�"+qwIdBaseResponse.getErrmsg());
+// }
+// if(Objects.isNull(qwIdBaseResponse.getData())){
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟寰俊鐢ㄦ埛淇℃伅瑙ｆ瀽澶辫触锛岃鑱旂郴绠＄悊鍛�");
+// }
+// String qwId = qwIdBaseResponse.getData();
+ String qwId = dto.getCode();
Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getQwId,qwId).eq(Member::getIsdeleted,Constants.ZERO).last(" limit 1 "));
if(Objects.isNull(member)){
//鏍规嵁浼佷笟寰俊ID 鏌ヨ鐢ㄦ埛淇℃伅
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 36aae5b..f2493b0 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
@@ -135,6 +135,8 @@
}
+ private static final String [] qwDetailUrls = {"/pages/details_she/details_she","/pages/workOrder_dca/workOrder_dca","","/pages/workOrder_she/workOrder_she"};
+
/**
* 閫氱煡鏂囨鏁寸悊
* @param workorder
@@ -147,6 +149,7 @@
public QywxTextCardMsgRequest dealMessageContent(Workorder workorder,String userName ,String categoryName,Integer contentType,String csInfo){
QywxTextCardMsgRequest textCard = new QywxTextCardMsgRequest();
String message = "";
+ textCard.setUrl(qwDetailUrls[workorder.getType()]+"?id="+workorder.getId());
if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
textCard.setTitle("銆怱HE浜嬩欢涓婃姤銆�");
if(Constants.equalsInteger(workorder.getMemberType(),Constants.ZERO)){
@@ -365,7 +368,7 @@
}
@Override
- public Workorder getDetail(Integer id){
+ public Workorder getDetail(Integer id,Member member){
Workorder workorder = workorderMapper.selectJoinOne(Workorder.class,
new MPJLambdaWrapper<Workorder>()
.selectAll(Workorder.class)
@@ -381,6 +384,7 @@
.last(" limit 1 ")
);
if(Objects.nonNull(workorder)){
+ this.dealButton(workorder,member);
//鏌ヨ闄勪欢淇℃伅
List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda().eq(Multifile::getIsdeleted,Constants.ZERO)
.eq(Multifile::getObjId,workorder.getId()).orderByAsc(Multifile::getId));
@@ -405,6 +409,29 @@
return workorder;
}
+ public void dealButton(Workorder workorder,Member member){
+ workorder.setPassOnButton(Constants.ZERO);
+ workorder.setCloseButton(Constants.ZERO);
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(member.getQwId())){
+ List<String> closeUserList = new ArrayList<>();
+ closeUserList.addAll(Arrays.asList(workorder.getQwnoticeMemberIds().split(",")));
+ closeUserList.add(org.apache.commons.lang3.StringUtils.isNotBlank(workorder.getManagerId())?workorder.getManagerId():null);
+ closeUserList.add(org.apache.commons.lang3.StringUtils.isNotBlank(workorder.getDealerId())?workorder.getDealerId():null);
+ workorder.setCloseButton(closeUserList.stream().filter(i->i.equals(member.getQwId())).collect(Collectors.toList()).size()>Constants.ZERO?Constants.ONE:Constants.ZERO);
+ List<String> passOnUserList = new ArrayList<>();
+ //寰呭垎閰嶇姸鎬� 澶勭悊杞氦鎸夐挳
+ if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitConfirm.getKey())){
+ passOnUserList.addAll(Arrays.asList(workorder.getQwnoticeMemberIds().split(",")));
+ }else if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitAllocation.getKey())){
+ closeUserList.add(workorder.getManagerId());
+ }
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(passOnUserList)){
+ workorder.setPassOnButton(passOnUserList.stream().filter(i->i.equals(member.getQwId())).collect(Collectors.toList()).size()>Constants.ZERO?Constants.ONE:Constants.ZERO);
+ }
+ }
+
+ }
+
public List<WorkorderLog> getLogList(Integer orderId){
List<WorkorderLog> logList = workorderLogMapper.selectJoinList(WorkorderLog.class,
@@ -418,7 +445,7 @@
);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(logList)){
String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
- +systemDictDataBiz.queryByCode(Constants.FTP,Constants.WORKORDER_FILE_PATH).getCode();
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.WORKORDER_LOG_FILE_PATH).getCode();
for (WorkorderLog workorderLog:logList) {
//鏌ヨ闄勪欢淇℃伅
List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
@@ -572,6 +599,9 @@
.leftJoin(" category c3 on t.TYPE_ID = c3.id ") //椋庨櫓绫诲瀷
.leftJoin(" category c4 on t.PROBLEM_ID = c4.id ") //DCA闂缂栫爜
.leftJoin(" category c2 on t.CATEGORY_ID = c2.id ") //DCA闂缂栫爜
+ .apply(Objects.nonNull(pageWrap.getModel().getMyWorkOrder())&& org.apache.commons.lang3.StringUtils.isNotBlank(pageWrap.getModel().getQwId())
+ &&Constants.equalsInteger(Constants.ONE,pageWrap.getModel().getMyWorkOrder()),
+ " ( t.id in ( select OBJ_ID from notices where param1 = '"+pageWrap.getModel().getQwId()+"' )) ")
.eq(pageWrap.getModel().getId() != null, Workorder::getId, pageWrap.getModel().getId())
.eq(pageWrap.getModel().getCreator() != null, Workorder::getCreator, pageWrap.getModel().getCreator())
.ge(pageWrap.getModel().getCreateDate() != null, Workorder::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))
--
Gitblit v1.9.3