流水鱼登陆合并整理

 package com.zhonglai.luhui.user.domain;
 
+import com.ruoyi.common.utils.DateUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.ruoyi.common.tool.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 基础用户信息对象 user_base_info
  * 
@@ -48,6 +51,14 @@ public class UserBaseInfo extends BaseEntity
         @ApiModelProperty(value="头像地址")
     private String imgUrl;
 
+    public void setCreateTime(Integer createTime)
+    {
+        if (null != createTime)
+        {
+            setCreateTime(new Date(createTime*1000l));
+        }
+    }
+
     public void setId(Integer id)
     {
         this.id = id;

@@ -29,7 +29,7 @@ public class UserExtraInfo extends BaseEntity
     private String describe;
 
     /** 用户类型（0普通用户,1管理员,2客服） */
-        @ApiModelProperty(value="用户类型",allowableValues="0=普通用户,1管理员,2客服")
+        @ApiModelProperty(value="用户类型（0=普通用户,1管理员,2客服）")
     private Integer userType;
 
     /** 是否失效 */

@@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectUserAccountInfoList" parameterType="UserAccountInfo" resultMap="UserAccountInfoResult">
         <include refid="selectUserAccountInfoVo"/>
         <where>
+            <if test="id != null "> and id = #{id}</if>
             <if test="integral != null "> and integral = #{integral}</if>
             <if test="balance != null "> and balance = #{balance}</if>
             <if test="level != null "> and level = #{level}</if>

@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectUserAddressInfoList" parameterType="UserAddressInfo" resultMap="UserAddressInfoResult">
         <include refid="selectUserAddressInfoVo"/>
         <where>
+            <if test="id != null "> and id = #{id}</if>
             <if test="provinceId != null  and provinceId != ''"> and province_id = #{provinceId}</if>
             <if test="cityId != null  and cityId != ''"> and city_id = #{cityId}</if>
             <if test="countyId != null  and countyId != ''"> and county_id = #{countyId}</if>

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectUserAuthInfoList" parameterType="UserAuthInfo" resultMap="UserAuthInfoResult">
         <include refid="selectUserAuthInfoVo"/>
         <where>
+            <if test="id != null "> and id = #{id}</if>
             <if test="nameAuthentication != null "> and name_authentication = #{nameAuthentication}</if>
             <if test="personalAuthenticationState != null "> and personal_authentication_state = #{personalAuthenticationState}</if>
             <if test="enterpriseAuthenticationState != null "> and enterprise_authentication_state = #{enterpriseAuthenticationState}</if>

@@ -16,12 +16,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectUserBaseInfoVo">
-        select id, name, nickname, gender, phone, email, img_url, create_time from user_base_info
+        select id, name, nickname, gender, phone, email, img_url, FROM_UNIXTIME(create_time) AS create_time from user_base_info
     </sql>
 
     <select id="selectUserBaseInfoList" parameterType="UserBaseInfo" resultMap="UserBaseInfoResult">
         <include refid="selectUserBaseInfoVo"/>
         <where>
+            <if test="id != null "> and id = #{id}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="nickname != null  and nickname != ''"> and nickname like concat('%', #{nickname}, '%')</if>
             <if test="gender != null "> and gender = #{gender}</if>

@@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectUserExtraInfoList" parameterType="UserExtraInfo" resultMap="UserExtraInfoResult">
         <include refid="selectUserExtraInfoVo"/>
         <where>
+            <if test="id != null "> and id = #{id}</if>
             <if test="describeImgUrl != null  and describeImgUrl != ''"> and describe_img_url = #{describeImgUrl}</if>
             <if test="describe != null  and describe != ''"> and `describe` = #{describe}</if>
             <if test="userType != null "> and user_type = #{userType}</if>

@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectUserLoginInfoList" parameterType="UserLoginInfo" resultMap="UserLoginInfoResult">
         <include refid="selectUserLoginInfoVo"/>
         <where>
+            <if test="id != null "> and id = #{id}</if>
             <if test="onlineState != null "> and online_state = #{onlineState}</if>
             <if test="lastLoginTime != null "> and last_login_time = #{lastLoginTime}</if>
             <if test="lastLoginIp != null  and lastLoginIp != ''"> and last_login_ip = #{lastLoginIp}</if>

@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectUserLoginList" parameterType="UserLogin" resultMap="UserLoginResult">
         <include refid="selectUserLoginVo"/>
         <where>
+            <if test="id != null "> and id = #{id}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="loginName != null  and loginName != ''"> and login_name like concat('%', #{loginName}, '%')</if>
             <if test="loginPass != null  and loginPass != ''"> and login_pass = #{loginPass}</if>

@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectUserOfficialInfoList" parameterType="UserOfficialInfo" resultMap="UserOfficialInfoResult">
         <include refid="selectUserOfficialInfoVo"/>
         <where>
+            <if test="id != null "> and id = #{id}</if>
             <if test="guarantee != null "> and guarantee = #{guarantee}</if>
             <if test="guaranteeDescribe != null  and guaranteeDescribe != ''"> and guarantee_describe = #{guaranteeDescribe}</if>
             <if test="alarmAgreement != null "> and alarm_agreement = #{alarmAgreement}</if>

@@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectUserSocialInfoList" parameterType="UserSocialInfo" resultMap="UserSocialInfoResult">
         <include refid="selectUserSocialInfoVo"/>
         <where>
+            <if test="id != null "> and id = #{id}</if>
             <if test="qq != null  and qq != ''"> and qq = #{qq}</if>
             <if test="weixin != null  and weixin != ''"> and weixin = #{weixin}</if>
             <if test="openId != null "> and open_id = #{openId}</if>

@@ -22,6 +22,7 @@ import org.springframework.context.annotation.ComponentScan;
         "com.zhonglai.luhui.rocketmq",
         "com.zhonglai.luhui.firewall",
         "com.zhonglai.luhui.admin",
+        "com.zhonglai.luhui.user",
 })
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 public class AdminApplication {

@@ -4,6 +4,8 @@ import java.util.List;
 import com.zhonglai.luhui.datasource.enums.DataSource;
 import com.zhonglai.luhui.datasource.enums.DataSourceType;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zhonglai.luhui.user.service.IUserAccountInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -38,7 +40,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 public class UserAccountInfoController extends BaseController
 {
     @Autowired
-    private PublicTemplateService publicTemplateService;
+    private IUserAccountInfoService publicTemplateService;
 
     @ApiOperation(value ="查询用户账户信息列表",notes="\n" +
         "公共参数描述：\n" +
@@ -57,7 +59,7 @@ public class UserAccountInfoController extends BaseController
     public TableDataInfo list(UserAccountInfo userAccountInfo)
     {
         startPage();
-        List<UserAccountInfo> list = publicTemplateService.selectTList(userAccountInfo);
+        List<UserAccountInfo> list = publicTemplateService.selectUserAccountInfoList(userAccountInfo);
         return getDataTable(list);
     }
 
@@ -68,7 +70,7 @@ public class UserAccountInfoController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, UserAccountInfo userAccountInfo)
     {
-        List<UserAccountInfo> list = publicTemplateService.selectTList(userAccountInfo);
+        List<UserAccountInfo> list = publicTemplateService.selectUserAccountInfoList(userAccountInfo);
         ExcelUtil<UserAccountInfo> util = new ExcelUtil<UserAccountInfo>(UserAccountInfo.class);
         util.exportExcel(response, list, "用户账户信息数据");
     }
@@ -79,7 +81,7 @@ public class UserAccountInfoController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Integer id)
     {
-        return success(publicTemplateService.getTById(id, UserAccountInfo.class));
+        return success(publicTemplateService.selectUserAccountInfoById(id));
     }
 
     @ApiOperation("新增用户账户信息")
@@ -89,7 +91,7 @@ public class UserAccountInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody UserAccountInfo userAccountInfo)
     {
-        return toAjax(publicTemplateService.add(userAccountInfo));
+        return toAjax(publicTemplateService.insertUserAccountInfo(userAccountInfo));
     }
 
     @ApiOperation("修改用户账户信息")
