From b62b207be0bd2aa2b62ede7e2b0dd8e1c9341147 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 19 Dec 2017 16:37:49 +0800
Subject: [PATCH] updated
---
src/main/java/com/moral/security/WebSecurityConfiguration.java | 8 +-
src/main/resources/mapper/OperateUserMapper.xml | 31 ++++++++++
src/main/java/com/moral/common/bean/PageResult.java | 20 ++++++
src/main/java/com/moral/controller/UserController.java | 39 +++++++++++++
src/main/java/com/moral/mapper/OperateUserMapper.java | 9 +++
src/main/java/com/moral/service/OperateUserService.java | 9 ++
src/main/java/com/moral/service/impl/OperateUserServiceImpl.java | 17 +++++
7 files changed, 128 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/common/bean/PageResult.java b/src/main/java/com/moral/common/bean/PageResult.java
new file mode 100644
index 0000000..be949f3
--- /dev/null
+++ b/src/main/java/com/moral/common/bean/PageResult.java
@@ -0,0 +1,20 @@
+package com.moral.common.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class PageResult {
+
+ private Long total;
+
+ private List<?> data;
+
+ public PageResult(Long total, List<?> data) {
+ this.total = total;
+ this.data = data;
+ }
+}
diff --git a/src/main/java/com/moral/controller/UserController.java b/src/main/java/com/moral/controller/UserController.java
new file mode 100644
index 0000000..a18fba7
--- /dev/null
+++ b/src/main/java/com/moral/controller/UserController.java
@@ -0,0 +1,39 @@
+package com.moral.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.moral.entity.OperateUser;
+import com.moral.common.bean.PageResult;
+import com.moral.service.OperateUserService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@RequestMapping("/user")
+public class UserController {
+
+ /** The operate user service. */
+ @Resource
+ private OperateUserService operateUserService;
+
+ @RequestMapping(value = "/operate_user", method = RequestMethod.GET)
+ public PageResult findOperateUserList() {
+
+ Long total = operateUserService.findOperateUserCount();
+ List<?> data = operateUserService.findOperateUserList();
+ return new PageResult(total, data);
+ }
+
+ @RequestMapping(value = "/operate_user/{id}", method = RequestMethod.GET)
+ public OperateUser findOperateUserById(@PathVariable(value = "id") int id) {
+
+ return operateUserService.findOperateUserById(id);
+ }
+
+ @RequestMapping(value = "/operate_user/save", method = RequestMethod.POST)
+ public int saveOrUpdate(@RequestBody OperateUser operateUser) {
+ System.out.println(JSON.toJSONString(operateUser));
+ return 1;
+ }
+}
diff --git a/src/main/java/com/moral/mapper/OperateUserMapper.java b/src/main/java/com/moral/mapper/OperateUserMapper.java
index 5c1bdbc..2d608af 100644
--- a/src/main/java/com/moral/mapper/OperateUserMapper.java
+++ b/src/main/java/com/moral/mapper/OperateUserMapper.java
@@ -2,6 +2,15 @@
import com.moral.common.mapper.BaseMapper;
import com.moral.entity.OperateUser;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
public interface OperateUserMapper extends BaseMapper<OperateUser> {
+
+ List<OperateUser> findOperateUserList();
+
+ Long findOperateUserCount();
+
+ OperateUser findOperateUserById( @Param("id") int id);
}
\ No newline at end of file
diff --git a/src/main/java/com/moral/security/WebSecurityConfiguration.java b/src/main/java/com/moral/security/WebSecurityConfiguration.java
index 0ff9182..98f1146 100644
--- a/src/main/java/com/moral/security/WebSecurityConfiguration.java
+++ b/src/main/java/com/moral/security/WebSecurityConfiguration.java
@@ -49,10 +49,10 @@
@Override
protected void configure(HttpSecurity http) throws Exception {
- http
- .anonymous().disable()
- .authorizeRequests()
- .antMatchers("/oauth/token").permitAll();
+ http.csrf().disable(); //TODO ������������CSRF
+ http.anonymous().disable()
+ .authorizeRequests()
+ .antMatchers("/oauth/token").permitAll();
}
@Override
diff --git a/src/main/java/com/moral/service/OperateUserService.java b/src/main/java/com/moral/service/OperateUserService.java
index e53567e..293b91f 100644
--- a/src/main/java/com/moral/service/OperateUserService.java
+++ b/src/main/java/com/moral/service/OperateUserService.java
@@ -2,6 +2,8 @@
import com.moral.entity.OperateUser;
+import java.util.List;
+
public interface OperateUserService {
OperateUser getOperateUserByMobile(String mobile);
@@ -9,5 +11,10 @@
OperateUser mobileLogin(String mobile, String password);
OperateUser updatePassword(Integer uid, String password, String newPassword);
-
+
+ List<OperateUser> findOperateUserList();
+
+ Long findOperateUserCount();
+
+ public OperateUser findOperateUserById(int id);
}
diff --git a/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java b/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
index 5d8de72..b7d5410 100644
--- a/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
@@ -13,6 +13,8 @@
import com.moral.mapper.OperateUserMapper;
import com.moral.service.OperateUserService;
+import java.util.List;
+
@Service
public class OperateUserServiceImpl implements OperateUserService {
@@ -59,4 +61,19 @@
}
}
+ @Override
+ public List<OperateUser> findOperateUserList() {
+ return operateUserMapper.findOperateUserList();
+ }
+
+ @Override
+ public Long findOperateUserCount() {
+ return operateUserMapper.findOperateUserCount();
+ }
+
+ @Override
+ public OperateUser findOperateUserById(int id) {
+ return operateUserMapper.findOperateUserById(id);
+ }
+
}
diff --git a/src/main/resources/mapper/OperateUserMapper.xml b/src/main/resources/mapper/OperateUserMapper.xml
new file mode 100644
index 0000000..8e83fd0
--- /dev/null
+++ b/src/main/resources/mapper/OperateUserMapper.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.moral.mapper.OperateUserMapper">
+
+ <select id="findOperateUserList" resultType="com.moral.entity.OperateUser">
+ SELECT
+ *
+ FROM
+ operate_user
+ </select>
+
+ <select id="findOperateUserCount" resultType="java.lang.Long">
+ SELECT
+ count(1)
+ FROM
+ operate_user
+ </select>
+
+ <select id="findOperateUserById" resultType="com.moral.entity.OperateUser">
+ SELECT
+ *
+ FROM
+ operate_user
+ WHERE
+ id = #{id}
+ </select>
+
+
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0