From eaf304ef67440c2e68ab523cfab7426afaecaf94 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Tue, 16 Mar 2021 11:41:18 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E8=81=8C=E4=BD=8D=E8=A1=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysDepartController.java | 4 - .../controller/SysPositionController.java | 280 ------------------ .../modules/system/entity/SysPosition.java | 90 ------ .../system/mapper/SysPositionMapper.java | 14 - .../system/mapper/xml/SysPositionMapper.xml | 5 - .../system/service/ISysPositionService.java | 14 - .../service/impl/SysPositionServiceImpl.java | 18 -- 7 files changed, 425 deletions(-) delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPositionController.java delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysPosition.java delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysPositionMapper.java delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPositionMapper.xml delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysPositionService.java delete mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPositionServiceImpl.java diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index a75599bd..8af94643 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -23,20 +23,16 @@ import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.model.DepartIdModel; import com.jero.modules.system.model.SysDepartTreeModel; import com.jero.modules.system.service.ISysDepartService; -import com.jero.modules.system.service.ISysPositionService; import com.jero.modules.system.service.ISysUserDepartService; import com.jero.modules.system.service.ISysUserService; -import com.jero.modules.system.util.FindsDepartsChildrenUtil; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPositionController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPositionController.java deleted file mode 100644 index cc1657c5..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPositionController.java +++ /dev/null @@ -1,280 +0,0 @@ -package com.jero.modules.system.controller; - -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.constant.CommonConstant; -import com.jero.common.system.query.QueryGenerator; -import com.jero.common.util.ImportExcelUtil; -import com.jero.common.util.oConvertUtils; -import com.jero.modules.quartz.service.IQuartzJobService; -import com.jero.modules.system.entity.SysPosition; -import com.jero.modules.system.service.ISysPositionService; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * @Description: 职务表 - * @Author: jero-boot - * @Date: 2019-09-19 - * @Version: V1.0 - */ -@Slf4j -@Api(tags = "职务表") -@RestController -@RequestMapping("/sys/position") -public class SysPositionController { - - @Autowired - private ISysPositionService sysPositionService; - - /** - * 分页列表查询 - * - * @param sysPosition - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "职务表-分页列表查询") - @ApiOperation(value = "职务表-分页列表查询", notes = "职务表-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(SysPosition sysPosition, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - Result> result = new Result>(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysPosition, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = sysPositionService.page(page, queryWrapper); - result.setSuccess(true); - result.setResult(pageList); - return result; - } - - /** - * 添加 - * - * @param sysPosition - * @return - */ - @AutoLog(value = "职务表-添加") - @ApiOperation(value = "职务表-添加", notes = "职务表-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody SysPosition sysPosition) { - Result result = new Result(); - try { - sysPositionService.save(sysPosition); - result.success("添加成功！"); - } catch (Exception e) { - log.error(e.getMessage(), e); - result.error500("操作失败"); - } - return result; - } - - /** - * 编辑 - * - * @param sysPosition - * @return - */ - @AutoLog(value = "职务表-编辑") - @ApiOperation(value = "职务表-编辑", notes = "职务表-编辑") - @PutMapping(value = "/edit") - public Result edit(@RequestBody SysPosition sysPosition) { - Result result = new Result(); - SysPosition sysPositionEntity = sysPositionService.getById(sysPosition.getId()); - if (sysPositionEntity == null) { - result.error500("未找到对应实体"); - } else { - boolean ok = sysPositionService.updateById(sysPosition); - //TODO 返回false说明什么？ - if (ok) { - result.success("修改成功!"); - } - } - - return result; - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "职务表-通过id删除") - @ApiOperation(value = "职务表-通过id删除", notes = "职务表-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name = "id", required = true) String id) { - try { - sysPositionService.removeById(id); - } catch (Exception e) { - log.error("删除失败", e.getMessage()); - return Result.error("删除失败!"); - } - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "职务表-批量删除") - @ApiOperation(value = "职务表-批量删除", notes = "职务表-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { - Result result = new Result(); - if (ids == null || "".equals(ids.trim())) { - result.error500("参数不识别！"); - } else { - this.sysPositionService.removeByIds(Arrays.asList(ids.split(","))); - result.success("删除成功!"); - } - return result; - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "职务表-通过id查询") - @ApiOperation(value = "职务表-通过id查询", notes = "职务表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name = "id", required = true) String id) { - Result result = new Result(); - SysPosition sysPosition = sysPositionService.getById(id); - if (sysPosition == null) { - result.error500("未找到对应实体"); - } else { - result.setResult(sysPosition); - result.setSuccess(true); - } - return result; - } - - /** - * 导出excel - * - * @param request - * @param response - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { - // Step.1 组装查询条件 - QueryWrapper queryWrapper = null; - try { - String paramsStr = request.getParameter("paramsStr"); - if (oConvertUtils.isNotEmpty(paramsStr)) { - String deString = URLDecoder.decode(paramsStr, "UTF-8"); - SysPosition sysPosition = JSON.parseObject(deString, SysPosition.class); - queryWrapper = QueryGenerator.initQueryWrapper(sysPosition, request.getParameterMap()); - } - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - - //Step.2 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - List pageList = sysPositionService.list(queryWrapper); - //导出文件名称 - mv.addObject(NormalExcelConstants.FILE_NAME, "职务表列表"); - mv.addObject(NormalExcelConstants.CLASS, SysPosition.class); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("职务表列表数据", "导出人:jero", "导出信息")); - mv.addObject(NormalExcelConstants.DATA_LIST, pageList); - return mv; - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response)throws IOException { - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; - Map fileMap = multipartRequest.getFileMap(); - // 错误信息 - List errorMessage = new ArrayList<>(); - int successLines = 0, errorLines = 0; - for (Map.Entry entity : fileMap.entrySet()) { - MultipartFile file = entity.getValue();// 获取上传文件对象 - ImportParams params = new ImportParams(); - params.setTitleRows(2); - params.setHeadRows(1); - params.setNeedSave(true); - try { - List listSysPositions = ExcelImportUtil.importExcel(file.getInputStream(), SysPosition.class, params); - List list = ImportExcelUtil.importDateSave(listSysPositions, ISysPositionService.class, errorMessage,CommonConstant.SQL_INDEX_UNIQ_CODE); - errorLines+=list.size(); - successLines+=(listSysPositions.size()-errorLines); - } catch (Exception e) { - log.error(e.getMessage(), e); - return Result.error("文件导入失败:" + e.getMessage()); - } finally { - try { - file.getInputStream().close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return ImportExcelUtil.imporReturnRes(errorLines,successLines,errorMessage); - } - - /** - * 通过code查询 - * - * @param code - * @return - */ - @AutoLog(value = "职务表-通过code查询") - @ApiOperation(value = "职务表-通过code查询", notes = "职务表-通过code查询") - @GetMapping(value = "/queryByCode") - public Result queryByCode(@RequestParam(name = "code", required = true) String code) { - Result result = new Result(); - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("code",code); - SysPosition sysPosition = sysPositionService.getOne(queryWrapper); - if (sysPosition == null) { - result.error500("未找到对应实体"); - } else { - result.setResult(sysPosition); - result.setSuccess(true); - } - return result; - } -} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysPosition.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysPosition.java deleted file mode 100644 index 90264851..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysPosition.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.jero.modules.system.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import com.jero.common.aspect.annotation.Dict; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -/** - * @Description: 职务表 - * @Author: jero-boot - * @Date: 2019-09-19 - * @Version: V1.0 - */ -@Data -@TableName("sys_position") -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value = "sys_position对象", description = "职务表") -public class SysPosition { - - /** - * id - */ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") - private java.lang.String id; - /** - * 职务编码 - */ - @Excel(name = "职务编码", width = 15) - @ApiModelProperty(value = "职务编码") - private java.lang.String code; - /** - * 职务名称 - */ - @Excel(name = "职务名称", width = 15) - @ApiModelProperty(value = "职务名称") - private java.lang.String name; - /** - * 职级 - */ - @Excel(name = "职级", width = 15,dicCode ="position_rank") - @ApiModelProperty(value = "职级") - @Dict(dicCode = "position_rank") - private java.lang.String postRank; - /** - * 公司id - */ - @Excel(name = "公司id", width = 15) - @ApiModelProperty(value = "公司id") - private java.lang.String companyId; - /** - * 创建人 - */ - @ApiModelProperty(value = "创建人") - private java.lang.String createBy; - /** - * 创建时间 - */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建时间") - private java.util.Date createTime; - /** - * 修改人 - */ - @ApiModelProperty(value = "修改人") - private java.lang.String updateBy; - /** - * 修改时间 - */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "修改时间") - private java.util.Date updateTime; - /** - * 组织机构编码 - */ - @Excel(name = "组织机构编码", width = 15) - @ApiModelProperty(value = "组织机构编码") - private java.lang.String sysOrgCode; -} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysPositionMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysPositionMapper.java deleted file mode 100644 index 762425c1..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysPositionMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.jero.modules.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.system.entity.SysPosition; - -/** - * @Description: 职务表 - * @Author: jero-boot - * @Date: 2019-09-19 - * @Version: V1.0 - */ -public interface SysPositionMapper extends BaseMapper { - -} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPositionMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPositionMapper.xml deleted file mode 100644 index 6424ef02..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPositionMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysPositionService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysPositionService.java deleted file mode 100644 index b71aa9fc..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysPositionService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.jero.modules.system.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.system.entity.SysPosition; - -/** - * @Description: 职务表 - * @Author: jero-boot - * @Date: 2019-09-19 - * @Version: V1.0 - */ -public interface ISysPositionService extends IService { - -} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPositionServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPositionServiceImpl.java deleted file mode 100644 index eeea9237..00000000 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPositionServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.jero.modules.system.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.modules.system.entity.SysPosition; -import com.jero.modules.system.mapper.SysPositionMapper; -import com.jero.modules.system.service.ISysPositionService; -import org.springframework.stereotype.Service; - -/** - * @Description: 职务表 - * @Author: jero-boot - * @Date: 2019-09-19 - * @Version: V1.0 - */ -@Service -public class SysPositionServiceImpl extends ServiceImpl implements ISysPositionService { - -}