新增spring-side

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/wlyy/WlyyContant.java

@@ -0,0 +1,11 @@
package com.yihu.jw.restmodel.wlyy;
/**
 * Created by chenweida on 2017/6/13.
 */
public class WlyyContant {
    public static Integer status_del=-1;
    public static Integer status_lock=0;
    public static Integer status_normal=-1;
}

svr-lib-parent-pom/pom.xml

@@ -384,6 +384,13 @@
            </dependency>
            <!--zipkin  end-->
            <!---->
            <dependency>
                <groupId>org.springside</groupId>
                <artifactId>springside-core</artifactId>
                <version>${version.springside}</version>
            </dependency>
            <!--hibernate start-->
            <dependency>
                <groupId>org.hibernate</groupId>

svr/svr-manage/pom.xml

@@ -92,6 +92,10 @@
            <groupId>net.sf.json-lib</groupId>
            <artifactId>json-lib</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springside</groupId>
            <artifactId>springside-core</artifactId>
        </dependency>
    </dependencies>
    <build>
        <finalName>svr-manage</finalName>

svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/login/LoginController.java

@@ -5,6 +5,9 @@ import com.yihu.jw.manage.model.system.ManageUser;
import com.yihu.jw.manage.service.login.LoginService;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -17,14 +20,16 @@ import java.util.Map;
 * Created by chenweida on 2017/6/8.
 */
@RestController
@Api(description = "登陆模块")
public class LoginController extends EnvelopRestController {
    @Autowired
    private LoginService loginService;
    @GetMapping("/login")
    @ApiOperation(value = "登陆")
    public Envelop login(
            @RequestParam(required = true, name = "username") String username,
            @RequestParam(required = true, name = "password") String password) {
            @ApiParam(name = "username", value = "账号", required = true)@RequestParam(required = true, name = "username") String username,
            @ApiParam(name = "password", value = "密码", required = true)@RequestParam(required = true, name = "password") String password) {
        try {
            ManageUser data = loginService.login(username, password);
            return Envelop.getSuccess("登陆成功", data);
@@ -35,7 +40,9 @@ public class LoginController extends EnvelopRestController {
    }
    @GetMapping("/loginout")
    public Envelop loginout(@RequestParam(required = true, name = "userCode") String userCode) {
    @ApiOperation(value = "退出")
    public Envelop loginout(
            @ApiParam(name = "userCode", value = "用户code", required = true)@RequestParam(required = true, name = "userCode") String userCode) {
        try {
            //从缓存清空
            LoginCache.cleanUser(userCode);
@@ -47,8 +54,9 @@ public class LoginController extends EnvelopRestController {
    }
    @GetMapping("/index")
    @ApiOperation(value = "index页面需要的参数,菜单 用户信息")
    public Envelop index(
            @RequestParam(required = true, name = "userCode") String userCode
            @ApiParam(name = "userCode", value = "用户code", required = true)  @RequestParam(required = true, name = "userCode") String userCode
    ) {
        try {
            Map<String, List> data = loginService.index(userCode);

svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/system/UserController.java

@@ -0,0 +1,52 @@
package com.yihu.jw.manage.controller.system;
import com.yihu.jw.manage.model.system.ManageUser;
import com.yihu.jw.manage.service.system.UserService;
import com.yihu.jw.restmodel.common.Envelop;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureOrder;
import org.springframework.data.domain.Page;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
/**
 * Created by chenweida on 2017/6/12.
 */
@RestController
@RequestMapping("/user")
@Api(description = "用户管理")
public class UserController {
    @Autowired
    private UserService userService;
    @GetMapping("/list")
    @ApiOperation(value = "用户列表")
    public Envelop userList(
            @ApiParam(name = "name", value = "用户名称", required = false) @RequestParam(required = false, name = "name") String name,
            @ApiParam(name = "page", value = "当前页", required = false) @RequestParam(required = false, name = "page", defaultValue = "1") Integer page,
            @ApiParam(name = "pageSize", value = "每页显示条数", required = false) @RequestParam(required = false, name = "pageSize", defaultValue = "10") Integer pageSize
    ) {
        try {
            Page<ManageUser> users = userService.userList(name,page, pageSize);
            return Envelop.getSuccessListWithPage(
                    "获取信息成功",
                    users.getContent(),//数据内容
                    page, //当前页
                    pageSize,//每个显示条数
                    users.getTotalElements()//总数
            );
        } catch (Exception e) {
            return Envelop.getError("获取信息成功:" + e.getMessage(), -1);
        }
    }
}

svr/svr-manage/src/main/java/com/yihu/jw/manage/service/system/UserService.java

@@ -3,8 +3,20 @@ package com.yihu.jw.manage.service.system;
import com.yihu.jw.manage.dao.system.UserDao;
import com.yihu.jw.manage.dao.system.UserRoleDao;
import com.yihu.jw.manage.model.system.ManageUser;
import com.yihu.jw.restmodel.exception.ManageException;
import com.yihu.jw.restmodel.wlyy.WlyyContant;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import org.springside.modules.persistence.DynamicSpecifications;
import org.springside.modules.persistence.SearchFilter;
import java.util.HashMap;
import java.util.Map;
/**
 * Created by chenweida on 2017/6/9.
@@ -23,4 +35,26 @@ public class UserService {
    public ManageUser findByCode(String usercode) {
        return userDao.findByCode(usercode);
    }
    public Page<ManageUser> userList(String name,Integer page, Integer pageSize)throws ManageException {
        // 排序
        Sort sort = new Sort(Sort.Direction.DESC, "createTime");
        // 分页信息
        PageRequest pageRequest = new PageRequest(page, pageSize, sort);
        // 设置查询条件
        Map<String, SearchFilter> filters = new HashMap<String, SearchFilter>();
        // 用户名称
        if (!StringUtils.isEmpty(name)) {
            name="%"+name+"%";
            filters.put("name", new SearchFilter("name", SearchFilter.Operator.LIKE, name));
        }
//        filters.put("recordDate1", new SearchFilter("recordDate", Operator.GTE, begin));
//        filters.put("recordDate2", new SearchFilter("recordDate", Operator.LTE, end));
        // 未作废
        filters.put("status", new SearchFilter("status", SearchFilter.Operator.EQ, WlyyContant.status_normal));
        Specification<ManageUser> spec = DynamicSpecifications.bySearchFilter(filters.values(), ManageUser.class);
        return userDao.findAll(spec, pageRequest);
    }
}