添加 修改管理员信息

src/main/java/org/rcisoft/business/system/user/controller/UserController.java

+package org.rcisoft.business.system.user.controller;
+
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.rcisoft.business.system.user.entity.SysAdmins;
+import org.rcisoft.business.system.user.entity.SysOwner;
+import org.rcisoft.business.system.user.entity.SysPrincipal;
+import org.rcisoft.business.system.user.entity.SysUser;
+import org.rcisoft.business.system.user.service.UserService;
+import org.rcisoft.business.system.user.vo.UserDto;
+import org.rcisoft.core.constant.MessageConstant;
+import org.rcisoft.core.model.PersistModel;
+import org.rcisoft.core.result.Result;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Author: GaoLiWei
+ * @Date: Created in 10:422018/5/2
+ */
+@Controller
+@RequestMapping("user")
+public class UserController {
+
+    @Autowired
+    private UserService userService;
+
+    @ApiOperation(value="添加系统用户", notes="返回是否成功")
+    @ApiImplicitParams({@ApiImplicitParam(name = "userDto", value = "Id不填,2是管理员，3是业主，4是团队负责人", required = true, dataType = "UserDto",paramType = "body")
+    })
+    @PostMapping(value = "saveUser")
+    @ResponseBody
+    public Result saveUser(@RequestBody UserDto userDto){
+        SysUser sysUser = userDto.getSysUser();
+        SysAdmins sysAdmins = userDto.getSysAdmins();
+        SysOwner sysOwner = userDto.getSysOwner();
+        SysPrincipal sysPrincipal = userDto.getSysPrincipal();
+        String data = userService.saveUser(sysUser, sysAdmins, sysOwner, sysPrincipal);
+        return Result.builder(new PersistModel(1), MessageConstant.MESSAGE_ALERT_SUCCESS, MessageConstant.MESSAGE_ALERT_ERROR,data);
+    }
+
+
+    @ApiOperation(value="修改系统用户", notes="返回是否成功")
+    @ApiImplicitParams({@ApiImplicitParam(name = "userDto", value = "2是管理员，3是业主，4是团队负责人", required = true, dataType = "UserDto",paramType = "body")
+    })
+    @PutMapping(value = "updateUser")
+    @ResponseBody
+    public Result updateUser(@RequestBody UserDto userDto){
+        SysUser sysUser = userDto.getSysUser();
+        SysAdmins sysAdmins = userDto.getSysAdmins();
+        SysOwner sysOwner = userDto.getSysOwner();
+        SysPrincipal sysPrincipal = userDto.getSysPrincipal();
+        String data = userService.updateUser(sysUser,sysAdmins,sysOwner,sysPrincipal);
+        return Result.builder(new PersistModel(1), MessageConstant.MESSAGE_ALERT_SUCCESS, MessageConstant.MESSAGE_ALERT_ERROR,data);
+    }
+
+
+}

src/main/java/org/rcisoft/business/system/user/dao/AdminRepository.java

+package org.rcisoft.business.system.user.dao;
+
+import org.apache.ibatis.annotations.Param;
+import org.rcisoft.business.system.user.entity.SysAdmins;
+import org.rcisoft.core.base.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: GaoLiWei
+ * @Date: Created in 10:422018/5/2
+ */
+@Repository
+public interface AdminRepository extends BaseMapper<SysAdmins>{
+
+    /** 根据userId查询当前管理员信息
+     * @param userId
+     * @return
+     */
+    SysAdmins getSysAdminsByUserId(@Param("userId") String userId);
+
+}

src/main/java/org/rcisoft/business/system/user/dao/OwnerRepository.java

+package org.rcisoft.business.system.user.dao;
+
+import org.apache.ibatis.annotations.Param;
+import org.rcisoft.business.system.user.entity.SysAdmins;
+import org.rcisoft.business.system.user.entity.SysOwner;
+import org.rcisoft.core.base.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: GaoLiWei
+ * @Date: Created in 10:422018/5/2
+ */
+@Repository
+public interface OwnerRepository extends BaseMapper<SysOwner>{
+
+
+    /** 根据userId查询业主信息
+     * @param userId
+     * @return
+     */
+    SysOwner getSysOwnerByUserId(@Param("userId") String userId);
+}

src/main/java/org/rcisoft/business/system/user/dao/PrincipalRepository.java

+package org.rcisoft.business.system.user.dao;
+
+import org.apache.ibatis.annotations.Param;
+import org.rcisoft.business.system.user.entity.SysPrincipal;
+import org.rcisoft.core.base.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: GaoLiWei
+ * @Date: Created in 10:422018/5/2
+ */
+@Repository
+public interface PrincipalRepository extends BaseMapper<SysPrincipal>{
+
+
+    /**  根据userId查询团队负责人信息
+     * @param userId
+     * @return
+     */
+    SysPrincipal getSysPrincipalByUserId(@Param("userId") String userId);
+}

src/main/java/org/rcisoft/business/system/user/dao/UserRepository.java

+package org.rcisoft.business.system.user.dao;
+
+import org.rcisoft.business.system.user.entity.SysUser;
+import org.rcisoft.core.base.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: GaoLiWei
+ * @Date: Created in 10:422018/5/2
+ */
+@Repository
+public interface UserRepository extends BaseMapper<SysUser>{
+}

src/main/java/org/rcisoft/business/system/user/entity/SysAdmins.java

+package org.rcisoft.business.system.user.entity;
+
+import lombok.*;
+
+import org.rcisoft.core.entity.IdNotDataEntity;
+import javax.persistence.*;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+* Created with  on 2018-5-2 10:30:10.
+*/
+@Entity
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "sys_admins")
+public class SysAdmins{
+
+
+     @Id
+     private String adminId;
+
+     private String userId;
+
+     private String adminNm;
+
+     private String telephone;
+
+     private String email;
+
+     private String wechat;
+
+     public String getAdminId() {
+          return adminId;
+     }
+
+     public void setAdminId(String adminId) {
+          this.adminId = adminId;
+     }
+
+     public String getUserId() {
+          return userId;
+     }
+
+     public void setUserId(String userId) {
+          this.userId = userId;
+     }
+
+     public String getAdminNm() {
+          return adminNm;
+     }
+
+     public void setAdminNm(String adminNm) {
+          this.adminNm = adminNm;
+     }
+
+     public String getTelephone() {
+          return telephone;
+     }
+
+     public void setTelephone(String telephone) {
+          this.telephone = telephone;
+     }
+
+     public String getEmail() {
+          return email;
+     }
+
+     public void setEmail(String email) {
+          this.email = email;
+     }
+
+     public String getWechat() {
+          return wechat;
+     }
+
+     public void setWechat(String wechat) {
+          this.wechat = wechat;
+     }
+}
+

src/main/java/org/rcisoft/business/system/user/entity/SysOwner.java

+package org.rcisoft.business.system.user.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+* Created with  on 2018-5-2 10:30:10.
+*/
+@Entity
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "sys_owner")
+public class SysOwner{
+
+
+     @Id
+     private String ownId;
+
+     private String userId;
+
+     private String ownNm;
+
+     private String telephone;
+
+     private String email;
+
+     private String wechat;
+
+     public String getOwnId() {
+          return ownId;
+     }
+
+     public void setOwnId(String ownId) {
+          this.ownId = ownId;
+     }
+
+     public String getUserId() {
+          return userId;
+     }
+
+     public void setUserId(String userId) {
+          this.userId = userId;
+     }
+
+     public String getOwnNm() {
+          return ownNm;
+     }
+
+     public void setOwnNm(String ownNm) {
+          this.ownNm = ownNm;
+     }
+
+     public String getTelephone() {
+          return telephone;
+     }
+
+     public void setTelephone(String telephone) {
+          this.telephone = telephone;
+     }
+
+     public String getEmail() {
+          return email;
+     }
+
+     public void setEmail(String email) {
+          this.email = email;
+     }
+
+     public String getWechat() {
+          return wechat;
+     }
+
+     public void setWechat(String wechat) {
+          this.wechat = wechat;
+     }
+}
+

src/main/java/org/rcisoft/business/system/user/entity/SysPrincipal.java

+package org.rcisoft.business.system.user.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+* Created with  on 2018-5-2 10:30:10.
+*/
+@Entity
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "sys_principal")
+public class SysPrincipal{
+
+
+     @Id
+     private String priId;
+
+     private String userId;
+
+     private String priNm;
+
+     private String job;
+
+     private String jobtitle;
+
+     private String bushour;
+
+     private String honor;
+
+     public String getPriId() {
+          return priId;
+     }
+
+     public void setPriId(String priId) {
+          this.priId = priId;
+     }
+
+     public String getUserId() {
+          return userId;
+     }
+
+     public void setUserId(String userId) {
+          this.userId = userId;
+     }
+
+     public String getPriNm() {
+          return priNm;
+     }
+
+     public void setPriNm(String priNm) {
+          this.priNm = priNm;
+     }
+
+     public String getJob() {
+          return job;
+     }
+
+     public void setJob(String job) {
+          this.job = job;
+     }
+
+     public String getJobtitle() {
+          return jobtitle;
+     }
+
+     public void setJobtitle(String jobtitle) {
+          this.jobtitle = jobtitle;
+     }
+
+     public String getBushour() {
+          return bushour;
+     }
+
+     public void setBushour(String bushour) {
+          this.bushour = bushour;
+     }
+
+     public String getHonor() {
+          return honor;
+     }
+
+     public void setHonor(String honor) {
+          this.honor = honor;
+     }
+}
+

src/main/java/org/rcisoft/business/system/user/entity/SysUser.java

+package org.rcisoft.business.system.user.entity;
+
+import com.alibaba.druid.sql.visitor.functions.Char;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+* Created with  on 2018-5-2 10:30:10.
+*/
+@Entity
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "sys_user")
+public class SysUser {
+
+     @Id
+     private String userId;
+
+     private String userNm;
+
+     private String userPwd;
+
+     private String userTp;
+
+     public String getUserId() {
+          return userId;
+     }
+
+     public void setUserId(String userId) {
+          this.userId = userId;
+     }
+
+     public String getUserNm() {
+          return userNm;
+     }
+
+     public void setUserNm(String userNm) {
+          this.userNm = userNm;
+     }
+
+     public String getUserPwd() {
+          return userPwd;
+     }
+
+     public void setUserPwd(String userPwd) {
+          this.userPwd = userPwd;
+     }
+
+     public String getUserTp() {
+          return userTp;
+     }
+
+     public void setUserTp(String userTp) {
+          this.userTp = userTp;
+     }
+}
+

src/main/java/org/rcisoft/business/system/user/service/UserService.java

+package org.rcisoft.business.system.user.service;
+
+import org.rcisoft.business.system.user.entity.SysAdmins;
+import org.rcisoft.business.system.user.entity.SysOwner;
+import org.rcisoft.business.system.user.entity.SysPrincipal;
+import org.rcisoft.business.system.user.entity.SysUser;
+
+/**
+ * @Author: GaoLiWei
+ * @Date: Created in 10:422018/5/2
+ */
+public interface UserService {
+
+     /**  添加系统用户
+      * @param sysUser
+      * @param sysAdmins
+      * @param sysOwner
+      * @param sysPrincipal
+      * @return
+      */
+     String saveUser(SysUser sysUser, SysAdmins sysAdmins, SysOwner sysOwner,SysPrincipal sysPrincipal);
+
+
+     /**  修改系统用户
+      * @param sysUser
+      * @param sysAdmins
+      * @param sysOwner
+      * @param sysPrincipal
+      * @return
+      */
+     String updateUser(SysUser sysUser, SysAdmins sysAdmins, SysOwner sysOwner,SysPrincipal sysPrincipal);
+
+}

src/main/java/org/rcisoft/business/system/user/service/impl/UserServiceImpl.java

+package org.rcisoft.business.system.user.service.impl;
+
+import com.alibaba.druid.sql.visitor.functions.Char;
+import lombok.extern.slf4j.Slf4j;
+import org.rcisoft.business.system.user.dao.AdminRepository;
+import org.rcisoft.business.system.user.dao.OwnerRepository;
+import org.rcisoft.business.system.user.dao.PrincipalRepository;
+import org.rcisoft.business.system.user.dao.UserRepository;
+import org.rcisoft.business.system.user.entity.SysAdmins;
+import org.rcisoft.business.system.user.entity.SysOwner;
+import org.rcisoft.business.system.user.entity.SysPrincipal;
+import org.rcisoft.business.system.user.entity.SysUser;
+import org.rcisoft.business.system.user.service.UserService;
+import org.rcisoft.common.constants.UserTpConstant;
+import org.rcisoft.core.util.IdGen;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * @Author: GaoLiWei
+ * @Date: Created in 10:432018/5/2
+ */
+@Service
+@Transactional(readOnly = true, propagation = Propagation.NOT_SUPPORTED)
+@Slf4j
+public class UserServiceImpl implements UserService {
+    @Autowired
+    private UserRepository userRepository;
+    @Autowired
+    private AdminRepository adminRepository;
+    @Autowired
+    private OwnerRepository ownerRepository;
+    @Autowired
+    private PrincipalRepository principalRepository;
+
+
+    @Override
+    public String saveUser(SysUser sysUser, SysAdmins sysAdmins, SysOwner sysOwner, SysPrincipal sysPrincipal) {
+        String result = "添加失败";
+
+        String userId = IdGen.uuid();
+        sysUser.setUserId(userId);
+
+        String userTp = sysUser.getUserTp();
+        if (UserTpConstant.TP_ADMIN.equals(userTp)) {
+            userRepository.insertSelective(sysUser);
+            sysAdmins.setAdminId(IdGen.uuid());
+            sysAdmins.setUserId(userId);
+            adminRepository.insertSelective(sysAdmins);
+            result = "添加管理员成功";
+        }
+        if (UserTpConstant.TP_OWNER.equals(userTp)) {
+            userRepository.insertSelective(sysUser);
+            sysOwner.setOwnId(IdGen.uuid());
+            sysOwner.setUserId(userId);
+            ownerRepository.insertSelective(sysOwner);
+            result = "添加业主成功";
+        }
+        if (UserTpConstant.TP_PRINCIPAL.equals(userTp)) {
+            userRepository.insertSelective(sysUser);
+            sysPrincipal.setPriId(IdGen.uuid());
+            sysPrincipal.setUserId(userId);
+            principalRepository.insertSelective(sysPrincipal);
+            result = "添加团队负责人成功";
+        }
+        return result;
+    }
+
+    @Override
+    public String updateUser(SysUser sysUser, SysAdmins sysAdmins, SysOwner sysOwner, SysPrincipal sysPrincipal) {
+        String result = "修改失败";
+        String userId = sysUser.getUserId();
+        String userTp = sysUser.getUserTp();
+        if (UserTpConstant.TP_ADMIN.equals(userTp)) {
+            SysAdmins sysAdminsByUserId = adminRepository.getSysAdminsByUserId(userId);
+            if (null != sysAdminsByUserId){
+                sysAdmins.setAdminId(sysAdminsByUserId.getAdminId());
+                adminRepository.updateByPrimaryKeySelective(sysAdmins);
+                result = "修改管理员信息成功";
+            }
+        }
+        if (UserTpConstant.TP_OWNER.equals(userTp)) {
+            SysOwner sysOwnerByUserId = ownerRepository.getSysOwnerByUserId(userId);
+            if (null != sysOwnerByUserId) {
+                sysOwner.setOwnId(sysOwnerByUserId.getOwnId());
+                ownerRepository.updateByPrimaryKeySelective(sysOwner);
+                result = "修改业主信息成功";
+            }
+        }
+        if (UserTpConstant.TP_PRINCIPAL.equals(userTp)) {
+            SysPrincipal sysPrincipalByUserId = principalRepository.getSysPrincipalByUserId(userId);
+            if (null != sysPrincipalByUserId) {
+                sysPrincipal.setPriId(sysPrincipalByUserId.getPriId());
+                principalRepository.updateByPrimaryKeySelective(sysPrincipal);
+                result = "修改团队负责人信息成功";
+            }
+        }
+        return result;
+    }
+}

src/main/java/org/rcisoft/business/system/user/vo/UserDto.java

+package org.rcisoft.business.system.user.vo;
+
+import org.rcisoft.business.system.user.entity.SysAdmins;
+import org.rcisoft.business.system.user.entity.SysOwner;
+import org.rcisoft.business.system.user.entity.SysPrincipal;
+import org.rcisoft.business.system.user.entity.SysUser;
+
+
+/**
+ * @Author: GaoLiWei
+ * @Date: Created in 14:262018/5/2
+ */
+public class UserDto {
+
+    private SysUser sysUser;
+    private SysAdmins sysAdmins;
+    private SysOwner sysOwner;
+    private SysPrincipal sysPrincipal;
+
+    public SysUser getSysUser() {
+        return sysUser;
+    }
+
+    public void setSysUser(SysUser sysUser) {
+        this.sysUser = sysUser;
+    }
+
+    public SysAdmins getSysAdmins() {
+        return sysAdmins;
+    }
+
+    public void setSysAdmins(SysAdmins sysAdmins) {
+        this.sysAdmins = sysAdmins;
+    }
+
+    public SysOwner getSysOwner() {
+        return sysOwner;
+    }
+
+    public void setSysOwner(SysOwner sysOwner) {
+        this.sysOwner = sysOwner;
+    }
+
+    public SysPrincipal getSysPrincipal() {
+        return sysPrincipal;
+    }
+
+    public void setSysPrincipal(SysPrincipal sysPrincipal) {
+        this.sysPrincipal = sysPrincipal;
+    }
+}

src/main/java/org/rcisoft/common/constants/UserTpConstant.java

+package org.rcisoft.common.constants;
+
+import com.alibaba.druid.sql.visitor.functions.Char;
+
+/**
+ * @Author: GaoLiWei
+ * @Date: Created in 11:212018/5/2
+ */
+public class UserTpConstant {
+
+    /**
+     * 超级管理员
+     */
+    public static final String TP_SUPER_ADMIN = "1";
+    /**
+     * 管理员
+     */
+    public static final String TP_ADMIN = "2";
+    /**
+     * 业主
+     */
+    public static final String TP_OWNER = "3";
+    /**
+     * 团队负责人
+     */
+    public static final String TP_PRINCIPAL = "4";
+}

src/main/java/org/rcisoft/core/security/JwtAuthenTokenFilter.java

@@ -33,6 +33,7 @@ public class JwtAuthenTokenFilter extends OncePerRequestFilter {
     private UserDetailsService jwtUserDetailServiceImpl;
 
 
+    @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
         response.setHeader("Access-Control-Allow-Origin", "*");
         response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE,PUT");

src/main/resources/application-dev.yml

@@ -11,7 +11,7 @@ server:
 #    org.springframework.web: DEBUG
 
 druid:
-  url: jdbc:mysql://192.168.1.118:3306/zhny?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
+  url: jdbc:mysql://192.168.1.164:3306/zhny?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
   username: root
   password: root
   initial-size: 1

src/main/resources/mapper/sys/system/user/AdminMapper.xml

+<?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="org.rcisoft.business.system.user.dao.AdminRepository">
+
+
+    <select id="getSysAdminsByUserId" resultType="org.rcisoft.business.system.user.entity.SysAdmins">
+      SELECT *
+      FROM sys_admins WHERE USER_ID = #{userId}
+    </select>
+
+</mapper>
\ No newline at end of file

src/main/resources/mapper/sys/system/user/OwnerMapper.xml

+<?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="org.rcisoft.business.system.user.dao.OwnerRepository">
+
+
+    <select id="getSysOwnerByUserId" resultType="org.rcisoft.business.system.user.entity.SysOwner">
+          SELECT * FROM sys_owner WHERE USER_ID = #{userId}
+    </select>
+</mapper>
\ No newline at end of file

src/main/resources/mapper/sys/system/user/PrincipalMapper.xml

+<?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="org.rcisoft.business.system.user.dao.PrincipalRepository">
+
+
+    <select id="getSysPrincipalByUserId" resultType="org.rcisoft.business.system.user.entity.SysPrincipal">
+        SELECT * FROM sys_principal WHERE USER_ID = #{userId}
+    </select>
+</mapper>
\ No newline at end of file

src/main/resources/mapper/sys/system/user/UserMapper.xml

+<?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="org.rcisoft.business.system.user.dao.UserRepository">
+
+
+</mapper>
\ No newline at end of file