Merge remote-tracking branch 'origin/master'

cms/pom.xml

@@ -23,6 +23,11 @@
 		</dependency>
 
 		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+		</dependency>
+
+		<dependency>
 			<groupId>de.codecentric</groupId>
 			<artifactId>spring-boot-admin-starter-client</artifactId>
 		</dependency>

mec-auth/mec-auth-api/.gitignore

@@ -0,0 +1 @@
+/target

mec-auth/mec-auth-server/pom.xml

@@ -26,6 +26,11 @@
 
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-oauth2</artifactId>
 		</dependency>
 

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysMenuServiceImpl.java

@@ -3,7 +3,6 @@ package com.ym.mec.auth.service.impl;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/LuckDrawPrize.java

@@ -2,7 +2,7 @@ package com.ym.mec.biz.dal.entity;
 
 import java.util.Date;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.ym.mec.common.enums.BaseEnum;
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/LuckDrawPrizeServiceImpl.java

@@ -3,8 +3,8 @@ package com.ym.mec.biz.service.impl;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.RandomUtils;
+import org.apache.commons.lang3.RandomUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -93,7 +93,7 @@ public class LuckDrawPrizeServiceImpl extends BaseServiceImpl<Integer, LuckDrawP
 		// 抽奖逻辑
 		List<LuckDrawPrize> luckDraws = luckDrawPrizeDao.queryEnabledList(group);
 		if (luckDraws != null) {
-			int randomNum = RandomUtils.nextInt(DRAW_BASE_NUMBER);
+			int randomNum = RandomUtils.nextInt(0, DRAW_BASE_NUMBER);
 			double start = 0;
 			double chances = 0;
 			for (LuckDrawPrize luckDraw : luckDraws) {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupPaymentCalenderDetailServiceImpl.java

@@ -15,7 +15,6 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import com.ym.mec.util.collection.MapUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,7 +31,6 @@ import com.ym.mec.biz.dal.dto.FeeStudentDto;
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PayUserType;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentCalenderStatusEnum;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderCourseSettings;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail;
@@ -48,6 +46,7 @@ import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
+import com.ym.mec.util.collection.MapUtil;
 
 @Service
 public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<Long, MusicGroupPaymentCalenderDetail>  implements MusicGroupPaymentCalenderDetailService {
@@ -501,10 +500,20 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 		if(details == null || details.size() == 0){
 			throw new BizException("删除失败: 数据不可为空");
 		}
-		//是否已缴费
-		long count = details.stream().filter(e -> e.getPaymentStatus() != NON_PAYMENT).count();
-		if(count > 0){
-			throw new BizException("删除失败: 存在已缴费的学员");
+		Long musicGroupPaymentCalenderId = details.get(0).getMusicGroupPaymentCalenderId();
+		MusicGroupPaymentCalender musicGroupPaymentCalender = musicGroupPaymentCalenderDao.get(musicGroupPaymentCalenderId);
+		
+		if(musicGroupPaymentCalender == null){
+			throw new BizException("查询缴费项目失败[{}]", musicGroupPaymentCalender);
+		}
+		
+		long count = 0;
+		if (musicGroupPaymentCalender.getPayUserType() == STUDENT) {
+			// 是否已缴费
+			count = details.stream().filter(e -> e.getPaymentStatus() != NON_PAYMENT).count();
+			if (count > 0) {
+				throw new BizException("删除失败: 存在已缴费的学员");
+			}
 		}
 		List<Long> musicGroupPaymentCalenderDetailIdList = new ArrayList<Long>();
 		for(String s : musicGroupPaymentCalenderDetailIds.split(",")){
@@ -517,12 +526,6 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 			throw new BizException("删除失败：存在已排课的学员");
 		}
 		
-		Long musicGroupPaymentCalenderId = details.get(0).getMusicGroupPaymentCalenderId();
-		MusicGroupPaymentCalender musicGroupPaymentCalender = musicGroupPaymentCalenderDao.get(musicGroupPaymentCalenderId);
-		
-		if(musicGroupPaymentCalender == null){
-			throw new BizException("查询缴费项目失败[{}]", musicGroupPaymentCalender);
-		}
 		int currentNum = musicGroupPaymentCalender.getExpectNum() - details.size();
 		musicGroupPaymentCalender.setExpectNum(currentNum < 0 ? 0 : currentNum);
 		musicGroupPaymentCalender.setUpdateTime(new Date());

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupPaymentCalenderServiceImpl.java

@@ -860,7 +860,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 						maps.get(e));
 				Map<Integer, String> receivers1 = new HashMap<>(1);
 				receivers1.put(calenderPushDto.getTeacherId(), calenderPushDto.getTeacherId().toString());
-				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_PAYMENT_DETAIL, receivers, null, 0,
+				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_PAYMENT_DETAIL, receivers1, null, 0,
 						null, "SYSTEM", calenderPushDto.getMusicGroupName(), calenderPushDto.getPaymentValidStartDate(), calenderPushDto.getPaymentValidEndDate(),
 						maps.get(e));
 			});
