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

Merge remote-tracking branch 'origin/develop_3' into develop_3

Browse Source
This commit is contained in:
super_liu
2021-07-28 16:15:07 +08:00
parent 0b069efd95 3adc08d178
commit c9484a822f
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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);