@@ -99,7 +101,7 @@ public class UserAccountInfoController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody UserAccountInfo userAccountInfo)
     {
-        return toAjax(publicTemplateService.edit((userAccountInfo)));
+        return toAjax(publicTemplateService.updateUserAccountInfo((userAccountInfo)));
     }
 
     @ApiOperation("删除用户账户信息")
@@ -109,6 +111,6 @@ public class UserAccountInfoController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Integer[] ids)
     {
-        return toAjax(publicTemplateService.removeByIds(UserAccountInfo.class,ids));
+        return toAjax(publicTemplateService.deleteUserAccountInfoByIds(ids));
     }
 }

@@ -4,6 +4,8 @@ import java.util.List;
 import com.zhonglai.luhui.datasource.enums.DataSource;
 import com.zhonglai.luhui.datasource.enums.DataSourceType;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zhonglai.luhui.user.service.IUserAddressInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -38,7 +40,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 public class UserAddressInfoController extends BaseController
 {
     @Autowired
-    private PublicTemplateService publicTemplateService;
+    private IUserAddressInfoService publicTemplateService;
 
     @ApiOperation(value ="查询用户地理信息列表",notes="\n" +
         "公共参数描述：\n" +
@@ -57,7 +59,7 @@ public class UserAddressInfoController extends BaseController
     public TableDataInfo list(UserAddressInfo userAddressInfo)
     {
         startPage();
-        List<UserAddressInfo> list = publicTemplateService.selectTList(userAddressInfo);
+        List<UserAddressInfo> list = publicTemplateService.selectUserAddressInfoList(userAddressInfo);
         return getDataTable(list);
     }
 
@@ -68,7 +70,7 @@ public class UserAddressInfoController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, UserAddressInfo userAddressInfo)
     {
-        List<UserAddressInfo> list = publicTemplateService.selectTList(userAddressInfo);
+        List<UserAddressInfo> list = publicTemplateService.selectUserAddressInfoList(userAddressInfo);
         ExcelUtil<UserAddressInfo> util = new ExcelUtil<UserAddressInfo>(UserAddressInfo.class);
         util.exportExcel(response, list, "用户地理信息数据");
     }
@@ -79,7 +81,7 @@ public class UserAddressInfoController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Integer id)
     {
-        return success(publicTemplateService.getTById(id, UserAddressInfo.class));
+        return success(publicTemplateService.selectUserAddressInfoById(id));
     }
 
     @ApiOperation("新增用户地理信息")
