Merge remote-tracking branch 'origin/master'

user_center/src/main/java/com/huaxu/config/ResourceServerConfig.java

@@ -17,7 +17,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                 .and()
                 .authorizeRequests()
                 .antMatchers("/swagger-ui.html","/webjars/**", "/webjars/**", "/swagger-resources/**",
-                       "/v2/**","/app/**","/user/**","/menu/**","/role/**","/org/**","/userGroup/**","/loginLog/**","/operateLog/**","/excel/download/**")
+                       "/v2/**","/app/**","/user/**","/menu/**","/role/**","/org/**","/userGroup/**","/loginLog/**","/operateLog/**","/excel/download/**","/dict/**","/userRegister/**")
                 .permitAll() //配置不需要身份认证的请求路径
                 .anyRequest().authenticated() //其他所有访问路径都需要身份认证
                 .and()

user_center/src/main/java/com/huaxu/controller/DictController.java

@@ -11,10 +11,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
 import java.util.List;
@@ -27,7 +24,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/dict")
-@Api(tags = "")
+@Api(tags = "字典管理")
 public class DictController {
     /**
      * 服务对象
@@ -42,7 +39,7 @@ public class DictController {
      * @return 单条数据
      */
     @RequestMapping(value = "get", method = RequestMethod.POST)
-    @ApiOperation(value = "查询数据字典配置列表")
+    @ApiOperation(value = "查询单个数据字典配置列表")
     public AjaxMessage<Dict> selectOne(
             @ApiParam(value = "数据字典配置", required = true) @RequestBody Dict dict) {
         Dict result = dictService.selectById(dict.getId());
@@ -81,15 +78,13 @@ public class DictController {
     /**
      * 删除一条数据
      *
-     * @param ids 主键，以逗号隔开
+     * @param ids
      * @return Response对象
      */
     @RequestMapping(value = "delete", method = RequestMethod.POST)
     @ApiOperation(value = "删除数据字典配置列表")
-    public AjaxMessage<Integer> delete(String ids) {
-        String[] arrayIds = ids.split(",");
-        List<String> idList = Arrays.asList(arrayIds);
-        int result = dictService.deleteById(idList);
+    public AjaxMessage<Integer> delete(@ApiParam(value = "字典ids", required = true) @RequestParam Long[] ids) {
+        int result = dictService.deleteById(ids);
         return new AjaxMessage<>(ResultStatus.OK, result);
     }
 
@@ -103,7 +98,7 @@ public class DictController {
      */
     @RequestMapping(value = "selectPage", method = RequestMethod.POST)
     @ApiOperation(value = "查询数据字典配置列表")
-    public AjaxMessage<Pagination<Dict>> selectPage(Integer pageNum, Integer pageSize,String keyWords) {
+    public AjaxMessage<Pagination<Dict>> selectPage(Integer pageNum, Integer pageSize,@ApiParam(value = "查询关键字", required = false)String keyWords) {
         Dict dict = new Dict();
         dict.setDictName(keyWords);
         dict.setDictCode(keyWords);

user_center/src/main/java/com/huaxu/controller/UserRegisterController.java

@@ -0,0 +1,94 @@
+package com.huaxu.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaxu.common.EasyExcelUtil;
+import com.huaxu.dto.OperateLogDto;
+import com.huaxu.entity.UserRegister;
+import com.huaxu.model.AjaxMessage;
+import com.huaxu.model.Pagination;
+import com.huaxu.model.ResultStatus;
+import com.huaxu.service.UserRegisterService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 用户注册(UserRegister)控制层
+ *
+ * @author yjy
+ * @since 2020-10-29
+ */
+@RestController
+@RequestMapping("/userRegister")
+@Api(tags = "注册申请")
+public class UserRegisterController {
+    /**
+     * 服务对象
+     */
+    @Autowired
+    private UserRegisterService userRegisterService;
+    @Value("${UMIS.sys_excel_path}")
+    private String baseDir;
+    /**
+     * 新增一条数据
+     *
+     * @param userRegister 实体类
+     * @return Response对象
+     */
+    @RequestMapping(value = "insert", method = RequestMethod.POST)
+    @ApiOperation(value = "插入注册申请")
+    public AjaxMessage<Integer> insert(@ApiParam(value = "注册申请信息", required = true) @RequestBody UserRegister userRegister) {
+        int result = userRegisterService.insert(userRegister);
+
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }
+
+    /**
+     * 删除多条数据
+     *
+     * @param ids 主键，以逗号隔开
+     * @return Response对象
+     */
+    @RequestMapping(value = "delete", method = RequestMethod.POST)
+    @ApiOperation(value = "删除注册申请")
+    public AjaxMessage<Integer> delete(@ApiParam(value = "注册ids", required = true) @RequestParam Long[] ids) {
+        int result = userRegisterService.deleteById(ids);
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }
+
+
+    /**
+     * 分页查询
+     *
+     * @param pageNum  偏移
+     * @param pageSize 条数
+     * @return Response对象
+     */
+    @RequestMapping(value = "selectPage", method = RequestMethod.POST)
+    @ApiOperation(value = "查询用户注册申请列表")
+    public AjaxMessage<Pagination<UserRegister>> selectPage(Integer pageNum, Integer pageSize,@ApiParam(value = "查询关键字", required = false) String keyWords) {
+        UserRegister userRegister = new UserRegister();
+        userRegister.setUsername(keyWords);
+        userRegister.setPhone(keyWords);
+        IPage<UserRegister> iPage = new Page<>(pageNum, pageSize);
+        iPage = userRegisterService.selectPage(userRegister, iPage);
+        Pagination<UserRegister> pages = new Pagination<>(iPage);
+        return new AjaxMessage<>(ResultStatus.OK, pages);
+    }
+
+   @RequestMapping(value = "/exportExcel", method = RequestMethod.POST)
+    @ApiOperation(value = "注册申请列表导出")
+    public AjaxMessage<String> exportExcel(@ApiParam(value = "注册ids", required = true) @RequestParam Long[] ids) {
+        List<UserRegister> result = userRegisterService.selectListByIds(ids);
+        String filePath = EasyExcelUtil.excelWrite(baseDir, UserRegister.class, "注册申请列表", result);
+        return new AjaxMessage<>(ResultStatus.OK, filePath);
+    }
+
+}

user_center/src/main/java/com/huaxu/dao/DictMapper.java

@@ -67,10 +67,10 @@ public interface DictMapper {
     /**
      * 通过主键删除数据
      *
-     * @param idList 主键
+     * @param ids 主键
      * @return 影响行数
      */
-    int deleteById(@Param("idList") List<String> idList);
+    int deleteById(@Param("ids") Long[] ids);
 
     /**
      * 查询总数据数

user_center/src/main/java/com/huaxu/dao/UserRegisterMapper.java

@@ -0,0 +1,60 @@
+package com.huaxu.dao;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huaxu.dto.OperateLogDto;
+import com.huaxu.entity.Dict;
+import com.huaxu.entity.UserRegister;
+import com.huaxu.model.AjaxMessage;
+import com.huaxu.model.ResultStatus;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * 用户注册(UserRegister)表数据库访问层
+ *
+ * @author yjy
+ * @since 2020-10-29
+ */
+@Mapper
+public interface UserRegisterMapper {
+
+    /**
+     * 新增数据
+     *
+     * @param userRegister 实例对象
+     * @return 影响行数
+     */
+    int insert(UserRegister userRegister);
+
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param ids 主键
+     * @return 影响行数
+     */
+    int deleteById(@Param("ids") Long[] ids);
+
+    /**
+     * 分页查询
+     *
+     * @return 对象列表
+     */
+    IPage<UserRegister> selectPage(IPage<UserRegister> page, UserRegister userRegister);
+
+    /**
+     * 通过ids条件查询
+     *
+     * @param ids 实例对象
+     * @return 对象列表
+     */
+    List<UserRegister> selectListByIds(@Param("ids") Long[] ids);
+
+}

user_center/src/main/java/com/huaxu/entity/UserRegister.java

@@ -0,0 +1,84 @@
+package com.huaxu.entity;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 用户注册(UserRegister)实体类
+ *
+ * @author yjy
+ * @since 2020-10-29
+ */
+@Data
+@ApiModel
+public class UserRegister implements Serializable {
+    private static final long serialVersionUID = 269554608076349144L;
+    /**
+     * 主键
+     */
+    @ExcelIgnore
+    @ApiModelProperty(value = "主键")
+    private Integer id;
+    /**
+     * 用户名
+     */
+    @ExcelProperty(value = {"注册申请列表","用户名"},index = 0)
+    @ApiModelProperty(value = "用户名")
+    private String username;
+    /**
+     * 手机号
+     */
+    @ExcelProperty(value = {"注册申请列表","手机号"},index = 1)
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+    /**
+     * 用户类型
+     */
+    @ExcelProperty(value = {"注册申请列表","用户类型"},index = 2)
+    @ApiModelProperty(value = "用户类型")
+    private String userType;
+   /**
+    * 备注
+    */
+   @ExcelIgnore
+   @ApiModelProperty(value = "备注")
+   private String remark;
+    /**
+     * 数据删除标识
+     */
+    @ExcelIgnore
+    @ApiModelProperty(value = "数据删除标识")
+    private Integer status;
+    /**
+     * 创建人
+     */
+    @ExcelIgnore
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = {"注册申请列表","注册时间"},index = 3)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @ApiModelProperty(value = "创建时间")
+    private Date dateCreate;
+    /**
+     * 更新人
+     */
+    @ExcelIgnore
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**
+    * 更新时间
+    */
+    @ExcelIgnore
+    @ApiModelProperty(value = "更新时间")
+    private Date dateUpdate;
+}

user_center/src/main/java/com/huaxu/service/DictService.java

@@ -64,10 +64,10 @@ public interface DictService {
     /**
      * 通过主键删除数据
      *
-     * @param idList 主键
+     * @param ids 主键
      * @return 影响行数
      */
-    int deleteById(List<String> idList);
+    int deleteById(Long[] ids);
 
     /**
      * 查询总数据数

user_center/src/main/java/com/huaxu/service/UserRegisterService.java

@@ -0,0 +1,46 @@
+package com.huaxu.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huaxu.dto.OperateLogDto;
+import com.huaxu.entity.UserRegister;
+
+import java.util.List;
+
+/**
+ * 用户注册(UserRegister)表服务接口
+ *
+ * @author yjy
+ * @since 2020-10-29
+ */
+public interface UserRegisterService {
+    /**
+     * 新增数据
+     *
+     * @param userRegister 实例对象
+     * @return 影响行数
+     */
+    int insert(UserRegister userRegister);
+
+
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param ids 主键
+     * @return 影响行数
+     */
+    int deleteById(Long[] ids);
+
+
+    /**
+     * 分页查询
+     *
+     * @return 对象列表
+     */
+    IPage<UserRegister> selectPage(UserRegister userRegister, IPage<UserRegister> page);
+    /**
+     * 通过ids条件查询
+     * @return 对象列表
+     */
+    List<UserRegister> selectListByIds(Long[] ids);
+}

user_center/src/main/java/com/huaxu/service/impl/DictServiceImpl.java

@@ -89,12 +89,12 @@ public class DictServiceImpl implements DictService {
     /**
      * 通过主键删除数据
      *
-     * @param idList 主键
+     * @param ids 主键
      * @return 是否成功
      */
     @Override
-    public int deleteById(List<String> idList) {
-        return this.dictMapper.deleteById(idList);
+    public int deleteById(Long[] ids) {
+        return this.dictMapper.deleteById(ids);
     }
 
     /**

user_center/src/main/java/com/huaxu/service/impl/UserRegisterServiceImpl.java

@@ -0,0 +1,66 @@
+package com.huaxu.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huaxu.dao.UserRegisterMapper;
+import com.huaxu.dto.OperateLogDto;
+import com.huaxu.entity.Dict;
+import com.huaxu.entity.UserRegister;
+import com.huaxu.service.UserRegisterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 用户注册(UserRegister)服务实现类
+ *
+ * @author yjy
+ * @since 2020-10-29
+ */
+@Service("userRegisterService")
+public class UserRegisterServiceImpl implements UserRegisterService {
+    @Autowired
+    private UserRegisterMapper userRegisterMapper;
+
+    /**
+     * 新增数据
+     *
+     * @param userRegister 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public int insert(UserRegister userRegister) {
+        return this.userRegisterMapper.insert(userRegister);
+    }
+
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param ids 主键
+     * @return 是否成功
+     */
+    @Override
+    public int deleteById(Long[] ids) {
+        return this.userRegisterMapper.deleteById(ids);
+    }
+
+    /**
+     * 分页查询
+     *
+     * @return 对象列表
+     */
+    @Override
+    public IPage<UserRegister> selectPage(UserRegister userRegister, IPage<UserRegister> page) {
+        return this.userRegisterMapper.selectPage(page, userRegister);
+    }
+    /**
+     * 根据ids条件查询
+     *
+     * @return 实例对象的集合
+     */
+    @Override
+    public List<UserRegister> selectListByIds(Long[] ids) {
+        return userRegisterMapper.selectListByIds(ids);
+    }
+}

user_center/src/main/resources/mapper/DictMapper.xml

@@ -137,12 +137,12 @@
     <!--通过主键删除-物理删除-->
     <!--<delete id="deleteById" parameterType="java.util.List">
         delete from uims_dict where ID IN
-        <foreach item="item" index="index" collection="idList" open="("
+        <foreach item="item" index="index" collection="ids" open="("
                  separator="," close=")">
             #{item}
         </foreach>
          or  PARENT_DICT_ID in
-        <foreach item="item" index="index" collection="idList" open="("
+        <foreach item="item" index="index" collection="ids" open="("
                  separator="," close=")">
             #{item}
         </foreach>
@@ -152,12 +152,12 @@
         update uims.uims_dict
         set STATUS=0
         where ID in
-        <foreach item="item" index="index" collection="idList" open="("
+        <foreach item="item" index="index" collection="ids" open="("
                  separator="," close=")">
             #{item}
         </foreach>
             or  PARENT_DICT_ID in
-        <foreach item="item" index="index" collection="idList" open="("
+        <foreach item="item" index="index" collection="ids" open="("
                  separator="," close=")">
             #{item}
         </foreach>

user_center/src/main/resources/mapper/UserRegisterMapper.xml

@@ -0,0 +1,67 @@
+<?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.huaxu.dao.UserRegisterMapper">
+    <!-- 结果集 -->
+    <resultMap type="com.huaxu.entity.UserRegister" id="UserRegisterMap">
+        <result property="id" column="ID" jdbcType="INTEGER"/>
+        <result property="username" column="USERNAME" jdbcType="VARCHAR"/>
+        <result property="phone" column="PHONE" jdbcType="VARCHAR"/>
+        <result property="userType" column="USER_TYPE" jdbcType="VARCHAR"/>
+        <result property="remark" column="REMARK" jdbcType="VARCHAR"/>
+        <result property="status" column="STATUS" jdbcType="INTEGER"/>
+        <result property="createBy" column="CREATE_BY" jdbcType="VARCHAR"/>
+        <result property="dateCreate" column="DATE_CREATE" jdbcType="TIMESTAMP"/>
+        <result property="updateBy" column="UPDATE_BY" jdbcType="VARCHAR"/>
+        <result property="dateUpdate" column="DATE_UPDATE" jdbcType="TIMESTAMP"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+         ID, USERNAME, PHONE, USER_TYPE,REMARK,	STATUS,	DATE_CREATE,CREATE_BY,DATE_UPDATE,UPDATE_BY</sql>
+
+    <!-- 新增所有列 -->
+    <insert id="insert" keyProperty="id" useGeneratedKeys="true">
+        insert into uims_user_register( ID, USERNAME, PHONE, USER_TYPE,	REMARK,	STATUS,	CREATE_BY,DATE_CREATE,UPDATE_BY,DATE_UPDATE)
+        values ( #{id}, #{username}, #{phone}, #{userType}, #{remark}, 1, #{createBy}, #{dateCreate}, #{updateBy}, #{dateUpdate})
+    </insert>
+
+    <!--通过主键删除-逻辑删除-->
+    <update id="deleteById" parameterType="java.util.List">
+        update uims.uims_user_register
+        set STATUS=0
+        where ID in
+        <foreach item="item" index="index" collection="ids" open="("
+                 separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <select id="selectPage" resultMap="UserRegisterMap">
+        select
+        <include refid="Base_Column_List"/>
+        from uims_user_register
+        <where>
+            <if test="userRegister.id != null">
+                and ID = #{userRegister.id}
+            </if>
+            <if test="userRegister.username != null and userRegister.username != ''">
+                and (USERNAME LIKE CONCAT('%',#{userRegister.username},'%')
+            </if>
+            <if test="userRegister.phone != null and userRegister.phone != ''">
+                or PHONE LIKE CONCAT('%',#{userRegister.phone},'%'))
+            </if>
+            and STATUS =1
+        </where>
+    </select>
+    <select id="selectListByIds" resultMap="UserRegisterMap">
+        select
+        <include refid="Base_Column_List"/>
+        from uims_user_register
+        <where>
+            ID in
+            <foreach item="item" index="index" collection="ids" open="("
+                     separator="," close=")">
+                #{item}
+            </foreach>
+            and STATUS =1
+        </where>
+    </select>
+</mapper>