注册用户 单位

common/src/main/java/com/jpsoft/bus/modules/base/dao/CompanyInfoDAO.java → common/src/main/java/com/jpsoft/bus/modules/bus/dao/CompanyInfoDAO.java

@@ -1,6 +1,6 @@
-package com.jpsoft.bus.modules.base.dao;
+package com.jpsoft.bus.modules.bus.dao;
 
-import com.jpsoft.bus.modules.base.entity.CompanyInfo;
+import com.jpsoft.bus.modules.bus.entity.CompanyInfo;
 import com.jpsoft.bus.modules.common.dto.Sort;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

common/src/main/java/com/jpsoft/bus/modules/bus/dao/UserInfoDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.bus.modules.bus.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.bus.modules.bus.entity.UserInfo;
+import java.util.Map;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+@Repository
+public interface UserInfoDAO {
+	int insert(UserInfo entity);
+	int update(UserInfo entity);
+	int exist(String id);
+	UserInfo get(String id);
+	int delete(String id);
+	List<UserInfo> list();
+	List<UserInfo> search(Map<String,Object> searchParams,List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/bus/modules/base/entity/CompanyInfo.java → common/src/main/java/com/jpsoft/bus/modules/bus/entity/CompanyInfo.java

@@ -1,4 +1,4 @@
-package com.jpsoft.bus.modules.base.entity;
+package com.jpsoft.bus.modules.bus.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

common/src/main/java/com/jpsoft/bus/modules/bus/entity/UserInfo.java

@@ -0,0 +1,47 @@
+package com.jpsoft.bus.modules.bus.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:bus_user_info的实体类
+ */
+@Data
+@ApiModel(value = "bus_user_info的实体类")
+public class UserInfo {
+        @ApiModelProperty(value = "")
+    private String id;
+        @ApiModelProperty(value = "乘客姓名")
+    private String name;
+        @ApiModelProperty(value = "手机号码")
+    private String phone;
+        @ApiModelProperty(value = "密码")
+    private String password;
+        @ApiModelProperty(value = "人脸图片")
+    private String faceImage;
+        @ApiModelProperty(value = "是否接受乘车信息（0：否，1：是）")
+    private Boolean acceptMessage;
+        @ApiModelProperty(value = "创建人")
+    private String createBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+        @ApiModelProperty(value = "更新人")
+    private String updateBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+        @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+        @ApiModelProperty(value = "备注")
+    private String remark;
+}

common/src/main/java/com/jpsoft/bus/modules/base/service/CompanyInfoService.java → common/src/main/java/com/jpsoft/bus/modules/bus/service/CompanyInfoService.java

@@ -1,7 +1,7 @@
-package com.jpsoft.bus.modules.base.service;
+package com.jpsoft.bus.modules.bus.service;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.bus.modules.base.entity.CompanyInfo;
+import com.jpsoft.bus.modules.bus.entity.CompanyInfo;
 import com.jpsoft.bus.modules.common.dto.Sort;
 
 import java.util.List;

common/src/main/java/com/jpsoft/bus/modules/bus/service/UserInfoService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.bus.modules.bus.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.bus.modules.bus.entity.UserInfo;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+public interface UserInfoService {
+	UserInfo get(String id);
+	boolean exist(String id);
+	int insert(UserInfo model);
+	int update(UserInfo model);
+	int delete(String id);
+	List<UserInfo> list();
+	Page<UserInfo> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/bus/modules/base/service/impl/CompanyInfoServiceImpl.java → common/src/main/java/com/jpsoft/bus/modules/bus/service/impl/CompanyInfoServiceImpl.java

@@ -1,10 +1,10 @@
-package com.jpsoft.bus.modules.base.service.impl;
+package com.jpsoft.bus.modules.bus.service.impl;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import com.jpsoft.bus.modules.base.dao.CompanyInfoDAO;
-import com.jpsoft.bus.modules.base.entity.CompanyInfo;
-import com.jpsoft.bus.modules.base.service.CompanyInfoService;
+import com.jpsoft.bus.modules.bus.dao.CompanyInfoDAO;
+import com.jpsoft.bus.modules.bus.entity.CompanyInfo;
+import com.jpsoft.bus.modules.bus.service.CompanyInfoService;
 import com.jpsoft.bus.modules.common.dto.Sort;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;

common/src/main/java/com/jpsoft/bus/modules/bus/service/impl/UserInfoServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.bus.modules.bus.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.bus.modules.bus.dao.UserInfoDAO;
+import com.jpsoft.bus.modules.bus.entity.UserInfo;
+import com.jpsoft.bus.modules.bus.service.UserInfoService;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="userInfoService")
+public class UserInfoServiceImpl implements UserInfoService {
+	@Resource(name="userInfoDAO")
+	private UserInfoDAO userInfoDAO;
+
+	@Override
+	public UserInfo get(String id) {
+		// TODO Auto-generated method stub
+		return userInfoDAO.get(id);
+	}
+
+	@Override
+	public int insert(UserInfo model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return userInfoDAO.insert(model);
+	}
+
+	@Override
+	public int update(UserInfo model) {
+		// TODO Auto-generated method stub
+		return userInfoDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return userInfoDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = userInfoDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<UserInfo> list() {
+		// TODO Auto-generated method stub
+		return userInfoDAO.list();
+	}
+		
+	@Override
+	public Page<UserInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<UserInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            userInfoDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/resources/mapper/base/CompanyInfo.xml → common/src/main/resources/mapper/bus/CompanyInfo.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!-- namespace必须指向DAO接口 -->
-<mapper namespace="com.jpsoft.bus.modules.base.dao.CompanyInfoDAO">
-    <resultMap id="CompanyInfoMap" type="com.jpsoft.bus.modules.base.entity.CompanyInfo">
+<mapper namespace="com.jpsoft.bus.modules.bus.dao.CompanyInfoDAO">
+    <resultMap id="CompanyInfoMap" type="com.jpsoft.bus.modules.bus.entity.CompanyInfo">
         <id property="id" column="id_"/>
         <result property="sortNo" column="sort_no"/>
         <result property="name" column="name_"/>
@@ -21,14 +21,14 @@
         <result property="typeName" column="type_name" />
         <result property="level" column="level_"/>
     </resultMap>
-    <insert id="insert" parameterType="com.jpsoft.bus.modules.base.entity.CompanyInfo">
+    <insert id="insert" parameterType="com.jpsoft.bus.modules.bus.entity.CompanyInfo">
         <!--
         <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
             select sys_guid() from dual
         </selectKey>
         -->
         <![CDATA[
-		insert into base_company_info
+		insert into bus_company_info
 	    (id_,sort_no,name_,full_name,remark_,create_by,create_time,
 	    update_by,update_time,del_flag,parent_id,code_,type_,level_
 	    )
@@ -52,10 +52,10 @@
 	]]>
     </insert>
     <delete id="delete" parameterType="string">
-        delete from base_company_info where id_=#{id,jdbcType=VARCHAR}
+        delete from bus_company_info where id_=#{id,jdbcType=VARCHAR}
     </delete>
-    <update id="update" parameterType="com.jpsoft.bus.modules.base.entity.CompanyInfo">
-        update base_company_info
+    <update id="update" parameterType="com.jpsoft.bus.modules.bus.entity.CompanyInfo">
+        update bus_company_info
         <set>
             <if test="sortNo!=null">
                 sort_no=#{sortNo,jdbcType= NUMERIC },
@@ -100,29 +100,29 @@
         where id_=#{id}
     </update>
     <update id="updateCode">
-        update base_company_info
+        update bus_company_info
         set code_ = concat(#{newCode},substr(code_,#{startIndex}))
         where code_ like #{oldCode}
     </update>
     <select id="get" parameterType="string" resultMap="CompanyInfoMap">
         select a.*,b.name_ as parent_name
-        from base_company_info a
-        left join base_company_info b on a.parent_id = b.id_
+        from bus_company_info a
+        left join bus_company_info b on a.parent_id = b.id_
         where a.id_=#{0}
     </select>
     <select id="exist" parameterType="string" resultType="int">
-        select count(*) from base_company_info where id_=#{0} and del_flag = 0
+        select count(*) from bus_company_info where id_=#{0} and del_flag = 0
     </select>
     <select id="list" resultMap="CompanyInfoMap">
-        select * from base_company_info where del_flag=0 order by level_ asc,sort_no asc
+        select * from bus_company_info where del_flag=0 order by level_ asc,sort_no asc
     </select>
     <select id="search" parameterType="hashmap" resultMap="CompanyInfoMap">
         <![CDATA[
             select
             a.*,
             b.name_ as parent_name
-            from base_company_info a
-            left join base_company_info b on a.parent_id = b.id_
+            from bus_company_info a
+            left join bus_company_info b on a.parent_id = b.id_
 		]]>
         <where>
             a.del_flag = 0
@@ -145,8 +145,8 @@
     </select>
     <select id="findByParentId" resultMap="CompanyInfoMap">
         select a.*,b.name_ as parent_name
-        from base_company_info a
-        left join base_company_info b on a.parent_id = b.id_
+        from bus_company_info a
+        left join bus_company_info b on a.parent_id = b.id_
         where a.del_flag=0
         <if test="parentId!=null">
             and a.parent_id=#{parentId,jdbcType=VARCHAR}
@@ -158,14 +158,14 @@
     </select>
     <select id="findByName" parameterType="string" resultMap="CompanyInfoMap">
         select a.*,b.name_ as parent_name
-        from base_company_info a
-        left join base_company_info b on a.parent_id = b.id_
+        from bus_company_info a
+        left join bus_company_info b on a.parent_id = b.id_
         where (a.name_=#{0} or a.full_name=#{0})
         and a.del_flag = 0
         limit 1
     </select>
     <select id="findByCompanyCodeAndType" resultMap="CompanyInfoMap">
-        select * from base_company_info
+        select * from bus_company_info
         where del_flag = 0
         and code_ like #{code}
         <if test="type!=null">
@@ -176,7 +176,7 @@
 
     <select id="findAllCompanyByCode" resultMap="CompanyInfoMap">
         <![CDATA[
-            select * from base_company_info
+            select * from bus_company_info
             where del_flag = 0
             and code_ like #{code}
         ]]>
@@ -184,14 +184,14 @@
 
     <select id="findByType" resultMap="CompanyInfoMap">
         <![CDATA[
-        select * from base_company_info
+        select * from bus_company_info
         where del_flag = 0
         and type_ = #{type}
         ]]>
     </select>
 
     <select id="countByParentId" resultType="long">
-        select count(*) from base_company_info
+        select count(*) from bus_company_info
         <where>
             del_flag=0
             <if test="parentId!=null">
@@ -205,8 +205,8 @@
 
     <select id="findByCompanyCode" resultMap="CompanyInfoMap">
         select a.*,b.name_ as parent_name
-        from base_company_info a
-        left join base_company_info b on a.parent_id = b.id_
+        from bus_company_info a
+        left join bus_company_info b on a.parent_id = b.id_
         where a.del_flag=0
         <trim prefix="and (" prefixOverrides="AND|OR" suffix=")">
             <if test="code!=null">
@@ -215,11 +215,6 @@
             <if test="code==null">
                 a.code_='-1'
             </if>
-            <if test="personId!=null">
-                or a.id_ in (
-                select c.company_id from base_person_company c where c.person_id = #{personId}
-                )
-            </if>
         </trim>
         order by a.level_ asc,a.sort_no asc,a.name_ asc
     </select>

common/src/main/resources/mapper/bus/UserInfo.xml

@@ -0,0 +1,111 @@
+<?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">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.bus.modules.bus.dao.UserInfoDAO">
+	<resultMap id="UserInfoMap" type="com.jpsoft.bus.modules.bus.entity.UserInfo">
+		<id property="id" column="id_" />
+			<result property="name" column="name_" />
+			<result property="phone" column="phone_" />
+			<result property="password" column="password_" />
+			<result property="faceImage" column="face_image" />
+			<result property="acceptMessage" column="accept_message" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			<result property="remark" column="remark_" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.bus.modules.bus.entity.UserInfo">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into bus_user_info
+	    (id_,name_,phone_,password_,face_image,accept_message,create_by,create_time,update_by,update_time,del_flag,remark_)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{name,jdbcType=VARCHAR}
+,#{phone,jdbcType=VARCHAR}
+,#{password,jdbcType=VARCHAR}
+,#{faceImage,jdbcType=VARCHAR}
+,#{acceptMessage,jdbcType= NUMERIC }
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+,#{remark,jdbcType=VARCHAR}
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from bus_user_info where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.bus.modules.bus.entity.UserInfo">
+		update bus_user_info
+		<set>
+				<if test="name!=null">
+		name_=#{name,jdbcType=VARCHAR},
+		</if>
+				<if test="phone!=null">
+		phone_=#{phone,jdbcType=VARCHAR},
+		</if>
+				<if test="password!=null">
+		password_=#{password,jdbcType=VARCHAR},
+		</if>
+				<if test="faceImage!=null">
+		face_image=#{faceImage,jdbcType=VARCHAR},
+		</if>
+				<if test="acceptMessage!=null">
+		accept_message=#{acceptMessage,jdbcType= NUMERIC },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="remark!=null">
+		remark_=#{remark,jdbcType=VARCHAR},
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="UserInfoMap">
+		select * from bus_user_info where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from bus_user_info where id_=#{0}
+	</select>
+	<select id="list" resultMap="UserInfoMap">
+		select * from bus_user_info
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="UserInfoMap">
+		<![CDATA[
+			select * from bus_user_info
+		]]>
+		<where>
+			del_flag = 0
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

web/src/main/java/com/jpsoft/bus/modules/base/controller/CompanyInfoController.java → web/src/main/java/com/jpsoft/bus/modules/bus/controller/CompanyInfoController.java

@@ -1,14 +1,11 @@
-package com.jpsoft.bus.modules.base.controller;
+package com.jpsoft.bus.modules.bus.controller;
 
-import com.alipay.api.domain.DeviceInfo;
 import com.github.pagehelper.Page;
 import com.jpsoft.bus.config.OSSConfig;
-import com.jpsoft.bus.modules.base.entity.*;
-import com.jpsoft.bus.modules.base.service.*;
+import com.jpsoft.bus.modules.bus.entity.CompanyInfo;
+import com.jpsoft.bus.modules.bus.service.CompanyInfoService;
 import com.jpsoft.bus.modules.common.dto.MessageResult;
 import com.jpsoft.bus.modules.common.dto.Sort;
-import com.jpsoft.bus.modules.common.utils.OSSUtil;
-import com.jpsoft.bus.modules.common.utils.POIUtils;
 import com.jpsoft.bus.modules.common.utils.PojoUtils;
 import com.jpsoft.bus.modules.sys.entity.User;
 import com.jpsoft.bus.modules.sys.service.DataDictionaryService;
@@ -18,24 +15,22 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.text.DecimalFormat;
 import java.util.*;
 
+
+/**
+ * 单位
+ * sz
+ */
 @RestController
-@RequestMapping("/base/companyInfo")
+@RequestMapping("/bus/companyInfo")
 @Api(description = "companyInfo")
 public class CompanyInfoController {
     private Logger logger = LoggerFactory.getLogger(getClass());

web/src/main/java/com/jpsoft/bus/modules/bus/controller/UserInfoController.java

@@ -0,0 +1,228 @@
+package com.jpsoft.bus.modules.bus.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.MessageResult;
+import com.jpsoft.bus.modules.common.dto.Sort;
+import com.jpsoft.bus.modules.bus.entity.UserInfo;
+import com.jpsoft.bus.modules.bus.service.UserInfoService;
+import com.jpsoft.bus.modules.common.utils.PojoUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 乘客
+ */
+@RestController
+@RequestMapping("/bus/userInfo")
+@Api(description = "userInfo")
+public class UserInfoController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private UserInfoService userInfoService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<UserInfo> create(){
+        MessageResult<UserInfo> msgResult = new MessageResult<>();
+
+        UserInfo userInfo = new UserInfo();
+
+        msgResult.setData(userInfo);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<UserInfo> add(@RequestBody UserInfo userInfo,@RequestAttribute String subject){
+        MessageResult<UserInfo> msgResult = new MessageResult<>();
+
+        try {
+            userInfo.setId(UUID.randomUUID().toString());
+            userInfo.setDelFlag(false);
+            userInfo.setCreateBy(subject);
+            userInfo.setCreateTime(new Date());
+            
+            int affectCount = userInfoService.insert(userInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(userInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<UserInfo> edit(@PathVariable("id") String id){
+        MessageResult<UserInfo> msgResult = new MessageResult<>();
+
+        try {
+            UserInfo userInfo = userInfoService.get(id);
+
+            if (userInfo != null) {
+                msgResult.setResult(true);
+                msgResult.setData(userInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<UserInfo> update(@RequestBody UserInfo userInfo,@RequestAttribute String subject){
+        MessageResult<UserInfo> msgResult = new MessageResult<>();
+
+        try {
+            userInfo.setUpdateBy(subject);
+            userInfo.setUpdateTime(new Date());
+            
+            int affectCount = userInfoService.update(userInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(userInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            UserInfo userInfo = userInfoService.get(id);
+            userInfo.setDelFlag(true);
+            userInfo.setUpdateBy(subject);
+            userInfo.setUpdateTime(new Date());
+
+            int affectCount = userInfoService.update(userInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                UserInfo userInfo = userInfoService.get(id);
+                userInfo.setDelFlag(true);
+                userInfo.setUpdateBy(subject);
+                userInfo.setUpdateTime(new Date());
+
+                affectCount += userInfoService.update(userInfo);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<UserInfo> page = userInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}