From 58a75277a83e48baa8ff9906e27975960659ff8a Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 16 五月 2024 14:53:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 user-server/src/main/java/com/yuanchu/mom/controller/SimpleController.java                       |   28 ++
 cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java               |    6 
 user-server/src/main/java/com/yuanchu/mom/pojo/AuthApi.java                                      |   11 +
 inspect-server/src/main/resources/mapper/StandardTreeMapper.xml                                  |    2 
 cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java                   |    5 
 framework/src/main/java/com/yuanchu/mom/common/GetLook.java                                      |    3 
 user-server/src/main/java/com/yuanchu/mom/pojo/User.java                                         |   22 ++
 user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java                       |    7 
 inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java                              |    4 
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java    |   53 +++--
 user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java                         |    9 
 user-server/src/main/java/com/yuanchu/mom/controller/SystemLogController.java                    |    8 
 user-server/src/main/java/com/yuanchu/mom/controller/PostController.java                         |   30 +++
 cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java                |    7 
 inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java              |   13 +
 performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java      |   16 +
 user-server/src/main/java/com/yuanchu/mom/util/HeaderToken.java                                  |  154 +++++++++++++++
 user-server/src/main/resources/mapper/EnumMapper.xml                                             |    2 
 performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursController.java |    3 
 inspect-server/src/main/resources/mapper/InsSampleMapper.xml                                     |    4 
 user-server/src/main/java/com/yuanchu/mom/util/TestApi.java                                      |   25 ++
 inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java                 |    3 
 inspect-server/src/main/java/com/yuanchu/mom/service/StandardProductListService.java             |    3 
 inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java                    |   23 +-
 user-server/src/main/java/com/yuanchu/mom/pojo/Company.java                                      |   17 +
 user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java                    |   37 +++
 inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java                 |    2 
 system-run/src/main/resources/application-dev.yml                                                |    3 
 user-server/src/main/java/com/yuanchu/mom/controller/UserController.java                         |    8 
 inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java          |    9 
 user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java                         |    5 
 cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java                |    6 
 cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java                       |   11 
 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java                  |   15 
 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java              |    2 
 cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java                   |    5 
 user-server/src/main/java/com/yuanchu/mom/pojo/Post.java                                         |   13 +
 37 files changed, 458 insertions(+), 116 deletions(-)

diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
index 9c2c333..5f2fc15 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
@@ -33,7 +33,8 @@
     private CapacityScopeService capacityScopeService;
 
     private ProductService productService;
