From 9c5c93a36294b3f14536689d548928196c367de8 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期二, 11 十月 2022 09:18:20 +0800 Subject: [PATCH] 1 --- src/main/java/com/lf/server/controller/data/DictController.java | 42 ++ src/main/java/com/lf/server/controller/data/MetaController.java | 38 ++ src/main/java/com/lf/server/controller/sys/AttachController.java | 38 ++ src/main/java/com/lf/server/controller/sys/LoginController.java | 41 ++ src/main/java/com/lf/server/controller/sys/MenuController.java | 55 +++ src/main/java/com/lf/server/controller/sys/OperateController.java | 41 ++ src/main/java/com/lf/server/controller/sys/ArgsController.java | 38 ++ 说明.txt | 2 src/main/java/com/lf/server/controller/sys/AuthController.java | 41 ++ src/main/java/com/lf/server/controller/data/MetaFileController.java | 38 ++ src/main/java/com/lf/server/controller/sys/BlacklistController.java | 38 ++ src/main/java/com/lf/server/controller/sys/MsgController.java | 38 ++ src/main/java/com/lf/server/mapper/sys/ResOpMapper.java | 5 src/main/java/com/lf/server/controller/all/SignController.java | 9 src/main/java/com/lf/server/controller/data/StyleController.java | 41 ++ src/main/java/com/lf/server/controller/sys/MenuAuthController.java | 38 ++ src/main/java/com/lf/server/controller/data/DirController.java | 53 ++ src/main/java/com/lf/server/controller/data/DownloadController.java | 39 ++ src/main/java/com/lf/server/controller/sys/DepController.java | 50 ++ src/main/java/com/lf/server/controller/data/VerController.java | 52 ++- src/main/java/com/lf/server/controller/sys/ResController.java | 42 ++ src/main/java/com/lf/server/entity/data/StyleEntity.java | 6 22 files changed, 639 insertions(+), 146 deletions(-) diff --git a/src/main/java/com/lf/server/controller/all/SignController.java b/src/main/java/com/lf/server/controller/all/SignController.java index 2335ac5..a284051 100644 --- a/src/main/java/com/lf/server/controller/all/SignController.java +++ b/src/main/java/com/lf/server/controller/all/SignController.java @@ -1,5 +1,6 @@ package com.lf.server.controller.all; +import com.lf.server.aspect.LogAspect; import com.lf.server.aspect.SysLog; import com.lf.server.config.PropertiesConfig; import com.lf.server.entity.all.ResponseMsg; @@ -16,6 +17,8 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -46,6 +49,8 @@ @Autowired PropertiesConfig propertiesConfig; + + private static final Log log = LogFactory.getLog(SignController.class); @SysLog() @ApiOperation(value = "璺宠浆棣栭〉") @@ -86,7 +91,7 @@ } } } catch (Exception ex) { - // + log.error(ex.getMessage() + ex.getStackTrace() + "\n"); } return mv; @@ -104,7 +109,7 @@ mv.setViewName("monitor"); } } catch (Exception ex) { - // + log.error(ex.getMessage() + ex.getStackTrace() + "\n"); } return mv; diff --git a/src/main/java/com/lf/server/controller/data/DictController.java b/src/main/java/com/lf/server/controller/data/DictController.java index 8ee5dc5..25df256 100644 --- a/src/main/java/com/lf/server/controller/data/DictController.java +++ b/src/main/java/com/lf/server/controller/data/DictController.java @@ -1,11 +1,12 @@ package com.lf.server.controller.data; - import com.lf.server.aspect.SysLog; import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.data.DictEntity; +import com.lf.server.entity.sys.UserEntity; import com.lf.server.service.data.DictService; +import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -13,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -26,6 +28,9 @@ public class DictController extends BaseController { @Autowired DictService dictService; + + @Autowired + TokenService tokenService; @SysLog() @ApiOperation(value = "鏌ヨ璁板綍鏁�") @@ -95,12 +100,17 @@ @SysLog() @ApiOperation(value = "鎻掑叆瀛楀吀") @ApiImplicitParams({ - @ApiImplicitParam(name = "dictEntity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.data.DictEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.data.DictEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertDict", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertDict(@RequestBody DictEntity dictEntity) { + public ResponseMsg<Integer> insertDict(@RequestBody DictEntity entity, HttpServletRequest req) { try { - int count = dictService.insertDict(dictEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setCreateUser(ue.getId()); + } + + int count = dictService.insertDict(entity); return success(count); } catch (Exception ex) { @@ -111,12 +121,19 @@ @SysLog() @ApiOperation(value = "鎻掑叆澶氭潯瀛楀吀") @ApiImplicitParams({ - @ApiImplicitParam(name = "dictEntity", value = "瀛楀吀瀹炰綋绫婚泦鍚�", dataType = "List<DictEntity>", paramType = "body", example = "") + @ApiImplicitParam(name = "list", value = "瀛楀吀瀹炰綋绫婚泦鍚�", dataType = "List<DictEntity>", paramType = "body", example = "") }) @PostMapping(value = "/insertDicts", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertDicts(@RequestBody List<DictEntity> dictEntity) { + public ResponseMsg<Integer> insertDicts(@RequestBody List<DictEntity> list, HttpServletRequest req) { try { - int count = dictService.insertDicts(dictEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (DictEntity entity : list) { + entity.setCreateUser(ue.getId()); + } + } + + int count = dictService.insertDicts(list); return success(count); } catch (Exception ex) { @@ -163,13 +180,18 @@ @SysLog() @ApiOperation(value = "鏇存柊涓�鏉″瓧鍏�") @ApiImplicitParams({ - @ApiImplicitParam(name = "dictEntity", value = "瀛楀吀ID闆嗗悎", dataType = "DictEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀛楀吀闆嗗悎", dataType = "DictEntity", paramType = "body", example = "") }) @ResponseBody @PostMapping(value = "/updateDict", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updateDict(@RequestBody DictEntity dictEntity) { + public ResponseMsg<Integer> updateDict(@RequestBody DictEntity entity, HttpServletRequest req) { try { - int count = dictService.updateDict(dictEntity); + UserEntity ue = tokenService.getCurrentUser(req); + { + entity.setUpdateUser(ue.getId()); + } + + int count = dictService.updateDict(entity); return success(count); } catch (Exception ex) { diff --git a/src/main/java/com/lf/server/controller/data/DirController.java b/src/main/java/com/lf/server/controller/data/DirController.java index cb6a1ee..38115ba 100644 --- a/src/main/java/com/lf/server/controller/data/DirController.java +++ b/src/main/java/com/lf/server/controller/data/DirController.java @@ -4,16 +4,18 @@ import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.data.DirEntity; +import com.lf.server.entity.sys.UserEntity; import com.lf.server.helper.StringHelper; import com.lf.server.service.data.DirService; +import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -28,15 +30,23 @@ @Autowired DirService dirService; + @Autowired + TokenService tokenService; + @SysLog() @ApiOperation(value = "鎻掑叆鏁版嵁") @ApiImplicitParams({ - @ApiImplicitParam(name = "DirEntity", value = "鐩綍瀹炰綋绫�", dataType = "com.lf.server.entity.data.DirEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "鐩綍瀹炰綋绫�", dataType = "com.lf.server.entity.data.DirEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertDir", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertDir(@RequestBody DirEntity dirEntity) { + public ResponseMsg<Integer> insertDir(@RequestBody DirEntity entity, HttpServletRequest req) { try { - int count = dirService.insertDir(dirEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setCreateUser(ue.getId()); + } + + int count = dirService.insertDir(entity); return success(count); } catch (Exception ex) { @@ -47,12 +57,17 @@ @SysLog() @ApiOperation(value = "鎻掑叆澶氭潯鏁版嵁") @ApiImplicitParams({ - @ApiImplicitParam(name = "DirEntity", value = "鐩綍瀹炰綋绫�", dataType = "com.lf.server.entity.data.DirEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "list", value = "鐩綍瀹炰綋绫�", dataType = "com.lf.server.entity.data.DirEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertDirs", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertDirs(@RequestBody List<DirEntity> dirEntity) { + public ResponseMsg<Integer> insertDirs(@RequestBody List<DirEntity> list, HttpServletRequest req) { try { - int count = dirService.insertDirs(dirEntity); + UserEntity ue = tokenService.getCurrentUser(req); + for (DirEntity entity : list) { + entity.setCreateUser(ue.getId()); + } + + int count = dirService.insertDirs(list); return success(count); } catch (Exception ex) { @@ -99,13 +114,18 @@ @SysLog() @ApiOperation(value = "鏇存柊涓�鏉℃暟鎹�") @ApiImplicitParams({ - @ApiImplicitParam(name = "dirEntity", value = "涓婚敭ID闆嗗悎", dataType = "DictEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "涓婚敭ID闆嗗悎", dataType = "DictEntity", paramType = "body", example = "") }) @ResponseBody @PostMapping(value = "/updateDir", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updateDir(@RequestBody DirEntity dirEntity) { + public ResponseMsg<Integer> updateDir(@RequestBody DirEntity entity, HttpServletRequest req) { try { - int count = dirService.updateDir(dirEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUpdateUser(ue.getId()); + } + + int count = dirService.updateDir(entity); return success(count); } catch (Exception ex) { @@ -116,13 +136,20 @@ @SysLog() @ApiOperation(value = "鏇存柊澶氭潯鏁版嵁") @ApiImplicitParams({ - @ApiImplicitParam(name = "DirEntity", value = "涓婚敭ID闆嗗悎", dataType = "DirEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "list", value = "涓婚敭ID闆嗗悎", dataType = "DirEntity", paramType = "body", example = "") }) @ResponseBody @PostMapping(value = "/updateDirs", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updateDirs(@RequestBody List<DirEntity> dirEntity) { + public ResponseMsg<Integer> updateDirs(@RequestBody List<DirEntity> list, HttpServletRequest req) { try { - int count = dirService.updateDirs(dirEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (DirEntity entity : list) { + entity.setUpdateUser(ue.getId()); + } + } + + int count = dirService.updateDirs(list); return success(count); } catch (Exception ex) { diff --git a/src/main/java/com/lf/server/controller/data/DownloadController.java b/src/main/java/com/lf/server/controller/data/DownloadController.java index e7461cf..15cd8ee 100644 --- a/src/main/java/com/lf/server/controller/data/DownloadController.java +++ b/src/main/java/com/lf/server/controller/data/DownloadController.java @@ -3,8 +3,11 @@ import com.lf.server.aspect.SysLog; import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; +import com.lf.server.entity.data.DirEntity; import com.lf.server.entity.data.DownloadEntity; +import com.lf.server.entity.sys.UserEntity; import com.lf.server.service.data.DownloadService; +import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -12,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -24,6 +28,9 @@ public class DownloadController extends BaseController { @Autowired DownloadService downloadService; + + @Autowired + TokenService tokenService; @SysLog() @ApiOperation(value = "鏌ヨ璁板綍鏁�") @@ -123,8 +130,13 @@ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "DownloadEntity", paramType = "body") }) @PostMapping(value = "/insert", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insert(@RequestBody DownloadEntity entity) { + public ResponseMsg<Integer> insert(@RequestBody DownloadEntity entity, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setCreateUser(ue.getId()); + } + int count = downloadService.insert(entity); return success(count); @@ -139,8 +151,15 @@ @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "DownloadEntity", paramType = "body") }) @PostMapping(value = "/inserts", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> inserts(@RequestBody List<DownloadEntity> list) { + public ResponseMsg<Integer> inserts(@RequestBody List<DownloadEntity> list, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (DownloadEntity entity : list) { + entity.setCreateUser(ue.getId()); + } + } + int count = downloadService.inserts(list); return success(count); @@ -192,8 +211,13 @@ }) @ResponseBody @PostMapping(value = "/update", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> update(@RequestBody DownloadEntity entity) { + public ResponseMsg<Integer> update(@RequestBody DownloadEntity entity, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setDownloadUser(ue.getId()); + } + int count = downloadService.update(entity); return success(count); @@ -209,8 +233,15 @@ }) @ResponseBody @PostMapping(value = "/updates", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updates(@RequestBody List<DownloadEntity> list) { + public ResponseMsg<Integer> updates(@RequestBody List<DownloadEntity> list, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (DownloadEntity entity : list) { + entity.setDownloadUser(ue.getId()); + } + } + int count = downloadService.updates(list); return success(count); diff --git a/src/main/java/com/lf/server/controller/data/MetaController.java b/src/main/java/com/lf/server/controller/data/MetaController.java index 30ea05f..cdcb7e2 100644 --- a/src/main/java/com/lf/server/controller/data/MetaController.java +++ b/src/main/java/com/lf/server/controller/data/MetaController.java @@ -4,7 +4,9 @@ import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.data.MetaEntity; +import com.lf.server.entity.sys.UserEntity; import com.lf.server.service.data.MetaService; +import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -12,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -24,6 +27,9 @@ public class MetaController extends BaseController { @Autowired MetaService metaService; + + @Autowired + TokenService tokenService; @SysLog() @ApiOperation(value = "鏌ヨ璁板綍鏁�") @@ -123,8 +129,13 @@ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "MetaEntity", paramType = "body") }) @PostMapping(value = "/insert", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insert(@RequestBody MetaEntity entity) { + public ResponseMsg<Integer> insert(@RequestBody MetaEntity entity, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setCreateUser(ue.getId()); + } + int count = metaService.insert(entity); return success(count); @@ -139,8 +150,15 @@ @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "MetaEntity", paramType = "body") }) @PostMapping(value = "/inserts", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> inserts(@RequestBody List<MetaEntity> list) { + public ResponseMsg<Integer> inserts(@RequestBody List<MetaEntity> list, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (MetaEntity entity : list) { + entity.setCreateUser(ue.getId()); + } + } + int count = metaService.inserts(list); return success(count); @@ -192,8 +210,13 @@ }) @ResponseBody @PostMapping(value = "/update", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> update(@RequestBody MetaEntity entity) { + public ResponseMsg<Integer> update(@RequestBody MetaEntity entity, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUpdateUser(ue.getId()); + } + int count = metaService.update(entity); return success(count); @@ -209,8 +232,15 @@ }) @ResponseBody @PostMapping(value = "/updates", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updates(@RequestBody List<MetaEntity> list) { + public ResponseMsg<Integer> updates(@RequestBody List<MetaEntity> list, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (MetaEntity entity : list) { + entity.setUpdateUser(ue.getId()); + } + } + int count = metaService.updates(list); return success(count); diff --git a/src/main/java/com/lf/server/controller/data/MetaFileController.java b/src/main/java/com/lf/server/controller/data/MetaFileController.java index 19996ae..94371b5 100644 --- a/src/main/java/com/lf/server/controller/data/MetaFileController.java +++ b/src/main/java/com/lf/server/controller/data/MetaFileController.java @@ -4,7 +4,9 @@ import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.data.MetaFileEntity; +import com.lf.server.entity.sys.UserEntity; import com.lf.server.service.data.MetaFileService; +import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -12,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -24,6 +27,9 @@ public class MetaFileController extends BaseController { @Autowired MetaFileService metaFileService; + + @Autowired + TokenService tokenService; @SysLog() @ApiOperation(value = "鏌ヨ璁板綍鏁�") @@ -123,8 +129,13 @@ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "MetaFileEntity", paramType = "body") }) @PostMapping(value = "/insert", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insert(@RequestBody MetaFileEntity entity) { + public ResponseMsg<Integer> insert(@RequestBody MetaFileEntity entity, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setCreateUser(ue.getId()); + } + int count = metaFileService.insert(entity); return success(count); @@ -139,8 +150,15 @@ @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "MetaFileEntity", paramType = "body") }) @PostMapping(value = "/inserts", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> inserts(@RequestBody List<MetaFileEntity> list) { + public ResponseMsg<Integer> inserts(@RequestBody List<MetaFileEntity> list, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (MetaFileEntity entity : list) { + entity.setCreateUser(ue.getId()); + } + } + int count = metaFileService.inserts(list); return success(count); @@ -192,8 +210,13 @@ }) @ResponseBody @PostMapping(value = "/update", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> update(@RequestBody MetaFileEntity entity) { + public ResponseMsg<Integer> update(@RequestBody MetaFileEntity entity, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUpdateUser(ue.getId()); + } + int count = metaFileService.update(entity); return success(count); @@ -209,8 +232,15 @@ }) @ResponseBody @PostMapping(value = "/updates", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updates(@RequestBody List<MetaFileEntity> list) { + public ResponseMsg<Integer> updates(@RequestBody List<MetaFileEntity> list, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (MetaFileEntity entity : list) { + entity.setUpdateUser(ue.getId()); + } + } + int count = metaFileService.updates(list); return success(count); diff --git a/src/main/java/com/lf/server/controller/data/StyleController.java b/src/main/java/com/lf/server/controller/data/StyleController.java index 0458fc2..3c5e19f 100644 --- a/src/main/java/com/lf/server/controller/data/StyleController.java +++ b/src/main/java/com/lf/server/controller/data/StyleController.java @@ -4,7 +4,9 @@ import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.data.StyleEntity; +import com.lf.server.entity.sys.UserEntity; import com.lf.server.service.data.StyleService; +import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -12,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -25,6 +28,9 @@ public class StyleController extends BaseController { @Autowired StyleService styleService; + + @Autowired + TokenService tokenService; @SysLog() @ApiOperation(value = "鏌ヨ璁板綍鏁�") @@ -95,12 +101,17 @@ @SysLog() @ApiOperation(value = "鎻掑叆瀛楀吀") @ApiImplicitParams({ - @ApiImplicitParam(name = "styleEntity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.data.StyleEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.data.StyleEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertStyle", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertStyle(@RequestBody StyleEntity styleEntity) { + public ResponseMsg<Integer> insertStyle(@RequestBody StyleEntity entity, HttpServletRequest req) { try { - int count = styleService.insertStyle(styleEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setCreateUser(ue.getId()); + } + + int count = styleService.insertStyle(entity); return success(count); } catch (Exception ex) { @@ -111,12 +122,19 @@ @SysLog() @ApiOperation(value = "鎻掑叆澶氭潯瀛楀吀") @ApiImplicitParams({ - @ApiImplicitParam(name = "StyleEntity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.data.StyleEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "list", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.data.StyleEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertStyles", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertStyles(@RequestBody List<StyleEntity> styleEntity) { + public ResponseMsg<Integer> insertStyles(@RequestBody List<StyleEntity> list, HttpServletRequest req) { try { - int count = styleService.insertStyles(styleEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (StyleEntity entity : list) { + entity.setCreateUser(ue.getId()); + } + } + + int count = styleService.insertStyles(list); return success(count); } catch (Exception ex) { @@ -163,13 +181,18 @@ @SysLog() @ApiOperation(value = "鏇存柊涓�鏉″瓧鍏�") @ApiImplicitParams({ - @ApiImplicitParam(name = "styleEntity", value = "瀛楀吀ID闆嗗悎", dataType = "StyleEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀛楀吀ID闆嗗悎", dataType = "StyleEntity", paramType = "body", example = "") }) @ResponseBody @PostMapping(value = "/updateStyle", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updateStyle(@RequestBody StyleEntity styleEntity) { + public ResponseMsg<Integer> updateStyle(@RequestBody StyleEntity entity, HttpServletRequest req) { try { - int count = styleService.updateStyle(styleEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUpdateUser(ue.getId()); + } + + int count = styleService.updateStyle(entity); return success(count); } catch (Exception ex) { diff --git a/src/main/java/com/lf/server/controller/data/VerController.java b/src/main/java/com/lf/server/controller/data/VerController.java index 4d4d59a..6a5e2fb 100644 --- a/src/main/java/com/lf/server/controller/data/VerController.java +++ b/src/main/java/com/lf/server/controller/data/VerController.java @@ -4,7 +4,9 @@ import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.data.VerEntity; +import com.lf.server.entity.sys.UserEntity; import com.lf.server.service.data.VerService; +import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -12,8 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; - /** * 鐗堟湰琛� @@ -27,6 +29,9 @@ @Autowired VerService versionService; + @Autowired + TokenService tokenService; + @SysLog() @ApiOperation(value = "鏌ヨ璁板綍鏁�") @ApiImplicitParams({ @@ -34,9 +39,9 @@ @ApiImplicitParam(name = "depName", value = "鐩綍", dataType = "String", paramType = "query", example = ""), }) @GetMapping({"/selectCount"}) - public ResponseMsg<Integer> selectCount(String name,String depName) { + public ResponseMsg<Integer> selectCount(String name, String depName) { try { - int count = versionService.selectCount(name,depName); + int count = versionService.selectCount(name, depName); return success(count); } catch (Exception ex) { @@ -58,7 +63,7 @@ if (pageSize < 1 || pageIndex < 1) { return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null); } - List<VerEntity> rs = versionService.selectByPage(name,depName, pageSize, pageSize * (pageIndex - 1)); + List<VerEntity> rs = versionService.selectByPage(name, depName, pageSize, pageSize * (pageIndex - 1)); return success(rs); } catch (Exception ex) { return fail(ex.getMessage(), null); @@ -80,12 +85,12 @@ return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null); } - int count = versionService.selectCount(name,depName); + int count = versionService.selectCount(name, depName); if (count == 0) { return success(0, null); } - List<VerEntity> rs = versionService.selectByPage(name,depName, pageSize, pageSize * (pageIndex - 1)); + List<VerEntity> rs = versionService.selectByPage(name, depName, pageSize, pageSize * (pageIndex - 1)); return success(count, rs); } catch (Exception ex) { @@ -96,12 +101,17 @@ @SysLog() @ApiOperation(value = "鎻掑叆瀛楀吀") @ApiImplicitParams({ - @ApiImplicitParam(name = "versionEntity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.data.VersionEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.data.VersionEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertVersion", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertVersion(@RequestBody VerEntity verEntity) { + public ResponseMsg<Integer> insertVersion(@RequestBody VerEntity entity, HttpServletRequest req) { try { - int count = versionService.insertVersion(verEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setCreateUser(ue.getId()); + } + + int count = versionService.insertVersion(entity); return success(count); } catch (Exception ex) { @@ -112,12 +122,19 @@ @SysLog() @ApiOperation(value = "鎻掑叆澶氭潯瀛楀吀") @ApiImplicitParams({ - @ApiImplicitParam(name = "versionEntity", value = "瀛楀吀瀹炰綋绫婚泦鍚�", dataType = "List<VersionEntity>", paramType = "body", example = "") + @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "List<VersionEntity>", paramType = "body", example = "") }) @PostMapping(value = "/insertVersions", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertVersions(@RequestParam List<VerEntity> verEntity) { + public ResponseMsg<Integer> insertVersions(@RequestParam List<VerEntity> list, HttpServletRequest req) { try { - int count = versionService.insertVersions(verEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (VerEntity entity : list) { + entity.setCreateUser(ue.getId()); + } + } + + int count = versionService.insertVersions(list); return success(count); } catch (Exception ex) { @@ -162,13 +179,18 @@ @SysLog() @ApiOperation(value = "鏇存柊涓�鏉″瓧鍏�") @ApiImplicitParams({ - @ApiImplicitParam(name = "versionEntity", value = "瀛楀吀ID闆嗗悎", dataType = "VersionEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀛楀吀ID闆嗗悎", dataType = "VersionEntity", paramType = "body", example = "") }) @ResponseBody @PostMapping(value = "/updateVersion", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updateVersion(@RequestBody VerEntity verEntity) { + public ResponseMsg<Integer> updateVersion(@RequestBody VerEntity entity, HttpServletRequest req) { try { - int count = versionService.updateVersion(verEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUpdateUser(ue.getId()); + } + + int count = versionService.updateVersion(entity); return success(count); } catch (Exception ex) { diff --git a/src/main/java/com/lf/server/controller/sys/ArgsController.java b/src/main/java/com/lf/server/controller/sys/ArgsController.java index 873bcb2..f4e2207 100644 --- a/src/main/java/com/lf/server/controller/sys/ArgsController.java +++ b/src/main/java/com/lf/server/controller/sys/ArgsController.java @@ -4,7 +4,9 @@ import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.sys.ArgsEntity; +import com.lf.server.entity.sys.UserEntity; import com.lf.server.service.sys.ArgsService; +import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -12,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -24,6 +27,9 @@ public class ArgsController extends BaseController { @Autowired ArgsService argsService; + + @Autowired + TokenService tokenService; @SysLog() @ApiOperation(value = "鏌ヨ璁板綍鏁�") @@ -123,8 +129,13 @@ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "ArgsEntity", paramType = "body") }) @PostMapping(value = "/insert", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insert(@RequestBody ArgsEntity entity) { + public ResponseMsg<Integer> insert(@RequestBody ArgsEntity entity, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setCreateUser(ue.getId()); + } + int count = argsService.insert(entity); return success(count); @@ -139,8 +150,15 @@ @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "ArgsEntity", paramType = "body") }) @PostMapping(value = "/inserts", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> inserts(@RequestBody List<ArgsEntity> list) { + public ResponseMsg<Integer> inserts(@RequestBody List<ArgsEntity> list, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (ArgsEntity entity : list) { + entity.setCreateUser(ue.getId()); + } + } + int count = argsService.inserts(list); return success(count); @@ -192,8 +210,13 @@ }) @ResponseBody @PostMapping(value = "/update", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> update(@RequestBody ArgsEntity entity) { + public ResponseMsg<Integer> update(@RequestBody ArgsEntity entity, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUpdateUser(ue.getId()); + } + int count = argsService.update(entity); return success(count); @@ -209,8 +232,15 @@ }) @ResponseBody @PostMapping(value = "/updates", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updates(@RequestBody List<ArgsEntity> list) { + public ResponseMsg<Integer> updates(@RequestBody List<ArgsEntity> list, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (ArgsEntity entity : list) { + entity.setUpdateUser(ue.getId()); + } + } + int count = argsService.updates(list); return success(count); diff --git a/src/main/java/com/lf/server/controller/sys/AttachController.java b/src/main/java/com/lf/server/controller/sys/AttachController.java index a7afa0e..f634d37 100644 --- a/src/main/java/com/lf/server/controller/sys/AttachController.java +++ b/src/main/java/com/lf/server/controller/sys/AttachController.java @@ -4,7 +4,9 @@ import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.sys.AttachEntity; +import com.lf.server.entity.sys.UserEntity; import com.lf.server.service.sys.AttachService; +import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -12,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -24,6 +27,9 @@ public class AttachController extends BaseController { @Autowired AttachService attachService; + + @Autowired + TokenService tokenService; @SysLog() @ApiOperation(value = "鏌ヨ璁板綍鏁�") @@ -123,8 +129,13 @@ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "AttachEntity", paramType = "body") }) @PostMapping(value = "/insert", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insert(@RequestBody AttachEntity entity) { + public ResponseMsg<Integer> insert(@RequestBody AttachEntity entity, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setCreateUser(ue.getId()); + } + int count = attachService.insert(entity); return success(count); @@ -139,8 +150,15 @@ @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "AttachEntity", paramType = "body") }) @PostMapping(value = "/inserts", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> inserts(@RequestBody List<AttachEntity> list) { + public ResponseMsg<Integer> inserts(@RequestBody List<AttachEntity> list, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (AttachEntity entity : list) { + entity.setCreateUser(ue.getId()); + } + } + int count = attachService.inserts(list); return success(count); @@ -192,8 +210,13 @@ }) @ResponseBody @PostMapping(value = "/update", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> update(@RequestBody AttachEntity entity) { + public ResponseMsg<Integer> update(@RequestBody AttachEntity entity, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUpdateUser(ue.getId()); + } + int count = attachService.update(entity); return success(count); @@ -209,8 +232,15 @@ }) @ResponseBody @PostMapping(value = "/updates", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updates(@RequestBody List<AttachEntity> list) { + public ResponseMsg<Integer> updates(@RequestBody List<AttachEntity> list, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (AttachEntity entity : list) { + entity.setUpdateUser(ue.getId()); + } + } + int count = attachService.updates(list); return success(count); diff --git a/src/main/java/com/lf/server/controller/sys/AuthController.java b/src/main/java/com/lf/server/controller/sys/AuthController.java index df9513c..3d0be1b 100644 --- a/src/main/java/com/lf/server/controller/sys/AuthController.java +++ b/src/main/java/com/lf/server/controller/sys/AuthController.java @@ -4,7 +4,9 @@ import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.sys.AuthEntity; +import com.lf.server.entity.sys.UserEntity; import com.lf.server.service.sys.AuthService; +import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -12,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -25,6 +28,9 @@ public class AuthController extends BaseController { @Autowired AuthService authService; + + @Autowired + TokenService tokenService; @SysLog() @ApiOperation(value = "鏌ヨ璁板綍鏁�") @@ -92,12 +98,17 @@ @SysLog() @ApiOperation(value = "鎻掑叆瀛楀吀") @ApiImplicitParams({ - @ApiImplicitParam(name = "authEntity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.sys.AuthEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.sys.AuthEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertAuth", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertAuth(@RequestBody AuthEntity authEntity) { + public ResponseMsg<Integer> insertAuth(@RequestBody AuthEntity entity, HttpServletRequest req) { try { - int count = authService.insertAuth(authEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setCreateUser(ue.getId()); + } + + int count = authService.insertAuth(entity); return success(count); } catch (Exception ex) { @@ -108,12 +119,19 @@ @SysLog() @ApiOperation(value = "鎻掑叆澶氭潯瀛楀吀") @ApiImplicitParams({ - @ApiImplicitParam(name = "authEntity", value = "瀛楀吀瀹炰綋绫婚泦鍚�", dataType = "List<AuthEntity>", paramType = "body", example = "") + @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "List<AuthEntity>", paramType = "body", example = "") }) @PostMapping(value = "/insertAuths", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertAuths(@RequestBody List<AuthEntity> authEntity) { + public ResponseMsg<Integer> insertAuths(@RequestBody List<AuthEntity> list, HttpServletRequest req) { try { - int count = authService.insertAuths(authEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (AuthEntity entity : list) { + entity.setCreateUser(ue.getId()); + } + } + + int count = authService.insertAuths(list); return success(count); } catch (Exception ex) { @@ -158,13 +176,18 @@ @SysLog() @ApiOperation(value = "鏇存柊涓�鏉″瓧鍏�") @ApiImplicitParams({ - @ApiImplicitParam(name = "loginEntity", value = "瀛楀吀ID闆嗗悎", dataType = "LoginEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "LoginEntity", paramType = "body", example = "") }) @ResponseBody @PostMapping(value = "/updateAuth", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updateAuth(@RequestBody AuthEntity authEntity) { + public ResponseMsg<Integer> updateAuth(@RequestBody AuthEntity entity, HttpServletRequest req) { try { - int count = authService.updateAuth(authEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUpdateUser(ue.getId()); + } + + int count = authService.updateAuth(entity); return success(count); } catch (Exception ex) { diff --git a/src/main/java/com/lf/server/controller/sys/BlacklistController.java b/src/main/java/com/lf/server/controller/sys/BlacklistController.java index fe63079..3e14284 100644 --- a/src/main/java/com/lf/server/controller/sys/BlacklistController.java +++ b/src/main/java/com/lf/server/controller/sys/BlacklistController.java @@ -4,7 +4,9 @@ import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.sys.BlacklistEntity; +import com.lf.server.entity.sys.UserEntity; import com.lf.server.service.sys.BlacklistService; +import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -12,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -24,6 +27,9 @@ public class BlacklistController extends BaseController { @Autowired BlacklistService blacklistService; + + @Autowired + TokenService tokenService; @SysLog() @ApiOperation(value = "鏌ヨ璁板綍鏁�") @@ -126,8 +132,13 @@ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "BlacklistEntity", paramType = "body") }) @PostMapping(value = "/insert", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insert(@RequestBody BlacklistEntity entity) { + public ResponseMsg<Integer> insert(@RequestBody BlacklistEntity entity, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setCreateUser(ue.getId()); + } + int count = blacklistService.insert(entity); return success(count); @@ -142,8 +153,15 @@ @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "BlacklistEntity", paramType = "body") }) @PostMapping(value = "/inserts", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> inserts(@RequestBody List<BlacklistEntity> list) { + public ResponseMsg<Integer> inserts(@RequestBody List<BlacklistEntity> list, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (BlacklistEntity entity : list) { + entity.setCreateUser(ue.getId()); + } + } + int count = blacklistService.inserts(list); return success(count); @@ -195,8 +213,13 @@ }) @ResponseBody @PostMapping(value = "/update", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> update(@RequestBody BlacklistEntity entity) { + public ResponseMsg<Integer> update(@RequestBody BlacklistEntity entity, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUpdateUser(ue.getId()); + } + int count = blacklistService.update(entity); return success(count); @@ -212,8 +235,15 @@ }) @ResponseBody @PostMapping(value = "/updates", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updates(@RequestBody List<BlacklistEntity> list) { + public ResponseMsg<Integer> updates(@RequestBody List<BlacklistEntity> list, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (BlacklistEntity entity : list) { + entity.setUpdateUser(ue.getId()); + } + } + int count = blacklistService.updates(list); return success(count); diff --git a/src/main/java/com/lf/server/controller/sys/DepController.java b/src/main/java/com/lf/server/controller/sys/DepController.java index 387a697..4e1ba7c 100644 --- a/src/main/java/com/lf/server/controller/sys/DepController.java +++ b/src/main/java/com/lf/server/controller/sys/DepController.java @@ -4,8 +4,10 @@ import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.sys.DepEntity; +import com.lf.server.entity.sys.UserEntity; import com.lf.server.helper.StringHelper; import com.lf.server.service.sys.DepService; +import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -13,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -27,15 +30,23 @@ @Autowired DepService depService; + @Autowired + TokenService tokenService; + @SysLog() @ApiOperation(value = "鎻掑叆鏁版嵁") @ApiImplicitParams({ - @ApiImplicitParam(name = "DepEntity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.sys.DepEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.sys.DepEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertDep", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertDep(@RequestBody DepEntity depEntity) { + public ResponseMsg<Integer> insertDep(@RequestBody DepEntity entity, HttpServletRequest req) { try { - int count = depService.insertDep(depEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setCreateUser(ue.getId()); + } + + int count = depService.insertDep(entity); return success(count); } catch (Exception ex) { @@ -46,12 +57,19 @@ @SysLog() @ApiOperation(value = "鎻掑叆澶氭潯鏁版嵁") @ApiImplicitParams({ - @ApiImplicitParam(name = "DepEntity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.sys.DepEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "com.lf.server.entity.sys.DepEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertDes", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertDes(@RequestBody List<DepEntity> depEntity) { + public ResponseMsg<Integer> insertDes(@RequestBody List<DepEntity> list, HttpServletRequest req) { try { - int count = depService.insertDeps(depEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (DepEntity entity : list) { + entity.setCreateUser(ue.getId()); + } + } + + int count = depService.insertDeps(list); return success(count); } catch (Exception ex) { @@ -98,13 +116,18 @@ @SysLog() @ApiOperation(value = "鏇存柊涓�鏉℃暟鎹�") @ApiImplicitParams({ - @ApiImplicitParam(name = "depEntity", value = "涓婚敭ID闆嗗悎", dataType = "DepEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "DepEntity", paramType = "body", example = "") }) @ResponseBody @PostMapping(value = "/updateDep", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updateDep(@RequestBody DepEntity depEntity) { + public ResponseMsg<Integer> updateDep(@RequestBody DepEntity entity, HttpServletRequest req) { try { - int count = depService.updateDep(depEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUpdateUser(ue.getId()); + } + + int count = depService.updateDep(entity); return success(count); } catch (Exception ex) { @@ -119,8 +142,15 @@ }) @ResponseBody @PostMapping(value = "/updateDeps", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updateDeps(@RequestBody List<DepEntity> list) { + public ResponseMsg<Integer> updateDeps(@RequestBody List<DepEntity> list, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (DepEntity entity : list) { + entity.setUpdateUser(ue.getId()); + } + } + int count = depService.updateDeps(list); return success(count); diff --git a/src/main/java/com/lf/server/controller/sys/LoginController.java b/src/main/java/com/lf/server/controller/sys/LoginController.java index 2878084..13cae2e 100644 --- a/src/main/java/com/lf/server/controller/sys/LoginController.java +++ b/src/main/java/com/lf/server/controller/sys/LoginController.java @@ -4,7 +4,9 @@ import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.sys.LoginEntity; +import com.lf.server.entity.sys.UserEntity; import com.lf.server.service.sys.LoginService; +import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -12,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.sql.Timestamp; import java.util.List; @@ -26,6 +29,9 @@ public class LoginController extends BaseController { @Autowired LoginService loginService; + + @Autowired + TokenService tokenService; @SysLog() @ApiOperation(value = "鏌ヨ璁板綍鏁�") @@ -103,12 +109,17 @@ @SysLog() @ApiOperation(value = "鎻掑叆瀛楀吀") @ApiImplicitParams({ - @ApiImplicitParam(name = "loginEntity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.sys.LoginEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.sys.LoginEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertLogin", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertLogin(@RequestBody LoginEntity loginEntity) { + public ResponseMsg<Integer> insertLogin(@RequestBody LoginEntity entity, HttpServletRequest req) { try { - int count = loginService.insertLogin(loginEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUserid(ue.getId()); + } + + int count = loginService.insertLogin(entity); return success(count); } catch (Exception ex) { @@ -119,12 +130,19 @@ @SysLog() @ApiOperation(value = "鎻掑叆澶氭潯瀛楀吀") @ApiImplicitParams({ - @ApiImplicitParam(name = "loginEntity", value = "瀛楀吀瀹炰綋绫婚泦鍚�", dataType = "List<LoginEntity>", paramType = "body", example = "") + @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "List<LoginEntity>", paramType = "body", example = "") }) @PostMapping(value = "/insertLogins", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertLogins(@RequestBody List<LoginEntity> loginEntity) { + public ResponseMsg<Integer> insertLogins(@RequestBody List<LoginEntity> list, HttpServletRequest req) { try { - int count = loginService.insertLogins(loginEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (LoginEntity entity : list) { + entity.setUserid(ue.getId()); + } + } + + int count = loginService.insertLogins(list); return success(count); } catch (Exception ex) { @@ -169,13 +187,18 @@ @SysLog() @ApiOperation(value = "鏇存柊涓�鏉″瓧鍏�") @ApiImplicitParams({ - @ApiImplicitParam(name = "loginEntity", value = "瀛楀吀ID闆嗗悎", dataType = "LoginEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "LoginEntity", paramType = "body", example = "") }) @ResponseBody @PostMapping(value = "/updateLogin", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updateLogin(@RequestBody LoginEntity loginEntity) { + public ResponseMsg<Integer> updateLogin(@RequestBody LoginEntity entity, HttpServletRequest req) { try { - int count = loginService.updateLogin(loginEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUserid(ue.getId()); + } + + int count = loginService.updateLogin(entity); return success(count); } catch (Exception ex) { diff --git a/src/main/java/com/lf/server/controller/sys/MenuAuthController.java b/src/main/java/com/lf/server/controller/sys/MenuAuthController.java index d867d58..9852bd4 100644 --- a/src/main/java/com/lf/server/controller/sys/MenuAuthController.java +++ b/src/main/java/com/lf/server/controller/sys/MenuAuthController.java @@ -4,7 +4,9 @@ import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.sys.MenuAuthEntity; +import com.lf.server.entity.sys.UserEntity; import com.lf.server.service.sys.MenuAuthService; +import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -12,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -24,6 +27,9 @@ public class MenuAuthController extends BaseController { @Autowired MenuAuthService menuAuthService; + + @Autowired + TokenService tokenService; @SysLog() @ApiOperation(value = "鏌ヨ璁板綍鏁�") @@ -123,8 +129,13 @@ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "MenuAuthEntity", paramType = "body") }) @PostMapping(value = "/insert", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insert(@RequestBody MenuAuthEntity entity) { + public ResponseMsg<Integer> insert(@RequestBody MenuAuthEntity entity, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setCreateUser(ue.getId()); + } + int count = menuAuthService.insert(entity); return success(count); @@ -139,8 +150,15 @@ @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "MenuAuthEntity", paramType = "body") }) @PostMapping(value = "/inserts", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> inserts(@RequestBody List<MenuAuthEntity> list) { + public ResponseMsg<Integer> inserts(@RequestBody List<MenuAuthEntity> list, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (MenuAuthEntity entity : list) { + entity.setCreateUser(ue.getId()); + } + } + int count = menuAuthService.inserts(list); return success(count); @@ -192,8 +210,13 @@ }) @ResponseBody @PostMapping(value = "/update", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> update(@RequestBody MenuAuthEntity entity) { + public ResponseMsg<Integer> update(@RequestBody MenuAuthEntity entity, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUpdateUser(ue.getId()); + } + int count = menuAuthService.update(entity); return success(count); @@ -209,8 +232,15 @@ }) @ResponseBody @PostMapping(value = "/updates", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updates(@RequestBody List<MenuAuthEntity> list) { + public ResponseMsg<Integer> updates(@RequestBody List<MenuAuthEntity> list, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (MenuAuthEntity entity : list) { + entity.setUpdateUser(ue.getId()); + } + } + int count = menuAuthService.updates(list); return success(count); diff --git a/src/main/java/com/lf/server/controller/sys/MenuController.java b/src/main/java/com/lf/server/controller/sys/MenuController.java index e37257c..b606928 100644 --- a/src/main/java/com/lf/server/controller/sys/MenuController.java +++ b/src/main/java/com/lf/server/controller/sys/MenuController.java @@ -5,8 +5,10 @@ import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.data.DirEntity; import com.lf.server.entity.sys.MenuEntity; +import com.lf.server.entity.sys.UserEntity; import com.lf.server.helper.StringHelper; import com.lf.server.service.sys.MenuService; +import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -14,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -28,15 +31,24 @@ @Autowired MenuService menuService; + @Autowired + TokenService tokenService; + @SysLog() @ApiOperation(value = "鎻掑叆涓�鏉℃暟鎹�") @ApiImplicitParams({ - @ApiImplicitParam(name = "MenusEntity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.sys.MenusEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.sys.MenusEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertMenu", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertMenu(@RequestBody MenuEntity menuEntity) { + public ResponseMsg<Integer> insertMenu(@RequestBody MenuEntity entity, HttpServletRequest req) { try { - int count = menuService.insertMenu(menuEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setCreateUser(ue.getId()); + } + + int count = menuService.insertMenu(entity); + return success(count); } catch (Exception ex) { return fail(ex.getMessage(), -1); @@ -46,12 +58,19 @@ @SysLog() @ApiOperation(value = "鎻掑叆澶氭潯鏁版嵁") @ApiImplicitParams({ - @ApiImplicitParam(name = "MenusEntity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.sys.MenusEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "com.lf.server.entity.sys.MenusEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertMenus", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertMenus(@RequestBody List<MenuEntity> menuEntity) { + public ResponseMsg<Integer> insertMenus(@RequestBody List<MenuEntity> list, HttpServletRequest req) { try { - int count = menuService.insertMenus(menuEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (MenuEntity entity : list) { + entity.setCreateUser(ue.getId()); + } + } + + int count = menuService.insertMenus(list); return success(count); } catch (Exception ex) { @@ -98,13 +117,18 @@ @SysLog() @ApiOperation(value = "鏇存柊涓�鏉℃暟鎹�") @ApiImplicitParams({ - @ApiImplicitParam(name = "MenusEntity", value = "鑿滃崟ID闆嗗悎", dataType = "MenusEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "MenusEntity", paramType = "body", example = "") }) @ResponseBody @PostMapping(value = "/updateMenu", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updateMenu(@RequestBody MenuEntity menuEntity) { + public ResponseMsg<Integer> updateMenu(@RequestBody MenuEntity entity, HttpServletRequest req) { try { - int count = menuService.updateMenu(menuEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUpdateUser(ue.getId()); + } + + int count = menuService.updateMenu(entity); return success(count); } catch (Exception ex) { @@ -115,13 +139,20 @@ @SysLog() @ApiOperation(value = "鏇存柊澶氭潯鏁版嵁") @ApiImplicitParams({ - @ApiImplicitParam(name = "MenusEntity", value = "涓婚敭ID闆嗗悎", dataType = "MenusEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "MenusEntity", paramType = "body", example = "") }) @ResponseBody @PostMapping(value = "/updateMenus", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updateMenus(@RequestBody List<MenuEntity> menuEntity) { + public ResponseMsg<Integer> updateMenus(@RequestBody List<MenuEntity> list, HttpServletRequest req) { try { - int count = menuService.updateMenus(menuEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (MenuEntity entity : list) { + entity.setUpdateUser(ue.getId()); + } + } + + int count = menuService.updateMenus(list); return success(count); } catch (Exception ex) { diff --git a/src/main/java/com/lf/server/controller/sys/MsgController.java b/src/main/java/com/lf/server/controller/sys/MsgController.java index 26f6b4c..686bfca 100644 --- a/src/main/java/com/lf/server/controller/sys/MsgController.java +++ b/src/main/java/com/lf/server/controller/sys/MsgController.java @@ -4,7 +4,9 @@ import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.sys.MsgEntity; +import com.lf.server.entity.sys.UserEntity; import com.lf.server.service.sys.MsgService; +import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -12,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -24,6 +27,9 @@ public class MsgController extends BaseController { @Autowired MsgService msgService; + + @Autowired + TokenService tokenService; @SysLog() @ApiOperation(value = "鏌ヨ璁板綍鏁�") @@ -123,8 +129,13 @@ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "MsgEntity", paramType = "body") }) @PostMapping(value = "/insert", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insert(@RequestBody MsgEntity entity) { + public ResponseMsg<Integer> insert(@RequestBody MsgEntity entity, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setCreateUser(ue.getId()); + } + int count = msgService.insert(entity); return success(count); @@ -139,8 +150,15 @@ @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "MsgEntity", paramType = "body") }) @PostMapping(value = "/inserts", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> inserts(@RequestBody List<MsgEntity> list) { + public ResponseMsg<Integer> inserts(@RequestBody List<MsgEntity> list, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (MsgEntity entity : list) { + entity.setCreateUser(ue.getId()); + } + } + int count = msgService.inserts(list); return success(count); @@ -192,8 +210,13 @@ }) @ResponseBody @PostMapping(value = "/update", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> update(@RequestBody MsgEntity entity) { + public ResponseMsg<Integer> update(@RequestBody MsgEntity entity, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUpdateUser(ue.getId()); + } + int count = msgService.update(entity); return success(count); @@ -209,8 +232,15 @@ }) @ResponseBody @PostMapping(value = "/updates", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updates(@RequestBody List<MsgEntity> list) { + public ResponseMsg<Integer> updates(@RequestBody List<MsgEntity> list, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (MsgEntity entity : list) { + entity.setUpdateUser(ue.getId()); + } + } + int count = msgService.updates(list); return success(count); diff --git a/src/main/java/com/lf/server/controller/sys/OperateController.java b/src/main/java/com/lf/server/controller/sys/OperateController.java index 29435e7..9190c3c 100644 --- a/src/main/java/com/lf/server/controller/sys/OperateController.java +++ b/src/main/java/com/lf/server/controller/sys/OperateController.java @@ -4,7 +4,9 @@ import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.sys.OperateEntity; +import com.lf.server.entity.sys.UserEntity; import com.lf.server.service.sys.OperateService; +import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -12,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.sql.Timestamp; import java.util.List; @@ -26,6 +29,9 @@ public class OperateController extends BaseController { @Autowired OperateService operateService; + + @Autowired + TokenService tokenService; @SysLog() @ApiOperation(value = "鏌ヨ璁板綍鏁�") @@ -102,12 +108,17 @@ @SysLog() @ApiOperation(value = "鎻掑叆瀛楀吀") @ApiImplicitParams({ - @ApiImplicitParam(name = "operateEntity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.sys.OperateEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.sys.OperateEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertOperate", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertOperate(@RequestBody OperateEntity operateEntity) { + public ResponseMsg<Integer> insertOperate(@RequestBody OperateEntity entity, HttpServletRequest req) { try { - int count = operateService.insertOperate(operateEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUserid(ue.getId()); + } + + int count = operateService.insertOperate(entity); return success(count); } catch (Exception ex) { @@ -118,12 +129,19 @@ @SysLog() @ApiOperation(value = "鎻掑叆澶氭潯瀛楀吀") @ApiImplicitParams({ - @ApiImplicitParam(name = "operateEntity", value = "瀛楀吀瀹炰綋绫婚泦鍚�", dataType = "List<OperateEntity>", paramType = "body", example = "") + @ApiImplicitParam(name = "list", value = "瀛楀吀瀹炰綋绫婚泦鍚�", dataType = "List<OperateEntity>", paramType = "body", example = "") }) @PostMapping(value = "/insertOperates", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertOperates(@RequestBody List<OperateEntity> operateEntity) { + public ResponseMsg<Integer> insertOperates(@RequestBody List<OperateEntity> list, HttpServletRequest req) { try { - int count = operateService.insertOperates(operateEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (OperateEntity entity : list) { + entity.setUserid(ue.getId()); + } + } + + int count = operateService.insertOperates(list); return success(count); } catch (Exception ex) { @@ -168,13 +186,18 @@ @SysLog() @ApiOperation(value = "鏇存柊涓�鏉″瓧鍏�") @ApiImplicitParams({ - @ApiImplicitParam(name = "operateEntity", value = "瀛楀吀ID闆嗗悎", dataType = "OperateEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "OperateEntity", paramType = "body", example = "") }) @ResponseBody @PostMapping(value = "/updateOperate", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updateOperate(@RequestBody OperateEntity operateEntity) { + public ResponseMsg<Integer> updateOperate(@RequestBody OperateEntity entity, HttpServletRequest req) { try { - int count = operateService.updateOperate(operateEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUserid(ue.getId()); + } + + int count = operateService.updateOperate(entity); return success(count); } catch (Exception ex) { diff --git a/src/main/java/com/lf/server/controller/sys/ResController.java b/src/main/java/com/lf/server/controller/sys/ResController.java index 1f04d17..8208d9d 100644 --- a/src/main/java/com/lf/server/controller/sys/ResController.java +++ b/src/main/java/com/lf/server/controller/sys/ResController.java @@ -3,8 +3,11 @@ import com.lf.server.aspect.SysLog; import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; +import com.lf.server.entity.sys.AttachEntity; import com.lf.server.entity.sys.ResEntity; +import com.lf.server.entity.sys.UserEntity; import com.lf.server.service.sys.ResService; +import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -12,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -25,6 +29,9 @@ public class ResController extends BaseController { @Autowired ResService resService; + + @Autowired + TokenService tokenService; @SysLog() @ApiOperation(value = "鏌ヨ璁板綍鏁�") @@ -92,12 +99,17 @@ @SysLog() @ApiOperation(value = "鎻掑叆瀛楀吀") @ApiImplicitParams({ - @ApiImplicitParam(name = "resEntity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.sys.ResEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.sys.ResEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertRes", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertRes(@RequestBody ResEntity resEntity) { + public ResponseMsg<Integer> insertRes(@RequestBody ResEntity entity, HttpServletRequest req) { try { - int count = resService.insertRes(resEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setCreateUser(ue.getId()); + } + + int count = resService.insertRes(entity); return success(count); } catch (Exception ex) { @@ -108,12 +120,19 @@ @SysLog() @ApiOperation(value = "鎻掑叆澶氭潯瀛楀吀") @ApiImplicitParams({ - @ApiImplicitParam(name = "resEntity", value = "瀛楀吀瀹炰綋绫婚泦鍚�", dataType = "List<ResEntity>", paramType = "body", example = "") + @ApiImplicitParam(name = "list", value = "瀛楀吀瀹炰綋绫婚泦鍚�", dataType = "List<ResEntity>", paramType = "body", example = "") }) @PostMapping(value = "/insertRess", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertRess(@RequestBody List<ResEntity> resEntity) { + public ResponseMsg<Integer> insertRess(@RequestBody List<ResEntity> list, HttpServletRequest req) { try { - int count = resService.insertRess(resEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (ResEntity entity : list) { + entity.setCreateUser(ue.getId()); + } + } + + int count = resService.insertRess(list); return success(count); } catch (Exception ex) { @@ -158,13 +177,18 @@ @SysLog() @ApiOperation(value = "鏇存柊涓�鏉″瓧鍏�") @ApiImplicitParams({ - @ApiImplicitParam(name = "resEntity", value = "瀛楀吀ID闆嗗悎", dataType = "ResEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀛楀吀ID闆嗗悎", dataType = "ResEntity", paramType = "body", example = "") }) @ResponseBody @PostMapping(value = "/updateRes", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updateRes(@RequestBody ResEntity resEntity) { + public ResponseMsg<Integer> updateRes(@RequestBody ResEntity entity, HttpServletRequest req) { try { - int count = resService.updateRes(resEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUpdateUser(ue.getId()); + } + + int count = resService.updateRes(entity); return success(count); } catch (Exception ex) { diff --git a/src/main/java/com/lf/server/entity/data/StyleEntity.java b/src/main/java/com/lf/server/entity/data/StyleEntity.java index 70a3595..f5bddf5 100644 --- a/src/main/java/com/lf/server/entity/data/StyleEntity.java +++ b/src/main/java/com/lf/server/entity/data/StyleEntity.java @@ -35,7 +35,7 @@ private String viewGuid; - private String createUser; + private int createUser; private Timestamp createTime; @@ -137,11 +137,11 @@ this.viewGuid = viewGuid; } - public String getCreateUser() { + public int getCreateUser() { return createUser; } - public void setCreateUser(String createUser) { + public void setCreateUser(int createUser) { this.createUser = createUser; } diff --git a/src/main/java/com/lf/server/mapper/sys/ResOpMapper.java b/src/main/java/com/lf/server/mapper/sys/ResOpMapper.java index 941c69d..d14c301 100644 --- a/src/main/java/com/lf/server/mapper/sys/ResOpMapper.java +++ b/src/main/java/com/lf/server/mapper/sys/ResOpMapper.java @@ -33,9 +33,8 @@ * @param type * @param start * @param end - * @param type - * @param start - * @param end + * @param limit + * @param offset * @return */ public List<ResOpEntity> selectByPage(String name, Integer type, Timestamp start, Timestamp end, Integer limit, Integer offset); diff --git "a/\350\257\264\346\230\216.txt" "b/\350\257\264\346\230\216.txt" index 5a398b0..fb4f235 100644 --- "a/\350\257\264\346\230\216.txt" +++ "b/\350\257\264\346\230\216.txt" @@ -1,9 +1,9 @@ 1.淇敼鑿滃崟銆佹暟鎹洰褰曘�佸崟浣嶇殑xls鏁版嵁锛岀紪鍐欓�掑綊鏌ヨSQL 2.鐧诲綍鏃堕獙璇佷娇鐢∕D5+Salt瀵嗙爜 +3.鐧诲綍鏃剁殑鐢ㄦ埛鍚嶅拰瀵嗙爜浣跨敤RSA鍔犲瘑銆佽В瀵� 3.淇敼鐢ㄦ埛瀵嗙爜鏃朵娇鐢∕D5+Salt瀵嗙爜 4.瑙e喅Swagger-UI鏃犳硶浼犻�扖ookie淇℃伅 -5.鐧诲綍鏃剁殑鐢ㄦ埛鍚嶅拰瀵嗙爜浣跨敤RSA鍔犲瘑銆佽В瀵� 6.瀵嗙爜澶嶆潅搴﹂獙璇�(8-20浣嶅寘鍚瓧姣嶃�佹暟瀛楀拰鐗规畩瀛楃) 7.鍚庡彴鏈嶅姟璁块棶娣诲姞鐧诲綍楠岃瘉鎷︽埅鍣� 8.寮�鍙戝垏闈㈡棩蹇楀姛鑳� -- Gitblit v1.9.3