@@ -89,7 +91,7 @@ public class UserAddressInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody UserAddressInfo userAddressInfo)
     {
-        return toAjax(publicTemplateService.add(userAddressInfo));
+        return toAjax(publicTemplateService.insertUserAddressInfo(userAddressInfo));
     }
 
     @ApiOperation("修改用户地理信息")
@@ -99,7 +101,7 @@ public class UserAddressInfoController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody UserAddressInfo userAddressInfo)
     {
-        return toAjax(publicTemplateService.edit((userAddressInfo)));
+        return toAjax(publicTemplateService.updateUserAddressInfo((userAddressInfo)));
     }
 
     @ApiOperation("删除用户地理信息")
@@ -109,6 +111,6 @@ public class UserAddressInfoController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Integer[] ids)
     {
-        return toAjax(publicTemplateService.removeByIds(UserAddressInfo.class,ids));
+        return toAjax(publicTemplateService.deleteUserAddressInfoByIds(ids));
     }
 }

@@ -4,6 +4,8 @@ import java.util.List;
 import com.zhonglai.luhui.datasource.enums.DataSource;
 import com.zhonglai.luhui.datasource.enums.DataSourceType;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zhonglai.luhui.user.service.IUserAuthInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -38,7 +40,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 public class UserAuthInfoController extends BaseController
 {
     @Autowired
-    private PublicTemplateService publicTemplateService;
+    private IUserAuthInfoService publicTemplateService;
 
     @ApiOperation(value ="查询用户认证信息列表",notes="\n" +
         "公共参数描述：\n" +
@@ -57,7 +59,7 @@ public class UserAuthInfoController extends BaseController
     public TableDataInfo list(UserAuthInfo userAuthInfo)
     {
         startPage();
-        List<UserAuthInfo> list = publicTemplateService.selectTList(userAuthInfo);
+        List<UserAuthInfo> list = publicTemplateService.selectUserAuthInfoList(userAuthInfo);
         return getDataTable(list);
     }
 
@@ -68,7 +70,7 @@ public class UserAuthInfoController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, UserAuthInfo userAuthInfo)
     {
-        List<UserAuthInfo> list = publicTemplateService.selectTList(userAuthInfo);
+        List<UserAuthInfo> list = publicTemplateService.selectUserAuthInfoList(userAuthInfo);
         ExcelUtil<UserAuthInfo> util = new ExcelUtil<UserAuthInfo>(UserAuthInfo.class);
         util.exportExcel(response, list, "用户认证信息数据");
     }
@@ -79,7 +81,7 @@ public class UserAuthInfoController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Integer id)
     {
-        return success(publicTemplateService.getTById(id, UserAuthInfo.class));
+        return success(publicTemplateService.selectUserAuthInfoById(id));
     }
 
     @ApiOperation("新增用户认证信息")
