QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:88633

Browse Source
This commit is contained in:
梁琦涛
2024-08-14 16:34:20 +08:00
parent 8e2eecb9d2
commit 4f3a271ee1
4 changed files with 227 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java
+1 -20
View File
@@ -195,12 +195,8 @@ public class MyGlobalEventListener implements ActivitiEventListener {
unifiedTodoVO.setProcessDefinitionId(processDefinitionId);
unifiedTodoVO.setIsRemark(CommonConstant.TODO_TYPE_0);
list.add(unifiedTodoVO);
long l = System.currentTimeMillis();
pushWorkflowIntegrationAPI.sendTodoTask(list);
long l1 = System.currentTimeMillis();
pushWorkflowIntegrationAPI.sendTodoTaskByFeiShu(list);
long l2 = System.currentTimeMillis();
System.out.println("===========================OA" + (l1-l) + "+++++++++++feishu" + (l2-l1));
}
private void taskAssigned(ActivitiEvent event) {
@@ -230,12 +226,9 @@ public class MyGlobalEventListener implements ActivitiEventListener {
unifiedTodoVO.setIsRemark(CommonConstant.TODO_TYPE_2);
unifiedTodoVO.setProcessDefinitionId(processDefinitionId);
list.add(unifiedTodoVO);
long l = System.currentTimeMillis();
pushWorkflowIntegrationAPI.sendTodoTask(list);
long l1 = System.currentTimeMillis();
pushWorkflowIntegrationAPI.sendTodoTaskByFeiShu(list);
long l2 = System.currentTimeMillis();
System.out.println("===========================OA" + (l1-l) + "+++++++++++feishu" + (l2-l1));
//更新转办任务id
LambdaUpdateWrapper<ProcessApprovalRecord> update = new LambdaUpdateWrapper<>();
@@ -247,12 +240,8 @@ public class MyGlobalEventListener implements ActivitiEventListener {
unifiedTodoVO.setToUserId(assignee);
unifiedTodoVO.setIsRemark(CommonConstant.TODO_TYPE_0);
list.add(unifiedTodoVO);
long l11 = System.currentTimeMillis();
pushWorkflowIntegrationAPI.sendTodoTask(list);
long l12 = System.currentTimeMillis();
pushWorkflowIntegrationAPI.sendTodoTaskByFeiShu(list);
long l13 = System.currentTimeMillis();
System.out.println("===========================OA" + (l12-l11) + "+++++++++++feishu" + (l13-l12));
}
}
@@ -338,12 +327,8 @@ public class MyGlobalEventListener implements ActivitiEventListener {
unifiedTodoVO.setProcessDefinitionId(processDefinitionId);
unifiedTodoVO.setIsRemark(CommonConstant.TODO_TYPE_2);
list.add(unifiedTodoVO);
long l = System.currentTimeMillis();
pushWorkflowIntegrationAPI.sendTodoTask(list);
long l1 = System.currentTimeMillis();
pushWorkflowIntegrationAPI.sendTodoTaskByFeiShu(list);
long l2 = System.currentTimeMillis();
System.out.println("===========================OA" + (l1-l) + "+++++++++++feishu" + (l2-l1));
}
private void entityDeleted(ActivitiEvent event) {
@@ -393,12 +378,8 @@ public class MyGlobalEventListener implements ActivitiEventListener {
unifiedTodoVO.setProcessDefinitionId(processDefinitionId);
unifiedTodoVO.setIsRemark(CommonConstant.TODO_TYPE_2);
todoAddList.add(unifiedTodoVO);
long l = System.currentTimeMillis();
pushWorkflowIntegrationAPI.sendTodoTask(todoAddList);
long l1 = System.currentTimeMillis();
pushWorkflowIntegrationAPI.sendTodoTaskByFeiShu(todoAddList);
long l2 = System.currentTimeMillis();
System.out.println("===========================OA" + (l1-l) + "+++++++++++feishu" + (l2-l1));
}
laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
+105 -51
View File
@@ -1179,67 +1179,121 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
String searchMode = lawsHomeNormalSearchDTO.getSearchMode();
List<LawsHomeNormalSearchExportExcelVO> lawsHomeNormalSearchExportExcelVOList = new ArrayList<>();
List<LawsHomeNormalSearchVO> lawsHomeNormalSearchVOList;
if (LawsHomeSearchCommon.SEARCH_MODE_1.equals(searchMode)){
// 全文检索
IPage<LawsHomeNormalSearchVO> normalSearchAllPage = getNormalSearchAllPage(lawsHomeNormalSearchDTO,
1, 10000);
lawsHomeNormalSearchVOList =
JSON.parseArray(JSON.toJSONString(normalSearchAllPage.getRecords()),
LawsHomeNormalSearchVO.class);
List<LawsHomeNormalSearchMapVO> lawsHomeNormalSearchVOList = new ArrayList<>();
if(!CollectionUtils.isEmpty(normalSearchAllPage.getRecords())){
lawsHomeNormalSearchVOList =
JSON.parseArray(JSON.toJSONString(normalSearchAllPage.getRecords()),
LawsHomeNormalSearchMapVO.class);
}
for (LawsHomeNormalSearchMapVO lawsHomeNormalSearchVO : lawsHomeNormalSearchVOList) {
// 处理数据
LawsHomeNormalSearchExportExcelVO lawsHomeNormalSearchExportExcelVO =
new LawsHomeNormalSearchExportExcelVO();
lawsHomeNormalSearchExportExcelVO.setResourceType(lawsHomeNormalSearchVO.getResourceType());
if (LawsHomeSearchCommon.LAWS_DOMESTIC_STANDARD.equals(lawsHomeNormalSearchVO.getResourceType())) {
// 外部标准库
LawsDomesticStandard lawsDomesticStandard =
lawsDomesticStandardService.getOne(new LambdaQueryWrapper<LawsDomesticStandard>()
.select(LawsDomesticStandard::getStandardNumber,
LawsDomesticStandard::getStandardName,
LawsDomesticStandard::getImplementationDate)
.eq(LawsDomesticStandard::getId, lawsHomeNormalSearchVO.getId()),false);
if(!Objects.isNull(lawsDomesticStandard)){
lawsHomeNormalSearchExportExcelVO.setStandardName(lawsDomesticStandard.getStandardName());
lawsHomeNormalSearchExportExcelVO.setStandardNumber(lawsDomesticStandard.getStandardNumber());
lawsHomeNormalSearchExportExcelVO.setImplementationDate(lawsDomesticStandard.getImplementationDate());
}
}else {
// 企业标准
LawsEnterpriseStandard lawsEnterpriseStandard =
lawsEnterpriseStandardService.getOne(new LambdaQueryWrapper<LawsEnterpriseStandard>()
.select(LawsEnterpriseStandard::getStandardNumber,
LawsEnterpriseStandard::getStandardName,
LawsEnterpriseStandard::getImplementationDate)
.eq(LawsEnterpriseStandard::getId, lawsHomeNormalSearchVO.getId()),false);
if(!Objects.isNull(lawsEnterpriseStandard)){
lawsHomeNormalSearchExportExcelVO.setStandardName(lawsEnterpriseStandard.getStandardName());
lawsHomeNormalSearchExportExcelVO.setStandardNumber(lawsEnterpriseStandard.getStandardNumber());
lawsHomeNormalSearchExportExcelVO.setImplementationDate(lawsEnterpriseStandard.getImplementationDate());
}
}
lawsHomeNormalSearchExportExcelVOList.add(lawsHomeNormalSearchExportExcelVO);
}
// Step.3 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
try {
mv.addObject("fileName", URLEncoder.encode("一般检索", "UTF-8")); //此处设置的filename无效 ,前端会重更新设置一下
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
mv.addObject("entity", LawsHomeNormalSearchExportExcelVO.class);
//update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
ExportParams exportParams=new ExportParams(null, "一般检索");
exportParams.setType(ExcelType.XSSF);
//update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
mv.addObject("params",exportParams);
mv.addObject(NormalExcelConstants.DATA_LIST, lawsHomeNormalSearchExportExcelVOList);
return mv;
}else {
// 标题检索
lawsHomeNormalSearchVOList =
List<LawsHomeNormalSearchVO> lawsHomeNormalSearchVOList =
getNormalSearchTitleList(lawsHomeNormalSearchDTO);
}
for (LawsHomeNormalSearchVO lawsHomeNormalSearchVO : lawsHomeNormalSearchVOList) {
// 处理数据
LawsHomeNormalSearchExportExcelVO lawsHomeNormalSearchExportExcelVO =
new LawsHomeNormalSearchExportExcelVO();
lawsHomeNormalSearchExportExcelVO.setResourceType(lawsHomeNormalSearchVO.getResourceType());
if (LawsHomeSearchCommon.LAWS_DOMESTIC_STANDARD.equals(lawsHomeNormalSearchVO.getResourceType())) {
// 外部标准库
LawsDomesticStandard lawsDomesticStandard =
lawsDomesticStandardService.getOne(new LambdaQueryWrapper<LawsDomesticStandard>()
.select(LawsDomesticStandard::getStandardNumber,
LawsDomesticStandard::getStandardName,
LawsDomesticStandard::getImplementationDate)
.eq(LawsDomesticStandard::getId, lawsHomeNormalSearchVO.getId()));
lawsHomeNormalSearchExportExcelVO.setStandardName(lawsDomesticStandard.getStandardName());
lawsHomeNormalSearchExportExcelVO.setStandardNumber(lawsDomesticStandard.getStandardNumber());
lawsHomeNormalSearchExportExcelVO.setImplementationDate(lawsDomesticStandard.getImplementationDate());
}else {
// 企业标准
LawsEnterpriseStandard lawsEnterpriseStandard =
lawsEnterpriseStandardService.getOne(new LambdaQueryWrapper<LawsEnterpriseStandard>()
.select(LawsEnterpriseStandard::getStandardNumber,
LawsEnterpriseStandard::getStandardName,
LawsEnterpriseStandard::getImplementationDate)
.eq(LawsEnterpriseStandard::getId, lawsHomeNormalSearchVO.getId()));
lawsHomeNormalSearchExportExcelVO.setStandardName(lawsEnterpriseStandard.getStandardName());
lawsHomeNormalSearchExportExcelVO.setStandardNumber(lawsEnterpriseStandard.getStandardNumber());
lawsHomeNormalSearchExportExcelVO.setImplementationDate(lawsEnterpriseStandard.getImplementationDate());
for (LawsHomeNormalSearchVO lawsHomeNormalSearchVO : lawsHomeNormalSearchVOList) {
// 处理数据
LawsHomeNormalSearchExportExcelVO lawsHomeNormalSearchExportExcelVO =
new LawsHomeNormalSearchExportExcelVO();
lawsHomeNormalSearchExportExcelVO.setResourceType(lawsHomeNormalSearchVO.getResourceType());
if (LawsHomeSearchCommon.LAWS_DOMESTIC_STANDARD.equals(lawsHomeNormalSearchVO.getResourceType())) {
// 外部标准库
LawsDomesticStandard lawsDomesticStandard =
lawsDomesticStandardService.getOne(new LambdaQueryWrapper<LawsDomesticStandard>()
.select(LawsDomesticStandard::getStandardNumber,
LawsDomesticStandard::getStandardName,
LawsDomesticStandard::getImplementationDate)
.eq(LawsDomesticStandard::getId, lawsHomeNormalSearchVO.getId()),false);
if(!Objects.isNull(lawsDomesticStandard)){
lawsHomeNormalSearchExportExcelVO.setStandardName(lawsDomesticStandard.getStandardName());
lawsHomeNormalSearchExportExcelVO.setStandardNumber(lawsDomesticStandard.getStandardNumber());
lawsHomeNormalSearchExportExcelVO.setImplementationDate(lawsDomesticStandard.getImplementationDate());
}
}else {
// 企业标准
LawsEnterpriseStandard lawsEnterpriseStandard =
lawsEnterpriseStandardService.getOne(new LambdaQueryWrapper<LawsEnterpriseStandard>()
.select(LawsEnterpriseStandard::getStandardNumber,
LawsEnterpriseStandard::getStandardName,
LawsEnterpriseStandard::getImplementationDate)
.eq(LawsEnterpriseStandard::getId, lawsHomeNormalSearchVO.getId()),false);
if(!Objects.isNull(lawsEnterpriseStandard)){
lawsHomeNormalSearchExportExcelVO.setStandardName(lawsEnterpriseStandard.getStandardName());
lawsHomeNormalSearchExportExcelVO.setStandardNumber(lawsEnterpriseStandard.getStandardNumber());
lawsHomeNormalSearchExportExcelVO.setImplementationDate(lawsEnterpriseStandard.getImplementationDate());
}
}
lawsHomeNormalSearchExportExcelVOList.add(lawsHomeNormalSearchExportExcelVO);
}
lawsHomeNormalSearchExportExcelVOList.add(lawsHomeNormalSearchExportExcelVO);
// Step.3 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
try {
mv.addObject("fileName", URLEncoder.encode("一般检索", "UTF-8")); //此处设置的filename无效 ,前端会重更新设置一下
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
mv.addObject("entity", LawsHomeNormalSearchExportExcelVO.class);
//update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
ExportParams exportParams=new ExportParams(null, "一般检索");
exportParams.setType(ExcelType.XSSF);
//update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
mv.addObject("params",exportParams);
mv.addObject(NormalExcelConstants.DATA_LIST, lawsHomeNormalSearchExportExcelVOList);
return mv;
}
// Step.3 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
try {
mv.addObject("fileName", URLEncoder.encode("一般检索", "UTF-8")); //此处设置的filename无效 ,前端会重更新设置一下
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
mv.addObject("entity", LawsHomeNormalSearchExportExcelVO.class);
//update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
ExportParams exportParams=new ExportParams(null, "一般检索");
exportParams.setType(ExcelType.XSSF);
//update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
mv.addObject("params",exportParams);
mv.addObject(NormalExcelConstants.DATA_LIST, lawsHomeNormalSearchExportExcelVOList);
return mv;
}
@Override
laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchMapVO.java
+115
View File
@@ -0,0 +1,115 @@
package com.jero.modules.laws.home.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @author lqt
* @version 1.0
* @date 2023/11/7 17:04
*/
@Data
public class LawsHomeNormalSearchMapVO implements Serializable {
/**
* 业务id
*/
@ApiModelProperty(value = "业务id")
private String id;
/**
* 资源类型 1:外来标准法规 3:企业标准
*/
@ApiModelProperty(value = "资源类型 1:外来标准法规 3:企业标准")
private String resourceType;
/**
* 标题
*/
@ApiModelProperty(value = "标题")
private String standardName;
/**
* 标题
*/
@ApiModelProperty(value = "标题")
private String title;
/**
* 正文
*/
@ApiModelProperty(value = "正文")
private String content;
/**
* 发布日期
*/
@ApiModelProperty(value = "发布日期")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private String releaseDate;
/**
* 标准类别 （数据字典 只有外来标准法规：standard_type） (全部传空)
*/
@ApiModelProperty(value = "标准类别 （数据字典 只有外来标准法规：standard_type） (全部传空)")
private String standardClass;
/**
* 动力类型 （数据字典 只有外来标准法规：POWER_TYPE_DOMESTIC） (全部传空)
*/
@ApiModelProperty(value = "动力类型 （数据字典 只有外来标准法规：POWER_TYPE_DOMESTIC） (全部传空)")
private String dynamicType;
/**
* 适用市场 （数据字典 只有外来标准法规：market_state） (全部传空)
*/
@ApiModelProperty(value = "适用市场 （数据字典 只有外来标准法规：market_state） (全部传空)")
private String applicableMarket;
/**
* 适用车辆类型 （数据字典 只有外来标准法规：APPLICATIONS_DOMESTIC） (全部传空)
*/
@ApiModelProperty(value = "适用车辆类型 （数据字典 只有外来标准法规：APPLICATIONS_DOMESTIC） (全部传空)")
private String applicableVehicle;
/**
* 标准类型 （数据字典 只有外来标准法规：standard_property (全部传空)
*/
@ApiModelProperty(value = "标准类型 （数据字典 只有外来标准法规：standard_property (全部传空)")
private String standardProperty;
/**
* 状态 （数据字典 只有外来标准法规：standard_state (全部传空)
*/
@ApiModelProperty(value = "状态 （数据字典 只有外来标准法规：standard_state (全部传空)")
private String standardState;
/**
* 标准分类代码 （数据字典 只有企业标准：standard_category_code (全部传空)
*/
@ApiModelProperty(value = "标准分类代码 （数据字典 只有企业标准：standard_category_code (全部传空)")
private String categoryCode;
/**
* 标准状态 （数据字典 只有企业标准：enterprise_standard_state (全部传空)
*/
@ApiModelProperty(value = "标准状态 （数据字典 只有企业标准：enterprise_standard_state (全部传空)")
private String enterpriseStandardState;
/**
* 国内（GB、GB/T、JT、QC/T、HJ)/企标/海外/其他行业标准/动态
*/
private String standardTypeOrder;
/**
* 现行有效>即将实施>废止
*/
private String standardStateOrder;
/**
* 实施日期
*/
@ApiModelProperty(value = "实施日期")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private String implementationDate;
/**
* 入库时间
*/
private String createTime;
}