Merge branch 'zwt' into 'master'

0716 add uploadInfo

See merge request !1

hmit-admin/src/main/java/io/hmit/modules/competition/controller/WlUploadInfoController.java

+package io.hmit.modules.competition.controller;
+
+import io.hmit.common.annotation.LogOperation;
+import io.hmit.common.constant.Constant;
+import io.hmit.common.page.PageData;
+import io.hmit.common.utils.ExcelUtils;
+import io.hmit.common.utils.Result;
+import io.hmit.common.validator.AssertUtils;
+import io.hmit.common.validator.ValidatorUtils;
+import io.hmit.common.validator.group.AddGroup;
+import io.hmit.common.validator.group.DefaultGroup;
+import io.hmit.common.validator.group.UpdateGroup;
+import io.hmit.modules.competition.dto.WlUploadInfoDTO;
+import io.hmit.modules.competition.excel.WlUploadInfoExcel;
+import io.hmit.modules.competition.service.WlUploadInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 比赛人员信息
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2020-07-16
+ */
+@RestController
+@RequestMapping("competition/wluploadinfo")
+@Api(tags="比赛人员信息")
+public class WlUploadInfoController {
+    @Autowired
+    private WlUploadInfoService wlUploadInfoService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String")
+    })
+    @RequiresPermissions("competition:wluploadinfo:page")
+    public Result<PageData<WlUploadInfoDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<WlUploadInfoDTO> page = wlUploadInfoService.page(params);
+
+        return new Result<PageData<WlUploadInfoDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @RequiresPermissions("competition:wluploadinfo:info")
+    public Result<WlUploadInfoDTO> get(@PathVariable("id") Long id){
+        WlUploadInfoDTO data = wlUploadInfoService.get(id);
+
+        return new Result<WlUploadInfoDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @RequiresPermissions("competition:wluploadinfo:save")
+    public Result save(@RequestBody WlUploadInfoDTO dto){
+        //校验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        wlUploadInfoService.save(dto);
+
+        return new Result();
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @RequiresPermissions("competition:wluploadinfo:update")
+    public Result update(@RequestBody WlUploadInfoDTO dto){
+        //校验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        wlUploadInfoService.update(dto);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @RequiresPermissions("competition:wluploadinfo:delete")
+    public Result delete(@RequestBody Long[] ids){
+        //校验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        wlUploadInfoService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @RequiresPermissions("competition:wluploadinfo:export")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<WlUploadInfoDTO> list = wlUploadInfoService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, WlUploadInfoExcel.class);
+    }
+
+}
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/competition/dao/WlUploadInfoDao.java

+package io.hmit.modules.competition.dao;
+
+import io.hmit.common.dao.BaseDao;
+import io.hmit.modules.competition.entity.WlUploadInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 比赛人员信息
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2020-07-16
+ */
+@Mapper
+public interface WlUploadInfoDao extends BaseDao<WlUploadInfoEntity> {
+	
+}
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/competition/dto/WlUploadInfoDTO.java

+package io.hmit.modules.competition.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 比赛人员信息
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2020-07-16
+ */
+@Data
+@ApiModel(value = "比赛人员信息")
+public class WlUploadInfoDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "")
+	private Long id;
+
+	@ApiModelProperty(value = "姓名")
+	private String name;
+
+	@ApiModelProperty(value = "工作单位")
+	private String employer;
+
+	@ApiModelProperty(value = "职称")
+	private String job;
+
+	@ApiModelProperty(value = "邮箱")
+	private String email;
+
+	@ApiModelProperty(value = "会员")
+	private String member;
+
+	@ApiModelProperty(value = "关系会员名称")
+	private String withMember;
+
+	@ApiModelProperty(value = "与会员关系")
+	private String withRelationship;
+
+	@ApiModelProperty(value = "手机号")
+	private String phone;
+
+	@ApiModelProperty(value = "身高")
+	private String height;
+
+	@ApiModelProperty(value = "体重")
+	private String weight;
+
+	@ApiModelProperty(value = "衣服型号")
+	private String ctModel;
+
+	@ApiModelProperty(value = "就餐")
+	private String dinner;
+
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+
+	@ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+
+
+}
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/competition/entity/WlUploadInfoEntity.java

+package io.hmit.modules.competition.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.hmit.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 比赛人员信息
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2020-07-16
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("wl_upload_info")
+public class WlUploadInfoEntity extends BaseEntity {
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 姓名
+     */
+	private String name;
+    /**
+     * 工作单位
+     */
+	private String employer;
+    /**
+     * 职称
+     */
+	private String job;
+    /**
+     * 邮箱
+     */
+	private String email;
+    /**
+     * 会员
+     */
+	private String member;
+    /**
+     * 关系会员名称
+     */
+	private String withMember;
+    /**
+     * 与会员关系
+     */
+	private String withRelationship;
+    /**
+     * 手机号
+     */
+	private String phone;
+    /**
+     * 身高
+     */
+	private String height;
+    /**
+     * 体重
+     */
+	private String weight;
+    /**
+     * 衣服型号
+     */
+	private String ctModel;
+    /**
+     * 就餐
+     */
+	private String dinner;
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+    /**
+     * 修改时间
+     */
+	private Date updateTime;
+}
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/competition/excel/WlUploadInfoExcel.java

+package io.hmit.modules.competition.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 比赛人员信息
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2020-07-16
+ */
+@Data
+public class WlUploadInfoExcel {
+    @Excel(name = "")
+    private Long id;
+    @Excel(name = "姓名")
+    private String name;
+    @Excel(name = "工作单位")
+    private String employer;
+    @Excel(name = "职称")
+    private String job;
+    @Excel(name = "邮箱")
+    private String email;
+    @Excel(name = "会员")
+    private String member;
+    @Excel(name = "关系会员名称")
+    private String withMember;
+    @Excel(name = "与会员关系")
+    private String withRelationship;
+    @Excel(name = "手机号")
+    private String phone;
+    @Excel(name = "身高")
+    private String height;
+    @Excel(name = "体重")
+    private String weight;
+    @Excel(name = "衣服型号")
+    private String ctModel;
+    @Excel(name = "就餐")
+    private String dinner;
+    @Excel(name = "创建时间")
+    private Date createTime;
+    @Excel(name = "修改时间")
+    private Date updateTime;
+
+}
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/competition/service/WlUploadInfoService.java

+package io.hmit.modules.competition.service;
+
+import io.hmit.common.service.CrudService;
+import io.hmit.modules.competition.dto.WlUploadInfoDTO;
+import io.hmit.modules.competition.entity.WlUploadInfoEntity;
+
+/**
+ * 比赛人员信息
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2020-07-16
+ */
+public interface WlUploadInfoService extends CrudService<WlUploadInfoEntity, WlUploadInfoDTO> {
+
+}
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/competition/service/impl/WlUploadInfoServiceImpl.java

+package io.hmit.modules.competition.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.hmit.common.service.impl.CrudServiceImpl;
+import io.hmit.modules.competition.dao.WlUploadInfoDao;
+import io.hmit.modules.competition.dto.WlUploadInfoDTO;
+import io.hmit.modules.competition.entity.WlUploadInfoEntity;
+import io.hmit.modules.competition.service.WlUploadInfoService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 比赛人员信息
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2020-07-16
+ */
+@Service
+public class WlUploadInfoServiceImpl extends CrudServiceImpl<WlUploadInfoDao, WlUploadInfoEntity, WlUploadInfoDTO> implements WlUploadInfoService {
+
+    @Override
+    public QueryWrapper<WlUploadInfoEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get("id");
+
+        QueryWrapper<WlUploadInfoEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+
+        return wrapper;
+    }
+
+
+}
\ No newline at end of file

hmit-admin/src/main/resources/mapper/competition/WlUploadInfoDao.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="io.hmit.modules.competition.dao.WlUploadInfoDao">
+
+    <resultMap type="io.hmit.modules.competition.entity.WlUploadInfoEntity" id="wlUploadInfoMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="employer" column="employer"/>
+        <result property="job" column="job"/>
+        <result property="email" column="email"/>
+        <result property="member" column="member"/>
+        <result property="withMember" column="with_member"/>
+        <result property="withRelationship" column="with_relationship"/>
+        <result property="phone" column="phone"/>
+        <result property="height" column="height"/>
+        <result property="weight" column="weight"/>
+        <result property="ctModel" column="ct_model"/>
+        <result property="dinner" column="dinner"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file

hmit-api/src/main/java/io/hmit/controller/WlUploadInfoController.java