@@ -89,7 +91,7 @@ public class UserAuthInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody UserAuthInfo userAuthInfo)
     {
-        return toAjax(publicTemplateService.add(userAuthInfo));
+        return toAjax(publicTemplateService.insertUserAuthInfo(userAuthInfo));
     }
 
     @ApiOperation("修改用户认证信息")
@@ -99,7 +101,7 @@ public class UserAuthInfoController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody UserAuthInfo userAuthInfo)
     {
-        return toAjax(publicTemplateService.edit((userAuthInfo)));
+        return toAjax(publicTemplateService.updateUserAuthInfo((userAuthInfo)));
     }
 
     @ApiOperation("删除用户认证信息")
@@ -109,6 +111,6 @@ public class UserAuthInfoController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Integer[] ids)
     {
-        return toAjax(publicTemplateService.removeByIds(UserAuthInfo.class,ids));
+        return toAjax(publicTemplateService.deleteUserAuthInfoByIds(ids));
     }
 }

@@ -4,6 +4,8 @@ import java.util.List;
 import com.zhonglai.luhui.datasource.enums.DataSource;
 import com.zhonglai.luhui.datasource.enums.DataSourceType;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zhonglai.luhui.user.service.IUserBaseInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -38,7 +40,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 public class UserBaseInfoController extends BaseController
 {
     @Autowired
-    private PublicTemplateService publicTemplateService;
+    private IUserBaseInfoService publicTemplateService;
 
     @ApiOperation(value ="查询基础用户信息列表",notes="\n" +
         "公共参数描述：\n" +
@@ -57,7 +59,7 @@ public class UserBaseInfoController extends BaseController
     public TableDataInfo list(UserBaseInfo userBaseInfo)
     {
         startPage();
-        List<UserBaseInfo> list = publicTemplateService.selectTList(userBaseInfo);
+        List<UserBaseInfo> list = publicTemplateService.selectUserBaseInfoList(userBaseInfo);
         return getDataTable(list);
     }
 
@@ -68,7 +70,7 @@ public class UserBaseInfoController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, UserBaseInfo userBaseInfo)
     {
-        List<UserBaseInfo> list = publicTemplateService.selectTList(userBaseInfo);
+        List<UserBaseInfo> list = publicTemplateService.selectUserBaseInfoList(userBaseInfo);
         ExcelUtil<UserBaseInfo> util = new ExcelUtil<UserBaseInfo>(UserBaseInfo.class);
         util.exportExcel(response, list, "基础用户信息数据");
     }
@@ -79,7 +81,7 @@ public class UserBaseInfoController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Integer id)
     {
-        return success(publicTemplateService.getTById(id, UserBaseInfo.class));
+        return success(publicTemplateService.selectUserBaseInfoById(id));
     }
 
     @ApiOperation("新增基础用户信息")
