From 6586db1ec90fd6fbf0e4c7795137379b80ee31c1 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 11 十二月 2023 10:59:54 +0800
Subject: [PATCH] 1.修改批量更新 2.盘点人查询问题

---
 consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java |   96 ++++++++++++++++++++++++++++++-----------------
 1 files changed, 61 insertions(+), 35 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java
index be7b9be..50b6caa 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java
@@ -1,29 +1,32 @@
 package com.consum.base.controller;
 
 import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
 import com.consum.base.pojo.FinSysServerSearchParam;
 import com.consum.base.pojo.FinSysServerVo;
-import com.consum.base.service.FinSysServerImpl;
+import com.consum.base.service.FinSysServerService;
 import com.consum.model.po.FinSysServer;
 import com.walker.db.page.GenericPager;
-import com.walker.db.page.ListPageContext;
-import com.walker.db.page.PageSearch;
 import com.walker.infrastructure.utils.DateUtils;
 import com.walker.infrastructure.utils.NumberGenerator;
 import com.walker.web.ResponseValue;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/pc/fin/sys/server")
 public class FinSysServerController extends BaseController {
 
-    private FinSysServerImpl finSysServerImpl;
+    private FinSysServerService finSysServerServiceImpl;
+
     @Autowired
-    public void setfinSysCategory(FinSysServerImpl finSysServerImpl){
-        this.finSysServerImpl= finSysServerImpl;
+    public void setfinSysCategory(FinSysServerService finSysServerServiceImpl) {
+        this.finSysServerServiceImpl = finSysServerServiceImpl;
     }
 
     /**
@@ -32,19 +35,20 @@
      * @Date 2023/9/13 9:27
      */
     @GetMapping("/selectByDataScope")
-    public ResponseValue selectByDataScope(Integer dataScope){
-        return ResponseValue.success(finSysServerImpl.getByDataScope(dataScope));
+    public ResponseValue selectByDataScope(Integer dataScope) {
+        return ResponseValue.success(finSysServerServiceImpl.getByDataScope(dataScope));
     }
 
     /**
      * 鏌ヨ宸︿晶鏍�
+     *
      * @return
      */
     @GetMapping("/select/tree")
-    public ResponseValue selectFinSysCategoryTree(){
+    public ResponseValue selectFinSysCategoryTree() {
 
-        List<FinSysServerVo> finSysCategoryVos = finSysServerImpl.queryAllCategory();
-        if(finSysCategoryVos!=null){
+        List<FinSysServerVo> finSysCategoryVos = finSysServerServiceImpl.queryAllCategory();
+        if (finSysCategoryVos != null) {
             return ResponseValue.success(finSysCategoryVos);
         }
         return ResponseValue.error("鏈煡璇㈠埌鏁版嵁锛�");
@@ -52,51 +56,73 @@
     }
 
     @GetMapping("/select/detail")
-    public ResponseValue selectById(@RequestParam(name = "id") Long Id){
-       FinSysServer finSysServer =  this.finSysServerImpl.get(new FinSysServer(Id));
-        if (finSysServer == null) return ResponseValue.error("鏌ヨ澶辫触锛�");
-        return ResponseValue.success("鏌ヨ鎴愬姛!",finSysServer);
+    public ResponseValue selectById(@RequestParam(name = "id") Long Id) {
+        FinSysServer finSysServer = this.finSysServerServiceImpl.get(new FinSysServer(Id));
+        if (finSysServer == null) {
+            return ResponseValue.error("鏌ヨ澶辫触锛�");
+        }
+        return ResponseValue.success("鏌ヨ鎴愬姛!", finSysServer);
     }
 
     /**
      * 鍒嗛〉鏌ヨ
-     * @param param
+     *
      * @return
      */
     @RequestMapping("/select/list")
-    public ResponseValue finSysServerList(FinSysServerSearchParam param){
-        PageSearch pageSearch = ListPageContext.getPageSearch();
+    public ResponseValue finSysServerList() {
+        FinSysServerSearchParam param = CommonUtil.getObjFromReq(FinSysServerSearchParam.class);
+        FinSysServerSearchParam param2 = new FinSysServerSearchParam();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
 
-        GenericPager<FinSysServer> pager = this.finSysServerImpl.selectServerListByPage(param);
+        GenericPager<FinSysServer> pager = this.finSysServerServiceImpl.selectServerListByPage(param);
         return ResponseValue.success(pager);
     }
 
     /**
      * 娣诲姞
-     * @param finSysServer
+     *
      * @return
      */
     @PostMapping("/insert")
-    public ResponseValue addFinSysServer(@RequestBody FinSysServer finSysServer){
-        if(finSysServer==null) return ResponseValue.error("鍙傛暟涓虹┖");
-        finSysServer.setId(NumberGenerator.getLongSequenceNumber());
-        finSysServer.setCreatedTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
-        finSysServer.setCreatedBy(this.getCurrentUser().getUser_name());
-        finSysServer.setLv(finSysServer.getParentId()+1);
-        int num = this.finSysServerImpl.insert(finSysServer);
-        if(num>0) return ResponseValue.success(1);
+    public ResponseValue addFinSysServer() {
+        FinSysServer param = CommonUtil.getObjFromReqBody(FinSysServer.class);
+        FinSysServer finSysServer = new FinSysServer();
+        CommonUtil.copyProperties(param, finSysServer);
+        param = finSysServer;
+
+        if (param == null) {
+            return ResponseValue.error("鍙傛暟涓虹┖");
+        }
+        param.setId(NumberGenerator.getLongSequenceNumber());
+        param.setCreatedTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
+        param.setCreatedBy(this.getCurrentUser().getUser_name());
+        param.setLv(param.getParentId() + 1);
+        int num = this.finSysServerServiceImpl.insert(param);
+        if (num > 0) {
+            return ResponseValue.success(1);
+        }
         return ResponseValue.error("鎻掑叆澶辫触锛�");
     }
+
     /**
      * 缂栬緫
      */
     @PostMapping("/edit")
-    public ResponseValue editFinSysServer(@RequestBody FinSysServer finSysServer){
-        if (finSysServer==null) return ResponseValue.error("鍙傛暟涓虹┖");
+    public ResponseValue editFinSysServer() {
+        FinSysServer param = CommonUtil.getObjFromReqBody(FinSysServer.class);
+        FinSysServer finSysServer = new FinSysServer();
+        CommonUtil.copyProperties(param, finSysServer);
+        param = finSysServer;
+
+        if (param == null) {
+            return ResponseValue.error("鍙傛暟涓虹┖");
+        }
 //        if(finSysServer.getLvType()!=null) {
 //            finSysServer.setLv(Long.valueOf(finSysServer.getLvType()));
 //        }
-        int num = this.finSysServerImpl.save(finSysServer);
-        return num>0 ? ResponseValue.success(1):ResponseValue.error("缂栬緫澶辫触锛�");
+        int num = this.finSysServerServiceImpl.save(param);
+        return num > 0 ? ResponseValue.success(1) : ResponseValue.error("缂栬緫澶辫触锛�");
     }
 }

--
Gitblit v1.9.1