Skip to content

M
manager
Commit f9e3e894 by zhangxiaoyan
Options

conflict

parents 8cb1d4e7 3003a6c4
Showing with 291 additions and 149 deletions
.gitignore 0 → 100644
/target
/target/
/.settings/
/.classpath
/.project
/.externalToolBuilders
/.idea/
/node_modules/
/dist/
!/src/main/webapp/WEB-INF
/src/main/webapp
/node/
trackingio.iml
.tmp/
.tmp/styles/
.sass-cache
.sass-cache/
.sass-cache/3d09edcbe1cca1e701b8a3fb3aa5205d50bb2f2b/style.scssc
/target
Gruntfile.js
/target
/target
/test/mocks/.DS_Store
/.gradle
coverage-report
/src/main/websrc/.DS_Store
.idea/misc.xml
...@@ -10,5 +10,9 @@ ...@@ -10,5 +10,9 @@
</list> </list>
</option> </option>
</component> </component>
<<<<<<< HEAD
<component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK" /> <component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
=======
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
>>>>>>> 3003a6c49ac09d661bb616e5a363bb2109e68fb6
</project> </project>
\ No newline at end of file
.idea/uiDesigner.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
</component>
</project>
\ No newline at end of file
manage.iml
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Maven: com.alibaba:jconsole:1.8.0"> <library name="Maven: com.alibaba:jconsole:1.8.0">
<CLASSES> <CLASSES>
<root url="jar://D:/java/jdk1.8.0_91/lib/jconsole.jar!/" /> <root url="jar://E:/Java/jdk1.8.0_65/lib/jconsole.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Maven: com.alibaba:tools:1.8.0"> <library name="Maven: com.alibaba:tools:1.8.0">
<CLASSES> <CLASSES>
<root url="jar://D:/java/jdk1.8.0_91/lib/tools.jar!/" /> <root url="jar://E:/Java/jdk1.8.0_65/lib/tools.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
......
src/main/java/common/controller/LoginController.java
...@@ -5,6 +5,8 @@ package common.controller; ...@@ -5,6 +5,8 @@ package common.controller;
import com.sun.corba.se.spi.ior.ObjectKey; import com.sun.corba.se.spi.ior.ObjectKey;
import common.model.User; import common.model.User;
import common.repository.RoleRepository;
import common.repository.RoleTypeRepository;
import common.repository.UserRepository; import common.repository.UserRepository;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -37,6 +39,10 @@ public class LoginController { ...@@ -37,6 +39,10 @@ public class LoginController {
RedisLoginStatusManager redisLoginStatusManager; RedisLoginStatusManager redisLoginStatusManager;
@Autowired @Autowired
TokenManager tokenManager; TokenManager tokenManager;
@Autowired
RoleRepository roleRepository;
@Autowired
RoleTypeRepository roleTypeRepository;
@RequestMapping(value = "login", method = RequestMethod.GET) @RequestMapping(value = "login", method = RequestMethod.GET)
...@@ -44,11 +50,20 @@ public class LoginController { ...@@ -44,11 +50,20 @@ public class LoginController {
public ResultModel login(HttpServletResponse response, @RequestParam String email, @RequestParam String password) { public ResultModel login(HttpServletResponse response, @RequestParam String email, @RequestParam String password) {
User user = userRepository.login(email, CipherUtil.generatePassword(password)); User user = userRepository.login(email, CipherUtil.generatePassword(password));
if(null != user){ if(null != user){
if(null != user.getStatus() && !user.getStatus()){
Map<String, Object> map = new HashMap();;
map.put("code",201);
return ResultModel.OK(map);
}
//存储token //存储token
String token = tokenManager.createToken(String.valueOf(user.getId())); String token = tokenManager.createToken(String.valueOf(user.getId()));
//存储登陆密码 //存储登陆密码
redisLoginStatusManager.createLoginStatus(token, user.getPassword()); redisLoginStatusManager.createLoginStatus(token, user.getPassword());
user.setRoleName(roleRepository.getName(user.getRole()));
if(null != user.getRoleType()){
user.setRoleTypeName(roleTypeRepository.getName(user.getRoleType()));
}
Cookie cookie = new Cookie("TOKEN", token); Cookie cookie = new Cookie("TOKEN", token);
cookie.setPath("/"); cookie.setPath("/");
cookie.setMaxAge(60 * 60 * 24 * 7); cookie.setMaxAge(60 * 60 * 24 * 7);
......
src/main/java/common/controller/UserController.java
...@@ -2,6 +2,9 @@ package common.controller; ...@@ -2,6 +2,9 @@ package common.controller;
import common.model.Menu; import common.model.Menu;
import common.model.User; import common.model.User;
import common.repository.AuthRepository;
import common.repository.RoleRepository;
import common.repository.RoleTypeRepository;
import common.repository.UserRepository; import common.repository.UserRepository;
import common.service.MenuService; import common.service.MenuService;
import common.service.UserService; import common.service.UserService;
...@@ -27,33 +30,78 @@ public class UserController { ...@@ -27,33 +30,78 @@ public class UserController {
@Autowired @Autowired
UserRepository userRepository; UserRepository userRepository;
@Autowired
RoleRepository roleRepository;
@Autowired
RoleTypeRepository roleTypeRepository;
@Autowired
AuthRepository authRepository;
@RequestMapping(value = "/valid/email", method = RequestMethod.GET)
@ResponseBody
public ResultModel validEmail(@RequestParam String email) {
return ResultModel.OK(userService.validEmail(email));
}
@RequestMapping(value = "/create", method = RequestMethod.POST) @RequestMapping(value = "/create", method = RequestMethod.POST)
@ResponseBody @ResponseBody
public ResultModel create(@CurrentAccount User loginAccount, @RequestBody User resource) { public ResultModel create(@CurrentAccount User loginAccount, @RequestBody User resource) {
userService.create(loginAccount, resource); if(userService.validEmail(resource.getEmail())){
return ResultModel.OK(); userService.create(loginAccount, resource);
return ResultModel.OK(true);
}else{
return ResultModel.OK(false);
}
} }
@RequestMapping(value = "/update", method = RequestMethod.PUT) @RequestMapping(value = "/update", method = RequestMethod.PUT)
@ResponseBody @ResponseBody
public ResultModel update(@CurrentAccount User loginAccount, @RequestBody User resource) { public ResultModel update(@CurrentAccount User loginAccount, @RequestBody User resource) {
userService.create(loginAccount, resource); return ResultModel.OK(userService.update(loginAccount, resource));
return ResultModel.OK();
} }
@RequestMapping(value = "/find", method = RequestMethod.GET) @RequestMapping(value = "/find", method = RequestMethod.GET)
@ResponseBody @ResponseBody
public ResultModel find(@CurrentAccount User loginAccount, @RequestBody User resource) { public ResultModel find(@CurrentAccount User loginAccount) {
userService.create(loginAccount, resource); return ResultModel.OK(userService.find(loginAccount));
return ResultModel.OK(); }
@RequestMapping(value = "/find/role", method = RequestMethod.GET)
@ResponseBody
public ResultModel findRole(@CurrentAccount User loginAccount) {
return ResultModel.OK(roleRepository.findAll());
}
@RequestMapping(value = "/find/roletype", method = RequestMethod.GET)
@ResponseBody
public ResultModel findRoleType(@CurrentAccount User loginAccount) {
return ResultModel.OK(roleTypeRepository.findAll());
}
@RequestMapping(value = "/find/auth", method = RequestMethod.GET)
@ResponseBody
public ResultModel findAuth(@CurrentAccount User loginAccount) {
return ResultModel.OK(authRepository.findByUser(loginAccount.getId()));
}
@RequestMapping(value = "/delete/{id}", method = RequestMethod.DELETE)
@ResponseBody
public ResultModel delete(@CurrentAccount User loginAccount, @PathVariable Long id) {
return ResultModel.OK(userService.delete(loginAccount, id));
}
@RequestMapping(value = "/enable/{id}", method = RequestMethod.PUT)
@ResponseBody
public ResultModel enable(@CurrentAccount User loginAccount, @PathVariable Long id) {
return ResultModel.OK(userService.enable(loginAccount, id));
} }
@RequestMapping(value = "/delete", method = RequestMethod.GET) @RequestMapping(value = "/forbiden/{id}", method = RequestMethod.PUT)
@ResponseBody @ResponseBody
public ResultModel delete(@CurrentAccount User loginAccount, @RequestBody User resource) { public ResultModel forbiden(@CurrentAccount User loginAccount, @PathVariable Long id) {
userService.create(loginAccount, resource); return ResultModel.OK(userService.forbiden(loginAccount, id));
return ResultModel.OK();
} }
@RequestMapping(value = "/update/name", method = RequestMethod.PUT) @RequestMapping(value = "/update/name", method = RequestMethod.PUT)
......
src/main/java/common/model/Role.java 0 → 100644
package common.model;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
@Entity
public class Role {
private Long id;
//
private String role;
//
private Long roleKey;
public Role() {
super();
}
@Id
@GeneratedValue
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getRole() {
return role;
}
public void setRole(String role) {
this.role = role;
}
public Long getRoleKey() {
return roleKey;
}
public void setRoleKey(Long roleKey) {
this.roleKey = roleKey;
}
}
src/main/java/common/model/RoleType.java
...@@ -11,6 +11,9 @@ public class RoleType { ...@@ -11,6 +11,9 @@ public class RoleType {
// //
private String position; private String position;
//
private Long typeKey;
public RoleType() { public RoleType() {
...@@ -34,4 +37,12 @@ public class RoleType { ...@@ -34,4 +37,12 @@ public class RoleType {
public void setPosition(String position) { public void setPosition(String position) {
this.position = position; this.position = position;
} }
public Long getTypeKey() {
return typeKey;
}
public void setTypeKey(Long typeKey) {
this.typeKey = typeKey;
}
} }
src/main/java/common/model/User.java
...@@ -15,8 +15,11 @@ public class User { ...@@ -15,8 +15,11 @@ public class User {
private String password; private String password;
private String name; private String name;
private Long role; private Long role;
private String roleName;
private Long roleType; private Long roleType;
private String roleTypeName;
private String auth; private String auth;
private Boolean status;
private Long modifyAccount; private Long modifyAccount;
private Long createAccount; private Long createAccount;
...@@ -124,6 +127,31 @@ public class User { ...@@ -124,6 +127,31 @@ public class User {
this.auth = auth; this.auth = auth;
} }
public Boolean getStatus() {
return status;
}
public void setStatus(Boolean status) {
this.status = status;
}
public String getRoleTypeName() {
return roleTypeName;
}
public void setRoleTypeName(String roleTypeName) {
this.roleTypeName = roleTypeName;
}
public String getRoleName() {
return roleName;
}
public void setRoleName(String roleName) {
this.roleName = roleName;
}
@Override @Override
public String toString() { public String toString() {
return "User{" + return "User{" +
......
src/main/java/common/repository/AuthRepository.java
...@@ -11,4 +11,5 @@ import java.util.List; ...@@ -11,4 +11,5 @@ import java.util.List;
@Transactional @Transactional
public interface AuthRepository extends JpaRepository<Auth, Long> { public interface AuthRepository extends JpaRepository<Auth, Long> {
Auth findByUser(Long user);
} }
src/main/java/common/repository/RoleRepository.java 0 → 100644
package common.repository;
import common.model.Role;
import common.model.RoleType;
import common.model.User;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.transaction.annotation.Transactional;
@Transactional
public interface RoleRepository extends JpaRepository<Role, Long> {
@Query(value="select role from role where role_key = ?1",nativeQuery=true)
String getName(Long key);
}
src/main/java/common/repository/RoleTypeRepository.java
...@@ -2,9 +2,12 @@ package common.repository; ...@@ -2,9 +2,12 @@ package common.repository;
import common.model.RoleType; import common.model.RoleType;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@Transactional @Transactional
public interface RoleTypeRepository extends JpaRepository<RoleType, Long> { public interface RoleTypeRepository extends JpaRepository<RoleType, Long> {
@Query(value="select position from role_type where type_key = ?1",nativeQuery=true)
String getName(Long key);
} }
src/main/java/common/repository/UserRepository.java
...@@ -18,7 +18,7 @@ public interface UserRepository extends JpaRepository<User, Long> { ...@@ -18,7 +18,7 @@ public interface UserRepository extends JpaRepository<User, Long> {
List<User> findOneDepartment(Long role); List<User> findOneDepartment(Long role);
@Query(value="select * from user where del_flag is not true",nativeQuery=true) @Query(value="select * from user where del_flag is not true",nativeQuery=true)
List<User> findAll(); List<User> findList();
@Query(value="select * from user where email = ?1 and del_flag is not true",nativeQuery=true) @Query(value="select * from user where email = ?1 and del_flag is not true",nativeQuery=true)
User login(String email); User login(String email);
......
src/main/java/common/service/UserService.java
...@@ -10,6 +10,8 @@ import java.util.List; ...@@ -10,6 +10,8 @@ import java.util.List;
*/ */
public interface UserService { public interface UserService {
Boolean validEmail(String email);
User create(User login, User resource); User create(User login, User resource);
User update(User login, User resource); User update(User login, User resource);
...@@ -18,6 +20,10 @@ public interface UserService { ...@@ -18,6 +20,10 @@ public interface UserService {
User delete(User login, Long id); User delete(User login, Long id);
User enable(User login, Long id);
User forbiden(User login, Long id);
User updateName(User login, String name); User updateName(User login, String name);
User updatePwd(User login, String pwd); User updatePwd(User login, String pwd);
......
src/main/java/common/service/impl/UserServiceImpl.java
...@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; ...@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
import util.CharacterUtils; import util.CharacterUtils;
import util.CipherUtil; import util.CipherUtil;
import util.MailUtils; import util.MailUtils;
import util.ValidateUtil;
import java.util.*; import java.util.*;
...@@ -32,15 +33,25 @@ public class UserServiceImpl implements UserService { ...@@ -32,15 +33,25 @@ public class UserServiceImpl implements UserService {
private CodeRepository codeRepository; private CodeRepository codeRepository;
@Override @Override
public Boolean validEmail(String email) {
User user = userRepository.login(email);
if(null == user){
return true;
}
return false;
}
@Override
public User create(User login, User resource) { public User create(User login, User resource) {
if(!login.getRole().equals(RoleEnum.MANAGER.getKey())){//非管理员只能创建本部门普通账户 if(!login.getRole().equals(RoleEnum.MANAGER.getKey())){//非管理员只能创建本部门普通账户
resource.setRole(login.getRole()); resource.setRole(login.getRole());
resource.setRoleType(RoleTypeEnum.COMMON.getKey()); resource.setRoleType(RoleTypeEnum.COMMON.getKey());
} }
resource.setPassword(CipherUtil.generatePassword("111111")); resource.setPassword(CipherUtil.generatePassword(resource.getPassword()));
resource.setCreateTime(new Date()); resource.setCreateTime(new Date());
resource.setCreateAccount(login.getId()); resource.setCreateAccount(login.getId());
resource.setStatus(true);
User save = userRepository.save(resource); User save = userRepository.save(resource);
//auth //auth
...@@ -55,18 +66,24 @@ public class UserServiceImpl implements UserService { ...@@ -55,18 +66,24 @@ public class UserServiceImpl implements UserService {
@Override @Override
public User update(User login, User resource) { public User update(User login, User resource) {
User one = userRepository.findOne(resource.getId());
if(!login.getRole().equals(RoleEnum.MANAGER.getKey())){//非管理员只能创建本部门普通账户 if(!login.getRole().equals(RoleEnum.MANAGER.getKey())){//非管理员只能创建本部门普通账户
resource.setRole(login.getRole()); resource.setRole(login.getRole());
resource.setRoleType(RoleTypeEnum.COMMON.getKey()); resource.setRoleType(RoleTypeEnum.COMMON.getKey());
} }
resource.setCreateTime(one.getCreateTime());
resource.setStatus(one.getStatus());
resource.setDelFlag(one.getDelFlag());
resource.setCreateAccount(one.getCreateAccount());
resource.setPassword(one.getPassword());
resource.setModifyTime(new Date()); resource.setModifyTime(new Date());
resource.setModifyAccount(login.getId()); resource.setModifyAccount(login.getId());
User save = userRepository.save(resource); User save = userRepository.save(resource);
//auth //auth
Auth auth = new Auth(); Auth auth = authRepository.findByUser(one.getId());
auth.setCreateTime(new Date()); auth.setModifyTime(new Date());
auth.setCreateAccount(login.getId()); auth.setModifyAccount(login.getId());
auth.setAuth(resource.getAuth()); auth.setAuth(resource.getAuth());
auth.setUser(save.getId()); auth.setUser(save.getId());
authRepository.save(auth); authRepository.save(auth);
...@@ -75,13 +92,29 @@ public class UserServiceImpl implements UserService { ...@@ -75,13 +92,29 @@ public class UserServiceImpl implements UserService {
@Override @Override
public List<User> find(User login) { public List<User> find(User login) {
List<User> userList = null; List<Auth> authList = authRepository.findAll();
if(!login.getRole().equals(RoleEnum.MANAGER.getKey())) { Map<Long, String> map = new HashMap<>();
userList = userRepository.findAll(); if(ValidateUtil.isValid(authList)){
} else if(RoleTypeEnum.MANAGER.getKey().equals(login.getRoleType())){ for(Auth a : authList){
map.put(a.getUser(), a.getAuth());
}
}
List<User> userList = new ArrayList<>();
List<User> result = new ArrayList<>();
if(login.getRole().equals(RoleEnum.MANAGER.getKey())) {
userList = userRepository.findList();
} else if(!RoleTypeEnum.MANAGER.getKey().equals(login.getRoleType())){
userList = userRepository.findOneDepartment(login.getRole()); userList = userRepository.findOneDepartment(login.getRole());
} }
return userList; if(ValidateUtil.isValid(userList)){
for(User u : userList){
if(map.containsKey(u.getId())){
u.setAuth(map.get(u.getId()));
}
result.add(u);
}
}
return result;
} }
@Override @Override
...@@ -94,6 +127,24 @@ public class UserServiceImpl implements UserService { ...@@ -94,6 +127,24 @@ public class UserServiceImpl implements UserService {
} }
@Override @Override
public User enable(User login, Long id) {
User one = userRepository.findOne(id);
one.setModifyTime(new Date());
one.setModifyAccount(login.getId());
one.setStatus(true);
return userRepository.save(one);
}
@Override
public User forbiden(User login, Long id) {
User one = userRepository.findOne(id);
one.setModifyTime(new Date());
one.setModifyAccount(login.getId());
one.setStatus(false);
return userRepository.save(one);
}
@Override
public User updateName(User login, String name) { public User updateName(User login, String name) {
User one = userRepository.findOne(login.getId()); User one = userRepository.findOne(login.getId());
one.setName(name); one.setName(name);
......
src/main/resources/applicationContext-schedule.xml
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<bean id="tkioAccountTask" class="tkio.task.AccountTask"></bean> <bean id="tkioAccountTask" class="tkio.task.AccountTask"></bean>
<task:scheduled-tasks> <task:scheduled-tasks>
<!--//定时同步短链数据(每5分钟执行一次)--> <!--//定时同步短链数据(每5分钟执行一次)-->
<task:scheduled ref="tkioAccountTask" method="task" cron="0 40 14 * * ?"/> <task:scheduled ref="tkioAccountTask" method="task" cron="0 11 17 * * ?"/>
</task:scheduled-tasks> </task:scheduled-tasks>
<bean id="tkioNoticeTask" class="tkio.task.NoticeTask"></bean> <bean id="tkioNoticeTask" class="tkio.task.NoticeTask"></bean>
......
target/classes/applicationContext-schedule.xml
...@@ -12,7 +12,11 @@ ...@@ -12,7 +12,11 @@
<bean id="tkioAccountTask" class="tkio.task.AccountTask"></bean> <bean id="tkioAccountTask" class="tkio.task.AccountTask"></bean>
<task:scheduled-tasks> <task:scheduled-tasks>
<!--//定时同步短链数据(每5分钟执行一次)--> <!--//定时同步短链数据(每5分钟执行一次)-->
<<<<<<< HEAD
<task:scheduled ref="tkioAccountTask" method="task" cron="0 40 14 * * ?"/> <task:scheduled ref="tkioAccountTask" method="task" cron="0 40 14 * * ?"/>
=======
<task:scheduled ref="tkioAccountTask" method="task" cron="0 11 17 * * ?"/>
>>>>>>> 3003a6c49ac09d661bb616e5a363bb2109e68fb6
</task:scheduled-tasks> </task:scheduled-tasks>
<bean id="tkioNoticeTask" class="tkio.task.NoticeTask"></bean> <bean id="tkioNoticeTask" class="tkio.task.NoticeTask"></bean>
......
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
...@@ -19,6 +19,7 @@ tkio\model\Account.class ...@@ -19,6 +19,7 @@ tkio\model\Account.class
common\task\ReportCallable.class common\task\ReportCallable.class
security\AbstractTokenManager.class security\AbstractTokenManager.class
track\repository\TrackAccountRepository.class track\repository\TrackAccountRepository.class
common\model\Role.class
common\model\UserLog.class common\model\UserLog.class
security\exception\MethodNotSupportException.class security\exception\MethodNotSupportException.class
tkio\repository\SalesManLeaderRepository.class tkio\repository\SalesManLeaderRepository.class
...@@ -34,7 +35,11 @@ tkio\repository\IsNotifiedRepository.class ...@@ -34,7 +35,11 @@ tkio\repository\IsNotifiedRepository.class
track\repository\TrackChannelRepository.class track\repository\TrackChannelRepository.class
tkio\service\impl\TkioAccountServiceImpl.class tkio\service\impl\TkioAccountServiceImpl.class
util\DateUtil.class util\DateUtil.class
<<<<<<< HEAD
common\service\impl\OpenApiServiceImpl.class common\service\impl\OpenApiServiceImpl.class
=======
common\repository\RoleRepository.class
>>>>>>> 3003a6c49ac09d661bb616e5a363bb2109e68fb6
common\model\AppCategory.class common\model\AppCategory.class
tkio\repository\ChannelRepository.class tkio\repository\ChannelRepository.class
security\RedisLoginStatusManager.class security\RedisLoginStatusManager.class
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment