From def58c1f57a5fd7f0c8782ce2a8c81ac081db3f0 Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: 星期六, 07 五月 2022 11:34:08 +0800
Subject: [PATCH] 优化业主小程序广告栏图片不显示，兼容FTP和OSS(配置时需加上 /)
---
service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java | 287 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 267 insertions(+), 20 deletions(-)
diff --git a/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java b/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java
index 0fbb92c..1b706d4 100644
--- a/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java
+++ b/service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java
@@ -1,17 +1,27 @@
package com.java110.oa.bmo.oaWorkflowForm.impl;
import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Transactional;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.dto.oaWorkflowData.OaWorkflowDataDto;
import com.java110.dto.oaWorkflowForm.OaWorkflowFormDto;
import com.java110.dto.user.UserDto;
+import com.java110.dto.workflowDataFile.WorkflowDataFileDto;
import com.java110.entity.audit.AuditUser;
import com.java110.intf.common.IOaWorkflowUserInnerServiceSMO;
+import com.java110.intf.oa.IOaWorkflowDataInnerServiceSMO;
import com.java110.intf.oa.IOaWorkflowFormInnerServiceSMO;
import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
+import com.java110.intf.oa.IWorkflowDataFileV1InnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.oa.bmo.oaWorkflowForm.IGetOaWorkflowFormBMO;
+import com.java110.po.workflowDataFile.WorkflowDataFilePo;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +48,13 @@
@Autowired
private IOaWorkflowUserInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl;
+
+ @Autowired
+ private IOaWorkflowDataInnerServiceSMO oaWorkflowDataInnerServiceSMOImpl;
+
+ @Autowired
+ private IWorkflowDataFileV1InnerServiceSMO workflowDataFileV1InnerServiceSMOImpl;
+
/**
* @param oaWorkflowFormDto
@@ -95,15 +112,40 @@
List<Map> datas = null;
if (count > 0) {
datas = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowFormDatas(paramIn);
+
} else {
datas = new ArrayList<>();
}
+
+ //鏌ヨfile
+ queryFilesFromData(datas);
ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (int) paramIn.get("row")), count, datas);
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
return responseEntity;
+ }
+
+ private void queryFilesFromData(List<Map> datas) {
+ if (datas.size() != 1) {
+ return;
+ }
+
+ WorkflowDataFileDto workflowDataFileDto = new WorkflowDataFileDto();
+ workflowDataFileDto.setId(datas.get(0).get("id").toString());
+ workflowDataFileDto.setStoreId(datas.get(0).get("store_id").toString());
+ List<WorkflowDataFileDto> workflowDataFileDtos = workflowDataFileV1InnerServiceSMOImpl.queryWorkflowDataFiles(workflowDataFileDto);
+
+ if (workflowDataFileDtos == null || workflowDataFileDtos.size() < 1) {
+ return;
+ }
+ String imgUrl = MappingCache.getValue("IMG_PATH");
+ for(WorkflowDataFileDto tmpWorkflowDataFileDto: workflowDataFileDtos){
+ tmpWorkflowDataFileDto.setRealFileName(imgUrl + tmpWorkflowDataFileDto.getRealFileName());
+ }
+
+ datas.get(0).put("files",workflowDataFileDtos);
}
/**
@@ -156,10 +198,37 @@
throw new IllegalArgumentException("淇濆瓨澶辫触");
}
+ //鍒ゆ柇鏄惁鏈夐檮浠�
+ saveOaWorkflowFile(reqJson);
+
reqJson.put("processDefinitionKey", oaWorkflowDtos.get(0).getProcessDefinitionKey());
oaWorkflowUserInnerServiceSMOImpl.startProcess(reqJson);
return ResultVo.success();
+ }
+
+ private void saveOaWorkflowFile(JSONObject reqJson) {
+ if (!reqJson.containsKey("fileName")) {
+ return;
+ }
+
+ String fileName = reqJson.getString("fileName");
+ if (StringUtil.isEmpty(fileName)) {
+ return;
+ }
+
+ WorkflowDataFilePo workflowDataFilePo = new WorkflowDataFilePo();
+ workflowDataFilePo.setCreateUserId(reqJson.getString("userId"));
+ workflowDataFilePo.setCreateUserName(reqJson.getString("createUserName"));
+ workflowDataFilePo.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
+ workflowDataFilePo.setFileName(reqJson.getString("fileName"));
+ workflowDataFilePo.setId(reqJson.getString("id"));
+ workflowDataFilePo.setRealFileName(reqJson.getString("realFileName"));
+ workflowDataFilePo.setStoreId(reqJson.getString("storeId"));
+ int flag = workflowDataFileV1InnerServiceSMOImpl.saveWorkflowDataFile(workflowDataFilePo);
+ if (flag < 1) {
+ throw new CmdException("淇濆瓨闄勪欢澶辫触");
+ }
}
/**
@@ -177,6 +246,14 @@
List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
Assert.listOnlyOne(oaWorkflowDtos, "娴佺▼涓嶅瓨鍦�");
+ OaWorkflowFormDto oaWorkflowFormDto = new OaWorkflowFormDto();
+ oaWorkflowFormDto.setFlowId(paramIn.get("flowId").toString());
+ oaWorkflowFormDto.setStoreId(paramIn.get("storeId").toString());
+ oaWorkflowFormDto.setRow(1);
+ oaWorkflowFormDto.setPage(1);
+ List<OaWorkflowFormDto> oaWorkflowFormDtos = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowForms(oaWorkflowFormDto);
+ Assert.listOnlyOne(oaWorkflowFormDtos, "鏈寘鍚祦绋嬭〃鍗曪紝璇峰厛璁剧疆琛ㄥ崟");
+
AuditUser auditUser = new AuditUser();
auditUser.setProcessDefinitionKey(oaWorkflowDtos.get(0).getProcessDefinitionKey());
auditUser.setFlowId(paramIn.getString("flowId"));
@@ -192,7 +269,7 @@
if (count > 0) {
datas = oaWorkflowUserInnerServiceSMOImpl.getUserTasks(auditUser);
//鍒锋柊 琛ㄥ崟鏁版嵁
- freshFormData(datas, paramIn);
+ freshFormData(datas, paramIn, oaWorkflowFormDtos.get(0));
} else {
datas = new ArrayList<>();
}
@@ -218,24 +295,32 @@
List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
Assert.listOnlyOne(oaWorkflowDtos, "娴佺▼涓嶅瓨鍦�");
- AuditUser auditUser = new AuditUser();
- auditUser.setProcessDefinitionKey(oaWorkflowDtos.get(0).getProcessDefinitionKey());
- auditUser.setFlowId(paramIn.getString("flowId"));
- auditUser.setUserId(paramIn.getString("userId"));
- auditUser.setStoreId(paramIn.getString("storeId"));
- auditUser.setPage(paramIn.getInteger("page"));
- auditUser.setRow(paramIn.getInteger("row"));
+ OaWorkflowFormDto oaWorkflowFormDto = new OaWorkflowFormDto();
+ oaWorkflowFormDto.setFlowId(paramIn.get("flowId").toString());
+ oaWorkflowFormDto.setStoreId(paramIn.get("storeId").toString());
+ oaWorkflowFormDto.setRow(1);
+ oaWorkflowFormDto.setPage(1);
+ List<OaWorkflowFormDto> oaWorkflowFormDtos = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowForms(oaWorkflowFormDto);
+ Assert.listOnlyOne(oaWorkflowFormDtos, "鏈寘鍚祦绋嬭〃鍗曪紝璇峰厛璁剧疆琛ㄥ崟");
- long count = oaWorkflowUserInnerServiceSMOImpl.getUserHistoryTaskCount(auditUser);
+ OaWorkflowDataDto oaWorkflowDataDto = new OaWorkflowDataDto();
+ oaWorkflowDataDto.setFlowId(paramIn.getString("flowId"));
+ oaWorkflowDataDto.setStaffId(paramIn.getString("userId"));
+ oaWorkflowDataDto.setStoreId(paramIn.getString("storeId"));
+ oaWorkflowDataDto.setPage(paramIn.getInteger("page"));
+ oaWorkflowDataDto.setRow(paramIn.getInteger("row"));
+ oaWorkflowDataDto.setHis("Y");
- List<JSONObject> datas = null;
+ long count = oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatasCount(oaWorkflowDataDto);
+ List<JSONObject> datas = new ArrayList<>();
if (count > 0) {
- datas = oaWorkflowUserInnerServiceSMOImpl.getUserHistoryTasks(auditUser);
+ List<OaWorkflowDataDto> oaWorkflowDataDtos = oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatas(oaWorkflowDataDto);
+ for (OaWorkflowDataDto oaWorkflowDataDto1 : oaWorkflowDataDtos) {
+ datas.add(BeanConvertUtil.beanCovertJson(oaWorkflowDataDto1));
+ }
//鍒锋柊 琛ㄥ崟鏁版嵁
- freshFormData(datas, paramIn);
- } else {
- datas = new ArrayList<>();
+ freshFormData(datas, paramIn, oaWorkflowFormDtos.get(0));
}
ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) paramIn.getInteger("row")), count, datas);
@@ -245,13 +330,16 @@
}
@Override
+ @Java110Transactional
public ResponseEntity<String> auditOaWorkflow(JSONObject reqJson) {
+ //鏌ヨ娴佺▼鏄惁瀛樺湪
OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
oaWorkflowDto.setStoreId(reqJson.getString("storeId"));
oaWorkflowDto.setFlowId(reqJson.getString("flowId"));
List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
Assert.listOnlyOne(oaWorkflowDtos, "娴佺▼涓嶅瓨鍦�");
+ //娴佺▼琛ㄥ崟鏄惁瀛樺湪
OaWorkflowFormDto oaWorkflowFormDto = new OaWorkflowFormDto();
oaWorkflowFormDto.setFlowId(reqJson.get("flowId").toString());
oaWorkflowFormDto.setStoreId(reqJson.get("storeId").toString());
@@ -260,15 +348,120 @@
List<OaWorkflowFormDto> oaWorkflowFormDtos = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowForms(oaWorkflowFormDto);
Assert.listOnlyOne(oaWorkflowFormDtos, "鏈寘鍚祦绋嬭〃鍗曪紝璇峰厛璁剧疆琛ㄥ崟");
+ //娴佺▼鏁版嵁鏄惁瀛樺湪
+ Map paramMap = new HashMap();
+ paramMap.put("storeId", reqJson.getString("storeId"));
+ paramMap.put("id", reqJson.getString("id"));
+ paramMap.put("tableName", oaWorkflowFormDtos.get(0).getTableName());
+ paramMap.put("page", 1);
+ paramMap.put("row", 1);
+ List<Map> formDatas = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowFormDatas(paramMap);
- reqJson.put("createUserId", reqJson.getString("userId"));
- boolean isLastTask = oaWorkflowUserInnerServiceSMOImpl.completeTask(reqJson);
- if (isLastTask) {
- reqJson.put("state", "1005");
+ Assert.listOnlyOne(formDatas, "宸ュ崟鏁版嵁涓嶅瓨鍦�");
+
+ reqJson.put("startUserId", formDatas.get(0).get("create_user_id"));
+
+ //涓氬姟鍔炵悊
+ if ("1100".equals(reqJson.getString("auditCode"))
+ || "1500".equals(reqJson.getString("auditCode"))) { //鍔炵悊鎿嶄綔
+ reqJson.put("nextUserId", reqJson.getString("staffId"));
+ boolean isLastTask = oaWorkflowUserInnerServiceSMOImpl.completeTask(reqJson);
+ if (isLastTask) {
+ reqJson.put("state", "1005"); //宸ュ崟缁撴潫
+ } else {
+ reqJson.put("state", "1002"); //宸ュ崟瀹℃牳
+ }
reqJson.put("tableName", oaWorkflowFormDtos.get(0).getTableName());
oaWorkflowFormInnerServiceSMOImpl.updateOaWorkflowFormData(reqJson);
+ //瀹屾垚褰撳墠娴佺▼ 鎻掑叆涓嬩竴澶勭悊浜�
+ } else if ("1300".equals(reqJson.getString("auditCode"))) { //杞崟鎿嶄綔
+ reqJson.put("nextUserId", reqJson.getString("staffId"));
+ oaWorkflowUserInnerServiceSMOImpl.changeTaskToOtherUser(reqJson);
+ reqJson.put("state", "1004"); //宸ュ崟杞崟
+ reqJson.put("tableName", oaWorkflowFormDtos.get(0).getTableName());
+ oaWorkflowFormInnerServiceSMOImpl.updateOaWorkflowFormData(reqJson);
+ } else if ("1200".equals(reqJson.getString("auditCode"))
+ || "1400".equals(reqJson.getString("auditCode"))
+ ) { //閫�鍥炴搷浣�
+ oaWorkflowUserInnerServiceSMOImpl.goBackTask(reqJson);
+ reqJson.put("state", "1003"); //宸ュ崟閫�鍗�
+ reqJson.put("tableName", oaWorkflowFormDtos.get(0).getTableName());
+ oaWorkflowFormInnerServiceSMOImpl.updateOaWorkflowFormData(reqJson);
+ } else {
+ throw new IllegalArgumentException("涓嶆敮鎸佺殑绫诲瀷");
}
+
+
+
+
+
return ResultVo.success();
+ }
+
+ @Override
+ public ResponseEntity<String> getNextTask(JSONObject reqJson) {
+//娴佺▼琛ㄥ崟鏄惁瀛樺湪
+ OaWorkflowFormDto oaWorkflowFormDto = new OaWorkflowFormDto();
+ oaWorkflowFormDto.setFlowId(reqJson.get("flowId").toString());
+ oaWorkflowFormDto.setStoreId(reqJson.get("storeId").toString());
+ oaWorkflowFormDto.setRow(1);
+ oaWorkflowFormDto.setPage(1);
+ List<OaWorkflowFormDto> oaWorkflowFormDtos = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowForms(oaWorkflowFormDto);
+ Assert.listOnlyOne(oaWorkflowFormDtos, "鏈寘鍚祦绋嬭〃鍗曪紝璇峰厛璁剧疆琛ㄥ崟");
+
+ Map paramMap = new HashMap();
+ paramMap.put("storeId", reqJson.getString("storeId"));
+ paramMap.put("id", reqJson.getString("id"));
+ paramMap.put("tableName", oaWorkflowFormDtos.get(0).getTableName());
+ paramMap.put("page", 1);
+ paramMap.put("row", 1);
+ List<Map> formDatas = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowFormDatas(paramMap);
+ Assert.listOnlyOne(formDatas, "琛ㄥ崟鏁版嵁涓嶅瓨鍦�");
+ reqJson.put("startUserId", formDatas.get(0).get("create_user_id"));
+ List<JSONObject> tasks = oaWorkflowUserInnerServiceSMOImpl.nextAllNodeTaskList(reqJson);
+ return ResultVo.createResponseEntity(tasks);
+ }
+
+ @Override
+ public ResponseEntity<String> queryOaWorkflowUser(JSONObject paramIn) {
+ OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
+ oaWorkflowDto.setStoreId(paramIn.getString("storeId"));
+ oaWorkflowDto.setFlowId(paramIn.getString("flowId"));
+ List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
+ Assert.listOnlyOne(oaWorkflowDtos, "娴佺▼涓嶅瓨鍦�");
+
+ OaWorkflowFormDto oaWorkflowFormDto = new OaWorkflowFormDto();
+ oaWorkflowFormDto.setFlowId(paramIn.get("flowId").toString());
+ oaWorkflowFormDto.setStoreId(paramIn.get("storeId").toString());
+ oaWorkflowFormDto.setRow(1);
+ oaWorkflowFormDto.setPage(1);
+ List<OaWorkflowFormDto> oaWorkflowFormDtos = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowForms(oaWorkflowFormDto);
+ Assert.listOnlyOne(oaWorkflowFormDtos, "鏈寘鍚祦绋嬭〃鍗曪紝璇峰厛璁剧疆琛ㄥ崟");
+
+ OaWorkflowDataDto oaWorkflowDataDto = new OaWorkflowDataDto();
+ oaWorkflowDataDto.setFlowId(paramIn.getString("flowId"));
+ oaWorkflowDataDto.setBusinessKey(paramIn.getString("id"));
+ oaWorkflowDataDto.setStoreId(paramIn.getString("storeId"));
+ oaWorkflowDataDto.setPage(paramIn.getInteger("page"));
+ oaWorkflowDataDto.setRow(paramIn.getInteger("row"));
+
+ long count = oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatasCount(oaWorkflowDataDto);
+
+ List<JSONObject> datas = new ArrayList<>();
+
+ if (count > 0) {
+ List<OaWorkflowDataDto> oaWorkflowDataDtos = oaWorkflowDataInnerServiceSMOImpl.queryOaWorkflowDatas(oaWorkflowDataDto);
+ for (OaWorkflowDataDto oaWorkflowDataDto1 : oaWorkflowDataDtos) {
+ datas.add(BeanConvertUtil.beanCovertJson(oaWorkflowDataDto1));
+ }
+ //鍒锋柊 琛ㄥ崟鏁版嵁
+ freshFormData(datas, paramIn, oaWorkflowFormDtos.get(0));
+ }
+
+ ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) paramIn.getInteger("row")), count, datas);
+
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+ return responseEntity;
}
/**
@@ -276,10 +469,14 @@
*
* @param datas
*/
- private void freshFormData(List<JSONObject> datas, JSONObject paramIn) {
+ private void freshFormData(List<JSONObject> datas, JSONObject paramIn, OaWorkflowFormDto oaWorkflowFormDto) {
List<String> ids = new ArrayList<>();
+ List<String> userIds = new ArrayList<>();
for (JSONObject data : datas) {
ids.add(data.getString("id"));
+ if (!StringUtil.isEmpty(data.getString("staffId"))) {
+ userIds.add(data.getString("staffId"));
+ }
}
if (ids.size() < 1) {
return;
@@ -288,15 +485,65 @@
Map paramMap = new HashMap();
paramMap.put("storeId", paramIn.getString("storeId"));
paramMap.put("ids", ids.toArray(new String[ids.size()]));
+ paramMap.put("tableName", oaWorkflowFormDto.getTableName());
+ paramMap.put("page", 1);
+ paramMap.put("row", ids.size());
List<Map> formDatas = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowFormDatas(paramMap);
-
+ long duration = 0L;
for (JSONObject data : datas) {
for (Map form : formDatas) {
if (data.getString("id").equals(form.get("id"))) {
data.putAll(form);
}
}
+
+ if (data.containsKey("startTime") && data.containsKey("endTime")) {
+ try {
+ if (data.getString("endTime") == null) {
+ duration = DateUtil.getCurrentDate().getTime() - DateUtil.getDateFromString(data.getString("startTime"), DateUtil.DATE_FORMATE_STRING_A).getTime();
+ } else {
+ duration = DateUtil.getDateFromString(data.getString("endTime"), DateUtil.DATE_FORMATE_STRING_A).getTime()
+ - DateUtil.getDateFromString(data.getString("startTime"), DateUtil.DATE_FORMATE_STRING_A).getTime();
+ }
+ } catch (Exception e) {
+ duration = 0;
+ }
+ data.put("duration", getCostTime(duration));
+ }
}
+
+ if (userIds.size() < 1) {
+ return;
+ }
+
+ //鍒峰叆鍛樺伐淇℃伅
+ UserDto userDto = new UserDto();
+ userDto.setUserIds(userIds.toArray(new String[userIds.size()]));
+ List<UserDto> userDtos = userInnerServiceSMOImpl.getStaffs(userDto);
+
+ for (JSONObject data : datas) {
+ for (UserDto userDto1 : userDtos) {
+ if (data.getString("staffId").equals(userDto1.getUserId())) {
+ data.put("orgName", userDto1.getOrgName());
+ data.put("staffName", userDto1.getUserName());
+ }
+ }
+ }
+ }
+
+ public String getCostTime(Long time) {
+ if (time == null) {
+ return "00:00";
+ }
+ long hours = time / (1000 * 60 * 60);
+ long minutes = (time - hours * (1000 * 60 * 60)) / (1000 * 60);
+ String diffTime = "";
+ if (minutes < 10) {
+ diffTime = hours + ":0" + minutes;
+ } else {
+ diffTime = hours + ":" + minutes;
+ }
+ return diffTime;
}
}
--
Gitblit v1.8.0