FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_master' into FOTON

Browse Source
This commit is contained in:
super_liu
2022-01-19 17:44:37 +08:00
parent fd13ba6253 d5bf93da2b
commit cc001703f9
16 changed files with 287 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java
+5
View File
@@ -1,5 +1,6 @@
package com.adc.da.common;
import com.adc.da.utils.removeHtml.RemoveHtml;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
import org.apache.poi.ss.usermodel.*;
@@ -93,6 +94,10 @@ public class TableToExcel {
if (!"commentText".equals(key)) {
try {
Object val = BeanUtils.getProperty(t, key);
val= RemoveHtml.getResultsFromHtml(String.valueOf(val));
if ("null".equals(val)){
val="";
}
if (val instanceof Long) {
dataRow.createCell(v++).setCellValue((Long) val);
} else if (val instanceof Double) {
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java
+7 -3
View File
@@ -11,9 +11,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/${restPath}/lawss/actSarItemsBuss")
@@ -35,4 +33,10 @@ public class ActSarItemsBussEOController extends BaseController<ActSarItemsEO> {
return Result.error("传入数据json不能为空");
}
}
@ApiOperation(value = "手动更新")
@GetMapping("/autoUpdIndex")
public void autoUpdIndex(@RequestParam("pid") String pid,@RequestParam("bussId") String bussId) {
actSarItemsEOService.autoUpdIndex(pid,bussId);
}
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
+65 -5
View File
@@ -29,6 +29,7 @@ import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService;
import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
import com.adc.da.util.UUIDUtils;
import com.adc.da.utils.util.InitStandAttrUtil;
import com.adc.da.utils.util.Utils;
import com.adc.da.workFlow.dao.ActSarItemsEODao;
import com.adc.da.workFlow.entity.BusProcessEvaluationHis;
import com.alibaba.fastjson.JSON;
@@ -44,8 +45,10 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@Service("actSarItemsBussEOService")
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
@@ -78,6 +81,49 @@ public class ActSarItemsBussEOService {
@Value("${elas.flag}")
private boolean elasflag;
public void autoUpdIndex(String pid,String bussId){
List<BusProcessEvaluationHis> evaluationHisFilter = workFlowFeignClient.evaluationHisList(pid);
List<BusProcessEvaluationHis> evaluationHis = new ArrayList<>();
Map<String, List<BusProcessEvaluationHis>> listMap = new TreeMap<>();
// 按 相同数据分组
listMap = evaluationHisFilter.stream().collect(
Collectors.groupingBy(a -> Utils.format("{0}#{1}", a.getPId(),a.getTaskInfo())));
List<QualityEvaluation> evaluations = new ArrayList<>();
if(!listMap.isEmpty()){
SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
listMap.forEach((key, value) -> {
if(!value.isEmpty()){
evaluationHis.add(value.get(0));
}
});
String finalBussId = bussId;
Date date = new Date();
evaluationHis.forEach(busProcessEvaluationHis -> {
List<JSONObject> valueArr = JSONArray.parseArray(busProcessEvaluationHis.getMesg(),JSONObject.class);
if(!valueArr.isEmpty()){
valueArr.forEach(object -> {
QualityEvaluation evaluation = new QualityEvaluation();
evaluation.setId(UUIDUtils.randomUUID20());
evaluation.setLawId(finalBussId);
evaluation.setUserId(object.getString("userId"));
evaluation.setScore(object.getString("score"));
evaluation.setReason(object.getString("reason"));
evaluation.setEvaluationIndex(object.getString("code"));
evaluation.setProcessNode(object.getString("processNode"));
evaluation.setEvaluationType(object.getString("indexType"));
evaluation.setCreateTime(date);
evaluation.setModifyTime(date);
evaluations.add(evaluation);
});
}
});
qualityEvaluationService.saveBatch(evaluations);
}
}
/***
* @Description: 国内外标准流程入库"
* @Date: 2020/12/7 13:48
@@ -238,10 +284,24 @@ public class ActSarItemsBussEOService {
// saveCompStatusInfo(sarStandardsInfoEO,breakVal,allItems,prcNum);
// }
List<BusProcessEvaluationHis> evaluationHis = workFlowFeignClient.evaluationHisList(pid);
List<BusProcessEvaluationHis> evaluationHisFilter = workFlowFeignClient.evaluationHisList(pid);
List<BusProcessEvaluationHis> evaluationHis = new ArrayList<>();
Map<String, List<BusProcessEvaluationHis>> listMap = new TreeMap<>();
// 按 相同数据分组
listMap = evaluationHisFilter.stream().collect(
Collectors.groupingBy(a -> Utils.format("{0}#{1}", a.getPId(),a.getTaskInfo())));
List<QualityEvaluation> evaluations = new ArrayList<>();
if(!evaluationHis.isEmpty()){
if(!listMap.isEmpty()){
SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
listMap.forEach((key, value) -> {
if(!value.isEmpty()){
evaluationHis.add(value.get(0));
}
});
String finalBussId = bussId;
Date date = new Date();
evaluationHis.forEach(busProcessEvaluationHis -> {
List<JSONObject> valueArr = JSONArray.parseArray(busProcessEvaluationHis.getMesg(),JSONObject.class);
if(!valueArr.isEmpty()){
@@ -255,15 +315,15 @@ public class ActSarItemsBussEOService {
evaluation.setEvaluationIndex(object.getString("code"));
evaluation.setProcessNode(object.getString("processNode"));
evaluation.setEvaluationType(object.getString("indexType"));
evaluation.setCreateTime(new Date());
evaluation.setModifyTime(new Date());
evaluation.setCreateTime(date);
evaluation.setModifyTime(date);
evaluations.add(evaluation);
});
}
});
qualityEvaluationService.saveBatch(evaluations);
}
qualityEvaluationService.saveBatch(evaluations);
}
adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
+13 -7
View File
@@ -179,8 +179,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBName")).append(" ");
}else {
contentBuilder.append("归口管理部门:").append(attrInfoMap.get("GKDWName")).append(" ");
contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJGName")).append(" ");
contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMRName")).append(" ");
// contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJGName")).append(" ");
contentBuilder.append("起草单位:").append(attrInfoMap.get("QCDW")).append(" ");
// contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMRName")).append(" ");
contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMR")).append(" ");
contentBuilder.append("我司参与深度:").append(attrInfoMap.get("CYSDName")).append(" ");
contentBuilder.append("我司参与制标排名:").append(attrInfoMap.get("CYZBPMName")).append(" ");
}
@@ -188,8 +190,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXName")).append(" ");
contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPXName")).append(" ");
contentBuilder.append("适用认证:").append(attrInfoMap.get("SYRZName")).append(" ");
contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBMName")).append(" ");
contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCSName")).append(" ");
// contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBMName")).append(" ");
contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBM")).append(" ");
// contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCSName")).append(" ");
contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCS")).append(" ");
contentBuilder.append("关联模块--乘用车VPPS编码:").append(attrInfoMap.get("CYCVPPSBMName")).append(" ");
contentBuilder.append("关联模块--乘用车vpps中文名称:").append(attrInfoMap.get("CYCVPPSCNName")).append(" ");
contentBuilder.append("关联模块--卡车VPPS编码:").append(attrInfoMap.get("KCCVPPSBMName")).append(" ");
@@ -309,15 +313,17 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
StringBuilder contentBuilder = new StringBuilder();
contentBuilder.append("企标类别:").append(attrInfoMap.get("standSort")).append(" ");
contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append(" ");
contentBuilder.append("企标名称:").append(attrInfoMap.get("standName")).append(" ");
contentBuilder.append("企标名称:").append(attrInfoMap.get("stand_name")).append(" ");
contentBuilder.append("企标英文名称:").append(attrInfoMap.get("stand_en_name")).append(" ");
contentBuilder.append("文本状态:").append(attrInfoMap.get("textStatusBussName")).append(" ");
contentBuilder.append("企标实施日期:").append(attrInfoMap.get("putTime")).append(" ");
contentBuilder.append("企标发布日期:").append(attrInfoMap.get("issueTime")).append(" ");
contentBuilder.append("废止日期:").append(attrInfoMap.get("FZRQBUSSName")).append(" ");
contentBuilder.append("复审日期:").append(attrInfoMap.get("FSRQBUSSName")).append(" ");
contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDWName")).append(" ");
contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSSName")).append(" ");
// contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDWName")).append(" ");
contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDW")).append(" ");
// contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSSName")).append(" ");
contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSS")).append(" ");
contentBuilder.append("文件上传人员:").append(attrInfoMap.get("WJSCRYBUSSName")).append(" ");
contentBuilder.append("适用车型:").append(attrInfoMap.get("SYCXCLASSName")).append(" ");
contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXCLASSName")).append(" ");
adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java
+18
View File
@@ -211,6 +211,24 @@ public class SendStandMQService {
context = context.replace(",,", ",");
saveMap.put("content", context);
}
// 如果出现提示查询报错，而且提示 查询内容无法转换为 日期格式的 情况，原因可能是没有把日期转换为字符串，可以考虑放开下面的代码（目前，域内没有报错，但是，本地有问题）
// //部分字段没有转为汉字，在此处转为汉字
// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("XCXSSRQName")))) {
// saveMap.put("XCXSSRQName"," " + String.valueOf(saveMap.get("XCXSSRQName")));
// }
// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("ZCCSSRQName")))) {
// saveMap.put("ZCCSSRQName"," " + String.valueOf(saveMap.get("ZCCSSRQName")));
// }
// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("SSRQName")))) {
// saveMap.put("SSRQName"," " + String.valueOf(saveMap.get("SSRQName")));
// }
// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("issueTime")))) {
// saveMap.put("issueTime"," " + String.valueOf(saveMap.get("issueTime")));
// }
// if(StringUtils.isNotBlank(String.valueOf(saveMap.get("ZCCSSRQ")))) {
// saveMap.put("ZCCSSRQ"," " + String.valueOf(saveMap.get("ZCCSSRQ")));
// }
if("add".equals(addOrUpdate)){
sarStandardsInfoService.insertIntoIndexForMap(saveMap);
} else {
adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java
+40 -6
View File
@@ -5,6 +5,7 @@ import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.slrs.customWorkGroup.entity.WorkGroupQueryPage;
import com.adc.da.slrs.customWorkGroup.service.IWorkGroupService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.ApiModelProperty;
import org.apache.ibatis.annotations.Delete;
@@ -14,6 +15,8 @@ import com.adc.da.slrs.customWorkGroup.entity.WorkGroup;
import io.swagger.annotations.Api;
import com.adc.da.base.web.BaseController;
import java.util.List;
/**
* <p>
* 前端控制器
@@ -34,9 +37,18 @@ public class WorkGroupController extends BaseController<WorkGroup> {
@ApiModelProperty("新增工作组")
@PostMapping
public ResponseMessage addWorkGroup(WorkGroup workGroup) {
boolean add = iWorkGroupService.add(workGroup);
String meg="";
if (isDistinct(workGroup.getWorkGroup())){
if (iWorkGroupService.add(workGroup)){
meg="新增成功!";
}else {
meg="新增失败!";
}
}else {
meg="组名已存在!";
}
return Result.success(add);
return Result.success("200",meg);
}
@@ -49,11 +61,10 @@ public class WorkGroupController extends BaseController<WorkGroup> {
return Result.success(delete);
}
@ApiModelProperty("根据组长民或者组名查询工作组")
@ApiModelProperty("根据组长民或者组名查询工作组,参数为空时查询全部")
@GetMapping
public ResponseMessage<IPage<WorkGroup>> getWorkGroupLists(WorkGroupQueryPage queryPage){
IPage<WorkGroup> workGroup = iWorkGroupService.getWorkGroup(queryPage);
return Result.success(workGroup);
}
@@ -61,11 +72,34 @@ public class WorkGroupController extends BaseController<WorkGroup> {
@ApiModelProperty("修改工作组")
@PutMapping
public ResponseMessage updateWorkGroup(WorkGroup workGroup){
boolean update = iWorkGroupService.update(workGroup);
String meg="";
if (isDistinct(workGroup.getWorkGroup())){
if (iWorkGroupService.update(workGroup)){
meg="修改成功!";
}else {
meg="修改失败";
}
return Result.success(update);
}else {
meg="组名已存在!";
}
return Result.success("200",meg);
}
/**
* 判断提交的工作组名称是否重复
* @param groupName
* @return true 没有重复 false 有重复
*/
private boolean isDistinct(String groupName){
QueryWrapper<WorkGroup> ew = new QueryWrapper<>();
ew.eq("work_group_name",groupName);
List<WorkGroup> list = iWorkGroupService.list(ew);
return list.isEmpty();
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroup.java
+9
View File
@@ -1,6 +1,8 @@
package com.adc.da.slrs.customWorkGroup.entity;
import com.adc.da.base.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -22,15 +24,22 @@ public class WorkGroup extends BaseEntity {
private static final long serialVersionUID = 1L;
@TableId
private String id;
@TableField("work_group_name")
private String workGroup;
@TableField(exist = false)
private String workLeader;
@TableField("work_leader_id")
private String workLeaderId;
@TableField(exist = false)
private String workPeople;
@TableField("work_people_id")
private String workPeopleId;
adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java
+2
View File
@@ -4,6 +4,7 @@ import com.adc.da.slrs.customWorkGroup.entity.WorkGroup;
import com.adc.da.slrs.customWorkGroup.dao.WorkGroupDao;
import com.adc.da.slrs.customWorkGroup.entity.WorkGroupQueryPage;
import com.adc.da.slrs.customWorkGroup.service.IWorkGroupService;
import com.adc.da.util.UUIDUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -29,6 +30,7 @@ public class WorkGroupServiceImpl extends ServiceImpl<WorkGroupDao, WorkGroup> i
@Override
public boolean add(WorkGroup workGroup) {
workGroup.setId(UUIDUtils.randomUUID20());
return this.save(workGroup);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java
+3
View File
@@ -3,6 +3,7 @@ package com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity;
import com.adc.da.base.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -77,10 +78,12 @@ public class QualityEvaluation extends BaseEntity {
@ApiModelProperty(value = "创建时间")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "更新时间")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java
+5 -4
View File
@@ -6,6 +6,7 @@ import com.adc.da.http.Result;
import com.adc.da.slrs.sarStandIdea.dao.SarPublicIdeaAllDao;
import com.adc.da.slrs.sarStandIdea.entity.*;
import com.adc.da.slrs.sarStandIdea.service.Impl.SarPublicIdeaAllServiceImpl;
import com.adc.da.utils.removeHtml.RemoveHtml;
import com.alibaba.excel.EasyExcel;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -140,8 +141,8 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
if ("1".equals(type)) {
GetExcelDto2 getExcelDto = GetExcelDto2.builder()
.partCode(sarPublicIdeaAll.getPartCode())
.oldText(sarPublicIdeaAll.getOldText())
.newText(sarPublicIdeaAll.getNewText())
.oldText(RemoveHtml.getResultsFromHtml(sarPublicIdeaAll.getOldText()))
.newText(RemoveHtml.getResultsFromHtml(sarPublicIdeaAll.getNewText()))
.reason(sarPublicIdeaAll.getReason())
.userName(sarPublicIdeaAll.getUserName())
.deptName(sarPublicIdeaAll.getDeptName())
@@ -152,8 +153,8 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
}else {
GetExcelDto getExcelDto = GetExcelDto.builder()
.partCode(sarPublicIdeaAll.getPartCode())
.oldText(sarPublicIdeaAll.getOldText())
.newText(sarPublicIdeaAll.getNewText())
.oldText(RemoveHtml.getResultsFromHtml(sarPublicIdeaAll.getOldText()))
.newText(RemoveHtml.getResultsFromHtml(sarPublicIdeaAll.getNewText()))
.reason(sarPublicIdeaAll.getReason())
.userName(sarPublicIdeaAll.getUserName())
.deptName(sarPublicIdeaAll.getDeptName())
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+3
View File
@@ -2605,6 +2605,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
for (int i = 0; i < attidlist.length; i++) {
if(StringUtils.isNotEmpty(attidlist[i]) && !"null".equals(attidlist[i])){
AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i]);
if (null == attFileEO){
continue;
}
String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
try {
// 判断文件是docx还是PDF
adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java
+8
View File
@@ -97,5 +97,13 @@ public class TsUserController extends BaseController<TsUser> {
}
@ApiOperation("调研流程查询人 部门专用接口")
@GetMapping("/selectDeptByDY")
public ResponseMessage<List<TsUser>> selectDeptByDY(@Param("ids") String ids) throws Exception {
QueryWrapper<TsUser> queryWrapper=new QueryWrapper<>();
queryWrapper.in("USID",ids.split(","));
return Result.success(tsUserService.list(queryWrapper));
}
}
adc-da-slrs/src/main/java/com/adc/da/utils/removeHtml/RemoveHtml.java
+100
View File
@@ -0,0 +1,100 @@
package com.adc.da.utils.removeHtml;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class RemoveHtml {
/**
* 匹配html标签，例如"<p>xxx</p>"这种格式
*/
private static Pattern HTML_TAG_PATTERN = Pattern.compile("<[a-zA-Z]+.*?>([\\s\\S]*?)</[a-zA-Z]*?>");
/**
* 替换掉html标签里面的style内容
*
* @param content
* @return
*/
public static String replaceStyle(String content) {
if (content == null || content.length() == 0) {
return content;
}
String regEx = " style=\"(.*?)\"";
Pattern p = Pattern.compile(regEx);
Matcher m = p.matcher(content);
if (m.find()) {
content = m.replaceAll("");
}
return content;
}
/**
* 移除掉</br>标签
*
* @param src
* @return
*/
public static String removeBrTag(String src) {
if (src != null && !src.isEmpty()) {
src = src.replaceAll("<br/>", "");
}
return src;
}
/**
* 针对多个标签嵌套的情况进行处理
* 比如 <p><span style="white-space: normal;">王者荣耀</span></p>
* 预处理并且正则匹配完之后结果是 <span>王者荣耀
* 需要手工移除掉前面的起始标签
* @param content
* @return
*/
public static String replaceStartTag(String content) {
if (content == null || content.length() == 0) {
return content;
}
String regEx = "<[a-zA-Z]*?>([\\s\\S]*?)";
Pattern p = Pattern.compile(regEx);
Matcher m = p.matcher(content);
if (m.find()) {
content = m.replaceAll("");
}
return content;
}
/**
* 获取html中的数据
* @param htmlStr
* @return
*/
public static String getResultsFromHtml(String htmlStr) {
//定义script的正则表达式，去除js可以防止注入
String scriptRegex="<script[^>]*?>[\\s\\S]*?<\\/script>";
//定义style的正则表达式，去除style样式，防止css代码过多时只截取到css样式代码
String styleRegex="<style[^>]*?>[\\s\\S]*?<\\/style>";
//定义HTML标签的正则表达式，去除标签，只提取文字内容
String htmlRegex="<[^>]+>";
//定义空格,回车,换行符,制表符
String spaceRegex = "\\s*|\t|\r|\n";
// 过滤script标签
htmlStr = htmlStr.replaceAll(scriptRegex, "");
// 过滤style标签
htmlStr = htmlStr.replaceAll(styleRegex, "");
// 过滤html标签
htmlStr = htmlStr.replaceAll(htmlRegex, "");
// 过滤空格等
htmlStr = htmlStr.replaceAll(spaceRegex, "");
return htmlStr.trim(); // 返回文本字符串
}
}
adc-da-slrs/src/main/java/com/adc/da/utils/util/Utils.java
+6
View File
@@ -5,6 +5,8 @@ import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.Row;
import java.text.MessageFormat;
/**
* @Description: TODO
* @author: super_liu
@@ -12,6 +14,10 @@ import org.apache.poi.ss.usermodel.Row;
*/
public class Utils {
public static String format(String value, Object... paras) {
return MessageFormat.format(value, paras);
}
//判断row是否为空 空返回true
public static boolean isRowEmpty(Row row) {
if (null == row) {
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+2
View File
@@ -1723,6 +1723,8 @@
<select id="selectIdFormDTBZH" resultType="java.lang.String">
SELECT ID FROM sar_standards_info as sarInfo
WHERE
VALID_FLAG = '0'
AND
(
REPLACE (
concat(
adc-da-slrs/src/main/resources/mybatis/mapper/workGroup/WorkGroupMapper.xml
+1
View File
@@ -5,6 +5,7 @@
<select id="getWorkGroup" resultType="com.adc.da.slrs.customWorkGroup.entity.WorkGroup">
SELECT
id,
work_group_name AS workGroup,
work_leader_id AS workLeaderId,
work_people_id AS workPeopleId