@@ -894,7 +894,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 						null, null, e.getMusicGroupName(), e.getPaymentValidStartDate(), e.getPaymentValidEndDate());
 				Map<Integer, String> receivers1 = new HashMap<>(1);
 				receivers1.put(e.getTeacherId(), e.getTeacherId().toString());
-				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_PAYMENT_CREATE, receivers, null, 0,
+				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_PAYMENT_CREATE, receivers1, null, 0,
 						null, "SYSTEM", e.getMusicGroupName(), e.getPaymentValidStartDate(), e.getPaymentValidEndDate());
 			});
 		}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -631,6 +631,13 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 					groupCoursesUnitPrice=MapUtil.convertIntegerMap(groupCoursesUnitPriceMaps);
 				}
 
+				List<Integer> organIds = dataList.stream().map(VipGroup::getOrganId).collect(Collectors.toList());
+				List<Organization> organs = organizationDao.findOrgans(organIds);
+				Map<Integer, String> organNameMap = new HashMap<>();
+				if(!CollectionUtils.isEmpty(organs)){
+					organNameMap = organs.stream().collect(Collectors.toMap(Organization::getId, o->o.getName(), (o1, o2)->o1));
+				}
+
 				Map<Integer, String> idNameMap=new HashMap<>();
 				if(!CollectionUtils.isEmpty(educationalTeacherIds)){
 					List<SimpleUserDto> educationalUsers = employeeDao.findByIds(educationalTeacherIds);
@@ -655,6 +662,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 					Long aLong1 = currentClassTimeMap.get(vipGroup.getId() + "");
 					vipGroup.setCurrentClassTimes(aLong1==null?0:aLong1.intValue());
 
+					vipGroup.setOrganName(organNameMap.get(vipGroup.getOrganId()));
+
 					Long allStudentNum=groupStudentNumMap.get(vipGroup.getId().toString());
 					if(Objects.isNull(allStudentNum)){
 						allStudentNum=Long.valueOf(0);

mec-biz/src/main/resources/config/mybatis/SellOrderMapper.xml

@@ -594,7 +594,7 @@
     <select id="getFeeByType" resultType="com.ym.mec.biz.dal.dto.StudentPaymentOrderExportDto">
         SELECT MAX(spo.expect_amount_)                                expectAmount,
                SUM(IF(g.type_ = 'INSTRUMENT', so.expect_amount_, 0))  musicalFee,
-               SUM(IF(g.type_ != 'INSTRUMENT' || g.type_ IS NULL, so.expect_amount_, 0)) teachingFee
+               SUM(IF(g.type_ != 'INSTRUMENT', so.expect_amount_, 0)) teachingFee
         FROM student_payment_order spo
                  LEFT JOIN sell_order so ON spo.id_ = so.order_id_
                  LEFT JOIN goods g ON IF(so.parent_goods_id_ IS NOT NULL,g.id_ = so.parent_goods_id_,g.id_ = so.goods_id_)

mec-client-api/.gitignore

@@ -0,0 +1 @@
+/target

mec-common/audit-log/pom.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.ym</groupId>
+		<artifactId>mec-common</artifactId>
+		<version>1.0</version>
+	</parent>
+	<groupId>com.yonge.log</groupId>
+	<artifactId>audit-log</artifactId>
+	<name>audit-log</name>
+	<url>http://maven.apache.org</url>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.yonge.mongodb</groupId>
+			<artifactId>mongo-db</artifactId>
+		</dependency>
+	</dependencies>
+</project>

mec-common/audit-log/src/main/java/com/yonge/log/dal/dao/AuditLogDao.java

@@ -0,0 +1,16 @@
+package com.yonge.log.dal.dao;
+
+import org.springframework.stereotype.Component;
+
+import com.yonge.log.dal.model.AuditLog;
+import com.yonge.mongodb.dao.BaseDaoWithMongo;
+
+@Component
+public class AuditLogDao extends BaseDaoWithMongo<Long, AuditLog> {
+
+	@Override
+	public Class<AuditLog> getClassEntity() {
+		return AuditLog.class;
+	}
+
+}

mec-common/audit-log/src/main/java/com/yonge/log/dal/model/AuditLog.java

@@ -0,0 +1,87 @@
+package com.yonge.log.dal.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+@Document(collection = "sys_audit_log")
+public class AuditLog implements Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7721535265828759275L;
+
+	@Id
+	private Long id;
+
+	private String username;
+
+	private String operateName;
+
+	private String interfaceUrl;
+
+	private String inputParams;
+
+	private Date operateTime;
+
+	private String userIp;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getOperateName() {
+		return operateName;
+	}
+
+	public void setOperateName(String operateName) {
+		this.operateName = operateName;
+	}
+
+	public String getInterfaceUrl() {
+		return interfaceUrl;
+	}
+
+	public void setInterfaceUrl(String interfaceUrl) {
+		this.interfaceUrl = interfaceUrl;
+	}
+
+	public String getInputParams() {
+		return inputParams;
+	}
+
+	public void setInputParams(String inputParams) {
+		this.inputParams = inputParams;
+	}
+
+	public Date getOperateTime() {
+		return operateTime;
+	}
+
+	public void setOperateTime(Date operateTime) {
+		this.operateTime = operateTime;
+	}
+
+	public String getUserIp() {
+		return userIp;
+	}
+
+	public void setUserIp(String userIp) {
+		this.userIp = userIp;
+	}
+}

mec-common/audit-log/src/main/java/com/yonge/log/interceptor/AuditLogInterceptor.java

@@ -0,0 +1,64 @@
+package com.yonge.log.interceptor;
+
+import java.io.IOException;
+import java.util.Date;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import com.ym.mec.util.json.JsonUtil;
+import com.ym.mec.util.web.WebUtil;
+import com.yonge.log.dal.model.AuditLog;
+import com.yonge.log.model.AuditLogAnnotation;
+import com.yonge.log.service.AuditLogService;
+
+/**
+ * 日志审计的拦截器
+ */
+public class AuditLogInterceptor extends HandlerInterceptorAdapter {
+
+	@Autowired
+	private AuditLogService auditLogService;
+
+	private String username;
+
+	public AuditLogInterceptor(String username) {
+		this.username = username;
+	}
+
+	@Override
+	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
+
+		return true;
+	}
+
+	@Override
+	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+
+		HandlerMethod handlerMethod = (HandlerMethod) handler;
+		AuditLogAnnotation anno = handlerMethod.getMethodAnnotation(AuditLogAnnotation.class);
+
+		if (anno != null) {
+			AuditLog auditLog = new AuditLog();
+			auditLog.setOperateName(anno.operateName());
+			auditLog.setInterfaceUrl(anno.interfaceURL());
+			auditLog.setUserIp(WebUtil.getRemoteIp(request));
+			auditLog.setInputParams(JsonUtil.toJSONString(WebUtil.getParameterMap(request)));
+			// 操作人
+			auditLog.setUsername(username);
+			auditLog.setOperateTime(new Date());
+			auditLogService.insert(auditLog);
+		}
+
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+}