@@ -89,7 +91,7 @@ public class UserBaseInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody UserBaseInfo userBaseInfo)
     {
-        return toAjax(publicTemplateService.add(userBaseInfo));
+        return toAjax(publicTemplateService.insertUserBaseInfo(userBaseInfo));
     }
 
     @ApiOperation("修改基础用户信息")
@@ -99,7 +101,7 @@ public class UserBaseInfoController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody UserBaseInfo userBaseInfo)
     {
-        return toAjax(publicTemplateService.edit((userBaseInfo)));
+        return toAjax(publicTemplateService.updateUserBaseInfo((userBaseInfo)));
     }
 
     @ApiOperation("删除基础用户信息")
@@ -109,6 +111,6 @@ public class UserBaseInfoController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Integer[] ids)
     {
-        return toAjax(publicTemplateService.removeByIds(UserBaseInfo.class,ids));
+        return toAjax(publicTemplateService.deleteUserBaseInfoByIds(ids));
     }
 }

@@ -4,6 +4,8 @@ import java.util.List;
 import com.zhonglai.luhui.datasource.enums.DataSource;
 import com.zhonglai.luhui.datasource.enums.DataSourceType;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zhonglai.luhui.user.service.IUserExtraInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -38,7 +40,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 public class UserExtraInfoController extends BaseController
 {
     @Autowired
-    private PublicTemplateService publicTemplateService;
+    private IUserExtraInfoService publicTemplateService;
 
     @ApiOperation(value ="查询用户其他信息列表",notes="\n" +
         "公共参数描述：\n" +
@@ -57,7 +59,7 @@ public class UserExtraInfoController extends BaseController
     public TableDataInfo list(UserExtraInfo userExtraInfo)
     {
         startPage();
-        List<UserExtraInfo> list = publicTemplateService.selectTList(userExtraInfo);
+        List<UserExtraInfo> list = publicTemplateService.selectUserExtraInfoList(userExtraInfo);
         return getDataTable(list);
     }
 
@@ -68,7 +70,7 @@ public class UserExtraInfoController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, UserExtraInfo userExtraInfo)
     {
-        List<UserExtraInfo> list = publicTemplateService.selectTList(userExtraInfo);
+        List<UserExtraInfo> list = publicTemplateService.selectUserExtraInfoList(userExtraInfo);
         ExcelUtil<UserExtraInfo> util = new ExcelUtil<UserExtraInfo>(UserExtraInfo.class);
         util.exportExcel(response, list, "用户其他信息数据");
     }
@@ -79,7 +81,7 @@ public class UserExtraInfoController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Integer id)
     {
-        return success(publicTemplateService.getTById(id, UserExtraInfo.class));
+        return success(publicTemplateService.selectUserExtraInfoById(id));
     }
 
     @ApiOperation("新增用户其他信息")
@@ -89,7 +91,7 @@ public class UserExtraInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody UserExtraInfo userExtraInfo)
     {
-        return toAjax(publicTemplateService.add(userExtraInfo));
+        return toAjax(publicTemplateService.insertUserExtraInfo(userExtraInfo));
     }
 
     @ApiOperation("修改用户其他信息")
@@ -99,7 +101,7 @@ public class UserExtraInfoController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody UserExtraInfo userExtraInfo)
     {
-        return toAjax(publicTemplateService.edit((userExtraInfo)));
+        return toAjax(publicTemplateService.updateUserExtraInfo((userExtraInfo)));
     }
 
     @ApiOperation("删除用户其他信息")