-    @ValueAuth
+
+    @ValueClassify("鑳藉姏鑼冨洿")
     @ApiOperation(value = "鑾峰彇椤圭洰妫�楠屽弬鏁板垪琛�")
     @PostMapping("/selectItemParameterList")
     public Result selectItemParameterList(@RequestBody Map<String, Object> data) throws Exception {
@@ -91,13 +92,13 @@
     public Result selectTestObjectByName() {
         return Result.success(capacityScopeService.selectTestObjectByName());
     }
-    @ValueClassify("璁惧宸ュ叿鏄庣粏")
+    @ValueClassify("璁惧")
     @ApiOperation(value = "璁惧閲岄潰閫夋嫨妫�楠岄」鐩�(鏍戝舰缁撴瀯)")
     @PostMapping("/getInsProduction")
     public Result getInsProduction(){
         return Result.success(capacityScopeService.getInsProduction());
     }
-    @ValueClassify(value="浜у搧缁存姢")
+    @ValueClassify(value="鑳藉姏鑼冨洿")
     @ApiOperation(value = "缁存姢妫�楠屽璞＄殑浜у搧")
     @PostMapping("/selectProductListByObjectId")
     public Result selectProductListByObjectId(@RequestBody Map<String, Object> data) throws Exception {
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java
index d9bb223..7eaac6c 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java
@@ -1,10 +1,8 @@
 package com.yuanchu.mom.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.annotation.ValueAuth;
 import com.yuanchu.mom.annotation.ValueClassify;
 import com.yuanchu.mom.pojo.Certification;
-import com.yuanchu.mom.pojo.Device;
 import com.yuanchu.mom.service.CertificationService;
 import com.yuanchu.mom.utils.JackSonUtil;
 import com.yuanchu.mom.vo.Result;
@@ -16,7 +14,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
 import java.util.Map;
 
 @Api(tags = "璧勮川璇存槑")
@@ -26,7 +23,8 @@
 public class CertificationController {
 
     private CertificationService certificationService;
-    @ValueAuth
+
+    @ValueClassify("瀹為獙瀹よ祫璐�")
     @ApiOperation(value = "鏌ヨ璧勮川鏄庣粏鍒楄〃")
     @PostMapping("/getCertificationDetail")
     public Result getCertificationDetail(@RequestBody Map<String, Object> data) throws Exception {
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java
index 7e2c211..7f4579b 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java
@@ -4,9 +4,7 @@
 import com.yuanchu.mom.annotation.ValueAuth;
 import com.yuanchu.mom.annotation.ValueClassify;
 import com.yuanchu.mom.dto.UserDto;
-import com.yuanchu.mom.dto.UserPageDto;
 import com.yuanchu.mom.pojo.Department;
-import com.yuanchu.mom.pojo.User;
 import com.yuanchu.mom.service.DepartmentService;
 import com.yuanchu.mom.utils.JackSonUtil;
 import com.yuanchu.mom.vo.Result;
@@ -14,7 +12,6 @@
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
 
 import java.util.Map;
 
@@ -39,9 +36,9 @@
     public Result addDepartment(@RequestBody Department department) {
         return Result.success(departmentService.addDepartment(department));
     }
-    @ValueAuth
     @ApiOperation(value = "鑾峰彇閮ㄩ棬鏍�")
     @GetMapping("/selectDepartment")
+    @ValueClassify("浜哄憳鏄庣粏")
     public Result selectDepartment() {
         return Result.success(departmentService.selectDepartment());
     }
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index 9ad8cfc..17cd875 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -11,8 +11,6 @@
 import com.yuanchu.mom.utils.JackSonUtil;
 import com.yuanchu.mom.vo.Result;
 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.Value;
 import org.springframework.web.bind.annotation.*;
@@ -35,7 +33,8 @@
 
     @Value("${file.path}")
     private String filePath;
-    @ValueAuth
+
+    @ValueClassify("璁惧")
     @ApiOperation(value = "鏌ヨ璁惧璇︽儏鍒楄〃")
     @PostMapping("/selectDeviceParameter")
     public Result selectDeviceParameter(@RequestBody Map<String, Object> data) throws Exception {
@@ -43,19 +42,19 @@
         DeviceDto itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), DeviceDto.class);
         return Result.success(deviceService.selectDeviceParameter(page, itemParameter));
     }
-    @ValueClassify("璁惧宸ュ叿鏄庣粏")
+    @ValueClassify("璁惧")
     @ApiOperation(value = "娣诲姞璁惧璇︽儏鍙傛暟")
     @PostMapping("/addDeviceParameter")
     public Result addDeviceParameter(@RequestBody Device itemParameter) {
         return Result.success(deviceService.addDeviceParameter(itemParameter));
     }
-    @ValueClassify("璁惧宸ュ叿鏄庣粏")
+    @ValueClassify("璁惧")
     @ApiOperation(value = "鍒犻櫎璁惧璇︽儏鍙傛暟")
     @PostMapping("/delDeviceParameter")
     public Result<?> delDeviceParameter(Integer id) {
         return Result.success(deviceService.delDeviceParameter(id));
     }
-    @ValueClassify("璁惧宸ュ叿鏄庣粏")
+    @ValueClassify("璁惧")
     @ApiOperation(value = "淇敼璁惧璇︽儏鍙傛暟")
     @PostMapping("/upDeviceParameter")
     public Result<?> upDeviceParameter(@RequestBody Device itemParameter) {
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
index 2b43637..76b09bd 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
@@ -1,7 +1,6 @@
 package com.yuanchu.mom.controller;
 
 
-import cn.hutool.core.lang.UUID;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yuanchu.mom.annotation.ValueAuth;
 import com.yuanchu.mom.annotation.ValueClassify;
@@ -15,7 +14,6 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.annotation.Resources;
 import java.util.Map;
 
 /**
@@ -31,7 +29,8 @@
 
     @Resource
     private LaboratoryService laboratoryService;
-    @ValueAuth
+
+    @ValueClassify("鍦烘墍鎴栬鏂�")
     @ApiOperation(value = "鏌ヨ瀹為獙瀹ょ鐞嗗垪琛�")
     @PostMapping("/selectItemParameter")
     public Result selectItemParameter(@RequestBody Map<String, Object> data) throws Exception {
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java
index 2980dd0..ae92a36 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java
@@ -4,15 +4,12 @@
 import com.yuanchu.mom.annotation.ValueAuth;
 import com.yuanchu.mom.annotation.ValueClassify;
 import com.yuanchu.mom.pojo.StandardMethod;
-import com.yuanchu.mom.pojo.StructureItemParameter;
 import com.yuanchu.mom.service.StandardMethodService;
 import com.yuanchu.mom.utils.JackSonUtil;
 import com.yuanchu.mom.vo.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import lombok.Value;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
@@ -24,7 +21,8 @@
 public class StandardMethodController {
 
     private StandardMethodService standardMethodService;
-    @ValueAuth
+
+    @ValueClassify("瀹為獙瀹ょ殑妫�娴嬭兘鍔涙。妗�")
     @ApiOperation(value = "鑾峰彇鏍囧噯鏂规硶鍒楄〃")
     @PostMapping("/selectStandardMethodList")
     public Result selectStandardMethodList(@RequestBody Map<String, Object> data) throws Exception {
diff --git a/framework/src/main/java/com/yuanchu/mom/common/GetLook.java b/framework/src/main/java/com/yuanchu/mom/common/GetLook.java
index 0f70017..dc80717 100644
--- a/framework/src/main/java/com/yuanchu/mom/common/GetLook.java
+++ b/framework/src/main/java/com/yuanchu/mom/common/GetLook.java
@@ -26,7 +26,8 @@
         }
         Map<String, Integer> map = new HashMap<>();
         map.put("userId", id);
-        map.put("look", authMapper.countPower(id, method));
+        Integer look = authMapper.countPower(id, method);
+        map.put("look", look==null?0:look);
         return map;
     }
 }
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
index 63f1243..22fd71f 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
@@ -1,6 +1,5 @@
 package com.yuanchu.mom.controller;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,13 +14,13 @@
 import com.yuanchu.mom.service.InsOrderService;
 import com.yuanchu.mom.service.InsOrderTemplateService;
 import com.yuanchu.mom.service.InsProductService;
-import com.yuanchu.mom.service.InsSampleService;
 import com.yuanchu.mom.utils.JackSonUtil;
 import com.yuanchu.mom.vo.Result;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.beans.BeanUtils;
-import org.springframework.context.annotation.Bean;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
@@ -42,7 +41,7 @@
     private InsOrderTemplateService insOrderTemplateService;
 
     //鑾峰彇妫�楠屼笅鍗曟暟鎹�
-    @ValueAuth
+    @ValueClassify("妫�楠屼笅鍗�")
     @ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曟暟鎹�")
     @PostMapping("/selectInsOrderParameter")
     public Result selectInsOrderParameter(@RequestBody Map<String, Object> data) throws Exception {
@@ -125,7 +124,7 @@
         SampleProductDto2 sampleProductDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleProductDto2.class);
         return Result.success(insOrderService.selectSampleAndProductByOrderId(page, sampleProductDto));
     }
-    @ValueAuth
+    @ValueClassify("璐圭敤缁熻")
     @ApiOperation(value = "璐圭敤缁熻")
     @PostMapping("/costStatistics")
     public Result<?> costStatistics(@RequestBody Map<String, Object> data) throws Exception {
@@ -133,7 +132,7 @@
         CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
         return Result.success(insOrderService.costStatistics(page, costStatisticsDto));
     }
-    @ValueAuth
+    @ValueClassify("缁熻鍥捐〃")
     @ApiOperation(value = "鏍峰搧缂洪櫡鎸囨暟")
     @PostMapping("/selectSampleDefects")
     public Result selectSampleDefects(Integer size, Integer current, String inspectionItems, String orderNumber) {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
index 0323168..44a38a5 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
@@ -29,7 +29,7 @@
 
     private InsOrderPlanService insOrderPlanService;
 
-    @ValueAuth
+    @ValueClassify("妫�楠屼换鍔�")
     @ApiOperation(value = "鑾峰彇妫�楠屼换鍔″垪琛�")
     @PostMapping("/selectInsOrderPlanList")
     public Result selectInsOrderPlanList(@RequestBody Map<String, Object> data) throws Exception {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
index b3eba5f..ae91318 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
@@ -40,7 +40,7 @@
     @Value("${wordUrl}")
     private String wordUrl;
 
-    @ValueAuth
+    @ValueClassify("鎶ュ憡缂栧埗")
     @ApiOperation(value = "鏌ヨ妫�楠屾姤鍛婃暟鎹�")
     @PostMapping("/pageInsReport")
     public Result pageInsReport(@RequestBody Map<String, Object> data) throws Exception {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java
index 3841c3d..c03cc3f 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java
@@ -1,21 +1,17 @@
 package com.yuanchu.mom.controller;
 
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yuanchu.mom.annotation.ValueAuth;
 import com.yuanchu.mom.annotation.ValueClassify;
-import com.yuanchu.mom.dto.SampleOrderDto;
 import com.yuanchu.mom.service.ReportService;
-import com.yuanchu.mom.utils.JackSonUtil;
 import com.yuanchu.mom.vo.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Map;
+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.RestController;
 
 @RestController
 @AllArgsConstructor
@@ -24,32 +20,33 @@
 public class ReportController {
 
     private ReportService reportService;
-    @ValueAuth
+
+    @ValueClassify("缁熻鍥捐〃")
     @ApiOperation(value = "姣忔棩涓氬姟缁熻")
     @GetMapping("/businessStatisticsByDay")
     public Result businessStatisticsByDay(){
         return Result.success(reportService.businessStatisticsByDay());
     }
-    @ValueAuth
+    @ValueClassify("缁熻鍥捐〃")
     @ApiOperation(value = "妫�娴嬮」鐩粺璁�")
     @GetMapping("/testProductByDay")
     public Result testProductByDay(){
         return Result.success(reportService.testProductByDay());
     }
     @ValueAuth
-    @ApiOperation(value = "棣栭〉-->鏃ュ巻浠诲姟鍥�")
+    @ApiOperation(value = "鏃ュ巻浠诲姟鍥�")
     @GetMapping("/calendarWorkByWeek")
     public Result calendarWorkByWeek(){
         return Result.success(reportService.calendarWorkByWeek());
     }
     @ValueClassify("涓汉棣栭〉")
-    @ApiOperation(value = "棣栭〉-->娣诲姞鏃ョ▼")
+    @ApiOperation(value = "娣诲姞鏃ョ▼")
     @PostMapping("/addSchedule")
     public Result addSchedule(String time, String text){
         return Result.success(reportService.addSchedule(time,text));
     }
     @ValueAuth
-    @ApiOperation(value = "棣栭〉-->鎴戠殑鏃ョ▼")
+    @ApiOperation(value = "鎴戠殑鏃ョ▼")
     @PostMapping("/ScheduleByMe")
     public Result ScheduleByMe(String date){
         return Result.success(reportService.ScheduleByMe(date));
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java
index fe42eac..4ea2dbb 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java
@@ -8,7 +8,6 @@
 import com.yuanchu.mom.utils.JackSonUtil;
 import com.yuanchu.mom.vo.Result;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
@@ -22,7 +21,7 @@
 public class StandardTemplateController {
 
     private StandardTemplateService standardTemplateService;
-    @ValueAuth
+    @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "鑾峰彇鍘熷璁板綍妯℃澘鍒楄〃")
     @PostMapping("/selectStandardTemplatePageList")
     public Result selectStandardTemplatePageList(@RequestBody Map<String, Object> data) throws Exception {
@@ -30,19 +29,19 @@
         StandardTemplate standardTemplate = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), StandardTemplate.class);
         return Result.success(standardTemplateService.selectStandardTemplatePageList(page, standardTemplate));
     }
-    @ValueClassify("鍘熷璁板綍妯℃澘")
+    @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "娣诲姞鍘熷璁板綍妯℃澘")
     @PostMapping("/addStandardTemplate")
     public Result addStandardTemplate(@RequestBody StandardTemplate standardTemplate) {
         return Result.success(standardTemplateService.addStandardTemplate(standardTemplate));
     }
-    @ValueClassify("鍘熷璁板綍妯℃澘")
+    @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "淇敼鍘熷璁板綍妯℃澘")
     @PostMapping("/upStandardTemplate")
     public Result<?> upStandardTemplate(@RequestBody StandardTemplate standardTemplate) {
         return Result.success(standardTemplateService.upStandardTemplate(standardTemplate));
     }
-    @ValueClassify("鍘熷璁板綍妯℃澘")
+    @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "鍒犻櫎鍘熷璁板綍妯℃澘")
     @PostMapping("/delStandardTemplate")
     public Result<?> delStandardTemplate(Integer id) {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
index a62d352..d5ea19c 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
@@ -25,7 +25,8 @@
     private StandardMethodListService standardMethodListService;
 
     private StandardProductListService standardProductListService;
-    @ValueAuth
+
+    @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "鑾峰彇鏍囧噯鏍�")
     @GetMapping("/selectStandardTreeList")
     public Result selectStandardTreeList(){
@@ -37,6 +38,8 @@
     public Result addStandardTree(@RequestBody StandardTree standardTree){
         return Result.success(standardTreeService.addStandardTree(standardTree));
     }
+
+    @ValueAuth
     @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "缁欐爣鍑嗘爲娣诲姞妫�楠屾爣鍑�")
     @PostMapping("/addStandardMethodList")
@@ -56,12 +59,14 @@
     public Result upStandardProductList(@RequestBody StandardProductList list){
         return Result.success(standardProductListService.upStandardProductList(list));
     }
+    @ValueAuth
     @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠屾爣鍑�")
     @PostMapping("/delStandardMethodByFLSSM")
     public Result delStandardMethodByFLSSM(Integer id){
         return Result.success(standardMethodListService.delStandardMethodByFLSSM(id));
     }
+    @ValueAuth
     @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠岄」鐩�")
     @PostMapping("/delStandardProductByIds")
@@ -69,12 +74,14 @@
         JSONArray lists = JSON.parseArray(ids);
         return Result.success(standardProductListService.delStandardProduct(lists));
     }
+    @ValueAuth
     @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "鏂板鏍囧噯鏍戜笅鐨勬楠岄」鐩�")
     @PostMapping("/addStandardProduct")
     public Result addStandardProduct(String ids, String tree){
         return Result.success(standardTreeService.addStandardProduct(ids, tree));
     }
+
     @ValueClassify("鏍囧噯搴�")
     @ApiOperation(value = "鍒犻櫎鏍囧噯鏍戠殑灞傜骇")
     @PostMapping("/delStandardTree")
@@ -92,8 +99,8 @@
     @ApiOperation(value = "閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�")
     @PostMapping("/selectStandardProductListByMethodId")
     @ValueAuth
-    public Result selectStandardProductListByMethodId(Integer id, String tree){
-        return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree));
+    public Result selectStandardProductListByMethodId(Integer id, String tree, Integer page){
+        return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree, page));
     }
 
     @ApiOperation(value = "鑾峰彇鏍囧噯鏍戜笅鏍囧噯鏂规硶鏋氫妇")
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java
index 292f5c4..94c7a67 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java
@@ -26,7 +26,8 @@
     public Result addWarehouse(String name) {
         return Result.success(warehouseService.addWarehouse(name));
     }
-    @ValueAuth
+
+    @ValueClassify("鏍峰搧绠＄悊")
     @GetMapping("/selectWarehouse")
     @ApiOperation("鏌ヨ浠撳簱")
     public Result selectWarehouse() {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardProductListService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardProductListService.java
index 7e03502..5539cd5 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardProductListService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardProductListService.java
@@ -6,6 +6,7 @@
 import com.yuanchu.mom.pojo.StandardProductList;
 
 import java.util.List;
+import java.util.Map;
 
 /**
 * @author Administrator
@@ -20,6 +21,6 @@
 
     List<StandardProductList> selectStandardProductList(InsSample insSample);
 
-    List<StandardProductList> selectStandardProductListByMethodId(Integer id, String tree);
+    Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page);
 
 }
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
index d75719a..660938b 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
@@ -16,9 +16,7 @@
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
@@ -103,7 +101,7 @@
     }
 
     @Override
-    public List<StandardProductList> selectStandardProductListByMethodId(Integer id, String tree) {
+    public Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
         String[] trees = tree.split(" - ");
         List<StandardProductList> list = new ArrayList<>();
         if (trees.length == 3) {
@@ -154,25 +152,34 @@
                 }
             }
         }
-        Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
-        CompletableFuture.supplyAsync(() -> {
-            standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).like(StandardProductList::getTree, tree));
-            standardProductListService2.saveBatch(list.stream().map(a->{
-                a.setFactory(trees[0]);
-                a.setLaboratory(trees[1]);
-                a.setSampleType(trees[2]);
-                a.setCreateUser(userId);
-                a.setUpdateUser(userId);
-                a.setStandardMethodListId(id);
-                return a;
-            }).collect(Collectors.toList()));
-            return null;
-        }).thenAccept(res -> {
-        }).exceptionally(e -> {
-            e.printStackTrace();
-            return null;
-        });
-        return list;
+        if(page == 1){
+            Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+            CompletableFuture.supplyAsync(() -> {
+                standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).like(StandardProductList::getTree, tree));
+                standardProductListService2.saveBatch(list.stream().map(a->{
+                    a.setFactory(trees[0]);
+                    a.setLaboratory(trees[1]);
+                    a.setSampleType(trees[2]);
+                    a.setCreateUser(userId);
+                    a.setUpdateUser(userId);
+                    a.setStandardMethodListId(id);
+                    return a;
+                }).collect(Collectors.toList()));
+                return null;
+            }).thenAccept(res -> {
+            }).exceptionally(e -> {
+                e.printStackTrace();
+                return null;
+            });
+        }
+        Map<String, Object> map = new HashMap<>();
+        try {
+            map.put("productList", list.subList((page - 1)*50, page * 50));
+        }catch (IndexOutOfBoundsException e){
+            map.put("productList", list.subList((page - 1)*50, list.size()));
+        }
+        map.put("total", list.size());
+        return map;
     }
 }
 
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
index c91ca7b..7a2681d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
@@ -22,8 +22,8 @@
     @ValueTableShow(value = 5,name = "鐘舵��")
     private String insState;
 
-    @ValueTableShow(value = 8,name = "妫�楠岀粨鏋�")
-    private Integer insResult;
+    @ValueTableShow(value = 8,name = "妫�楠屽紑濮嬫椂闂�")
+    private String insTime;
 
     @ValueTableShow(value = 6,name = "绾﹀畾鏃堕棿")
     private String appointed;
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index d9eb934..141741a 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -40,7 +40,7 @@
         io.sample_type,
         isu.user_id,
         ip.son_laboratory,
-        io.ins_result
+        io.ins_time
         FROM
         ins_order io
         LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
@@ -56,7 +56,7 @@
         io.id
         ) a
         LEFT JOIN ins_order_state ios ON ios.ins_order_id = a.id AND ios.laboratory = a.son_laboratory
-        left join (SELECT c.user_id order_user_id, c.ins_sample_id from (SELECT * FROM ins_sample_user ORDER BY id DESC) c GROUP BY ins_sample_id having order_user_id = #{userId}) isu2 on isu2.ins_sample_id = a.id
+        left join (SELECT td.user_id order_user_id, td.ins_sample_id FROM ins_sample_user td,(SELECT max(id) id FROM ins_sample_user GROUP BY ins_sample_id) md  where td.id = md.id and user_id = #{userId}) isu2 on isu2.ins_sample_id = a.id
         ORDER BY
         a.user_id DESC,
         a.type DESC,
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index bdb8cfd..23b0adc 100644
--- a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -59,7 +59,7 @@
                  left join standard_tree st on st.laboratory = l.laboratory_name
             and st.sample_type = sto.specimen_name
             and st.sample = p.name
-        order by l.id,CAST(sto.code AS DECIMAL),st.id
+        order by l.id,CAST(sto.code AS DECIMAL),p.id,ISNULL(st.id),st.id
     </select>
 
     <select id="selectStandardProductById" resultType="com.yuanchu.mom.pojo.StandardProductList">
diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursController.java
index cb0f98f..c71fba0 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursController.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursController.java
@@ -9,7 +9,6 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -34,6 +33,7 @@
     @Resource
     private AuxiliaryWorkingHoursService auxiliaryWorkingHoursService;
 
+    @ValueClassify("宸ユ椂绠＄悊")
     @ApiOperation(value="鏌ヨ杈呭姪宸ユ椂")
     @PostMapping("/selectAuxiliaryWorkingHours")
     public Result selectAuxiliaryWorkingHours(@RequestBody Map<String, Object> data) throws Exception {
@@ -59,6 +59,5 @@
     public  Result insertAuxiliaryWorkingHours(@RequestBody AuxiliaryWorkingHours auxiliaryWorkingHours){
         return Result.success(auxiliaryWorkingHoursService.insertAuxiliaryWorkingHours(auxiliaryWorkingHours));
     }
-
 
 }
diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java
index 965ce6a..0831c44 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java
@@ -4,6 +4,7 @@
 import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueClassify;
 import com.yuanchu.mom.dto.PerformanceShiftAddDto;
 import com.yuanchu.mom.pojo.PerformanceShift;
 import com.yuanchu.mom.service.PerformanceShiftService;
@@ -38,33 +39,38 @@
     @Autowired
     private PerformanceShiftService performanceShiftService;
 
-    @ApiOperation(value = "缁╂晥绠＄悊-鐝-鎺掔彮")
+    @ValueClassify("鐝")
+    @ApiOperation(value = "鎺掔彮")
     @PostMapping("add")
     public Result<?> performanceShiftAdd(@RequestBody PerformanceShiftAddDto performanceShiftAddDto) {
         performanceShiftService.performanceShiftAdd(performanceShiftAddDto);
         return Result.success();
     }
 
-    @ApiOperation(value = "缁╂晥绠＄悊-鐝-鏈堜唤鍒嗛〉鏌ヨ")
+    @ValueClassify("鐝")
+    @ApiOperation(value = "鏈堜唤鍒嗛〉鏌ヨ")
     @PostMapping("page")
     public Result<?> performanceShiftPage(Integer size, Integer current, String time, String userName, String laboratory) {
         return Result.success(performanceShiftService.performanceShiftPage(new Page<>(current, size), time, userName, laboratory));
     }
 
-    @ApiOperation(value = "缁╂晥绠＄悊-鐝-骞翠唤鍒嗛〉鏌ヨ")
+    @ValueClassify("鐝")
+    @ApiOperation(value = "骞翠唤鍒嗛〉鏌ヨ")
     @PostMapping("pageYear")
     public Result<?> performanceShiftPageYear(Integer size, Integer current, String time, String userName, String laboratory) {
         return Result.success(performanceShiftService.performanceShiftPageYear(new Page<>(current, size), time, userName, laboratory));
     }
 
-    @ApiOperation(value = "缁╂晥绠＄悊-鐝-鐝鐘舵�佷慨鏀�")
+    @ValueClassify("鐝")
+    @ApiOperation(value = "鐝鐘舵�佷慨鏀�")
     @PutMapping("update")
     public Result<?> performanceShiftUpdate(@RequestBody PerformanceShift performanceShift) {
         performanceShiftService.performanceShiftUpdate(performanceShift);
         return Result.success();
     }
 
-    @ApiOperation(value = "缁╂晥绠＄悊-鐝-瀵煎嚭")
+    @ValueClassify("鐝")
+    @ApiOperation(value = "瀵煎嚭")
     @GetMapping("export")
     public void exportToExcel(@NotNull(message = "鏃堕棿涓嶈兘涓虹┖锛�") String time, String userName, String laboratory, Boolean isMonth, HttpServletResponse response) throws Exception {
         Map<Object, Object> data;
diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index b8bc183..6892d1f 100644
--- a/system-run/src/main/resources/application-dev.yml
+++ b/system-run/src/main/resources/application-dev.yml
@@ -38,7 +38,8 @@
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
     #url: jdbc:mysql://localhost:3306/center_lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
-    url: jdbc:mysql://114.132.189.42:9004/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+#    url: jdbc:mysql://114.132.189.42:9004/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+    url: jdbc:mysql://localhost:3306/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
     username: root
     password: 123456
     druid:
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java b/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java
new file mode 100644
index 0000000..73bb8e9
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java
@@ -0,0 +1,37 @@
+package com.yuanchu.mom.controller;
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.pojo.AuthApi;
+import com.yuanchu.mom.pojo.Company;
+import com.yuanchu.mom.util.HeaderToken;
+import com.yuanchu.mom.vo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Authorization;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/companies")
+@Api("缁勭粐妯″潡")
+public class CompaniesController {
+
+    @Autowired
+    private HeaderToken headerToken;
+
+    @ValueAuth
+    @ApiOperation(value = "鑾峰彇缁勭粐鍒楄〃")
+    @GetMapping(value = "/selectCompaniesList")
+    public Result<List<Company>> selectcompaniesList(){
+        return Result.success(headerToken.companyUrl());
+    }
+}
\ No newline at end of file
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java b/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java
index e798217..df90848 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java
@@ -1,10 +1,8 @@
 package com.yuanchu.mom.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yuanchu.mom.annotation.ValueAuth;
 import com.yuanchu.mom.annotation.ValueClassify;
-import com.yuanchu.mom.dto.RolePowerDto;
 import com.yuanchu.mom.pojo.Enums;
 import com.yuanchu.mom.service.EnumService;
 import com.yuanchu.mom.utils.JackSonUtil;
@@ -12,7 +10,10 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
 
@@ -24,7 +25,7 @@
 
     private EnumService enumService;
 
-    @ValueAuth
+    @ValueClassify("鏁版嵁瀛楀吀")
     @ApiOperation(value = "鑾峰彇鏋氫妇鍒楄〃")
     @PostMapping("/selectEnumList")
     public Result selectEnumList(@RequestBody Map<String, Object> data) throws Exception {
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/PostController.java b/user-server/src/main/java/com/yuanchu/mom/controller/PostController.java
new file mode 100644
index 0000000..dd87db6
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/PostController.java
@@ -0,0 +1,30 @@
+package com.yuanchu.mom.controller;
+
+import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.pojo.Post;
+import com.yuanchu.mom.util.HeaderToken;
+import com.yuanchu.mom.vo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/post")
+@Api("宀椾綅妯″潡")
+public class PostController {
+
+    @Autowired
+    private HeaderToken headerToken;
+
+    @ValueAuth
+    @ApiOperation(value = "鑾峰彇宀椾綅鍒楄〃")
+    @PostMapping(value = "/selectPostList/{companyId}")
+    public Result<List<Post>> selectPostList(@PathVariable String companyId){
+        return Result.success(headerToken.postUrl(companyId));
+    }
+}
\ No newline at end of file
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java b/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java
index b49c9d1..c87ab6d 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java
@@ -15,8 +15,6 @@
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @RequestMapping("/role")
@@ -28,6 +26,7 @@
     private RoleService roleService;
 
     private PowerService powerService;
+
     @ValueAuth
     @ApiOperation(value = "鑾峰彇瑙掕壊鍒楄〃鏋氫妇")
     @GetMapping("/selectRoleList")
@@ -35,7 +34,7 @@
         return Result.success(roleService.selectList());
     }
 
-    @ValueAuth
+    @ValueClassify("瑙掕壊绠＄悊")
     @ApiOperation(value = "鑾峰彇瑙掕壊鍒楄〃")
     @PostMapping("/selectRoleLists")
     public Result selectRoleLists(@RequestBody Map<String, Object> data) throws Exception {
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/SimpleController.java b/user-server/src/main/java/com/yuanchu/mom/controller/SimpleController.java
new file mode 100644
index 0000000..9d2660d
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/SimpleController.java
@@ -0,0 +1,28 @@
+package com.yuanchu.mom.controller;
+
+
+import com.yuanchu.mom.pojo.User;
+import com.yuanchu.mom.util.HeaderToken;
+import com.yuanchu.mom.vo.Result;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/simple")
+@Api("浜哄憳妯″潡")
+public class SimpleController {
+
+    @Autowired
+    private HeaderToken headerToken;
+
+    @PostMapping( value = "/selectSimpleList/companyId")
+    public Result<List<User>> selectSimpleList(@PathVariable String companyId){
+        return  Result.success(headerToken.userUrl(companyId));
+    }
+}
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/SystemLogController.java b/user-server/src/main/java/com/yuanchu/mom/controller/SystemLogController.java
index 25b5b5f..e52c1e7 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/SystemLogController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/SystemLogController.java
@@ -1,10 +1,8 @@
 package com.yuanchu.mom.controller;
 
 
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yuanchu.mom.annotation.ValueAuth;
-import com.yuanchu.mom.annotation.ValueClassify;
 import com.yuanchu.mom.pojo.PageSystemLogDto;
 import com.yuanchu.mom.service.SystemLogService;
 import com.yuanchu.mom.utils.JackSonUtil;
@@ -12,7 +10,10 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
 
@@ -29,6 +30,7 @@
 public class SystemLogController  {
 
     private SystemLogService systemLogService;
+
     @ValueAuth
     @ApiOperation(value = "鑾峰彇绯荤粺鏃ュ織鍒楄〃")
     @PostMapping("/selectSystemLogList")
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
index b9e4160..90522c7 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
@@ -16,10 +16,8 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.DigestUtils;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -91,7 +89,8 @@
         }
         return Result.fail(map.get("info"));
     }
-    @ValueAuth
+
+    @ValueClassify("鐢ㄦ埛绠＄悊")
     @ApiOperation(value = "鑾峰彇鐢ㄦ埛鍒楄〃")
     @PostMapping("/selectUserList")
     public Result selectUserList(@RequestBody Map<String, Object> data) throws Exception {
@@ -122,7 +121,8 @@
     public Result<?> getUserMenu() {
         return Result.success(userService.getUserMenu());
     }
-    @ValueAuth
+
+    @ValueClassify("瀹㈡埛绠＄悊")
     @ApiOperation(value = "鑾峰彇瀹㈡埛鍒楄〃")
     @PostMapping("/selectCustomPageList")
     public Result selectCustomPageList(@RequestBody Map<String, Object> data) throws Exception {
diff --git a/user-server/src/main/java/com/yuanchu/mom/pojo/AuthApi.java b/user-server/src/main/java/com/yuanchu/mom/pojo/AuthApi.java
new file mode 100644
index 0000000..b91d14b
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/mom/pojo/AuthApi.java
@@ -0,0 +1,11 @@
+package com.yuanchu.mom.pojo;
+
+public class AuthApi {
+
+    public static String companies = "https://ztt-sso.asuncloud.net/api/org/v1/companies";
+
+    public static String post="https://ztt-sso.asuncloud.net/api/org/v1/post?companyId=";
+
+    public static String simple="https://ztt-sso.asuncloud.net/api/org/v1/employees/simple?companyId=";
+
+}
\ No newline at end of file
diff --git a/user-server/src/main/java/com/yuanchu/mom/pojo/Company.java b/user-server/src/main/java/com/yuanchu/mom/pojo/Company.java
new file mode 100644
index 0000000..6ba5133
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/mom/pojo/Company.java
@@ -0,0 +1,17 @@
+package com.yuanchu.mom.pojo;
+
+import lombok.Data;
+
+@Data
+public class Company {
+
+    private String companyId;
+
+    private String companyName;
+
+    private String parentCompanyId;
+
+    private String description;
+
+    private String status;
+}
\ No newline at end of file
diff --git a/user-server/src/main/java/com/yuanchu/mom/pojo/Post.java b/user-server/src/main/java/com/yuanchu/mom/pojo/Post.java
new file mode 100644
index 0000000..5891604
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/mom/pojo/Post.java
@@ -0,0 +1,13 @@
+package com.yuanchu.mom.pojo;
+
+import lombok.Data;
+
+@Data
+public class Post {
+    private String companyId;
+    private String postCode;
+    private String postName;
+    private String deptCode;
+    private String postType;
+    private String status;
+}
diff --git a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
index ab26b1b..6f4b5fb 100644
--- a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
+++ b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
@@ -112,4 +112,26 @@
     @ApiModelProperty(value = "鍏宠仈鐨勯儴闂╥d")
     private String departId;
 
+    ////浜哄憳缂栧彿锛屽叏灞�鍞竴
+//    private String employeeID;
+////宀椾綅
+//    private String position;
+////宀椾綅缂栫爜
+//    private String positionCode;
+////鎵嬫満鍙风爜
+//    private String phoneNumber;
+//
+//    //鎬у埆 1:鐢� 2:濂�
+//    private int gender;
+//
+//    //缁勭粐鐘舵�� enable:鍦ㄨ亴 disabled:绂昏亴
+//    private String status;
+////鎵�灞炵粍缁囩紪鐮�
+//    private String companyId;
+////鍏徃閭(鍙敤浜庨偖绠辩郴缁�)
+//    private String companyEmail;
+////鍏ヨ亴鍏徃鏃堕棿
+//    private String dateOfJoiningTheCompany;
+////缁勭粐鍐呯殑閮ㄩ棬缂栫爜
+//    private String departmentCode;
 }
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java b/user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java
index a117a3d..07343a3 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java
@@ -1,27 +1,20 @@
 package com.yuanchu.mom.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yuanchu.mom.common.GetLook;
 import com.yuanchu.mom.common.PrintChina;
 import com.yuanchu.mom.dto.RolePowerDto;
-import com.yuanchu.mom.dto.UserPageDto;
 import com.yuanchu.mom.mapper.PowerMapper;
 import com.yuanchu.mom.mapper.RoleMapper;
-import com.yuanchu.mom.mapper.UserMapper;
 import com.yuanchu.mom.pojo.Menu;
 import com.yuanchu.mom.pojo.Power;
 import com.yuanchu.mom.pojo.Role;
-import com.yuanchu.mom.pojo.User;
 import com.yuanchu.mom.service.RoleService;
-import com.yuanchu.mom.service.UserService;
-import com.yuanchu.mom.utils.Jwt;
 import com.yuanchu.mom.utils.QueryWrappers;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.DigestUtils;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/user-server/src/main/java/com/yuanchu/mom/util/HeaderToken.java b/user-server/src/main/java/com/yuanchu/mom/util/HeaderToken.java
new file mode 100644
index 0000000..147145f
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/mom/util/HeaderToken.java
@@ -0,0 +1,154 @@
+package com.yuanchu.mom.util;
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.yuanchu.mom.pojo.AuthApi;
+import com.yuanchu.mom.pojo.Company;
+import com.yuanchu.mom.pojo.Post;
+import com.yuanchu.mom.pojo.User;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.time.Duration;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+@Component
+public class HeaderToken {
+
+    @Resource
+    private RedisTemplate redisTemplate;
+
+    public static void main(String[] args) {
+        HttpRequest request = HttpRequest.post("https://ztt-sso.asuncloud.net/oauth2/token")
+                .header("Content-Type", "application/x-www-form-urlencoded")
+                .form("grant_type", "client_credentials")
+                .form("client_id", "8b2f2c7e-2ab9-4718-8193-c0c636dceba8")
+                .form("client_secret", "db59b70d28ab1865aafe4008f59d4760");
+
+        HttpResponse response = request.execute();
+
+        System.out.println(response.body());
+    }
+
+    public String fetchNewAccessToken() {
+        HttpRequest request = HttpRequest.post("https://ztt-sso.asuncloud.net/oauth2/token")
+                .header("Content-Type", "application/x-www-form-urlencoded")
+                .form("grant_type", "client_credentials")
+                .form("client_id", "8b2f2c7e-2ab9-4718-8193-c0c636dceba8")
+                .form("client_secret", "db59b70d28ab1865aafe4008f59d4760");
+        HttpResponse response = request.execute();
+
+        System.out.println(response.body());
+        ObjectMapper objectMapper = new ObjectMapper();
+        JsonNode jsonNode = null;
+        try {
+            jsonNode = objectMapper.readTree(response.body());
+            String accessToken = jsonNode.get("access_token").asText();
+            redisTemplate.opsForValue().set("access_token",accessToken);
+            redisTemplate.expire("access_token", dataTime("access_token"), TimeUnit.SECONDS);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+        private String accessToken ;
+
+    //鍒ゆ柇鏄惁杩囨湡
+    public String getAccessToken() {
+        accessToken=(String) redisTemplate.opsForValue().get("access_token");
+        if (accessToken == null) {
+            accessToken = fetchNewAccessToken();
+        }
+        return accessToken;
+    }
+    //鍒ゆ柇 token 鏄惁宸插瓨鍦�
+    public String getToken(String token) {
+        String o = redisTemplate.opsForValue().get(token).toString();
+        if (o != null && !o.isEmpty()) {
+            return o;
+        }else{
+            redisTemplate.expire(token,dataTime("access_token"),TimeUnit.SECONDS);
+            String tokens = redisTemplate.opsForValue().get(token).toString();
+            return tokens;
+        }
+        // 鑾峰彇 token
+//        accessToken = fetchNewAccessToken();
+//        return accessToken;
+    }
+
+    //鑾峰彇token杩囨湡鏃堕棿
+    public Long dataTime(String token){
+        Long access_token = redisTemplate.getExpire(token);
+        if(access_token != null && access_token >60) {
+            redisTemplate.expire(token, access_token - 60 ,TimeUnit.SECONDS);
+            return access_token - 60;
+        }//灏辩洿鎺ヨ皟鐢�
+        return null;
+    }
+
+
+
+    //璋冪敤
+    public List<Company>  companyUrl() {
+        String accessToken = getAccessToken();
+        String getToken= getToken(accessToken);
+        String apiUrl =AuthApi.companies; // 鏇挎崲涓哄疄闄呯殑API绔偣URL
+        HttpRequest request = HttpRequest.get(apiUrl)
+                .header("Authorization", "Bearer " + accessToken);
+        HttpResponse response = request.execute();
+        ObjectMapper objectMapper = new ObjectMapper();
+        String body = response.body();
+        List<Company> companies = null;
+        try {
+            companies = objectMapper.readValue(body, new TypeReference<List<Company>>(){});
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        return companies;
+    }
+
+    public List<Post>  postUrl(String companyId) {
+        String accessToken = getAccessToken();
+        String token = getToken(accessToken);
+        String apiUrl =AuthApi.post+companyId; // 鏇挎崲涓哄疄闄呯殑API绔偣URL
+        HttpRequest request = HttpRequest.get(apiUrl)
+                .header("Authorization", "Bearer " + accessToken);
+        HttpResponse response = request.execute();
+        ObjectMapper objectMapper = new ObjectMapper();
+        String body = response.body();
+        List<Post> posts = null;
+        try {
+            posts=objectMapper.readValue(body, new TypeReference<List<Post>>() {});
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        return posts;
+    }
+
+    public List<User>  userUrl(String companyId) {
+        String accessToken = getAccessToken();
+        String token = getToken(accessToken);
+        String apiUrl =AuthApi.simple+companyId; // 鏇挎崲涓哄疄闄呯殑API绔偣URL
+        HttpRequest request = HttpRequest.get(apiUrl)
+                .header("Authorization", "Bearer " + accessToken)
+                .header("Content-Type", "application/form-data");
+        HttpResponse response = request.execute();
+        ObjectMapper objectMapper = new ObjectMapper();
+        String body = response.body();
+        List<User> user=null;
+        try {
+            user= objectMapper.readValue(body,new TypeReference<List<User>>(){});
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        return user;
+    }
+}
\ No newline at end of file
diff --git a/user-server/src/main/java/com/yuanchu/mom/util/TestApi.java b/user-server/src/main/java/com/yuanchu/mom/util/TestApi.java
new file mode 100644
index 0000000..1955fa5
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/mom/util/TestApi.java
@@ -0,0 +1,25 @@
+package com.yuanchu.mom.util;
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import com.yuanchu.mom.pojo.AuthApi;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class TestApi {
+
+    @Autowired
+    private HeaderToken headerToken;
+
+    public void testApi() {
+        String accessToken =headerToken.getAccessToken();
+        String apiUrl = AuthApi.companies;
+        // 鏇挎崲涓哄疄闄呯殑API绔偣URL
+        HttpRequest request = HttpRequest.get(apiUrl)
+                .header("Authorization", "Bearer " + accessToken);
+        HttpResponse response = request.execute();
+        System.out.println("Response Code: " + response.getStatus());
+        System.out.println("Response Body: " + response.body());
+    }
+}
\ No newline at end of file
diff --git a/user-server/src/main/resources/mapper/EnumMapper.xml b/user-server/src/main/resources/mapper/EnumMapper.xml
index 8886989..cca68ea 100644
--- a/user-server/src/main/resources/mapper/EnumMapper.xml
+++ b/user-server/src/main/resources/mapper/EnumMapper.xml
@@ -16,7 +16,7 @@
 
     <select id="selectEnumPageList" resultType="com.yuanchu.mom.pojo.Enums">
         select * from (
-        select e.id,e.category,e.label,e.value,e.order_num,e.type , u2.name create_user_name,e.create_time, u3.name update_user_name, e.update_time
+        select e.id,e.category,e.label,e.value,e.order_num,e.type , u2.name create_user_name,e.create_time, u3.name update_user_name, e.update_time,e.create_user
         from enums e
         left join user u2 on u2.id = e.create_user
         left join user u3 on u3.id = e.update_user

--
Gitblit v1.9.3