mec-common/audit-log/src/main/java/com/yonge/log/model/AuditLogAnnotation.java

@@ -0,0 +1,16 @@
+package com.yonge.log.model;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface AuditLogAnnotation {
+
+	String operateName();
+
+	String interfaceURL();
+
+}

mec-common/audit-log/src/main/java/com/yonge/log/service/AuditLogService.java

@@ -0,0 +1,8 @@
+package com.yonge.log.service;
+
+import com.yonge.log.dal.model.AuditLog;
+import com.yonge.mongodb.service.BaseServiceWithMongo;
+
+public interface AuditLogService extends BaseServiceWithMongo<Long, AuditLog> {
+
+}

mec-common/audit-log/src/main/java/com/yonge/log/service/impl/AuditLogServiceImpl.java

@@ -0,0 +1,23 @@
+package com.yonge.log.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.yonge.log.dal.dao.AuditLogDao;
+import com.yonge.log.dal.model.AuditLog;
+import com.yonge.log.service.AuditLogService;
+import com.yonge.mongodb.dao.BaseDaoWithMongo;
+import com.yonge.mongodb.service.impl.BaseServiceImplWithMongo;
+
+@Service
+public class AuditLogServiceImpl extends BaseServiceImplWithMongo<Long, AuditLog> implements AuditLogService {
+
+	@Autowired
+	private AuditLogDao auditLogDao;
+
+	@Override
+	public BaseDaoWithMongo<Long, AuditLog> getDAO() {
+		return auditLogDao;
+	}
+
+}

mec-common/audit-log/src/test/java/com/yonge/log/AuditLogServerApplication.java

@@ -0,0 +1,20 @@
+package com.yonge.log;
+
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@SpringBootApplication
+@EnableDiscoveryClient
+@ComponentScan(basePackages = { "com.yonge.log" })
+@Configuration
+public class AuditLogServerApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(AuditLogServerApplication.class, args);
+	}
+
+}

mec-common/audit-log/src/test/java/com/yonge/log/test/SpringBootMongodbApplicationTests.java

@@ -0,0 +1,87 @@
+package com.yonge.log.test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.ym.mec.util.json.JsonUtil;
+import com.yonge.log.AuditLogServerApplication;
+import com.yonge.log.dal.model.AuditLog;
+import com.yonge.log.service.AuditLogService;
+import com.yonge.mongodb.QueryInfo;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = AuditLogServerApplication.class)
+public class SpringBootMongodbApplicationTests {
+
+	@Autowired
+	private AuditLogService auditLogService;
+	
+	@Test
+	public void add() {
+		AuditLog auditLog = new AuditLog();
+		auditLog.setId(1L);
+		auditLog.setInputParams("{'signClassId':'','mixClassId':'','snapClassIds':'','highClassId':'','temporaryCourseFee':null,'studentRegistration':{'name':'上低08','gender':1,'birthdate':'2020-12-21','parentsName':'上低08家长','parentsPhone':'18881230038','currentGrade':'一年级','currentClass':'A','subjectId':2,'musicGroupId':'20123009470100001'},'studentPaymentOrderDetails':[]}");
+		auditLog.setInterfaceUrl("api-web/studentRegistration/insertStudent");
+		auditLog.setOperateName("进行中加学员");
+		auditLog.setUserIp("127.0.0.1");
+		auditLog.setUsername("xxx");
+		auditLogService.insert(auditLog);
+		
+		System.out.println("*********insert*********");
+		System.out.println(JsonUtil.toJSONString(auditLog));
+		System.out.println("******************");
+	}
+
+	@Test
+	public void query() {
+		System.out.println("********query**********");
+		System.out.println(JsonUtil.toJSONString(auditLogService.get(1L)));
+		System.out.println("******************");
+	}
+
+	@Test
+	public void update() {
+		AuditLog auditLog = auditLogService.get(1L);
+		auditLog.setInputParams("测试输入参数222");
+		System.out.println("********update**********");
+		System.out.println(JsonUtil.toJSONString(auditLogService.update(1L, auditLog)));
+		System.out.println("******************");
+	}
+
+	@Test
+	public void delete() {
+		System.out.println("********delete**********");
+		System.out.println(JsonUtil.toJSONString(auditLogService.delete(1L)));
+		System.out.println("******************");
+	}
+
+	@Test
+	public void findAll() {
+		System.out.println("********findAll**********");
+		System.out.println(JsonUtil.toJSONString(auditLogService.findAll(null)));
+		System.out.println("******************");
+	}
+
+	@Test
+	public void queryCount() {
+		System.out.println("********queryCount**********");
+		Map<String, Object> params = new HashMap<String, Object>();
+		params.put("id", 1);
+		System.out.println(JsonUtil.toJSONString(auditLogService.queryCount(params)));
+		System.out.println("******************");
+	}
+
+	@Test
+	public void queryPage() {
+		System.out.println("********queryPage**********");
+		QueryInfo queryInfo = new QueryInfo();
+		System.out.println(JsonUtil.toJSONString(auditLogService.queryPage(queryInfo)));
+		System.out.println("******************");
+	}
+}

mec-common/audit-log/src/test/resources/application.properties

@@ -0,0 +1,6 @@
+spring.application.name=audit-log
+
+# mongodb
+spring.data.mongodb.uri=mongodb://47.114.1.200:27018
+
+spring.data.mongodb.database=mec_dev

mec-common/mongo-db/pom.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.ym</groupId>
+		<artifactId>mec-common</artifactId>
+		<version>1.0</version>
+	</parent>
+	<groupId>com.yonge.mongodb</groupId>
+	<artifactId>mongo-db</artifactId>
+	<name>mongo-db</name>
+	<url>http://maven.apache.org</url>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-mongodb</artifactId>
+		</dependency>
+	</dependencies>
+</project>

mec-common/mongo-db/src/main/java/com/yonge/mongodb/PageInfo.java