@@ -109,6 +111,6 @@ public class UserExtraInfoController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Integer[] ids)
     {
-        return toAjax(publicTemplateService.removeByIds(UserExtraInfo.class,ids));
+        return toAjax(publicTemplateService.deleteUserExtraInfoByIds(ids));
     }
 }

@@ -4,6 +4,8 @@ import java.util.List;
 import com.zhonglai.luhui.datasource.enums.DataSource;
 import com.zhonglai.luhui.datasource.enums.DataSourceType;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zhonglai.luhui.user.service.IUserLoginService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -38,7 +40,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 public class UserLoginController extends BaseController
 {
     @Autowired
-    private PublicTemplateService publicTemplateService;
+    private IUserLoginService publicTemplateService;
 
     @ApiOperation(value ="查询用户登录列表",notes="\n" +
         "公共参数描述：\n" +
@@ -57,7 +59,7 @@ public class UserLoginController extends BaseController
     public TableDataInfo list(UserLogin userLogin)
     {
         startPage();
-        List<UserLogin> list = publicTemplateService.selectTList(userLogin);
+        List<UserLogin> list = publicTemplateService.selectUserLoginList(userLogin);
         return getDataTable(list);
     }
 
@@ -68,7 +70,7 @@ public class UserLoginController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, UserLogin userLogin)
     {
-        List<UserLogin> list = publicTemplateService.selectTList(userLogin);
+        List<UserLogin> list = publicTemplateService.selectUserLoginList(userLogin);
         ExcelUtil<UserLogin> util = new ExcelUtil<UserLogin>(UserLogin.class);
         util.exportExcel(response, list, "用户登录数据");
     }
@@ -79,7 +81,7 @@ public class UserLoginController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Integer id)
     {
-        return success(publicTemplateService.getTById(id, UserLogin.class));
+        return success(publicTemplateService.selectUserLoginById(id));
     }
 
     @ApiOperation("新增用户登录")
@@ -89,7 +91,7 @@ public class UserLoginController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody UserLogin userLogin)
     {
-        return toAjax(publicTemplateService.add(userLogin));
+        return toAjax(publicTemplateService.insertUserLogin(userLogin));
     }
 
     @ApiOperation("修改用户登录")
@@ -99,7 +101,7 @@ public class UserLoginController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody UserLogin userLogin)
     {
-        return toAjax(publicTemplateService.edit((userLogin)));
+        return toAjax(publicTemplateService.updateUserLogin((userLogin)));
     }
 
     @ApiOperation("删除用户登录")
@@ -109,6 +111,6 @@ public class UserLoginController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Integer[] ids)
     {
-        return toAjax(publicTemplateService.removeByIds(UserLogin.class,ids));
+        return toAjax(publicTemplateService.deleteUserLoginByIds(ids));
     }
 }

@@ -4,6 +4,8 @@ import java.util.List;
 import com.zhonglai.luhui.datasource.enums.DataSource;
 import com.zhonglai.luhui.datasource.enums.DataSourceType;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zhonglai.luhui.user.service.IUserLoginInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -38,7 +40,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 public class UserLoginInfoController extends BaseController
 {
     @Autowired
-    private PublicTemplateService publicTemplateService;
+    private IUserLoginInfoService publicTemplateService;
 
     @ApiOperation(value ="查询用户登录信息列表",notes="\n" +
         "公共参数描述：\n" +
@@ -57,7 +59,7 @@ public class UserLoginInfoController extends BaseController
     public TableDataInfo list(UserLoginInfo userLoginInfo)
     {
         startPage();
-        List<UserLoginInfo> list = publicTemplateService.selectTList(userLoginInfo);
+        List<UserLoginInfo> list = publicTemplateService.selectUserLoginInfoList(userLoginInfo);
         return getDataTable(list);
     }
 
@@ -68,7 +70,7 @@ public class UserLoginInfoController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, UserLoginInfo userLoginInfo)
     {
-        List<UserLoginInfo> list = publicTemplateService.selectTList(userLoginInfo);
+        List<UserLoginInfo> list = publicTemplateService.selectUserLoginInfoList(userLoginInfo);
         ExcelUtil<UserLoginInfo> util = new ExcelUtil<UserLoginInfo>(UserLoginInfo.class);
         util.exportExcel(response, list, "用户登录信息数据");
     }
@@ -79,7 +81,7 @@ public class UserLoginInfoController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Integer id)
     {
-        return success(publicTemplateService.getTById(id, UserLoginInfo.class));
+        return success(publicTemplateService.selectUserLoginInfoById(id));
     }
 
     @ApiOperation("新增用户登录信息")
