用户登录功能完成

单元测试 Demo 编写

modules/i3plus-core-apiservice/pom.xml

@@ -94,6 +94,18 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+
+        <!-- Junit -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

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());
-            }
-        }
-
-    }
 }

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;

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());

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
+//@SpringBootTest
-@WebAppConfiguration
+//@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);
-    }
 }

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;
+package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
-//
+
-//import cn.estsh.i3plus.core.api.iservice.busi.IPositionService;
+import cn.estsh.i3plus.core.api.iservice.busi.IPositionService;
-//import org.springframework.beans.factory.annotation.Autowired;
+import cn.estsh.i3plus.pojo.platform.bean.Position;
-//import org.springframework.boot.test.context.SpringBootTest;
+import com.alibaba.fastjson.JSON;
-//import org.springframework.test.context.junit4.SpringRunner;
+import org.junit.Test;
-//
+import org.springframework.beans.factory.annotation.Autowired;
-///**
+
-// * @Description :
+import javax.transaction.Transactional;
-// * @Reference :
+import java.util.List;
-// * @Author : wei.peng
+
-// * @Date : 2018-10-29 19:02
+/**
-// * @Modify :
+ * @Description : 岗位信息测试
-// **/
+ * @Reference :
-//@RunWith(SpringRunner.class)
+ * @Author : wei.peng
-//@SpringBootTest(classes = {cn.estsh.ImppGo.class})
+ * @Date : 2018-10-29 19:02
-//public class TestPositionServiceImpl {
+ * @Modify :
-//
+ **/
-//    @Autowired
+public class TestPositionServiceImpl extends TestBase {
-//    private IPositionService positionService;
+
-//
+    @Autowired
-//    @Test
+    private IPositionService positionService;
-//    public void test1(){
+
-//        System.out.println(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);
+    }
+
+
+}

pom.xml

@@ -150,6 +150,20 @@
                 <artifactId>ehcache-core</artifactId>
                 <version>2.6.11</version>
             </dependency>
+
+            <!-- Junit -->
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-test</artifactId>
+                <version>2.0.3.RELEASE</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.12</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>