@@ -0,0 +1,153 @@
+/**
+ * PageInfo.java 
+ * Copyright © 2015-2015
+ * 
+ * @author pengdc
+ * @create 2015年7月14日
+ */
+package com.yonge.mongodb;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 分页对象
+ */
+public class PageInfo<T> implements Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -5951140453033647399L;
+
+	private int pageNo;
+	private int offset;
+	private int limit;
+	private long total = 0;
+	private int totalPage = 0;
+
+	/**
+	 * 分页信息
+	 */
+	protected List<T> rows = new ArrayList<T>();
+
+	protected List<T> footer = new ArrayList<T>();
+
+	/** 默认构造函数 */
+	public PageInfo() {
+	}
+
+	public PageInfo(Integer pageNo) {
+		if (pageNo == null || pageNo < 1)
+			pageNo = 1;
+		this.setPageNo(pageNo);
+	}
+
+	/** 构造函数 */
+	public PageInfo(Integer pageNo, int pageSize) {
+		if (pageNo == null || pageNo < 1)
+			pageNo = 1;
+		this.setPageNo(pageNo);
+		this.limit = pageSize;
+		this.offset = (pageNo - 1) * limit;
+	}
+
+	/**
+	 * 是否还有上一页
+	 * @return
+	 */
+	public boolean hasPre() {
+		return (pageNo > 1);
+	}
+
+	/**
+	 * 是否还有下一页.
+	 */
+	public boolean hasNext() {
+		return (pageNo < totalPage);
+	}
+
+	/**
+	 * 取得上页的页号, 序号从1开始. 当前页为首页时返回首页序号.
+	 */
+	public int getPrePage() {
+		if (hasPre()) {
+			return pageNo - 1;
+		} else {
+			return pageNo;
+		}
+	}
+
+	/**
+	 * 取得下页的页号, 序号从1开始. 当前页为尾页时仍返回尾页序号.
+	 */
+	public int getNextPage() {
+		if (hasNext()) {
+			return pageNo + 1;
+		} else {
+			return pageNo;
+		}
+	}
+
+	public int getPageNo() {
+		return pageNo;
+	}
+
+	public void setPageNo(int pageNo) {
+		if (pageNo > 0) {
+			this.pageNo = pageNo;
+		}
+	}
+
+	public int getOffset() {
+		return offset;
+	}
+
+	public void setOffset(int offset) {
+		this.offset = offset;
+	}
+
+	public int getLimit() {
+		return limit;
+	}
+
+	public void setLimit(int limit) {
+		this.limit = limit;
+	}
+
+	public void setTotalPage(int totalPage) {
+		this.totalPage = totalPage;
+	}
+
+	public int getTotalPage() {
+		return totalPage;
+	}
+
+	public long getTotal() {
+		return total;
+	}
+
+	public void setTotal(long total) {
+		this.total = total;
+		this.totalPage=new BigDecimal(total).divide(new BigDecimal(limit),0,BigDecimal.ROUND_CEILING).intValue();
+	}
+
+	public List<T> getRows() {
+		return rows;
+	}
+
+	public void setRows(List<T> rows) {
+		this.rows = rows;
+	}
+
+	public List<T> getFooter() {
+		return footer;
+	}
+
+	public void setFooter(List<T> footer) {
+		this.footer = footer;
+	}
+
+}

mec-common/mongo-db/src/main/java/com/yonge/mongodb/QueryInfo.java

@@ -0,0 +1,79 @@
+/**
+ * QueryInfo.java 
+ * Copyright © 2015-2015
+ * 
+ * @author pengdc
+ * @create 2015年7月14日
+ */
+package com.yonge.mongodb;
+
+/**
+ * 查询对象基类
+ */
+public class QueryInfo {
+	/**
+	 * 默认当前页码
+	 */
+	private int page = 1;
+	/**
+	 * 默认页码大小
+	 */
+	private int rows = 20;
+	/**
+	 * 默认排序列
+	 */
+	private String sort = "create_time_";
+	/**
+	 * 默认排序方向
+	 */
+	private String order = "desc";
+
+	public QueryInfo() {
+	}
+
+	public QueryInfo(int page, int rows, String sort, String order) {
+		super();
+		this.page = page;
+		this.rows = rows;
+		this.sort = sort;
+		this.order = order;
+	}
+
+	public QueryInfo(int page, int rows) {
+		super();
+		this.page = page;
+		this.rows = rows;
+	}
+
+	public int getPage() {
+		return page;
+	}
+
+	public void setPage(int page) {
+		this.page = page;
+	}
+
+	public int getRows() {
+		return rows;
+	}
+
+	public void setRows(int rows) {
+		this.rows = rows;
+	}
+
+	public String getSort() {
+		return sort;
+	}
+
+	public void setSort(String sort) {
+		this.sort = sort;
+	}
+
+	public String getOrder() {
+		return order;
+	}
+
+	public void setOrder(String order) {
+		this.order = order;
+	}
+}

mec-common/mongo-db/src/main/java/com/yonge/mongodb/dao/BaseDaoWithMongo.java

