From ef91628ec82aec198e61bd50bc56413692a8aa44 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 16 五月 2024 22:40:58 +0800
Subject: [PATCH] 优化
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java | 9 +
user-server/src/main/java/com/yuanchu/mom/util/HeaderToken.java | 145 ++++++--------------
cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java | 2
cnas-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodServiceImpl.java | 2
inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java | 2
user-server/src/main/java/com/yuanchu/mom/pojo/AuthApi.java | 34 ++++
inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java | 3
framework/src/main/java/com/yuanchu/mom/config/Swagger3.java | 10
inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java | 2
framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java | 1
user-server/src/main/java/com/yuanchu/mom/pojo/User.java | 22 ---
user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java | 39 +++--
inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java | 3
system-run/src/main/resources/application-dev.yml | 3
/dev/null | 28 ----
user-server/src/main/java/com/yuanchu/mom/pojo/Person.java | 36 +++++
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java | 2
inspect-server/src/main/java/com/yuanchu/mom/controller/InsUnPassController.java | 2
user-server/src/main/java/com/yuanchu/mom/service/UserService.java | 5
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 2
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 2
user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java | 18 +-
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java | 16 ++
user-server/src/main/java/com/yuanchu/mom/dto/PersonDto.java | 16 ++
24 files changed, 208 insertions(+), 196 deletions(-)
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 ae92a36..072928d 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
@@ -14,7 +14,7 @@
import java.util.Map;
-@Api("鏍囧噯鏂规硶")
+@Api(tags = "鏍囧噯鏂规硶")
@RestController
@RequestMapping("/standardMethod")
@AllArgsConstructor
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodServiceImpl.java
index d101d18..146faef 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodServiceImpl.java
@@ -42,7 +42,7 @@
@Override
public List<StandardMethod> selectStandardMethods() {
- return standardMethodMapper.selectList(Wrappers.<StandardMethod>lambdaQuery().select(StandardMethod::getId,StandardMethod::getCode,StandardMethod::getName));
+ return standardMethodMapper.selectList(Wrappers.<StandardMethod>lambdaQuery().select(StandardMethod::getId,StandardMethod::getCode,StandardMethod::getName).ne(StandardMethod::getId, 0));
}
@Override
diff --git a/framework/src/main/java/com/yuanchu/mom/config/Swagger3.java b/framework/src/main/java/com/yuanchu/mom/config/Swagger3.java
index 1156d4d..e6cba12 100644
--- a/framework/src/main/java/com/yuanchu/mom/config/Swagger3.java
+++ b/framework/src/main/java/com/yuanchu/mom/config/Swagger3.java
@@ -34,15 +34,15 @@
// 鐢ˋpiInfoBuilder杩涜瀹氬埗
return new ApiInfoBuilder()
// 璁剧疆鏍囬
- .title("OMS")
+ .title("LIMS")
// 鎻忚堪
- .description("OMS绯荤粺")
+ .description("瀹為獙瀹ょ鐞嗙郴缁�")
// 浣滆�呬俊鎭�
- .contact(new Contact("榈烽洀", null, null))
+ .contact(new Contact("榈烽洀缃戠粶绉戞妧", null, null))
// 鐗堟湰
- .version("鐗堟湰鍙�:V1.0")
+ .version("鐗堟湰鍙凤細V1.0")
//鍗忚
- .license("The Apache License")
+ .license("鍟嗕笟椤圭洰")
//鍗忚url
.licenseUrl("http://www.baidu.com")
.build();
diff --git a/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java b/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
index 62a181b..4f60117 100644
--- a/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
+++ b/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
@@ -1,7 +1,6 @@
package com.yuanchu.mom.utils;
import com.yuanchu.mom.mapper.SystemLogMapper;
-import lombok.Builder;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
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 22fd71f..97f0ff1 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
@@ -31,7 +31,7 @@
@RestController
@AllArgsConstructor
@RequestMapping("/insOrder")
-@Api("妫�楠屽崟妯″潡")
+@Api(tags="妫�楠屽崟妯″潡")
public class InsOrderController {
private InsOrderService insOrderService;
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 44a38a5..18c32af 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
@@ -23,7 +23,7 @@
*/
@RestController
@RequestMapping("/insOrderPlan")
-@Api("/妫�楠屼换鍔�")
+@Api(tags = "妫�楠屼换鍔�")
@AllArgsConstructor
public class InsOrderPlanController {
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 88b3345..b851be5 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
@@ -22,8 +22,7 @@
@RestController
@RequestMapping("/insReport")
-//@AllArgsConstructor
-@Api("妫�楠屾姤鍛�")
+@Api(tags = "妫�楠屾姤鍛�")
public class InsReportController {
@Resource
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsUnPassController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsUnPassController.java
index e379da7..2877fa1 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsUnPassController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsUnPassController.java
@@ -23,7 +23,7 @@
*/
@RestController
@RequestMapping("/unPass")
-@Api("/涓嶅悎鏍肩鐞�")
+@Api(tags = "涓嶅悎鏍肩鐞�")
@AllArgsConstructor
public class InsUnPassController {
@Resource
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 c03cc3f..b3936d4 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
@@ -16,7 +16,7 @@
@RestController
@AllArgsConstructor
@RequestMapping("/report")
-@Api("鎶ヨ〃妯″潡")
+@Api(tags = "鎶ヨ〃妯″潡")
public class ReportController {
private ReportService reportService;
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 4ea2dbb..311068a 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
@@ -17,7 +17,7 @@
@RequestMapping("/StandardTemplate")
@RestController
@AllArgsConstructor
-@Api("鍘熷璁板綍妯℃澘")
+@Api(tags = "鍘熷璁板綍妯℃澘")
public class StandardTemplateController {
private StandardTemplateService standardTemplateService;
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 d5ea19c..2cdcc88 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
@@ -11,13 +11,19 @@
import com.yuanchu.mom.service.StandardProductListService;
import com.yuanchu.mom.service.StandardTreeService;
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 lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import java.util.Map;
+
@RestController
@AllArgsConstructor
@RequestMapping("/standardTree")
+@Api(tags="鏍囧噯搴�")
public class StandardTreeController {
private StandardTreeService standardTreeService;
@@ -117,4 +123,14 @@
return Result.success(standardTreeService.getStandardTree2());
}
+ @ValueClassify("鏍囧噯搴�")
+ @ApiOperation(value = "鎵归噺淇敼椤圭洰鍐呭")
+ @PostMapping("/upStandardProducts")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "standardProductList",dataTypeClass = StandardProductList.class),
+ @ApiImplicitParam(name = "ids",dataTypeClass = Integer.class)
+ })
+ public Result upStandardProducts(@RequestBody Map<String, Object> product){
+ return Result.success(standardTreeService.upStandardProducts(product));
+ }
}
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 94c7a67..7aa68e5 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
@@ -16,7 +16,7 @@
@RequestMapping("/warehouse")
@RestController
@AllArgsConstructor
-@Api("鏍峰搧浠撳簱")
+@Api(tags = "鏍峰搧绠＄悊")
public class WarehouseController {
private WarehouseService warehouseService;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
index cdff842..2805ef6 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
@@ -6,6 +6,7 @@
import com.yuanchu.mom.pojo.StandardTree;
import java.util.List;
+import java.util.Map;
/**
* @author Administrator
@@ -24,4 +25,6 @@
List<SampleTypeDto> getStandardTree2();
+ int upStandardProducts(Map<String, Object> product);
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
index 0654d4a..1fe8cf3 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
@@ -19,6 +19,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
+import java.util.Map;
/**
* @author Administrator
@@ -109,6 +110,14 @@
return standardTreeMapper.getStandardTree2();
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int upStandardProducts(Map<String, Object> product) {
+ List<Integer> ids = JSON.parseArray(JSON.toJSONString(product.get("ids")));
+ StandardProductList productList = JSON.parseObject(JSON.toJSONString(product.get("standardProductList")), StandardProductList.class);
+ standardProductListMapper.update(productList, Wrappers.<StandardProductList>lambdaUpdate().in(StandardProductList::getId, ids));
+ return 1;
+ }
}
diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index 6892d1f..13e6c40 100644
--- a/system-run/src/main/resources/application-dev.yml
+++ b/system-run/src/main/resources/application-dev.yml
@@ -37,9 +37,8 @@
datasource:
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://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
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
index 73bb8e9..08729b4 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java
@@ -1,37 +1,48 @@
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.annotation.ValueClassify;
+import com.yuanchu.mom.dto.PersonDto;
import com.yuanchu.mom.pojo.Company;
+import com.yuanchu.mom.service.UserService;
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 org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@AllArgsConstructor
@RequestMapping("/companies")
-@Api("缁勭粐妯″潡")
+@Api(tags="鐢ㄦ埛妯″潡")
public class CompaniesController {
- @Autowired
private HeaderToken headerToken;
- @ValueAuth
- @ApiOperation(value = "鑾峰彇缁勭粐鍒楄〃")
+ private UserService userService;
+
+ @ValueClassify("鐢ㄦ埛绠＄悊")
+ @ApiOperation(value = "鑾峰彇浜轰簨绯荤粺缁勭粐鏋舵瀯")
@GetMapping(value = "/selectCompaniesList")
- public Result<List<Company>> selectcompaniesList(){
+ public Result<List<Company>> selectCompaniesList() {
return Result.success(headerToken.companyUrl());
}
+
+ @ValueAuth
+ @ApiOperation("鑾峰彇浜轰簨绯荤粺缁勭粐涓嬬殑浜哄憳")
+ @PostMapping(value = "/selectSimpleList")
+ public Result<?> selectSimpleList(String companyId) {
+ return Result.success(headerToken.userUrl(companyId));
+ }
+
+ @ValueAuth
+ @ApiOperation("灏嗕汉浜嬬郴缁熷嬀閫夌殑鍐呭杞Щ鍒版湰绯荤粺")
+ @PostMapping(value = "/addPersonUser")
+ public Result<?> addPersonUser(@RequestBody PersonDto personDto) {
+ return Result.success(userService.addPersonUser(personDto));
+ }
+
}
\ No newline at end of file
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
deleted file mode 100644
index dd87db6..0000000
--- a/user-server/src/main/java/com/yuanchu/mom/controller/PostController.java
+++ /dev/null
@@ -1,30 +0,0 @@
-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/SimpleController.java b/user-server/src/main/java/com/yuanchu/mom/controller/SimpleController.java
deleted file mode 100644
index 9d2660d..0000000
--- a/user-server/src/main/java/com/yuanchu/mom/controller/SimpleController.java
+++ /dev/null
@@ -1,28 +0,0 @@
-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/dto/PersonDto.java b/user-server/src/main/java/com/yuanchu/mom/dto/PersonDto.java
new file mode 100644
index 0000000..fa1e22d
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/mom/dto/PersonDto.java
@@ -0,0 +1,16 @@
+package com.yuanchu.mom.dto;
+
+import com.yuanchu.mom.pojo.Company;
+import com.yuanchu.mom.pojo.Person;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PersonDto {
+
+ private List<Person> person;
+
+ private List<Company> company;
+
+}
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
index b91d14b..1e338b4 100644
--- a/user-server/src/main/java/com/yuanchu/mom/pojo/AuthApi.java
+++ b/user-server/src/main/java/com/yuanchu/mom/pojo/AuthApi.java
@@ -2,10 +2,38 @@
public class AuthApi {
- public static String companies = "https://ztt-sso.asuncloud.net/api/org/v1/companies";
+ /**
+ * 娴嬭瘯鍦板潃
+ * */
+// private String code = "https://ztt-sso.asuncloud.net/oauth2/token";
+ /**
+ * 姝ｅ紡鍦板潃
+ * */
+ public static String code = "https://ztt-sso.chinaztt.cn/oauth2/token";
- public static String post="https://ztt-sso.asuncloud.net/api/org/v1/post?companyId=";
+ /**
+ * 娌冲彛浜轰簨娴嬭瘯搴�
+ * */
+// private String appId = "8b2f2c7e-2ab9-4718-8193-c0c636dceba8";
+// private String appSecret = "db59b70d28ab1865aafe4008f59d4760";
+ /**
+ * 娌冲彛浜轰簨姝ｅ紡搴�
+ * */
+ public static String appId = "f6f3d70f-3666-4d3d-b9c5-430de3f6007c";
+ public static String appSecret = "a18923496542302066b0a7bec993a4e2";
+/**
+ * 瑁呭浜轰簨娴嬭瘯搴�
+ * */
+// private String appId = "0acf9b63-31e3-45c4-99c1-af1aac88b985";
+// private String appSecret = "7fb7a4026c71619345c31fa12ba31f4f";
+ /**
+ * 瑁呭浜轰簨姝ｅ紡搴�
+ * */
+// private String appId = "6f5f6a0c-2a01-4ef6-9e75-c8a6f0c2f044";
+// private String appSecret = "89b9c4735b1e5ee9d6a8544b9b38bb03";
- public static String simple="https://ztt-sso.asuncloud.net/api/org/v1/employees/simple?companyId=";
+ public static String companies = "https://ztt-connector.chinaztt.cn/api/org/v1/companies";
+
+ public static String simple="https://ztt-connector.chinaztt.cn/api/org/v1/employees/simple?companyId=";
}
\ No newline at end of file
diff --git a/user-server/src/main/java/com/yuanchu/mom/pojo/Person.java b/user-server/src/main/java/com/yuanchu/mom/pojo/Person.java
new file mode 100644
index 0000000..c363b82
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/mom/pojo/Person.java
@@ -0,0 +1,36 @@
+package com.yuanchu.mom.pojo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class Person {
+
+ private String name;
+
+ //浜哄憳缂栧彿锛屽叏灞�鍞竴
+ private String employeeID;
+//宀椾綅
+ private String position;
+//宀椾綅缂栫爜
+ private String positionCode;
+//鎵嬫満鍙风爜
+ private String phoneNumber;
+
+ //鎬у埆 1:鐢� 2:濂�
+ private Integer gender;
+
+ //缁勭粐鐘舵�� enable:鍦ㄨ亴 disabled:绂昏亴
+ private String status;
+//鎵�灞炵粍缁囩紪鐮�
+ private String companyId;
+//鍏徃閭(鍙敤浜庨偖绠辩郴缁�)
+ private String companyEmail;
+//鍏ヨ亴鍏徃鏃堕棿
+ private String dateOfJoiningTheCompany;
+//缁勭粐鍐呯殑閮ㄩ棬缂栫爜
+ private String departmentCode;
+
+ @ApiModelProperty(">1锛氬瓨鍦� =0锛氫笉瀛樺湪")
+ private Long isLive;
+}
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 6f4b5fb..ab26b1b 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,26 +112,4 @@
@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/UserService.java b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
index 01fde83..ec986f2 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
@@ -1,10 +1,9 @@
package com.yuanchu.mom.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.dto.PersonDto;
import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.pojo.User;
-import org.springframework.web.multipart.MultipartFile;
import java.util.List;
import java.util.Map;
@@ -34,4 +33,6 @@
int upUserPassword(String oldPassword, String newPassWord);
+ int addPersonUser(PersonDto personDto);
+
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
index 351cd81..92bf542 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
@@ -3,11 +3,10 @@
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
+import com.yuanchu.mom.dto.PersonDto;
import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.UserMapper;
@@ -15,18 +14,11 @@
import com.yuanchu.mom.service.UserService;
import com.yuanchu.mom.utils.Jwt;
import com.yuanchu.mom.utils.QueryWrappers;
-import com.yuanchu.mom.vo.Result;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.DigestUtils;
-import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
-import java.io.File;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -114,4 +106,10 @@
return userMapper.updateById(user);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int addPersonUser(PersonDto personDto) {
+ System.out.println(personDto);
+ return 1;
+ }
}
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
index 147145f..f1792a4 100644
--- a/user-server/src/main/java/com/yuanchu/mom/util/HeaderToken.java
+++ b/user-server/src/main/java/com/yuanchu/mom/util/HeaderToken.java
@@ -2,23 +2,25 @@
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
+import cn.hutool.log.Log;
import com.alibaba.fastjson.JSON;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.yuanchu.mom.exception.ErrorException;
+import com.yuanchu.mom.mapper.UserMapper;
import com.yuanchu.mom.pojo.AuthApi;
import com.yuanchu.mom.pojo.Company;
-import com.yuanchu.mom.pojo.Post;
+import com.yuanchu.mom.pojo.Person;
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.Objects;
import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
@Component
public class HeaderToken {
@@ -26,129 +28,74 @@
@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());
- }
+ @Resource
+ private UserMapper userMapper;
public String fetchNewAccessToken() {
- HttpRequest request = HttpRequest.post("https://ztt-sso.asuncloud.net/oauth2/token")
+ HttpRequest request = HttpRequest.post(AuthApi.code)
.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");
+ .form("client_id", AuthApi.appId)
+ .form("client_secret", AuthApi.appSecret);
HttpResponse response = request.execute();
-
- System.out.println(response.body());
ObjectMapper objectMapper = new ObjectMapper();
- JsonNode jsonNode = null;
+ JsonNode jsonNode;
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();
+ Log.get().info("鑾峰彇浜轰簨绯荤粺token锛�"+accessToken);
+ redisTemplate.opsForValue().set("access_token",accessToken,jsonNode.get("expires_in").asInt() - 60,TimeUnit.SECONDS);
+ return accessToken;
+ } catch (Exception e) {
+ throw new ErrorException(e.getMessage());
}
- return null;
}
- private String accessToken ;
- //鍒ゆ柇鏄惁杩囨湡
+ //鍒ゆ柇鏄惁瀛樺湪
public String getAccessToken() {
- accessToken=(String) redisTemplate.opsForValue().get("access_token");
- if (accessToken == null) {
+ String accessToken;
+ if (!redisTemplate.hasKey("access_token")) {
accessToken = fetchNewAccessToken();
+ }else{
+ accessToken = redisTemplate.opsForValue().get("access_token")+"";
}
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() {
+ public List<Company> companyUrl() {
String accessToken = getAccessToken();
- String getToken= getToken(accessToken);
- String apiUrl =AuthApi.companies; // 鏇挎崲涓哄疄闄呯殑API绔偣URL
- HttpRequest request = HttpRequest.get(apiUrl)
+ HttpRequest request = HttpRequest.get(AuthApi.companies)
.header("Authorization", "Bearer " + accessToken);
- HttpResponse response = request.execute();
- ObjectMapper objectMapper = new ObjectMapper();
- String body = response.body();
- List<Company> companies = null;
+ List<Company> companies;
try {
- companies = objectMapper.readValue(body, new TypeReference<List<Company>>(){});
- } catch (JsonProcessingException e) {
- e.printStackTrace();
+ companies = JSON.parseArray(request.execute().body(), Company.class);
+ }catch (Exception e){
+ throw new ErrorException(e.getMessage());
}
- return companies;
+ return companies.stream().filter(ob->{
+ if(ob.getStatus().equals("enabled")) return true;
+ return false;
+ }).collect(Collectors.toList());
}
- public List<Post> postUrl(String companyId) {
+ public List<Person> userUrl(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)
+ HttpRequest request = HttpRequest.get(AuthApi.simple+companyId)
.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;
+ List<Person> person;
try {
- user= objectMapper.readValue(body,new TypeReference<List<User>>(){});
- } catch (JsonProcessingException e) {
- e.printStackTrace();
+ person = JSON.parseArray(request.execute().body(), Person.class);
+ }catch (Exception e){
+ throw new ErrorException(e.getMessage());
}
- return user;
+ return person.stream().filter(ob->{
+ if(Objects.equals(ob.getStatus(), "enabled")) {
+ ob.setIsLive(userMapper.selectCount(Wrappers.<User>lambdaQuery().eq(User::getAccount, ob.getEmployeeID())));
+ return true;
+ }
+ return false;
+ }).collect(Collectors.toList());
}
}
\ No newline at end of file
--
Gitblit v1.9.3