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

Revert "最新"

Browse Source 
This reverts commit 9f82519e
This commit is contained in:
zhaokaiyao@91isoft.com
2021-07-30 16:26:27 +08:00
parent d71c4a81e1
commit d7a2285d75
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java
-3
View File
@@ -3,7 +3,6 @@ package com.adc.da.slrs.sarResource.dao;
import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.entity.TsResource;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.HashMap;
import java.util.List; import java.util.List;
/** /**
@@ -20,6 +19,4 @@ public interface TsResourceDao extends BaseMapper<TsResource> {
List<TsResource> selectMenuByRole(TsResource sarMenuEO); List<TsResource> selectMenuByRole(TsResource sarMenuEO);
int insertTsRoleResource(HashMap<String,Object> map);
} }
adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java
+4 -5
View File
@@ -276,14 +276,13 @@ 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() + ",";
//2021/7/28水印内容取消工号 if (StringUtils.isNotEmpty(tsUser.getWorkNum())) {
// if (StringUtils.isNotEmpty(tsUser.getWorkNum())) { userMsg += 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+date ; 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);
adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java
+1 -1
View File
@@ -93,7 +93,7 @@ public class PersonCollectEOController extends BaseController<TsPersonCollect> {
@ApiOperation(value = "|PersonCollectEO|修改") @ApiOperation(value = "|PersonCollectEO|修改")
@PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE,value = "/updatePersonCollect")
// @RequiresPermissions("person:personCollect:update") // @RequiresPermissions("person:personCollect:update")
public ResponseMessage<TsPersonCollect> update(@RequestBody TsPersonCollect tsPersonCollect) throws Exception { public ResponseMessage<TsPersonCollect> update(@RequestBody TsPersonCollect tsPersonCollect) throws Exception {
tsPersonCollect.setModifyTime(new Date()); tsPersonCollect.setModifyTime(new Date());