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

Merge branch '20240920' into 24年9月安全问题

Browse Source
This commit is contained in:
fengchenchen
2024-09-19 17:31:47 +08:00
parent 205473efff 325b2c4832
commit deeab09cd3
14 changed files with 215 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update/测试阶段.sql
+26
View File
@@ -377,3 +377,29 @@ ALTER TABLE `sar_file_split_info`
ALTER TABLE `laws_evaluation_not_met_library`
ADD COLUMN `close_user` varchar(50) NULL COMMENT '关闭人' AFTER `all_approval_user`,
ADD COLUMN `close_time` datetime NULL COMMENT '关闭时间' AFTER `close_user`;
-- 2024-09-14 IAM同步的时候 修改部门ID的长度为 64
ALTER TABLE sys_depart MODIFY COLUMN `id` varchar(64) NOT NULL COMMENT 'ID';
ALTER TABLE sys_depart MODIFY COLUMN `parent_id` varchar(64) NULL COMMENT '父机构ID';
ALTER TABLE laws_club_join_team MODIFY COLUMN `depart_id` varchar(64) NULL COMMENT '部门id';
ALTER TABLE laws_club_meeting MODIFY COLUMN `notify_depart_id` varchar(64) NULL COMMENT '通知部门id';
ALTER TABLE laws_club_research_information MODIFY COLUMN `feedback_depart` varchar(64) NULL COMMENT '反馈部门';
ALTER TABLE laws_conformity_assessment_library_detail MODIFY COLUMN `auth_dept` varchar(64) NULL COMMENT '反馈部门';
ALTER TABLE laws_enterprise_standard_inspect_content MODIFY COLUMN `rectification_department` varchar(64) NULL COMMENT '整改部门';
ALTER TABLE laws_evaluation_not_met_library MODIFY COLUMN `auth_dept` varchar(64) NULL COMMENT '责任部门';
ALTER TABLE laws_solicitation_clause MODIFY COLUMN `department` varchar(64) NULL COMMENT '提出部门';
ALTER TABLE process_es_recheck MODIFY COLUMN `main_drafting_unit` varchar(64) NULL COMMENT '起草部门';
ALTER TABLE sys_depart_permission MODIFY COLUMN `depart_id` varchar(64) NULL COMMENT '部门id';
ALTER TABLE sys_user_agent MODIFY COLUMN `sys_org_code` varchar(64) NULL COMMENT '所属部门';
-- 2024-09-14 IAM同步的时候 用户管理-人员类型修改长度为 64
ALTER TABLE sys_user MODIFY COLUMN `type_id` varchar(64) NULL COMMENT '人员类型,000正式员工、002外部用户、001劳务工等';
-- 2024-09-18 增加法规符合性评估库适用市场字段长度
ALTER TABLE `laws_conformity_assessment_library`
MODIFY COLUMN `applicable_market` varchar(200) NULL DEFAULT NULL COMMENT '适用市场' AFTER `valuation_time`;
-- 2024-09-19 市场法规清单-标准添加排序号字段
ALTER TABLE `laws_market_standard_detail`
ADD COLUMN `order_no` float NULL COMMENT '排序号';
laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java
+2 -1
View File
@@ -304,7 +304,8 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
if(!Objects.isNull(data)){
LambdaQueryWrapper<LawsMarketStandardDetail> queryLawsMarketStandardDetail = new LambdaQueryWrapper<>();
queryLawsMarketStandardDetail.eq(LawsMarketStandardDetail::getManifestId,data.getManifestId());
queryLawsMarketStandardDetail.orderByDesc(LawsMarketStandardDetail::getId);
queryLawsMarketStandardDetail.orderByAsc(LawsMarketStandardDetail::getOrderNo);
queryLawsMarketStandardDetail.orderByDesc(LawsMarketStandardDetail::getCreateTime);
List<LawsMarketStandardDetail> listLawsMarketStandardDetail = lawsMarketStandardDetailService.list(queryLawsMarketStandardDetail);
if(!CollectionUtils.isEmpty(listLawsMarketStandardDetail)){
data.setList(listLawsMarketStandardDetail);
laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
+1 -1
View File
@@ -320,7 +320,7 @@
<select id="getSplitSelectIds" resultType="java.lang.String">
select l2.id from laws_domestic_standard l1
left join sar_file_split_info l2 on l1.id = l2.standard_id and l2.del_flag = 0
where l1.del_flag = 0 and l2.id is not null
where l1.del_flag = 0 and l2.id is not null and split_status = 2
and
<foreach collection="countryList" separator="or" item= "item" open="(" close=")">
CONCAT(',',l1.applicable_market,',') like CONCAT('%,',#{item},',%')
laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+5 -3
View File
@@ -1879,10 +1879,12 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
// 查询市场下的标准
List<String> countryList = Arrays.asList(parameter.get(COUNTRY).toString().split(","));
List<String> ids = documentSplitMapper.getSplitSelectIds(countryList);
if(!CollectionUtils.isEmpty(ids)){
// in查询
selectCondition.append(" and s.info_id" + " in('").append(String.join("','",ids)).append("')");
if(CollectionUtils.isEmpty(ids)){
ids = new ArrayList<>();
ids.add("-1");
}
// in查询
selectCondition.append(" and s.info_id" + " in('").append(String.join("','",ids)).append("')");
parameter.remove(COUNTRY);
}
}
laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
+17 -8
View File
@@ -76,6 +76,7 @@ import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ForkJoinPool;
import java.util.stream.Collectors;
@@ -1361,7 +1362,7 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
private ModelAndView exportExcelByClause(Map<String, Object> parameterMap) {
List<LawsHomeAdvancedSearchClauseVO> advancedSearchClause = getAdvancedSearchClauseExport(parameterMap);
List<Map<String, Object>> list = new ArrayList<>();
List<Map<String, Object>> list = new CopyOnWriteArrayList<>();
// 标准sheet页
List<LawsHomeAdvancedSearchStandardExcelVO> lawsHomeAdvancedSearchStandardExcelVOList =
@@ -1373,14 +1374,12 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
standardSheet.put(NormalExcelConstants.PARAMS, exportParams);
standardSheet.put(NormalExcelConstants.DATA_LIST, lawsHomeAdvancedSearchStandardExcelVOList);
list.add(standardSheet);
for (LawsHomeAdvancedSearchClauseVO lawsHomeAdvancedSearchClauseVO : advancedSearchClause) {
List<Map<String, Object>> clauseList = lawsHomeAdvancedSearchClauseVO.getClauseList();
List<LawsHomeAdvancedSearchClauseExcelVO> lawsHomeAdvancedSearchClauseExcelVOS =
JSON.parseArray(JSON.toJSONString(clauseList), LawsHomeAdvancedSearchClauseExcelVO.class);
// 条款详情
for (LawsHomeAdvancedSearchClauseExcelVO lawsHomeAdvancedSearchClauseExcelVO :
lawsHomeAdvancedSearchClauseExcelVOS) {
lawsHomeAdvancedSearchClauseExcelVOS.parallelStream().forEach(lawsHomeAdvancedSearchClauseExcelVO->{
List<SarFileSplitItemsValEO> sarFileSplitItemsValEOS = sarFileSplitItemsValEOMapper.findList(
new QueryWrapper<SarFileSplitItemsValEO>()
.eq("item_id", lawsHomeAdvancedSearchClauseExcelVO.getId())
@@ -1393,11 +1392,16 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
.collect(Collectors.joining("\n\r"));
lawsHomeAdvancedSearchClauseExcelVO.setItemContent(itemContents);
}
}
});
// 条款sheet页
Map<String, Object> clauseSheet = new HashMap<>();
clauseSheet.put(NormalExcelConstants.CLASS, LawsHomeAdvancedSearchClauseExcelVO.class);
ExportParams exportParamss = new ExportParams(null, lawsHomeAdvancedSearchClauseVO.getStandardNumber());
ExportParams exportParamss = new ExportParams(null,
lawsHomeAdvancedSearchClauseVO.getStandardNumber().replace("/"," ")
.replace("\\"," ").replace("?"," ")
.replace("*"," ").replace("["," ")
.replace("]"," ").replace(":"," "));
exportParamss.setType(ExcelType.XSSF);
clauseSheet.put(NormalExcelConstants.PARAMS, exportParamss);
clauseSheet.put(NormalExcelConstants.DATA_LIST, lawsHomeAdvancedSearchClauseExcelVOS);
@@ -1533,8 +1537,13 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
data.put("release_date", new SimpleDateFormat(YYYY_MM_DD).format(releaseDate));
}
if (!Objects.isNull(data.get("implementation_date"))){
Date implementationDate = (Date) data.get("implementation_date");
data.put("implementation_date", new SimpleDateFormat(YYYY_MM_DD).format(implementationDate));
try{
Date implementationDate = (Date) data.get("implementation_date");
data.put("implementation_date", new SimpleDateFormat(YYYY_MM_DD).format(implementationDate));
}catch (Exception e){
String implementationDate = data.get("implementation_date").toString();
data.put("implementation_date", implementationDate);
}
}
}
return Result.OK(advancedSearchAll);
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java
+16
View File
@@ -235,4 +235,20 @@ public class MarketStandardDetailController {
return lawsMarketStandardDetailService.export(marketStandardDetail,request);
}
/**
* 移动
*
* @param marketStandardDetail
* @return
*/
@AutoLog(value = "外部标准库-市场法规清单-移动")
@ApiOperation(value = "外部标准库-市场法规清单-移动", notes = "外部标准库-市场法规清单-移动")
@PostMapping(value = "/move")
@ApiOperationSupport(order = 5)
// @RequiresPermissions("marketStandard:move")
public Result<?> move(@RequestBody LawsMarketStandardDetail marketStandardDetail) {
return lawsMarketStandardDetailService.move(marketStandardDetail);
}
}
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java
+13
View File
@@ -247,4 +247,17 @@ public class LawsMarketStandardDetail implements Serializable {
@ApiModelProperty(value = "清单版本")
@TableField(exist = false)
private String manifestVersion;
/**
* 排序号
*/
@ApiModelProperty(value = "排序号")
private Float orderNo;
/**
* 移动标识 上移：up 下移：down
*/
@ApiModelProperty(value = "移动标识")
@TableField(exist = false)
private String moveFlag;
}
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml
+1 -1
View File
@@ -61,7 +61,7 @@
${ew.customSqlSegment}
</select>
<select id="getOneByManifestNo" resultType="java.lang.String">
select max(manifest_no) as manifest_no from laws_market_standard where manifest_no like CONCAT(#{str},'%')
select CONCAT(max(REPLACE(manifest_no,#{str},'') * 1), '') as manifest_no from laws_market_standard where manifest_no like CONCAT(#{str},'%')
<if test = "oldStr != null and oldStr != ''">
and manifest_no &lt;> #{oldStr}
</if>
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardDetailService.java
+7
View File
@@ -110,4 +110,11 @@ public interface ILawsMarketStandardDetailService extends IService<LawsMarketSta
* @return
*/
ModelAndView export(LawsMarketStandardDetail marketStandardDetail, HttpServletRequest request);
/**
* 移动
* @param marketStandardDetail
* @return
*/
Result<?> move(LawsMarketStandardDetail marketStandardDetail);
}
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java
+109 -1
View File
@@ -3,6 +3,7 @@ package com.jero.modules.laws.marketStandard.service.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.api.vo.Result;
@@ -207,6 +208,22 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
if(!StringUtils.isBlank(m.toString())){
return Result.error(m.toString());
}
if(CollectionUtils.isEmpty(listLawsMarketStandardDetail)){
return Result.OK(ResultCommon.OK);
}
QueryWrapper<LawsMarketStandardDetail> queryWrapper = new QueryWrapper<>();
queryWrapper.select("max(order_no) as order_no");
queryWrapper.eq("manifest_id",manifestId);
LawsMarketStandardDetail lawsMarketStandardDetail = getOne(queryWrapper,false);
int no = 0;
if(!Objects.isNull(lawsMarketStandardDetail) && !Objects.isNull(lawsMarketStandardDetail.getOrderNo())){
no = lawsMarketStandardDetail.getOrderNo().intValue();
}
no = no + 1;
for (int i = 0; i < listLawsMarketStandardDetail.size(); i++) {
listLawsMarketStandardDetail.get(i).setOrderNo((float)(no + i));
}
// 更新状态
marketStandardService.updateStatus(manifestId);
@@ -448,12 +465,30 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
if(CollectionUtils.isEmpty(list)){
return Result.OK(ResultCommon.OK);
}
setOrderData(list, manifestId);
// 更细状态
marketStandardService.updateStatus(list.get(0).getManifestId());
saveBatch(list);
return Result.OK(ResultCommon.OK);
}
private void setOrderData(List<LawsMarketStandardDetail> list, String manifestId) {
QueryWrapper<LawsMarketStandardDetail> queryWrapper = new QueryWrapper<>();
queryWrapper.select("max(order_no) as order_no");
queryWrapper.eq("manifest_id", manifestId);
LawsMarketStandardDetail lawsMarketStandardDetail = getOne(queryWrapper, false);
int m = 0;
if (!Objects.isNull(lawsMarketStandardDetail) && !Objects.isNull(lawsMarketStandardDetail.getOrderNo())) {
m = lawsMarketStandardDetail.getOrderNo().intValue();
}
m = m + 1;
for (int i = 0; i < list.size(); i++) {
list.get(i).setOrderNo((float) (m + i));
}
}
@Override
public synchronized Result<?> copy(String oldId,String newId) {
LawsMarketStandard lawsMarketStandard = marketStandardService.getById(newId);
@@ -495,6 +530,9 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
if(CollectionUtils.isEmpty(listOld)){
return Result.OK(ResultCommon.OK);
}
setOrderData(listOld, newId);
// 更细状态
marketStandardService.updateStatus(listOld.get(0).getManifestId());
saveBatch(listOld);
@@ -549,7 +587,17 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
}
// 更细状态
marketStandardService.updateStatus(marketStandardDetail.getManifestId());
if(Objects.isNull(marketStandardDetail.getOrderNo())){
QueryWrapper<LawsMarketStandardDetail> query = new QueryWrapper<>();
query.select("max(order_no) as order_no");
query.eq("manifest_id",marketStandardDetail.getManifestId());
LawsMarketStandardDetail obj = getOne(query,false);
int m = 0;
if(!Objects.isNull(obj)){
m = obj.getOrderNo().intValue();
}
marketStandardDetail.setOrderNo((float) m);
}
updateById(marketStandardDetail);
return Result.OK(ResultCommon.OK);
}
@@ -687,6 +735,66 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
mv.addObject(NormalExcelConstants.DATA_LIST, res);
return mv;
}
@Override
public Result<?> move(LawsMarketStandardDetail marketStandardDetail) {
if(StringUtils.isBlank(marketStandardDetail.getManifestId()) ||
StringUtils.isBlank(marketStandardDetail.getId()) ||
StringUtils.isBlank(marketStandardDetail.getMoveFlag())){
return Result.error(ResultCommon.PARAMETER_NOT_RECOGNIZED);
}
LawsMarketStandard lawsMarketStandard = marketStandardService.getById(marketStandardDetail.getManifestId());
if(Objects.isNull(lawsMarketStandard)){
return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
}
LawsMarketStandardDetail lawsMarketStandardDetail = getById(marketStandardDetail.getId());
if(Objects.isNull(lawsMarketStandardDetail)){
return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
}
LambdaQueryWrapper<LawsMarketStandardDetail> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(LawsMarketStandardDetail::getManifestId,marketStandardDetail.getManifestId());
queryWrapper.orderByAsc(LawsMarketStandardDetail::getOrderNo);
queryWrapper.orderByDesc(LawsMarketStandardDetail::getCreateTime);
List<LawsMarketStandardDetail> list = list(queryWrapper);
if(CollectionUtils.isEmpty(list)){
return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
}
if(Objects.equals(marketStandardDetail.getMoveFlag(),"up")){
for (int i = 0; i < list.size(); i++) {
LawsMarketStandardDetail now = list.get(i);
if(Objects.equals(now.getId(),marketStandardDetail.getId()) && i > 0){
LawsMarketStandardDetail last = list.get(i - 1);
LambdaUpdateWrapper<LawsMarketStandardDetail> updateNow = new LambdaUpdateWrapper<>();
updateNow.eq(LawsMarketStandardDetail::getId,now.getId());
updateNow.set(LawsMarketStandardDetail::getOrderNo,last.getOrderNo());
update(updateNow);
LambdaUpdateWrapper<LawsMarketStandardDetail> updateLast = new LambdaUpdateWrapper<>();
updateLast.eq(LawsMarketStandardDetail::getId,last.getId());
updateLast.set(LawsMarketStandardDetail::getOrderNo,now.getOrderNo());
update(updateLast);
}
}
}else if(Objects.equals(marketStandardDetail.getMoveFlag(),"down")){
for (int i = 0; i < list.size(); i++) {
LawsMarketStandardDetail now = list.get(i);
if(Objects.equals(now.getId(),marketStandardDetail.getId()) && (i != list.size() -1)){
LawsMarketStandardDetail next = list.get(i + 1);
LambdaUpdateWrapper<LawsMarketStandardDetail> updateNow = new LambdaUpdateWrapper<>();
updateNow.eq(LawsMarketStandardDetail::getId,now.getId());
updateNow.set(LawsMarketStandardDetail::getOrderNo,next.getOrderNo());
update(updateNow);
LambdaUpdateWrapper<LawsMarketStandardDetail> updateNext = new LambdaUpdateWrapper<>();
updateNext.eq(LawsMarketStandardDetail::getId,next.getId());
updateNext.set(LawsMarketStandardDetail::getOrderNo,now.getOrderNo());
update(updateNext);
}
}
}
return Result.OK(ResultCommon.OK);
}
}
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
+5 -5
View File
@@ -220,7 +220,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
List<DictModel> listDict = map.get(marketState);
List<String> country = listDict.stream().map(DictModel::getText).collect(Collectors.toList());
// 国家/地区+自定义+固定字段，自定义字段：预留手填，当前默认不填；固定字段：车型需满足标准法规清单
manifest.setManifestName(String.join("",country) +
manifest.setManifestName(String.join("、",country) +
(StringUtils.isEmpty(manifest.getCustomColumnName()) ? "" : manifest.getCustomColumnName())
+ "车型需满足标准法规清单");
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -247,9 +247,9 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
if(StringUtils.isBlank(manifestNo)){
return s + "01";
}
String num = manifestNo.substring(manifestNo.length() - 2);
int m = Integer.parseInt(num);
return s + (m >= 10 ? (m + 1) : "0" + (m + 1));
int m = Integer.parseInt(manifestNo) + 1;
String n = s + (m >= 10 ? m : "0" + m);
return n;
}
@Override
@@ -288,7 +288,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
List<DictModel> listDict = map.get(marketState);
List<String> country = listDict.stream().map(DictModel::getText).collect(Collectors.toList());
// 国家/地区+自定义+固定字段，自定义字段：预留手填，当前默认不填；固定字段：车型需满足标准法规清单
manifest.setManifestName(String.join("",country) +
manifest.setManifestName(String.join("、",country) +
(StringUtils.isEmpty(manifest.getCustomColumnName()) ? "" : manifest.getCustomColumnName())
+ "车型需满足标准法规清单");
updateById(manifest);
laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+4 -1
View File
@@ -2269,6 +2269,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
tableHtml = tableHtml.replaceAll("style","border=\"1\" style");// 解决导入的表格没线
splitTableInfo.setTableHtml(tableHtml);
}catch (Exception e){
log.error(e.getMessage(),e);
throw new JeroBootException(sheet.getSheetName() + "页签数据异常");
}
getSheetTableList.add(splitTableInfo);
@@ -2295,11 +2296,12 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
FileUnZip.deleteDir(saveDirectory);
return message;
} catch (JeroBootException e){
log.error(e.getMessage(),e);
//删除原上传文件
FileUnZip.deleteDir(saveDirectory);
return Result.error(1, e.getMessage());
}catch (NullPointerException e){
log.error(e.getMessage());
log.error("读取失败，请严格按照模板文件导入数据",e);
//删除原上传文件
FileUnZip.deleteDir(saveDirectory);
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
@@ -2309,6 +2311,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
}
return Result.error(1, resultMsg);
}catch (Exception e) {
log.error(e.getMessage(),e);
//删除原上传文件
FileUnZip.deleteDir(saveDirectory);
return Result.error(e.getMessage());
laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
+7 -7
View File
@@ -3,6 +3,7 @@ package com.jero.modules.split.service.impl;
import cn.hutool.core.collection.CollStreamUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.api.vo.Result;
import com.jero.modules.laws.documenttool.service.IDocumentSplitService;
@@ -381,23 +382,22 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
List<String> sourceIdList = Arrays.asList(sourceIds.split(","));
// 获取要移动到的层级的最后一个 的排序值
List<SarFileSplitMenuEO> lastMenuList = getLastMenu(parentMenu.getId(),displaySeq,sourceIdList);
if(displaySeq == 0){
displaySeq = parentMenu.getDisplaySeq();
if (CollectionUtil.isNotEmpty(lastMenuList)){
displaySeq = lastMenuList.stream().map(SarFileSplitMenuEO::getDisplaySeq).min(Comparator.comparing(x -> x)).orElse(null);
}
// 要移动的节点所有子集（包括本身）
List<SarFileSplitMenuEO> sarFileSplitMenuEO1List = new ArrayList<>();
List<String> idList = new ArrayList<>();
for (int i = 0; i < sourceIdList.size(); i++) {
String sourceId = sourceIdList.get(i);
for (String sourceId : sourceIdList) {
// 要移动的节点信息
SarFileSplitMenuEO sarFileSplitMenuEO = baseMapper.findById(sourceId);
sarFileSplitMenuEO.setParentId(parentId);
sarFileSplitMenuEO1List.add(sarFileSplitMenuEO);
idList.add(sourceId);
}
List<SarFileSplitMenuEO> allList = new ArrayList<>();
getChildren(allList, sarFileSplitMenuEO1List);
//for (SarFileSplitMenuEO splitMenuEO : allList) {
// splitMenuEO.setParentId(parentId);
//}
//排除
getChildren(allList, lastMenuList);
laws-single-startup/src/main/resources/application-dev.yml
+2 -2
View File
@@ -45,7 +45,7 @@ spring:
job-store-type: jdbc
initialize-schema: embedded
#定时任务启动开关，true-开 false-关
auto-startup: true
auto-startup: false
#启动时更新己存在的Job
overwrite-existing-jobs: true
properties:
@@ -147,7 +147,7 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000;druid.stat.logSlowSql\=true
datasource:
master:
url: jdbc:p6spy:mysql://10.10.10.44:3306/laws_chery_dev_init?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
url: jdbc:p6spy:mysql://10.10.10.44:3306/laws_chery_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
username: root
password: hzwlsoft.com
driver-class-name: com.p6spy.engine.spy.P6SpyDriver