From 1a73abc088caa0f5873d8143a6bd71937263a413 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 27 Dec 2017 15:43:46 +0800
Subject: [PATCH] 更新 安装用户
---
src/main/java/com/moral/service/impl/AccountServiceImpl.java | 3 -
/dev/null | 10 ---
src/main/java/com/moral/controller/OperateUserController.java | 54 ++++++++++++++++++
src/main/java/com/moral/common/bean/ResultBean.java | 19 ++---
src/main/java/com/moral/service/OperateUserService.java | 15 ++---
src/main/java/com/moral/service/impl/OperateUserServiceImpl.java | 75 +++++++++++++++---------
6 files changed, 114 insertions(+), 62 deletions(-)
diff --git a/src/main/java/com/moral/common/bean/ResultBean.java b/src/main/java/com/moral/common/bean/ResultBean.java
index 96ad875..17e19e4 100644
--- a/src/main/java/com/moral/common/bean/ResultBean.java
+++ b/src/main/java/com/moral/common/bean/ResultBean.java
@@ -5,24 +5,21 @@
import lombok.Data;
@Data
-public class ResultBean<T>implements Serializable {
+public class ResultBean<T> implements Serializable {
private static final long serialVersionUID = 1L;
-
+
public static final int FAIL = 0;
public static final int SUCCESS = 1;
public static final int NO_PERMISSION = 2;
- private String message = "success";
- private int code = SUCCESS;
+ private String message;
+ private Integer code;
private T data;
public ResultBean() {
super();
- }
-
- public ResultBean(int code) {
- super();
- this.code = code;
+ this.message = "success";
+ this.code = SUCCESS;
}
public ResultBean(Throwable e) {
@@ -32,10 +29,10 @@
}
public ResultBean(T data) {
- super();
+ this();
this.data = data;
}
-
+
public ResultBean(String message, int code) {
super();
this.message = message;
diff --git a/src/main/java/com/moral/controller/OperateUserController.java b/src/main/java/com/moral/controller/OperateUserController.java
new file mode 100644
index 0000000..e1ab4c5
--- /dev/null
+++ b/src/main/java/com/moral/controller/OperateUserController.java
@@ -0,0 +1,54 @@
+package com.moral.controller;
+
+import static com.moral.common.util.WebUtils.getParametersStartingWith;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.moral.common.bean.PageBean;
+import com.moral.common.bean.ResultBean;
+import com.moral.entity.OperateUser;
+import com.moral.service.OperateUserService;
+
+@RestController
+@RequestMapping("operateUser")
+public class OperateUserController {
+
+ @Resource
+ private OperateUserService operateUserService;
+
+ @GetMapping("list")
+ public ResultBean<PageBean<OperateUser>> getOperateUserList(HttpServletRequest request) {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ PageBean<OperateUser> operateUsers = operateUserService.getOperateUserList(parameters);
+ return new ResultBean<PageBean<OperateUser>>(operateUsers);
+ }
+
+ @PostMapping("operateUser")
+ public ResultBean<Integer> saveOrUpdateOperateUser(@RequestBody OperateUser operateUser) {
+ Integer code= operateUserService.saveOrUpdateOperateUser(operateUser);
+ return new ResultBean<Integer>(code);
+ }
+
+ @PostMapping("operateUser/id")
+ public ResultBean<Integer> deleteOperateUserByLogic(@RequestBody OperateUser operateUser) {
+ Integer result = operateUserService.deleteOperateUserByLogic(operateUser);
+ return new ResultBean<Integer>(result);
+ }
+
+ @PostMapping("operateUsers/ids")
+ public ResultBean<Integer> deleteAccountsByLogic(@RequestBody List<Integer> ids) {
+ Integer result = operateUserService.deleteOperateUsersByLogic(ids);
+ return new ResultBean<Integer>(result);
+ }
+
+}
diff --git a/src/main/java/com/moral/controller/UserController.java b/src/main/java/com/moral/controller/UserController.java
deleted file mode 100644
index 6162ce2..0000000
--- a/src/main/java/com/moral/controller/UserController.java
+++ /dev/null
@@ -1,56 +0,0 @@
-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;
-
- @GetMapping("/operate_user")
- public PageResult findOperateUserList() {
-
- Long total = operateUserService.findOperateUserCount();
- List<?> data = operateUserService.findOperateUserList();
- return new PageResult(total, data);
- }
-
- @GetMapping("/operate_user/{id}")
- public OperateUser findOperateUserById(@PathVariable(value = "id") int id) {
-
- return operateUserService.findOperateUser(id);
- }
-
- @PostMapping("/operate_user/save")
- public int saveOrUpdate(@RequestBody OperateUser user) {
- int result = 1;
- Integer id = user.getId();
- if(id != null && id > 0) {
- result = operateUserService.updateOperateUser(user);
- } else {
- result = operateUserService.insertOperateUser(user);
- }
- return result;
- }
-
- @DeleteMapping("/operate_user/{id}")
- public int delete(@PathVariable(value = "id") int id) {
- return operateUserService.deleteOperateUser(id);
- }
-
- @PostMapping("/operate_user/deleteList")
- public int deleteUserList(@RequestBody String[] ids) {
- System.out.println(ids);
- return operateUserService.deleteOperateUserList(ids);
- }
-}
diff --git a/src/main/java/com/moral/mapper/UserMapper.java b/src/main/java/com/moral/mapper/UserMapper.java
deleted file mode 100644
index 9070663..0000000
--- a/src/main/java/com/moral/mapper/UserMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.moral.mapper;
-
-import com.moral.entity.auth.AuthUser;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface UserMapper {
-
- public AuthUser findByUsername(String name);
-}
diff --git a/src/main/java/com/moral/service/OperateUserService.java b/src/main/java/com/moral/service/OperateUserService.java
index d7b28a5..72465a9 100644
--- a/src/main/java/com/moral/service/OperateUserService.java
+++ b/src/main/java/com/moral/service/OperateUserService.java
@@ -1,8 +1,10 @@
package com.moral.service;
+import com.moral.common.bean.PageBean;
import com.moral.entity.OperateUser;
import java.util.List;
+import java.util.Map;
public interface OperateUserService {
@@ -12,17 +14,12 @@
OperateUser updatePassword(Integer uid, String password, String newPassword);
- List<OperateUser> findOperateUserList();
+ PageBean<OperateUser> getOperateUserList(Map<String, Object> parameters);
- Long findOperateUserCount();
+ Integer saveOrUpdateOperateUser(OperateUser operateUser);
- OperateUser findOperateUser(int id);
+ Integer deleteOperateUserByLogic(OperateUser operateUser);
- int insertOperateUser(OperateUser user);
+ Integer deleteOperateUsersByLogic(List<Integer> ids);
- int updateOperateUser(OperateUser user);
-
- int deleteOperateUser(int id);
-
- int deleteOperateUserList(String[] ids);
}
diff --git a/src/main/java/com/moral/service/UserService.java b/src/main/java/com/moral/service/UserService.java
deleted file mode 100644
index e8ce740..0000000
--- a/src/main/java/com/moral/service/UserService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.moral.service;
-
-import com.moral.entity.auth.AuthUser;
-
-import java.util.List;
-
-public interface UserService {
-
- AuthUser findByUsername(String name);
-}
diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index c25281e..0a93e6b 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -129,9 +129,6 @@
@Transactional
public Integer deleteAccountByLogic(Account account) {
account.setIsDelete(Constants.IS_DELETE_TRUE);
- if (account.getId() > 0) {
- throw new BusinessException("hahahahahah..................");
- }
return accountMapper.updateByPrimaryKeySelective(account);
}
diff --git a/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java b/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
index 3079783..f33c794 100644
--- a/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
@@ -1,11 +1,18 @@
package com.moral.service.impl;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
+import com.github.pagehelper.PageHelper;
+import com.moral.common.bean.Constants;
+import com.moral.common.bean.PageBean;
import com.moral.common.exception.BusinessException;
import com.moral.common.util.Crypto;
import com.moral.common.util.ValidateUtil;
@@ -13,7 +20,8 @@
import com.moral.mapper.OperateUserMapper;
import com.moral.service.OperateUserService;
-import java.util.List;
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.entity.Example.Criteria;
@Service
public class OperateUserServiceImpl implements OperateUserService {
@@ -62,41 +70,50 @@
}
@Override
- public List<OperateUser> findOperateUserList() {
- return operateUserMapper.findOperateUserList();
- }
-
- @Override
- public Long findOperateUserCount() {
- return operateUserMapper.findOperateUserCount();
- }
-
- @Override
- public OperateUser findOperateUser(int id) {
- return operateUserMapper.selectByPrimaryKey(id);
+ public PageBean<OperateUser> getOperateUserList(Map<String, Object> parameters) {
+ Example example = new Example(OperateUser.class);
+ Criteria criteria = example.createCriteria();
+ if (parameters.containsKey("u_name")) {
+ criteria.andLike("name", "%" + (String) parameters.get("u_name") + "%");
+ }
+ if (parameters.containsKey("u_mobile")) {
+ criteria.andLike("mobile", "%" + (String) parameters.get("u_mobile") + "%");
+ }
+ if (parameters.containsKey("sorter")) {
+ example.setOrderByClause((String) parameters.get("sorter"));
+ }
+ PageHelper.startPage(Integer.valueOf((String) parameters.get("pi")), Integer.valueOf((String) parameters.get("ps")));
+ List<OperateUser> operateUsers = operateUserMapper.selectByExample(example);
+ return new PageBean<OperateUser>(operateUsers);
}
@Override
@Transactional
- public int insertOperateUser(OperateUser user) {
- return operateUserMapper.insertSelective(user);
+ public Integer saveOrUpdateOperateUser(OperateUser operateUser) {
+ if (ObjectUtils.isEmpty(operateUser.getId())) {
+ operateUser.setIsDelete(Constants.IS_DELETE_FALSE);
+ operateUser.setCreateTime(new Date());
+ return operateUserMapper.insertSelective(operateUser);
+ }else {
+ return operateUserMapper.updateByPrimaryKeySelective(operateUser);
+ }
+ }
+
+
+ @Override
+ @Transactional
+ public Integer deleteOperateUserByLogic(OperateUser operateUser) {
+ operateUser.setIsDelete(Constants.IS_DELETE_TRUE);
+ return operateUserMapper.updateByPrimaryKey(operateUser);
}
@Override
@Transactional
- public int updateOperateUser(OperateUser user) {
- return operateUserMapper.updateByPrimaryKeySelective(user);
- }
-
- @Override
- @Transactional
- public int deleteOperateUser(int id) {
- return operateUserMapper.deleteByPrimaryKey(id);
- }
-
- @Override
- @Transactional
- public int deleteOperateUserList(String[] ids) {
- return operateUserMapper.deleteOperateUserList(ids);
+ public Integer deleteOperateUsersByLogic(List<Integer> ids) {
+ OperateUser operateUser = new OperateUser();
+ operateUser.setIsDelete(Constants.IS_DELETE_TRUE);
+ Example example = new Example(OperateUser.class);
+ example.or().andIn("id", ids);
+ return operateUserMapper.updateByExampleSelective(operateUser, example);
}
}
diff --git a/src/main/java/com/moral/service/impl/UserServiceImpl.java b/src/main/java/com/moral/service/impl/UserServiceImpl.java
deleted file mode 100644
index e6a32cb..0000000
--- a/src/main/java/com/moral/service/impl/UserServiceImpl.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.moral.service.impl;
-
-import com.moral.entity.auth.AuthRole;
-import com.moral.entity.auth.AuthUser;
-import com.moral.mapper.UserMapper;
-import com.moral.service.UserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class UserServiceImpl implements UserService {
-
- @Autowired
- private UserMapper userMapper;
-
- @Override
- public AuthUser findByUsername(String name) {
- return userMapper.findByUsername(name);
- }
-}
diff --git a/src/main/resources/mapper/OperateUserMapper.xml b/src/main/resources/mapper/OperateUserMapper.xml
deleted file mode 100644
index 1bb4be5..0000000
--- a/src/main/resources/mapper/OperateUserMapper.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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">
-
- <resultMap id="operateUserMap" type="com.moral.entity.OperateUser">
- <result column="id" jdbcType="INTEGER" property="id" />
- <result column="name" jdbcType="VARCHAR" property="name" />
- <result column="password" jdbcType="VARCHAR" property="password" />
- <result column="organization_id" jdbcType="INTEGER" property="organizationId" />
- <result column="mobile" jdbcType="VARCHAR" property="mobile" />
- <result column="email" jdbcType="VARCHAR" property="email" />
- <result column="weixin" jdbcType="VARCHAR" property="weixin" />
- <result column="is_delete" jdbcType="INTEGER" property="isDelete" />
- <result column="create_time" property="createTime" />
- <result column="expire_time" property="expireTime" />
- </resultMap>
-
- <select id="findOperateUserList" resultMap="operateUserMap">
- SELECT
- *
- FROM
- operate_user
- </select>
-
- <select id="findOperateUserCount" resultType="java.lang.Long">
- SELECT
- count(1)
- FROM
- operate_user
- </select>
-
- <delete id="deleteOperateUserList">
- DELETE FROM
- operate_user
- WHERE id in
- <foreach collection="ids" item="user_id" open="(" separator="," close=")">
- #{user_id}
- </foreach>
- </delete>
-</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
deleted file mode 100644
index 65e04c7..0000000
--- a/src/main/resources/mapper/UserMapper.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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.UserMapper">
-
- <select id="findByUsername" resultType="com.moral.entity.auth.AuthUser">
-
- </select>
-
-</mapper>
\ No newline at end of file
--
Gitblit v1.8.0