diff --git a/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java b/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java index e28415b7..cb03edc7 100644 --- a/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java +++ b/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java @@ -46,16 +46,17 @@ public class WaterMarkUtil { // 获得PDF最顶层 under = stamper.getOverContent(i); under.saveState(); - // set Transparency - PdfGState gs = new PdfGState(); - // 设置透明度为0.2 - gs.setFillOpacity(0.25f); - under.setGState(gs); + under.restoreState(); under.beginText(); under.setFontAndSize(base, 30); under.setTextMatrix(30, 30); under.setColorFill(BaseColor.LIGHT_GRAY); + // 设置透明度为0.2 + // set Transparency + PdfGState gs = new PdfGState(); + gs.setFillOpacity(0.2f); + under.setGState(gs); for (int y = 0; y < 50; y++) { for (int x = 0; x < 50; x++) { // 水印文字成45度角倾斜 x位置 y位置 角度 diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 492c5ea8..88eba4da 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -91,6 +91,8 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/lawss/activiti/exportProcessDetailInfo"); + addInterceptor.excludePathPatterns("/api/lawss/activiti/getImg"); + // //测试接口使用 // addInterceptor.excludePathPatterns("/api/**"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java index f1dc2bd1..555d4d4d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java @@ -5,6 +5,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterialPage; import com.adc.da.slrs.fileMaterialCenter.service.IFileMaterialService; +import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiModelProperty; @@ -15,8 +16,11 @@ import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterial; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; +import javax.xml.crypto.Data; import java.lang.reflect.Array; +import java.text.SimpleDateFormat; import java.util.Arrays; +import java.util.Date; import java.util.List; /** @@ -29,7 +33,7 @@ import java.util.List; */ @RestController @Api(description = "资料中心") -@RequestMapping("/fileMaterialCenter/file-material") +@RequestMapping("/${restPath}/fileMaterialCenter/file-material") public class FileMaterialController extends BaseController { @Autowired @@ -37,7 +41,15 @@ public class FileMaterialController extends BaseController { @PostMapping @ApiOperation("新增文件资料组") - public ResponseMessage addFileMaterial(FileMaterial material){ + public ResponseMessage addFileMaterial(@RequestBody FileMaterial material){ + + +// Date date = new Date(); +// String strDateFormat = "yyyy-MM-dd HH:mm:ss"; +// SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat); + material.setId(UUIDUtils.randomUUID20()); + material.setDataUploadTime(new Date()); + material.setDelFlag("0"); boolean save = iFileMaterialService.save(material); return Result.success(save); @@ -47,7 +59,7 @@ public class FileMaterialController extends BaseController { @DeleteMapping @ApiOperation("删除文件资料组") public ResponseMessage deleteMaterial(String id){ - List idList = Arrays.asList(id.split(id)); + List idList = Arrays.asList(id.split(",")); boolean b = iFileMaterialService.removeByIds(idList); return Result.success(b); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java index ec068ebc..6533651e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java @@ -6,6 +6,7 @@ import java.util.Date; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.Tag; @@ -58,4 +59,8 @@ public class FileMaterial extends BaseEntity { @ApiModelProperty(value = "置顶") @TableField("is_top") private Integer isTop; + + @ApiModelProperty(value = "删除标志") + @TableLogic(value = "0",delval = "1") + private String delFlag; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java index f9b159c5..5692f135 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java @@ -36,7 +36,7 @@ public class FileMaterialServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); if (queryPage.getDataType()!=null){ - queryWrapper.eq("data_type",queryPage.getDataTitle()); + queryWrapper.eq("data_type",queryPage.getDataType()); } if (queryPage.getDataTitle()!=null){ @@ -48,9 +48,8 @@ public class FileMaterialServiceImpl extends ServiceImpl(queryPage.getPage(),queryPage.getPageSize()),queryWrapper); @@ -60,7 +59,7 @@ public class FileMaterialServiceImpl extends ServiceImpl getFileMaterialType() { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select("data_type"); + queryWrapper.select("DISTINCT data_type"); return this.listObjs(queryWrapper, item -> item.toString()); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java index 7b50a568..26a498c1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java @@ -21,15 +21,15 @@ public class StandRegionalTimeDto { @ApiModelProperty(value = "实施日期") @DateTimeFormat(pattern="yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - private Date putTime; + private String putTime; @ApiModelProperty(value = "在产车实施日期") @DateTimeFormat(pattern="yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - private Date zccssrq; + private String zccssrq; @ApiModelProperty(value = "新车型实施日期") @DateTimeFormat(pattern="yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - private Date xcxssrq; + private String xcxssrq; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 037c2f22..6394e360 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -301,14 +301,14 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl> mapList, StandRegionalTimeDto s) { - String putTime = new SimpleDateFormat("yyyy-MM-dd").format(s.getPutTime()); - String xcx = new SimpleDateFormat("yyyy-MM-dd").format(s.getXcxssrq()); - String zcc = new SimpleDateFormat("yyyy-MM-dd").format(s.getZccssrq()); +// String putTime = new SimpleDateFormat("yyyy-MM-dd").format(s.getPutTime()); +// String xcx = new SimpleDateFormat("yyyy-MM-dd").format(s.getXcxssrq()); +// String zcc = new SimpleDateFormat("yyyy-MM-dd").format(s.getZccssrq()); // putTime.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getPutTime()); // xcx.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getXcxssrq())); // zcc.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getZccssrq())); - mapList.put("实施日期("+s.getCountry()+")", Collections.singletonList(putTime)); - mapList.put("新车型实施日期("+s.getCountry()+")", Collections.singletonList(xcx)); - mapList.put("在产车实施日期("+s.getCountry()+")", Collections.singletonList(zcc)); + mapList.put("实施日期("+s.getCountry()+")",Arrays.asList(s.getPutTime().split(","))); + mapList.put("新车型实施日期("+s.getCountry()+")", Arrays.asList(s.getXcxssrq().split(","))); + mapList.put("在产车实施日期("+s.getCountry()+")", Arrays.asList(s.getZccssrq().split(","))); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java index b1027836..cceb64d5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java @@ -140,7 +140,7 @@ public class SarStandFileEOController extends BaseController { } - @ApiOperation(value = "查询文本信息") + @ApiOperation(value = "查询转换后文本信息") @GetMapping("/queryFileInfo") public ResponseMessage> queryFileInfo(String standId){ @@ -156,4 +156,13 @@ public class SarStandFileEOController extends BaseController { return Result.success(sarStandFileEOS); } + + + @ApiOperation(value = "查询转原始文件信息") + @GetMapping("/querySourceFileInfo") + public ResponseMessage> querySourceFileInfo(String standId){ + + List sarStandFileEOS = sarStandFileEOService.selectFileByStandId(standId); + return Result.success(sarStandFileEOS); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java index acd0004b..78c760dc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java @@ -23,8 +23,21 @@ public interface SarStandFileEOService { List selectFileByAttId(String attId) throws Exception; + /** + * 查询转换后文件的文本信息 + * @param standId + * @return + */ List selectFileByStandId(String standId); List selectFileByStandIdOCR(String standId,String type) throws Exception; + /** + * 查询转原始文件的信息 + * @param standId + * @return + */ + List querySourceFileInfo(String standId); + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java index 5ec05134..19cf6cf5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java @@ -399,7 +399,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic String imgContent = itemsValEO.getItemContent(); String imgUUIndex = "img" + String.valueOf(imgIndex); if (StringUtils.isNotEmpty(imgContent)){ - int pathIndex = imgContent.indexOf("src='uploadPath"); + int pathIndex = imgContent.indexOf("src='file"); if (pathIndex > -1 && imgContent.length()>(pathIndex+16)) { String imgPath = imgContent.substring(pathIndex+16,imgContent.length()-2); String imgName = imgUUIndex + "-" +imgPath.substring(imgPath.lastIndexOf("/")+1,imgPath.length()); @@ -525,7 +525,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic AttFileVo attFileVo = attFileEOService.saveFileInfo(nowfilelist.get(0)); if(attFileVo!=null){ isText = false; - String path = "uploadPath" + attFileVo.getFilePath()+attFileVo.getFileName(); + String path = "file" + attFileVo.getFilePath()+attFileVo.getFileName(); String imgCon = ""; valEO.setType("IMG"); valEO.setItemContent(imgCon); @@ -559,7 +559,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic AttFileVo attFileVo = attFileEOService.saveFileInfo(nowfilelist.get(0)); if(attFileVo!=null){ isText = false; - String path = "uploadPath" + attFileVo.getFilePath()+attFileVo.getFileName(); + String path = "file" + attFileVo.getFilePath()+attFileVo.getFileName(); String imgCon = ""; valEO.setType("IMG"); valEO.setItemContent(imgCon); @@ -595,7 +595,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic AttFileVo attFileVo = attFileEOService.saveFileInfo(nowfilelist.get(0)); if(attFileVo!=null){ isText = false; - String path = "uploadPath" + attFileVo.getFilePath()+attFileVo.getFileName(); + String path = "file" + attFileVo.getFilePath()+attFileVo.getFileName(); String imgCon = ""; valEO.setType("IMG"); valEO.setItemContent(imgCon); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java index 9bfa3851..4214ede6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java @@ -78,6 +78,9 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { queryWrapper.eq("STAND_ID",standId).eq("USE_MODEL","WEB_FILE"); List sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper); + /** + * 询转换后文件信息 因为文件转换成pdf后会出现文件名位路径的情况,遍历查询文件的原始文件信息从中取出正确的文件名 + */ //开耀这地方我把selectOne改成了批量因为 查单个数据里面出了问题你看看给改一下 sarStandFileEOS.forEach(item->{ QueryWrapper wrapper = new QueryWrapper<>(); @@ -142,4 +145,15 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { return sarStandFileEOS; } + + @Override + public List querySourceFileInfo(String standId){ + QueryWrapper queryWrapper= new QueryWrapper<>(); + + queryWrapper.eq("STAND_ID",standId).eq("USE_MODEL","SOURCE_FILE"); + return sarStandFileEODao.selectList(queryWrapper); + + } + + } diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java index 475d5f7d..ce965718 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java @@ -293,7 +293,7 @@ public class AttFileEOController { if (!newFile.exists()) { Files.copy(oldFile.toPath(), newFile.toPath()); } - filePathResult = "uploadPath/phoneLoadFiles/" + timeStr + "/" + fileOldName; + filePathResult = "file/phoneLoadFiles/" + timeStr + "/" + fileOldName; return Result.success(filePathResult); } else { return Result.error("获取文件信息失败"); diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/UeditorController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/UeditorController.java index f566df77..888609b8 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/controller/UeditorController.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/UeditorController.java @@ -69,9 +69,9 @@ public class UeditorController { AttFileVo attFileVo= attFileEOService.saveFileInfo(uploadFile); String picUrlPath =""; if(StringUtils.isNotEmpty(referer)){ - picUrlPath=referer+"uploadPath"+ attFileVo.getFilePath()+attFileVo.getFileName(); + picUrlPath=referer+"file"+ attFileVo.getFilePath()+attFileVo.getFileName(); }else{ - picUrlPath="uploadPath"+attFileVo.getFilePath()+attFileVo.getFileName(); + picUrlPath="file"+attFileVo.getFilePath()+attFileVo.getFileName(); } log.info("Ueditor 上传图片返回路径："+picUrlPath); image.setState("SUCCESS");