From 9f82519e1c325b6dc082b2d3be3823a9e71aa006 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 27 Jul 2021 18:01:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java | 3 +++ .../java/com/adc/da/att/controller/AttFileEOController.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java index 335a7986..de959ae0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarResource.dao; import com.adc.da.slrs.sarResource.entity.TsResource; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.HashMap; import java.util.List; /** @@ -19,4 +20,6 @@ public interface TsResourceDao extends BaseMapper { List selectMenuByRole(TsResource sarMenuEO); + int insertTsRoleResource(HashMap map); + } 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 cc34cb29..f49b116c 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 @@ -280,9 +280,9 @@ public class AttFileEOController { userMsg += tsUser.getWorkNum() + ","; } } - SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式 - String date = df.format(new Date()); - String waterContent = userMsg + date; +// SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式 +// String date = df.format(new Date()); + String waterContent = userMsg ; //2020年9月5日 去掉水印处理 //2021年7月25日要求下载生成水印 WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent);