ta-user

src/main/java/com/huiju/estateagents/center/sysUser/controller/SysUserController.java

@@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
 import com.huiju.estateagents.center.sysUser.entity.SysUser;
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import com.huiju.estateagents.center.sysUser.service.ISysUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.MD5Utils;
-import com.huiju.estateagents.center.sysUser.entity.SysToken;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -115,15 +115,16 @@ public class SysUserController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
      * @param sysUser 实体对象
      * @return
      */
-    @RequestMapping(value="/sysUser/{id}",method= RequestMethod.PUT)
-    public ResponseBean sysUserUpdate(@PathVariable Integer id,
-                                        @RequestBody SysUser sysUser){
+    @RequestMapping(value="/center/sysUser",method= RequestMethod.PUT)
+    public ResponseBean sysUserUpdate(@RequestBody SysUser sysUser,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            String userName = JWTUtils.getSubject(request);
+            sysUser.setPassword(MD5Utils.md5(sysUser.getPassword()));
+            sysUser.setUserName(userName);
             if (iSysUserService.updateById(sysUser)){
                 responseBean.addSuccess(sysUser);
             }else {

src/main/java/com/huiju/estateagents/center/sysUser/service/impl/SysTokenServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.center.sysUser.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.center.sysUser.entity.SysToken;
 import com.huiju.estateagents.center.sysUser.mapper.SysTokenMapper;

src/main/java/com/huiju/estateagents/center/sysUser/service/impl/SysUserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.center.sysUser.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.center.sysUser.entity.SysUser;
 import com.huiju.estateagents.center.sysUser.mapper.SysUserMapper;

src/main/java/com/huiju/estateagents/controller/TaUserController.java → src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -1,17 +1,20 @@
-package com.huiju.estateagents.controller;
+package com.huiju.estateagents.center.taUser.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.entity.TaUser;
-import com.huiju.estateagents.service.ITaUserService;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.common.CommConstant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Map;
+
 /**
  * <p>
     * 用户表  前端控制器
@@ -21,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2019-09-11
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaUserController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaUserController.class);
@@ -36,17 +39,14 @@ public class TaUserController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taUser",method= RequestMethod.GET)
+    @RequestMapping(value="/center/taUser",method= RequestMethod.GET)
     public ResponseBean taUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaUser> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaUser> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaUser> result = iTaUserService.page(pg, queryWrapper);
+		    IPage pg = new Page<>(pageNum, pageSize);
+            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/huiju/estateagents/entity/TaUser.java → src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -1,4 +1,4 @@
-package com.huiju.estateagents.entity;
+package com.huiju.estateagents.center.taUser.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -79,6 +79,4 @@ public class TaUser implements Serializable {
      * 是否管理员
      */
     private Boolean isAdmin;
-
-
 }

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.java

@@ -0,0 +1,23 @@
+package com.huiju.estateagents.center.taUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Mapper
+public interface TaUserMapper extends BaseMapper<TaUser> {
+	
+	List<Map<String,Object>> getPageList(IPage<TaUser> pg);
+}

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserService.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+public interface ITaUserService extends IService<TaUser> {
+	
+	IPage<Map<String,Object>> getPageList(IPage<TaUser> pg);
+}

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -0,0 +1,34 @@
+package com.huiju.estateagents.center.taUser.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Service
+public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> implements ITaUserService {
+	
+	@Autowired
+	private TaUserMapper taUserMapper;
+	
+	@Override
+	public IPage<Map<String,Object>> getPageList(IPage pg) {
+		List<Map<String,Object>> taUserList = taUserMapper.getPageList(pg);
+		pg.setRecords(taUserList);
+		return pg;
+	}
+}

src/main/java/com/huiju/estateagents/mapper/TaUserMapper.java

@@ -1,18 +0,0 @@
-package com.huiju.estateagents.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huiju.estateagents.entity.TaUser;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 用户表  Mapper 接口
- * </p>
- *
- * @author jobob
- * @since 2019-09-11
- */
-@Mapper
-public interface TaUserMapper extends BaseMapper<TaUser> {
-
-}

src/main/java/com/huiju/estateagents/service/ITaUserService.java

@@ -1,16 +0,0 @@
-package com.huiju.estateagents.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.huiju.estateagents.entity.TaUser;
-
-/**
- * <p>
- * 用户表  服务类
- * </p>
- *
- * @author jobob
- * @since 2019-09-11
- */
-public interface ITaUserService extends IService<TaUser> {
-
-}

src/main/java/com/huiju/estateagents/service/impl/TaUserServiceImpl.java

@@ -1,20 +0,0 @@
-package com.huiju.estateagents.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huiju.estateagents.entity.TaUser;
-import com.huiju.estateagents.mapper.TaUserMapper;
-import com.huiju.estateagents.service.ITaUserService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 用户表  服务实现类
- * </p>
- *
- * @author jobob
- * @since 2019-09-11
- */
-@Service
-public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> implements ITaUserService {
-
-}

src/main/resources/mapper/TaUserMapper.xml

@@ -1,5 +1,30 @@
 <?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.huiju.estateagents.mapper.TaUserMapper">
+<mapper namespace="com.huiju.estateagents.center.taUser.mapper.TaUserMapper">
 
+    <select id="getPageList" resultType="map">
+        SELECT
+            t.user_id AS userId,
+            t.org_id AS orgId,
+            t.user_name AS userName,
+            t.login_name AS loginName,
+            t.phone,
+            t.avatar,
+            t.create_date AS createDate,
+            o.NAME AS orgName,
+            o.address,
+            o.logo,
+            o.remark,
+            m.miniapp_id AS miniappId,
+            m.secret,
+            m.token,
+            m.NAME AS miniaooName,
+            m.qr_code AS qrCode
+        FROM
+            ta_user t
+            LEFT JOIN ta_org o ON t.org_id = o.org_id
+            LEFT JOIN ta_miniapp m ON o.org_id = m.org_id
+        WHERE
+            t.is_admin =1
+    </select>
 </mapper>