@@ -0,0 +1,143 @@
+package com.yonge.mongodb.dao;
+
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import javax.annotation.Resource;
+
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+
+import com.yonge.mongodb.PageInfo;
+
+public abstract class BaseDaoWithMongo<PK, T extends Serializable> {
+
+	@Resource
+	private MongoTemplate mongoTemplate;
+
+	public abstract Class<T> getClassEntity();
+
+	/**
+	 * 通过主键id获取对象
+	 * @param id
+	 * @return T
+	 */
+	public T get(PK id) {
+		Query query = new Query(Criteria.where("_id").is(id));
+		return mongoTemplate.findOne(query, getClassEntity());
+	}
+
+	/**
+	 * 更新实体对象
+	 * @param bean
+	 */
+	public long update(PK id, T bean) {
+		Query query = new Query(Criteria.where("_id").is(id));
+
+		Update update = new Update();
+
+		Field[] fieldList = bean.getClass().getDeclaredFields();
+		for (Field field : fieldList) {
+			field.setAccessible(true);
+			try {
+				update.set(field.getName(), field.get(bean));
+			} catch (IllegalArgumentException e) {
+				e.printStackTrace();
+			} catch (IllegalAccessException e) {
+				e.printStackTrace();
+			}
+		}
+
+		return mongoTemplate.updateFirst(query, update, getClassEntity()).getModifiedCount();
+	}
+
+	/**
+	 * 通过主键id删除对象
+	 * @param id
+	 */
+	public long delete(final PK id) {
+		Query query = new Query(Criteria.where("_id").is(id));
+		return mongoTemplate.remove(query, getClassEntity()).getDeletedCount();
+	}
+
+	/**
+	 * 写入实体对象
+	 * @param bean
+	 */
+	public void insert(T bean) {
+		mongoTemplate.insert(bean);
+	}
+
+	/**
+	 * 通过参数查找所有结果集
+	 * @param params
+	 * @return
+	 */
+	public List<T> findAll(Map<String, Object> params) {
+		Query query = new Query();
+
+		Criteria criteria = new Criteria();
+		if (params != null) {
+			for (Entry<String, Object> entry : params.entrySet()) {
+				criteria.and(entry.getKey()).is(entry.getValue());
+			}
+		}
+		query.addCriteria(criteria);
+		return mongoTemplate.find(query, getClassEntity());
+	}
+
+	/**
+	 * 通过参数查找结果集，适合分页场景
+	 * @param params
+	 * @return
+	 */
+	public PageInfo<T> queryPage(int page, int size, Map<String, Object> params) {
+		PageInfo<T> pageInfo = new PageInfo<T>(page, size);
+
+		List<T> dataList = null;
+		long total = this.queryCount(params);
+		if (total > 0) {
+			pageInfo.setTotal(total);
+
+			Query query = new Query();
+			Criteria criteria = new Criteria();
+			if (params != null) {
+				for (Entry<String, Object> entry : params.entrySet()) {
+					criteria.and(entry.getKey()).is(entry.getValue());
+				}
+			}
+			query.addCriteria(criteria);
+			query.skip(pageInfo.getOffset()).limit(pageInfo.getLimit());
+			dataList = mongoTemplate.find(query, getClassEntity());
+		}
+		if (total == 0) {
+			dataList = new ArrayList<T>();
+		}
+		pageInfo.setRows(dataList);
+		return pageInfo;
+	}
+
+	/**
+	 * 通过参数查找结果集数目
+	 * @param params
+	 * @return
+	 */
+	public long queryCount(Map<String, Object> params) {
+		Query query = new Query();
+
+		Criteria criteria = new Criteria();
+		if (params != null) {
+			for (Entry<String, Object> entry : params.entrySet()) {
+				criteria.and(entry.getKey()).is(entry.getValue());
+			}
+		}
+		query.addCriteria(criteria);
+		return mongoTemplate.count(query, getClassEntity());
+	}
+}

mec-common/mongo-db/src/main/java/com/yonge/mongodb/service/BaseServiceWithMongo.java

@@ -0,0 +1,25 @@
+package com.yonge.mongodb.service;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import com.yonge.mongodb.PageInfo;
+import com.yonge.mongodb.QueryInfo;
+
+public interface BaseServiceWithMongo<PK, T extends Serializable> {
+
+	public T get(PK id);
+	
+	public long update(PK id, T bean);
+	
+	public long delete(final PK id);
+	
+	public void insert(T bean);
+	
+	public List<T> findAll(Map<String, Object> params);
+	
+	public PageInfo<T> queryPage(QueryInfo queryInfo);
+	
+	public long queryCount(Map<String, Object> params);
+}

mec-common/mongo-db/src/main/java/com/yonge/mongodb/service/impl/BaseServiceImplWithMongo.java

