diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml
index 082b8ba..c8bf412 100644
--- a/modules/i3plus-core-apiservice/pom.xml
+++ b/modules/i3plus-core-apiservice/pom.xml
@@ -94,6 +94,18 @@
org.slf4j
slf4j-api
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ junit
+ junit
+ test
+
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java
index 5d13663..a155880 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java
@@ -101,39 +101,4 @@ public class AuthController {
}
- /**
- * @Description : 系统资源服务demo
- * @Reference :
- * @Author : alwaysfrin
- * @CreateDate : 2018-09-26 10:34
- * @Modify:
- **/
- @RestController
- @RequestMapping("/core/tree")
- @Api(description="系统服务demo")
- public static class CoreTreeController {
- private static final Logger LOGGER = LoggerFactory.getLogger(CoreTreeController.class);
-
- @Autowired
- private ICoreTreeService coreTreeService;
-
- @GetMapping(value="/department")
- @ApiOperation(value="查询部门树",notes="通过部门主键获取部门树,-1为根节点")
- public ResultBean listDepartmentTree(long depParentId) {
- try {
- Department department = coreTreeService.getDepartmentTreeByParentId(depParentId);
-
- return ResultBean.success("查询部门树成功")
- .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
- .setResultObject(department);
- }catch(ImppBusiException busExcep){
- LOGGER.error(busExcep.getErrorMsg() + ":{}",busExcep.getErrorDetail(),busExcep);
- return ResultBean.fail(busExcep.getErrorShow());
- }catch(Exception e){
- LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + ":{}",e.getMessage(),e);
- return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
- }
- }
-
- }
}
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java
index 94fa4a1..fa54917 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java
@@ -125,7 +125,7 @@ public class SystemLoginService implements ISystemLoginService {
sessionUser.setLanguageCode(languageCode);
// sessionUser.setSiteCode(user.getFactoryCode());
// sessionUser.setUserName(user.getName());
- sessionUser.setUserTypeId(Integer.parseInt(userType));
+ sessionUser.setUserTypeId(userType);
// sessionUser.setUserCode(user.getUserInfo().getLanguageCode());
return sessionUser;
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java
index a14e018..695fe3a 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java
@@ -7,7 +7,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.shirotoken.AdminToken;
import cn.estsh.i3plus.pojo.base.shirotoken.SaAdminToken;
import cn.estsh.i3plus.pojo.base.shirotoken.UserToken;
-import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.platform.bean.*;
import cn.estsh.i3plus.pojo.platform.repository.*;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
@@ -15,7 +14,6 @@ import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
-import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authc.AuthenticationToken;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -331,7 +329,7 @@ public class SysUserServiceImpl implements ISysUserService {
public static SessionUser packSessionUser(SessionUser sessionUser, SysUser user, Integer userType, String languageCode) {
sessionUser.setLanguageCode(languageCode);
sessionUser.setUserName(user.getName());
- sessionUser.setUserTypeId(userType);
+ sessionUser.setUserTypeId(CommonEnumUtil.USER_TYPE.valueOf(userType));
sessionUser.setUserCode(user.getUserInfo().getLanguageCode());
sessionUser.setRoleList(user.getRoleList());
sessionUser.setDepartmentList(user.getDepartmentList());
diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java
index 058a0c5..fa8f9a5 100644
--- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java
+++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java
@@ -7,10 +7,13 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.web.WebAppConfiguration;
+import java.util.List;
+
/**
* @Description :
* @Reference :
@@ -18,27 +21,22 @@ import org.springframework.test.context.web.WebAppConfiguration;
* @Date : 2018-10-29 19:12
* @Modify :
**/
-@SpringBootTest
-@WebAppConfiguration
+//@SpringBootTest
+//@RunWith(SpringRunner.class)
+
@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@AutoConfigureMockMvc
public class TestBase {
@Before
public void init() {
- System.out.println("开始测试-----------------");
+ System.out.println("-----------------开始测试-----------------");
}
@After
public void after() {
- System.out.println("测试结束-----------------");
+ System.out.println("-----------------测试结束-----------------");
}
- @Autowired
- private IPositionService positionService;
-
-
- @Test
- public void test1(){
- System.out.println(positionService);
- }
}
diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionServiceImpl.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionServiceImpl.java
index 969ea29..292d082 100644
--- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionServiceImpl.java
+++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionServiceImpl.java
@@ -1,27 +1,79 @@
-//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
-//
-//import cn.estsh.i3plus.core.api.iservice.busi.IPositionService;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.boot.test.context.SpringBootTest;
-//import org.springframework.test.context.junit4.SpringRunner;
-//
-///**
-// * @Description :
-// * @Reference :
-// * @Author : wei.peng
-// * @Date : 2018-10-29 19:02
-// * @Modify :
-// **/
-//@RunWith(SpringRunner.class)
-//@SpringBootTest(classes = {cn.estsh.ImppGo.class})
-//public class TestPositionServiceImpl {
-//
-// @Autowired
-// private IPositionService positionService;
-//
-// @Test
-// public void test1(){
-// System.out.println(positionService);
-// }
-//
-//}
+package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
+
+import cn.estsh.i3plus.core.api.iservice.busi.IPositionService;
+import cn.estsh.i3plus.pojo.platform.bean.Position;
+import com.alibaba.fastjson.JSON;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.transaction.Transactional;
+import java.util.List;
+
+/**
+ * @Description : 岗位信息测试
+ * @Reference :
+ * @Author : wei.peng
+ * @Date : 2018-10-29 19:02
+ * @Modify :
+ **/
+public class TestPositionServiceImpl extends TestBase {
+
+ @Autowired
+ private IPositionService positionService;
+
+ /**
+ * 测试获取 所有岗位
+ */
+ @Test
+ @Transactional
+ public void testListPosition() {
+ List list = positionService.listPosition();
+ System.out.println(JSON.toJSONString(list));
+ }
+
+ /**
+ * 主键查询测试
+ */
+ @Test
+ @Transactional
+ public void testGetPositionById() {
+ Position position = positionService.getPositionById("1056796316849541120");
+ System.out.println(JSON.toJSONString(position));
+ }
+
+ /**
+ * 插入数据 测试
+ */
+ @Test
+ @Transactional
+ public void testInsertPosition() {
+ Position position = new Position();
+ position.setName("张三的岗位");
+ position.setPositionCode("ZS_CODE");
+ position.setPositionDescription("描述该岗位的信息");
+ Position pos = positionService.insertPosition(position);
+ System.out.println(JSON.toJSONString(pos));
+ }
+
+ /**
+ * 删除数据测试
+ */
+ @Test
+ @Transactional
+ public void testDeletePositionById() {
+ positionService.deletePositionById("105605611393555");
+ }
+
+ /**
+ * 修改数据测试
+ */
+ @Test
+ @Transactional
+ public void testUpdatePosition(){
+ Position position = positionService.getPositionById("1056878692237709312");
+ position.setName("===>> 改动后的名称");
+ positionService.updatePosition(position);
+ }
+
+
+}
diff --git a/pom.xml b/pom.xml
index 160703c..97710cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,6 +150,20 @@
ehcache-core
2.6.11
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ 2.0.3.RELEASE
+ test
+
+
+ junit
+ junit
+ 4.12
+ test
+