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/VerController.java |   52 +++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 37 insertions(+), 15 deletions(-)

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) {

--
Gitblit v1.9.3