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

Merge branch 'develop_3' into 'develop_master'

Browse Source 
Develop 3

See merge request !68
This commit is contained in:
super_liu
2021-07-28 08:16:16 +00:00
parent 935a47d1f1 c9484a822f
commit 31a14da9db
3 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java
-12
View File
@@ -158,18 +158,6 @@ public class SarStandAttrInfo extends BaseEntity {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private String ssrq; private String ssrq;
@ApiModelProperty(value = "实施日期(国际）")
@TableField("SSRQGJ")
private String ssrqgj;
@ApiModelProperty(value = "新车型实施日期(国家）")
@TableField("XCXSSRQGJ")
private String xcxssrqgj;
@ApiModelProperty(value = "在产车实施日期(国家）")
@TableField("ZCCSSRQGJ")
private String zccssrqgj;
@ApiModelProperty(value = "修改单") @ApiModelProperty(value = "修改单")
@TableField("XGD") @TableField("XGD")
private String xgd; private String xgd;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+7 -2
View File
@@ -620,8 +620,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
sarStandFileEO.setFileSuffix(fileInfo.getFileSuffix()); sarStandFileEO.setFileSuffix(fileInfo.getFileSuffix());
sarStandFileEO.setOriAttId(fileInfo.getId()); sarStandFileEO.setOriAttId(fileInfo.getId());
standFileList.add(sarStandFileEO); standFileList.add(sarStandFileEO);
//文档转换 //多文档转换 PPT|PPTX|ppt|pptx|PDF|pdf|DOC|doc|DOCX|docx
if ("pdf".equals(fileInfo.getFileSuffix()) || "PDF".equals(fileInfo.getFileSuffix())) { if (verifyFileType(fileInfo.getFileSuffix())) {
SarStandFile newFileEO = new SarStandFile(); SarStandFile newFileEO = new SarStandFile();
newFileEO.setCreationUser(LoginUserUtil.getUserId()); newFileEO.setCreationUser(LoginUserUtil.getUserId());
newFileEO.setCreationTime(new Date()); newFileEO.setCreationTime(new Date());
@@ -652,6 +652,11 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
} }
} }
private Boolean verifyFileType(String str){
String verifyType = "^PPT|PPTX|ppt|pptx|PDF|pdf|DOC|doc|DOCX|docx*$";
return Pattern.matches(verifyType,str);
}
public void createStandPutTime(String standId, Map<String, String> multiTimeMap) throws Exception { public void createStandPutTime(String standId, Map<String, String> multiTimeMap) throws Exception {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if (multiTimeMap != null && multiTimeMap.size() > 0) { if (multiTimeMap != null && multiTimeMap.size() > 0) {
adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java
+7 -6
View File
@@ -276,13 +276,14 @@ public class AttFileEOController {
TsUser tsUser = userDao.selectById(userId); TsUser tsUser = userDao.selectById(userId);
if (tsUser != null) { if (tsUser != null) {
userMsg = tsUser.getUname() + ","; userMsg = tsUser.getUname() + ",";
if (StringUtils.isNotEmpty(tsUser.getWorkNum())) { //2021/7/28水印内容取消工号
userMsg += tsUser.getWorkNum() + ","; // if (StringUtils.isNotEmpty(tsUser.getWorkNum())) {
} // userMsg += tsUser.getWorkNum() + ",";
// }
} }
// SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式 SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式
// String date = df.format(new Date()); String date = df.format(new Date());
String waterContent = userMsg ; String waterContent = userMsg+date ;
//2020年9月5日 去掉水印处理 //2020年9月5日 去掉水印处理
//2021年7月25日要求下载生成水印 //2021年7月25日要求下载生成水印
WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent); WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent);