From 04bf6c32f6ebce7cdfb23e3e72a9d83dcf531113 Mon Sep 17 00:00:00 2001 From: sunzheng Date: Mon, 29 Jul 2024 15:09:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update:=E4=BF=9D=E5=AD=98=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=96=B0=E5=A2=9E=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FeiShuDockingServiceImpl.java | 16 +++++++++------- .../hiwork/entity/LawsUnifiedTodoLog.java | 7 +++++++ .../service/impl/UnifiedTodoServiceImpl.java | 5 +++-- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java index 801bdcfb..51557f12 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java @@ -252,9 +252,9 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService { HttpEntity entity = new HttpEntity<>(approvalsInstanceVo, headers); ResponseEntity response = restTemplate.exchange(url, HttpMethod.POST, entity, String.class); JSONObject jsonResponse = JSON.parseObject(response.getBody()); - logMessage(JSON.toJSONString(instanceDto), jsonResponse, "/feishu/synchronizeApprovalInstance", Constant.FEISHU_PENDING); + logMessage(JSON.toJSONString(instanceDto), instanceDto.getTitle(), jsonResponse, "/feishu/synchronizeApprovalInstance", Constant.FEISHU_PENDING); }catch (Exception e) { - logError(JSON.toJSONString(instanceDto), e.getMessage(), "/feishu/synchronizeApprovalInstance", Constant.FEISHU_PENDING); + logError(JSON.toJSONString(instanceDto), instanceDto.getTitle(), e.getMessage(), "/feishu/synchronizeApprovalInstance", Constant.FEISHU_PENDING); log.error("同步三方审批实例异常" + e.getMessage()); } } @@ -423,7 +423,7 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService { BotMessageDto botMessageDto1 = new BotMessageDto(); BeanUtils.copyProperties(botMessageDto,botMessageDto1); botMessageDto1.setReceiveIds(id); - logError(JSON.toJSONString(botMessageDto1), "用户id:" + id +"对应的飞书账用户不存在", "/feishu/sendHrefMessageByBot", Constant.FEISHU_MESSAGE); + logError(JSON.toJSONString(botMessageDto1), botMessageDto.getTitle(),"用户id:" + id +"对应的飞书账用户不存在", "/feishu/sendHrefMessageByBot", Constant.FEISHU_MESSAGE); } } } @@ -482,30 +482,32 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService { HttpEntity entity = new HttpEntity<>(botMessageVo, headers); ResponseEntity response = restTemplate.exchange(builder.toUriString(), HttpMethod.POST, entity, String.class); JSONObject jsonResponse = JSON.parseObject(response.getBody()); - logMessage(JSON.toJSONString(botMessageDto), jsonResponse, "/feishu/sendHrefMessageByBot", Constant.FEISHU_MESSAGE); + logMessage(JSON.toJSONString(botMessageDto), botMessageDto.getTitle(), jsonResponse, "/feishu/sendHrefMessageByBot", Constant.FEISHU_MESSAGE); } } catch (Exception e) { - logError(JSON.toJSONString(botMessageDto), e.getMessage(), "/feishu/sendHrefMessageByBot", Constant.FEISHU_MESSAGE); + logError(JSON.toJSONString(botMessageDto),botMessageDto.getTitle(), e.getMessage(), "/feishu/sendHrefMessageByBot", Constant.FEISHU_MESSAGE); } } - private void logMessage(String dto, JSONObject jsonResponse, String url, Integer messageType) { + private void logMessage(String dto, String title, JSONObject jsonResponse, String url, Integer messageType) { LawsUnifiedTodoLog logEntry = new LawsUnifiedTodoLog(); logEntry.setJsonStr(dto); logEntry.setResponseBody(JSON.toJSONString(jsonResponse)); logEntry.setState("0".equals(jsonResponse.getString("code")) ? 1 : 2); logEntry.setMessageType(messageType); logEntry.setUrl(url); + logEntry.setTitle(title); lawsUnifiedTodoLogService.add(logEntry); } - private void logError(String dto, String errorMessage, String url, Integer messageType) { + private void logError(String dto, String title, String errorMessage, String url, Integer messageType) { LawsUnifiedTodoLog logEntry = new LawsUnifiedTodoLog(); logEntry.setJsonStr(dto); logEntry.setResponseBody(errorMessage); logEntry.setState(2); logEntry.setMessageType(messageType); logEntry.setUrl(url); + logEntry.setTitle(title); lawsUnifiedTodoLogService.add(logEntry); log.error("飞书发送消息异常: " + errorMessage); } diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/LawsUnifiedTodoLog.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/LawsUnifiedTodoLog.java index 6dee5a6c..da7c5ee4 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/LawsUnifiedTodoLog.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/LawsUnifiedTodoLog.java @@ -87,4 +87,11 @@ public class LawsUnifiedTodoLog { @ApiModelProperty(value="更新时间") private Date updateTime; + /** + * 标题 + */ + @TableField(value = "title") + @ApiModelProperty(value="标题") + private String title; + } diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java index 2b36b98b..8c8d2931 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java @@ -111,13 +111,13 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI { String reqJsonString = JSONObject.toJSONString(unifiedTodoVOList); String jsonString = JSONObject.toJSONString(unifiedTodoList); log.info("统一待办推送入参" + jsonString); - push(ip + todoUrl,jsonString, reqJsonString); + push(ip + todoUrl,jsonString, reqJsonString, unifiedTodoList.get(0).getRequestname()); }catch (Exception e){ log.error("统一待办推送异常",e); } } - private void push(String url, String jsonString, String reqJsonString) { + private void push(String url, String jsonString, String reqJsonString, String title) { // 设置最大重试次数 int maxRetries = 3; // 当前重试次数 @@ -151,6 +151,7 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI { lawsUnifiedTodoLog.setUrl(url); lawsUnifiedTodoLog.setJsonStr(reqJsonString); lawsUnifiedTodoLog.setMessageType(1); + lawsUnifiedTodoLog.setTitle(title); if (retries == maxRetries){ lawsUnifiedTodoLog.setState(2); }else { From 23c98b99cd0639533ad57d6764de75865537c0a8 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 29 Jul 2024 15:16:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=2087532=20=E5=A4=96=E6=9D=A5=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=E6=96=87=E6=9C=AC=E5=BA=93--?= =?UTF-8?q?=E5=AF=BC=E5=87=BA/=E5=B8=A6=E6=96=87=E4=BB=B6=E5=AF=BC?= =?UTF-8?q?=E5=87=BA--excel=E4=B8=8D=E8=83=BD=E7=9B=B4=E6=8E=A5=E6=89=93?= =?UTF-8?q?=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsCommonServiceImpl.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 9d82a936..19ae5bd4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -59,7 +59,6 @@ import com.jero.modules.system.service.ISysDepartService; import com.jero.modules.system.service.ISysDictItemService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.util.SysWaterMarkUtil; -import com.jero.modules.system.util.UserUtils; import com.jero.modules.tag.entity.LawsArea; import com.jero.modules.tag.entity.LawsTag; import com.jero.modules.tag.enums.FieldShowTypeEnum; @@ -71,6 +70,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.usermodel.XSSFSheet; @@ -157,8 +158,6 @@ public class LawsCommonServiceImpl implements ILawsCommonService { @Resource private ILawsPartNameService partNameService; @Resource - private ISysUserService sysUserRoleService; - @Resource private ILawsPartNameStandardService partNameStandardService; @Resource private ISysBaseAPI sysBaseAPI; @@ -1419,8 +1418,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService { IPage> commonPage = this.getExportData(parameterMap, headers); List> records = commonPage.getRecords(); - XSSFWorkbook workbook = new XSSFWorkbook(); - XSSFSheet sheet = workbook.createSheet(sheetName); + HSSFWorkbook workbook = new HSSFWorkbook(); + HSSFSheet sheet = workbook.createSheet(sheetName); Row headerRow = sheet.createRow(0); for (int i = 0; i < headers.size(); i++) { @@ -1445,7 +1444,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { } // 设置响应头和内容类型 - String encodedFileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8"); + String encodedFileName = URLEncoder.encode(fileName + ".xls", "UTF-8"); response.setHeader("Content-Disposition", "attachment; filename=" + encodedFileName); // 写出到响应流 @@ -2064,12 +2063,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { parameterMap.remove(FieldCommon.AUTH_DEPT); } } - // 外标引用标准 - // 如果当前登陆人是那几种管理员角色，则不需要授权部门筛选 - String userId = UserUtils.getUserId(); - SysUser user = sysUserService.getById(userId); // 管理员有所有外标的权限 - List roleList = sysUserRoleService.getRole(user.getUsername()); adminRoleCodeList.addAll(enterpriseDetailRoleCodeList); // 体系 String standardSystem = (String) parameterMap.get(FieldCommon.STANDARD_SYSTEM); From d7a4f0447f21aa0e05d7d1fa3886c6563206ca79 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 29 Jul 2024 15:17:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?ci:=20=E6=9B=B4=E6=96=B0=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- laws-module-system/pom.xml | 1 + laws-modules/pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/laws-module-system/pom.xml b/laws-module-system/pom.xml index 10c0da46..7f23d8c1 100644 --- a/laws-module-system/pom.xml +++ b/laws-module-system/pom.xml @@ -9,6 +9,7 @@ 4.0.0 laws-module-system + 2.5.2 diff --git a/laws-modules/pom.xml b/laws-modules/pom.xml index ab2697df..772aa121 100644 --- a/laws-modules/pom.xml +++ b/laws-modules/pom.xml @@ -23,7 +23,7 @@ com.jero.boot laws-module-system - ${jero.version} + 2.5.2 com.jero.boot