@@ -89,7 +91,7 @@ public class UserLoginInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody UserLoginInfo userLoginInfo)
     {
-        return toAjax(publicTemplateService.add(userLoginInfo));
+        return toAjax(publicTemplateService.insertUserLoginInfo(userLoginInfo));
     }
 
     @ApiOperation("修改用户登录信息")
@@ -99,7 +101,7 @@ public class UserLoginInfoController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody UserLoginInfo userLoginInfo)
     {
-        return toAjax(publicTemplateService.edit((userLoginInfo)));
+        return toAjax(publicTemplateService.updateUserLoginInfo((userLoginInfo)));
     }
 
     @ApiOperation("删除用户登录信息")
@@ -109,6 +111,6 @@ public class UserLoginInfoController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Integer[] ids)
     {
-        return toAjax(publicTemplateService.removeByIds(UserLoginInfo.class,ids));
+        return toAjax(publicTemplateService.deleteUserLoginInfoByIds(ids));
     }
 }

@@ -4,6 +4,8 @@ import java.util.List;
 import com.zhonglai.luhui.datasource.enums.DataSource;
 import com.zhonglai.luhui.datasource.enums.DataSourceType;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zhonglai.luhui.user.service.IUserOfficialInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -38,7 +40,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 public class UserOfficialInfoController extends BaseController
 {
     @Autowired
-    private PublicTemplateService publicTemplateService;
+    private IUserOfficialInfoService publicTemplateService;
 
     @ApiOperation(value ="查询用户官方及告警信息列表",notes="\n" +
         "公共参数描述：\n" +
@@ -57,7 +59,7 @@ public class UserOfficialInfoController extends BaseController
     public TableDataInfo list(UserOfficialInfo userOfficialInfo)
     {
         startPage();
-        List<UserOfficialInfo> list = publicTemplateService.selectTList(userOfficialInfo);
+        List<UserOfficialInfo> list = publicTemplateService.selectUserOfficialInfoList(userOfficialInfo);
         return getDataTable(list);
     }
 
@@ -68,7 +70,7 @@ public class UserOfficialInfoController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, UserOfficialInfo userOfficialInfo)
     {
-        List<UserOfficialInfo> list = publicTemplateService.selectTList(userOfficialInfo);
+        List<UserOfficialInfo> list = publicTemplateService.selectUserOfficialInfoList(userOfficialInfo);
         ExcelUtil<UserOfficialInfo> util = new ExcelUtil<UserOfficialInfo>(UserOfficialInfo.class);
         util.exportExcel(response, list, "用户官方及告警信息数据");
     }
@@ -79,7 +81,7 @@ public class UserOfficialInfoController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Integer id)
     {
-        return success(publicTemplateService.getTById(id, UserOfficialInfo.class));
+        return success(publicTemplateService.selectUserOfficialInfoById(id));
     }
 
     @ApiOperation("新增用户官方及告警信息")
@@ -89,7 +91,7 @@ public class UserOfficialInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody UserOfficialInfo userOfficialInfo)
     {
-        return toAjax(publicTemplateService.add(userOfficialInfo));
+        return toAjax(publicTemplateService.insertUserOfficialInfo(userOfficialInfo));
     }
 
     @ApiOperation("修改用户官方及告警信息")
@@ -99,7 +101,7 @@ public class UserOfficialInfoController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody UserOfficialInfo userOfficialInfo)
     {
-        return toAjax(publicTemplateService.edit((userOfficialInfo)));
+        return toAjax(publicTemplateService.updateUserOfficialInfo((userOfficialInfo)));
     }
 
     @ApiOperation("删除用户官方及告警信息")