+package io.hmit.controller;
+
+
+import io.hmit.common.constant.Constant;
+import io.hmit.common.page.PageData;
+
+import io.hmit.common.utils.Result;
+import io.hmit.common.validator.AssertUtils;
+import io.hmit.common.validator.ValidatorUtils;
+import io.hmit.common.validator.group.AddGroup;
+import io.hmit.common.validator.group.DefaultGroup;
+import io.hmit.common.validator.group.UpdateGroup;
+import io.hmit.dto.WlUploadInfoDTO;
+
+import io.hmit.service.WlUploadInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 比赛人员信息
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2020-07-16
+ */
+@RestController
+@RequestMapping("competition/wluploadinfo")
+@Api(tags="比赛人员信息")
+public class WlUploadInfoController {
+    @Autowired
+    private WlUploadInfoService wlUploadInfoService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String")
+    })
+
+    public Result<PageData<WlUploadInfoDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<WlUploadInfoDTO> page = wlUploadInfoService.page(params);
+
+        return new Result<PageData<WlUploadInfoDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+
+    public Result<WlUploadInfoDTO> get(@PathVariable("id") Long id){
+        WlUploadInfoDTO data = wlUploadInfoService.get(id);
+
+        return new Result<WlUploadInfoDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+
+    public Result save(@RequestBody WlUploadInfoDTO dto){
+        //校验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        wlUploadInfoService.save(dto);
+
+        return new Result();
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+
+    public Result update(@RequestBody WlUploadInfoDTO dto){
+        //校验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        wlUploadInfoService.update(dto);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+
+    public Result delete(@RequestBody Long[] ids){
+        //校验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        wlUploadInfoService.delete(ids);
+
+        return new Result();
+    }
+
+
+
+}
\ No newline at end of file

hmit-api/src/main/java/io/hmit/dao/WlUploadInfoDao.java

+package io.hmit.dao;
+
+import io.hmit.common.dao.BaseDao;
+import io.hmit.entity.WlUploadInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 比赛人员信息
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2020-07-16
+ */
+@Mapper
+public interface WlUploadInfoDao extends BaseDao<WlUploadInfoEntity> {
+	
+}
\ No newline at end of file

hmit-api/src/main/java/io/hmit/dto/WlUploadInfoDTO.java

+package io.hmit.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 比赛人员信息
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2020-07-16
+ */
+@Data
+@ApiModel(value = "比赛人员信息")
+public class WlUploadInfoDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "")
+	private Long id;
+
+	@ApiModelProperty(value = "姓名")
+	private String name;
+
+	@ApiModelProperty(value = "工作单位")
+	private String employer;
+
+	@ApiModelProperty(value = "职称")
+	private String job;
+
+	@ApiModelProperty(value = "邮箱")
+	private String email;
+
+	@ApiModelProperty(value = "会员")
+	private String member;
+
+	@ApiModelProperty(value = "关系会员名称")
+	private String withMember;
+
+	@ApiModelProperty(value = "与会员关系")
+	private String withRelationship;
+
+	@ApiModelProperty(value = "手机号")
+	private String phone;
+
+	@ApiModelProperty(value = "身高")
+	private String height;
+
+	@ApiModelProperty(value = "体重")
+	private String weight;
+
+	@ApiModelProperty(value = "衣服型号")
+	private String ctModel;
+
+	@ApiModelProperty(value = "就餐")
+	private String dinner;
+
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+
+	@ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+
+
+}
\ No newline at end of file

hmit-api/src/main/java/io/hmit/entity/WlUploadInfoEntity.java

+package io.hmit.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.hmit.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 比赛人员信息
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2020-07-16
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("wl_upload_info")
+public class WlUploadInfoEntity extends BaseEntity {
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 姓名
+     */
+	private String name;
+    /**
+     * 工作单位
+     */
+	private String employer;
+    /**
+     * 职称
+     */
+	private String job;
+    /**
+     * 邮箱
+     */
+	private String email;
+    /**
+     * 会员
+     */
+	private String member;
+    /**
+     * 关系会员名称
+     */
+	private String withMember;
+    /**
+     * 与会员关系
+     */
+	private String withRelationship;
+    /**
+     * 手机号
+     */
+	private String phone;
+    /**
+     * 身高
+     */
+	private String height;
+    /**
+     * 体重
+     */
+	private String weight;
+    /**
+     * 衣服型号
+     */
+	private String ctModel;
+    /**
+     * 就餐
+     */
+	private String dinner;
+    /**
+     * 创建时间
+     */
+//	@TableField(fill = FieldFill.INSERT)
+	private Date createTime;
+    /**
+     * 修改时间
+     */
+	private Date updateTime;
+}
\ No newline at end of file

hmit-api/src/main/java/io/hmit/service/WlUploadInfoService.java

+package io.hmit.service;
+
+import io.hmit.common.service.CrudService;
+import io.hmit.dto.WlUploadInfoDTO;
+import io.hmit.entity.WlUploadInfoEntity;
+
+/**
+ * 比赛人员信息
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2020-07-16
+ */
+public interface WlUploadInfoService extends CrudService<WlUploadInfoEntity, WlUploadInfoDTO> {
+
+}
\ No newline at end of file

hmit-api/src/main/java/io/hmit/service/impl/WlUploadInfoServiceImpl.java

+package io.hmit.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.hmit.common.service.impl.CrudServiceImpl;
+import io.hmit.dao.WlUploadInfoDao;
+import io.hmit.dto.WlUploadInfoDTO;
+import io.hmit.entity.WlUploadInfoEntity;
+import io.hmit.service.WlUploadInfoService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 比赛人员信息
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2020-07-16
+ */
+@Service
+public class WlUploadInfoServiceImpl extends CrudServiceImpl<WlUploadInfoDao, WlUploadInfoEntity, WlUploadInfoDTO> implements WlUploadInfoService {
+
+    @Override
+    public QueryWrapper<WlUploadInfoEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get("id");
+
+        QueryWrapper<WlUploadInfoEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+
+        return wrapper;
+    }
+
+
+}
\ No newline at end of file

hmit-api/src/main/resources/mapper/WlUploadInfoDao.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="io.hmit.dao.WlUploadInfoDao">
+
+    <resultMap type="io.hmit.entity.WlUploadInfoEntity" id="wlUploadInfoMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="employer" column="employer"/>
+        <result property="job" column="job"/>
+        <result property="email" column="email"/>
+        <result property="member" column="member"/>
+        <result property="withMember" column="with_member"/>
+        <result property="withRelationship" column="with_relationship"/>
+        <result property="phone" column="phone"/>
+        <result property="height" column="height"/>
+        <result property="weight" column="weight"/>
+        <result property="ctModel" column="ct_model"/>
+        <result property="dinner" column="dinner"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file