@@ -0,0 +1,75 @@
+package com.yonge.mongodb.service.impl;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.ym.mec.util.collection.MapUtil;
+import com.yonge.mongodb.PageInfo;
+import com.yonge.mongodb.QueryInfo;
+import com.yonge.mongodb.dao.BaseDaoWithMongo;
+import com.yonge.mongodb.service.BaseServiceWithMongo;
+
+public abstract class BaseServiceImplWithMongo<PK, T extends Serializable> implements BaseServiceWithMongo<PK, T> {
+
+	public abstract BaseDaoWithMongo<PK, T> getDAO();
+
+	public T get(PK id) {
+		return getDAO().get(id);
+	}
+
+	/**
+	 * 更新实体对象
+	 * @param bean
+	 */
+	public long update(PK id, T bean) {
+		return getDAO().update(id, bean);
+	}
+
+	/**
+	 * 通过主键id删除对象
+	 * @param id
+	 */
+	public long delete(final PK id) {
+		return getDAO().delete(id);
+	}
+
+	/**
+	 * 写入实体对象
+	 * @param bean
+	 */
+	public void insert(T bean) {
+		getDAO().insert(bean);
+	}
+
+	/**
+	 * 通过参数查找所有结果集
+	 * @param params
+	 * @return
+	 */
+	public List<T> findAll(Map<String, Object> params) {
+		return getDAO().findAll(params);
+	}
+
+	/**
+	 * 通过参数查找结果集，适合分页场景
+	 * @param params
+	 * @return
+	 */
+	public PageInfo<T> queryPage(QueryInfo queryInfo) {
+		Map<String, Object> params = new HashMap<String, Object>();
+		MapUtil.populateMap(params, queryInfo, "page", "rows", "sort", "order");
+		return getDAO().queryPage(queryInfo.getPage(), queryInfo.getRows(), params);
+	}
+
+	/**
+	 * 通过参数查找结果集数目
+	 * @param params
+	 * @return
+	 */
+	public long queryCount(Map<String, Object> params) {
+		return getDAO().queryCount(params);
+	}
+
+}

mec-common/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.ym</groupId>
@@ -27,5 +26,7 @@
 	<modules>
 		<module>common-core</module>
 		<module>common-log</module>
-	</modules>
+	  <module>mongo-db</module>
+    <module>audit-log</module>
+  </modules>
 </project>

mec-eureka/pom.xml

@@ -20,6 +20,17 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-lang</groupId>
+					<artifactId>commons-lang</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
 		</dependency>
 		
 		<dependency>

mec-gateway/mec-gateway-web/pom.xml

@@ -32,6 +32,11 @@
 
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-zuul</artifactId>
 		</dependency>
 

mec-im/pom.xml

