FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 标准入库流程测试实例提交 及 项目token固定用户admin

Browse Source
This commit is contained in:
super_liu
2021-06-09 17:34:42 +08:00
parent fe786eec40
commit 19c7a56d73
6 changed files with 62 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java
+21
View File
@@ -0,0 +1,21 @@
package com.adc.da.common;
import java.util.Map;
import java.util.TreeMap;
/**
* @Description: TODO
* @author: super_liu
* @date: 2021年06月09日 17:18
*/
public class ActDefineStartMap {
// map 添加 新的流程实例
public static String actDefineStartMap(String type){
Map<String,String> map = new TreeMap<>();
map.put("1","standardLibraryWkflow");
return map.get(type);
}
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+3 -40
View File
@@ -56,46 +56,9 @@ public class WorkFlowController {
@ApiOperation(value = "启动流程-以流程定义id")
@GetMapping("/startProcess")
public ResponseMessage startProcess(@RequestParam("type") String type, @RequestParam(value="id",required = false) String id){
if(type.equals("1")){
return this.activiti_define_start("fgrk", LoginUserUtil.getUserId(),id);
}else if(type.equals("2")){
return this.activiti_define_start("fgjspglc",LoginUserUtil.getUserId(),id);
}else if(type.equals("3")){
return this.activiti_define_start("projectreview",LoginUserUtil.getUserId(),id);
}else if(type.equals("4")){
return this.activiti_define_start("qbzxd",LoginUserUtil.getUserId(),id);
}else if(type.equals("5")){
return this.activiti_define_start("whgxgllc",LoginUserUtil.getUserId(),id);
}else if(type.equals("6")){
return this.activiti_define_start("qbzxdsqlc",LoginUserUtil.getUserId(),id);
}else if(type.equals("9")){
return this.activiti_define_start("bzcgsqlc",LoginUserUtil.getUserId(),id);
}else if(type.equals("8")){
return this.activiti_define_start("zxdyqsplc",LoginUserUtil.getUserId(),id);
}else if(type.equals("10")){
return this.activiti_define_start("bzhyhqsqlc",LoginUserUtil.getUserId(),id);
}else if(type.equals("11")){
return this.activiti_define_start("qbzxdpglc",LoginUserUtil.getUserId(),id);
}else if(type.equals("12")){
return this.activiti_define_start("qbkwlc",LoginUserUtil.getUserId(),id);
}else if(type.equals("13")){
return this.activiti_define_start("xzyqpglc",LoginUserUtil.getUserId(),id);
}else if(type.equals("7")){
return this.activiti_define_start("qbfzlc",LoginUserUtil.getUserId(),id);
}
else if(type.equals("15")){
return this.activiti_define_start("bzfysqlc",LoginUserUtil.getUserId(),id);
}else if(type.equals("16")){
return this.activiti_define_start("bzhyhhgllc",LoginUserUtil.getUserId(),id);
}else if(type.equals("17")){
return this.activiti_define_start("qbbalc",LoginUserUtil.getUserId(),id);
}else if(type.equals("18")){
return this.activiti_define_start("hwfgqdfbjgxlc",LoginUserUtil.getUserId(),id);
}else if(type.equals("19")){
return this.activiti_define_start("qbfslc","3U5F8UJJVPZB4B4BKN3P",id);
}else if(type.equals("14")){
return this.activiti_define_start("zcrkjpglc",LoginUserUtil.getUserId(),id);
}else{
if(StringUtils.isNotBlank(type)){
return this.activiti_define_start(ActDefineStartMap.actDefineStartMap(type), LoginUserUtil.getUserId(),id);
}else {
return null;
}
}
adc-da-base/src/main/java/com/adc/da/util/LoginUserUtil.java
+12 -9
View File
@@ -1,6 +1,7 @@
package com.adc.da.util;
import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.UnavailableSecurityManagerException;
import org.apache.shiro.session.InvalidSessionException;
@@ -14,16 +15,18 @@ public class LoginUserUtil {
*
*/
public static String getUserId() {
String userId = null;
String userId = "WY8J26MH23";
try {
Subject subject = SecurityUtils.getSubject();
Object object=subject.getPrincipal();
if(object!=null){
String json = JSONObject.toJSONString(object);
if(json!=null && json.length()>0){
Map<String, Object> userInfo=JSONObject.parseObject(json, Map.class);
userId=userInfo.get("id").toString();
}
if(!StringUtils.isNotBlank(userId)){
Subject subject = SecurityUtils.getSubject();
Object object=subject.getPrincipal();
if(object!=null){
String json = JSONObject.toJSONString(object);
if(json!=null && json.length()>0){
Map<String, Object> userInfo=JSONObject.parseObject(json, Map.class);
userId=userInfo.get("id").toString();
}
}
}
} catch (UnavailableSecurityManagerException e) {
} catch (InvalidSessionException e) {
adc-da-main/pom.xml
+11
View File
@@ -49,6 +49,17 @@
<artifactId>adc-da-jwtLogin</artifactId>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
<version>2.2.0.RELEASE</version>
</dependency>
<!-- feign调用 -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
<version>2.2.0.RELEASE</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.adc</groupId>-->
<!-- <artifactId>adc-da-search</artifactId>-->
adc-da-main/src/main/resources/application-dev.properties
+1 -1
View File
@@ -9,7 +9,7 @@ spring.datasource.password = 1q2w3e4r
#==============================================
# 应用设置
spring.application.name=gsar
spring.application.name=FotonLAWSSystem
application.code=20200101
application.center=1
#==============================================
adc-da-main/src/main/resources/application.properties
+14 -1
View File
@@ -1,7 +1,6 @@
##############################################
# 项目启动模式
##############################################
spring.application.name=FotonLAWSSystem
spring.profiles.active=dev
##############################################
@@ -30,6 +29,20 @@ logging.level.org.springframework=info
restPath=/api
#server.servlet.context-path=/api
#是否将自己注册到Eureka Server上，默认为true
eureka.client.register-with-eureka=true
##是否从Eureka Server上获取注册信息，默认为true
eureka.client.fetch-registry=true
#eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/
#eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/
#eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/
eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka/
# 请求连接的超时时间 默认的时间为 1 秒
ribbon.ConnectTimeout=500000
# 请求处理的超时时间
ribbon.ReadTimeout=500000
# ===============================
# = DATA SOURCE
# ===============================