@@ -109,6 +111,6 @@ public class UserOfficialInfoController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Integer[] ids)
     {
-        return toAjax(publicTemplateService.removeByIds(UserOfficialInfo.class,ids));
+        return toAjax(publicTemplateService.deleteUserOfficialInfoByIds(ids));
     }
 }

@@ -4,6 +4,8 @@ import java.util.List;
 import com.zhonglai.luhui.datasource.enums.DataSource;
 import com.zhonglai.luhui.datasource.enums.DataSourceType;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zhonglai.luhui.user.service.IUserSocialInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -38,7 +40,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 public class UserSocialInfoController extends BaseController
 {
     @Autowired
-    private PublicTemplateService publicTemplateService;
+    private IUserSocialInfoService publicTemplateService;
 
     @ApiOperation(value ="查询用户社交信息列表",notes="\n" +
         "公共参数描述：\n" +
@@ -57,7 +59,7 @@ public class UserSocialInfoController extends BaseController
     public TableDataInfo list(UserSocialInfo userSocialInfo)
     {
         startPage();
-        List<UserSocialInfo> list = publicTemplateService.selectTList(userSocialInfo);
+        List<UserSocialInfo> list = publicTemplateService.selectUserSocialInfoList(userSocialInfo);
         return getDataTable(list);
     }
 
@@ -68,7 +70,7 @@ public class UserSocialInfoController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, UserSocialInfo userSocialInfo)
     {
-        List<UserSocialInfo> list = publicTemplateService.selectTList(userSocialInfo);
+        List<UserSocialInfo> list = publicTemplateService.selectUserSocialInfoList(userSocialInfo);
         ExcelUtil<UserSocialInfo> util = new ExcelUtil<UserSocialInfo>(UserSocialInfo.class);
         util.exportExcel(response, list, "用户社交信息数据");
     }
@@ -79,7 +81,7 @@ public class UserSocialInfoController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Integer id)
     {
-        return success(publicTemplateService.getTById(id, UserSocialInfo.class));
+        return success(publicTemplateService.selectUserSocialInfoById(id));
     }
 
     @ApiOperation("新增用户社交信息")
@@ -89,7 +91,7 @@ public class UserSocialInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody UserSocialInfo userSocialInfo)
     {
-        return toAjax(publicTemplateService.add(userSocialInfo));
+        return toAjax(publicTemplateService.insertUserSocialInfo(userSocialInfo));
     }
 
     @ApiOperation("修改用户社交信息")
@@ -99,7 +101,7 @@ public class UserSocialInfoController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody UserSocialInfo userSocialInfo)
     {
-        return toAjax(publicTemplateService.edit((userSocialInfo)));
+        return toAjax(publicTemplateService.updateUserSocialInfo((userSocialInfo)));
     }
 
     @ApiOperation("删除用户社交信息")
@@ -109,6 +111,6 @@ public class UserSocialInfoController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Integer[] ids)
     {
-        return toAjax(publicTemplateService.removeByIds(UserSocialInfo.class,ids));
+        return toAjax(publicTemplateService.deleteUserSocialInfoByIds(ids));
     }
 }

@@ -12,10 +12,10 @@ spring:
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
-                enabled: false
-                url: 
-                username: 
-                password: 
+                enabled: true
+                url: jdbc:mysql://rm-wz9740un21f09iokuao.mysql.rds.aliyuncs.com:3306/ly_user?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: luhui
+                password: Luhui586
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -26,7 +26,7 @@ spring:
             maxWait: 60000
             # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
             timeBetweenEvictionRunsMillis: 60000
-            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            # 配置一个连接在池中最小 生存的时间，单位是毫秒
             minEvictableIdleTimeMillis: 300000
             # 配置一个连接在池中最大生存的时间，单位是毫秒
             maxEvictableIdleTimeMillis: 900000