@@ -20,6 +20,11 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+		</dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-jpa</artifactId>

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -421,7 +421,6 @@ public class RoomServiceImpl implements RoomService {
             //如果设备号不为空，更新设备号
             RoleEnum roleEnum = RoleEnum.getEnumByValue(roomMember.getRole());
             if(roleEnum == RoleTeacher && StringUtils.isNotEmpty(deviceNum)){
-                signInSuccess(roomMember,deviceNum);
                 teacherAttendanceService.addTeacherAttendanceSignOut(firstCourseId.longValue(),Integer.parseInt(userId),deviceNum);
             }
             return;

mec-student/pom.xml

@@ -19,6 +19,11 @@
 
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-security</artifactId>
 		</dependency>
 

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -150,7 +150,7 @@ public class MusicGroupController extends BaseController {
             return failed(HttpStatus.CONTINUE, "乐团报名信息不存在");
         }
         if (studentRegistration.getPaymentStatus() != null && studentRegistration.getPaymentStatus() == PaymentStatusEnum.YES) {
-            return failed("您已缴费,请等待乐团开启");
+            return failed(HttpStatus.PROCESSING,"您已缴费,请等待乐团开启");
         }
 
         if (studentRegistration.getPaymentStatus() != PaymentStatusEnum.OPEN) {

mec-task/pom.xml

@@ -24,6 +24,11 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+		</dependency>
 		
 		<dependency>
 			<groupId>org.quartz-scheduler</groupId>

mec-teacher/pom.xml

@@ -22,6 +22,11 @@
 
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-security</artifactId>
 		</dependency>
 

mec-thirdparty/.gitignore

@@ -0,0 +1 @@
+/target

mec-util/.gitignore

@@ -0,0 +1 @@
+/target

mec-util/pom.xml

@@ -79,10 +79,22 @@
 			<artifactId>iTextAsian</artifactId>
 			<version>1.0</version>
 		</dependency>
-        <dependency>
-            <groupId>org.ini4j</groupId>
-            <artifactId>ini4j</artifactId>
-            <version>0.5.4</version>
-        </dependency>
-    </dependencies>
+		<dependency>
+			<groupId>org.ini4j</groupId>
+			<artifactId>ini4j</artifactId>
+			<version>0.5.4</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+			<version>1.2.70</version>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.8.0</version>
+		</dependency>
+	</dependencies>
 </project>

mec-util/src/main/java/com/ym/mec/util/collection/MapUtil.java

@@ -1,5 +1,6 @@
 package com.ym.mec.util.collection;
 
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.beans.BeanInfo;
@@ -28,15 +29,15 @@ public class MapUtil {
 	* @param bean
 	* @return
 	*/
-	public static Map<String, Object> populateMap(Map<String, Object> map, Object bean) {
-		return populateMap(map, bean, null);
+	public static Map<String, Object> populateMap(Map<String, Object> map, Object bean, String... ignoreKeys) {
+		return populateMapWithPrefix(map, bean, null, ignoreKeys);
 	}
 
 	/**
 	 * 假设prefix=detail.，bean带有一个属性name，则map中将有一个项：
 	 * key=detail.name，value为bean的name属性值。
 	 */
-	public static Map<String, Object> populateMap(Map<String, Object> map, Object bean, String prefix) {
+	public static Map<String, Object> populateMapWithPrefix(Map<String, Object> map, Object bean, String prefix, String... ignoreKeys) {
 		boolean withoutPrefix = StringUtils.isBlank(prefix);
 
 		try {
@@ -53,6 +54,10 @@ public class MapUtil {
 					}
 
 					String key = withoutPrefix ? propName : prefix + propName;
+					
+					if(ArrayUtils.contains(ignoreKeys, key)){
+						continue;
+					}
 
 					Object value = methods[i].invoke(bean, EMPTY_ARRAY);
 					if (value != null) {

mec-web/pom.xml

@@ -23,6 +23,11 @@
 
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-security</artifactId>
 		</dependency>
 

pom.xml

@@ -82,6 +82,12 @@
 				<artifactId>mec-util</artifactId>
 				<version>1.0</version>
 			</dependency>
+			
+			<dependency>
+				<groupId>com.yonge.mongodb</groupId>
+				<artifactId>mongo-db</artifactId>
+				<version>1.0</version>
+			</dependency>
 
 			<dependency>
 				<groupId>com.ym</groupId>
@@ -255,11 +261,12 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-lang</groupId>
+					<artifactId>commons-lang</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 

workflowy/src/main/java/org/snaker/engine/access/AbstractDBAccess.java

@@ -25,8 +25,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.snaker.engine.DBAccess;

workflowy/src/main/java/org/snaker/engine/access/Page.java

@@ -16,7 +16,7 @@ package org.snaker.engine.access;
 
 import java.util.List;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.springframework.beans.factory.annotation.Value;
 
 /**

workflowy/src/main/java/org/snaker/engine/access/QueryFilter.java

@@ -18,7 +18,7 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.snaker.engine.Completion;
 import org.snaker.engine.core.ServiceContext;
 import org.snaker.engine.helper.AssertHelper;

workflowy/src/main/java/org/snaker/engine/access/dialect/SQLServerDialect.java

@@ -14,7 +14,7 @@
  */
 package org.snaker.engine.access.dialect;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.snaker.engine.access.Page;
 import org.snaker.engine.helper.StringHelper;
 

workflowy/src/main/java/org/snaker/engine/core/OrderService.java

@@ -17,7 +17,7 @@ package org.snaker.engine.core;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.snaker.engine.Completion;
 import org.snaker.engine.IOrderService;
 import org.snaker.engine.SnakerEngine;

workflowy/src/main/java/org/snaker/engine/helper/StringHelper.java

@@ -14,7 +14,7 @@
  */
 package org.snaker.engine.helper;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.snaker.engine.SnakerException;
 
 /**

workflowy/src/main/java/org/snaker/engine/impl/SchedulerInterceptor.java

@@ -17,7 +17,7 @@ package org.snaker.engine.impl;
 import java.util.Date;
 import java.util.Map;
 
-import org.apache.commons.lang.math.NumberUtils;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.snaker.engine.SnakerInterceptor;

workflowy/src/main/java/org/snaker/engine/parser/impl/SubProcessParser.java

@@ -14,7 +14,7 @@
  */
 package org.snaker.engine.parser.impl;
 
-import org.apache.commons.lang.math.NumberUtils;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.snaker.engine.helper.StringHelper;
 import org.snaker.engine.model.NodeModel;
 import org.snaker.engine.model.SubProcessModel;