From 66ea95e0ab86fa4a6d52f906650eb8aa28cb2d5c Mon Sep 17 00:00:00 2001 From: Gitea Date: Fri, 30 Jun 2023 09:23:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../requirementitem/RequirementItemList.vue | 282 ++++++++++++++++++ .../modules/RequirementItemForm.vue | 188 ++++++++++++ .../modules/RequirementItemModal.vue | 60 ++++ .../RequirementItemModal__Style#Drawer.vue | 84 ++++++ .../requirementtype/RequirementTypeList.vue | 6 - .../controller/RequirementItemController.java | 211 +++++++++++++ .../entity/RequirementItem.java | 112 +++++++ .../mapper/RequirementItemMapper.java | 17 ++ .../mapper/xml/RequirementItemMapper.xml | 5 + .../service/IRequirementItemService.java | 14 + .../impl/RequirementItemServiceImpl.java | 19 ++ 11 files changed, 992 insertions(+), 6 deletions(-) create mode 100644 ant-design-vue-jeecg/src/views/requirementitem/RequirementItemList.vue create mode 100644 ant-design-vue-jeecg/src/views/requirementitem/modules/RequirementItemForm.vue create mode 100644 ant-design-vue-jeecg/src/views/requirementitem/modules/RequirementItemModal.vue create mode 100644 ant-design-vue-jeecg/src/views/requirementitem/modules/RequirementItemModal__Style#Drawer.vue create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/controller/RequirementItemController.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/entity/RequirementItem.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/mapper/RequirementItemMapper.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/mapper/xml/RequirementItemMapper.xml create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/service/IRequirementItemService.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/service/impl/RequirementItemServiceImpl.java diff --git a/ant-design-vue-jeecg/src/views/requirementitem/RequirementItemList.vue b/ant-design-vue-jeecg/src/views/requirementitem/RequirementItemList.vue new file mode 100644 index 0000000..d128c25 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/requirementitem/RequirementItemList.vue @@ -0,0 +1,282 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/requirementitem/modules/RequirementItemForm.vue b/ant-design-vue-jeecg/src/views/requirementitem/modules/RequirementItemForm.vue new file mode 100644 index 0000000..ce0ef74 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/requirementitem/modules/RequirementItemForm.vue @@ -0,0 +1,188 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/requirementitem/modules/RequirementItemModal.vue b/ant-design-vue-jeecg/src/views/requirementitem/modules/RequirementItemModal.vue new file mode 100644 index 0000000..52961b2 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/requirementitem/modules/RequirementItemModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/requirementitem/modules/RequirementItemModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/requirementitem/modules/RequirementItemModal__Style#Drawer.vue new file mode 100644 index 0000000..6f1d9d3 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/requirementitem/modules/RequirementItemModal__Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/requirementtype/RequirementTypeList.vue b/ant-design-vue-jeecg/src/views/requirementtype/RequirementTypeList.vue index 23346e4..fd7de30 100644 --- a/ant-design-vue-jeecg/src/views/requirementtype/RequirementTypeList.vue +++ b/ant-design-vue-jeecg/src/views/requirementtype/RequirementTypeList.vue @@ -29,12 +29,6 @@ - - - diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/controller/RequirementItemController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/controller/RequirementItemController.java new file mode 100644 index 0000000..9b43895 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/controller/RequirementItemController.java @@ -0,0 +1,211 @@ +package org.jeecg.modules.demo.requirementitem.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.shiro.SecurityUtils; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.demo.requirementitem.entity.RequirementItem; +import org.jeecg.modules.demo.requirementitem.service.IRequirementItemService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecg.modules.projectx.entity.Projectx; +import org.jeecg.modules.projectx.service.IProjectxService; +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.jeecg.common.system.base.controller.JeecgController; +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 com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 需求管理 + * @Author: jeecg-boot + * @Date: 2023-06-28 + * @Version: V1.0 + */ +@Api(tags="需求管理") +@RestController +@RequestMapping("/requirementitem/requirementItem") +@Slf4j +public class RequirementItemController extends JeecgController { + @Autowired + private IRequirementItemService requirementItemService; + @Autowired + private IProjectxService projectxService; + + /** + * 分页列表查询 + * + * @param requirementItem + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "需求管理-分页列表查询") + @ApiOperation(value="需求管理-分页列表查询", notes="需求管理-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(RequirementItem requirementItem, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + LoginUser principal = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(requirementItem, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = requirementItemService.page(page, queryWrapper); + for (int i = 0 ; i < pageList.getRecords().size();i++){ + Projectx projectx = projectxService.getById(pageList.getRecords().get(i).getProjectId()); + if(!principal.getUsername().equals("admin")){ + if(projectx.getCreateBy().equals(principal.getUsername())){ + pageList.getRecords().get(i).setXqflag("1"); + }else{ + pageList.getRecords().get(i).setXqflag("0"); + } + }else{ + pageList.getRecords().get(i).setXqflag("1"); + } + + } + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param requirementItem + * @return + */ + @AutoLog(value = "需求管理-添加") + @ApiOperation(value="需求管理-添加", notes="需求管理-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody RequirementItem requirementItem) { + requirementItemService.save(requirementItem); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param requirementItem + * @return + */ + @AutoLog(value = "需求管理-编辑") + @ApiOperation(value="需求管理-编辑", notes="需求管理-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody RequirementItem requirementItem) { + requirementItemService.updateById(requirementItem); + return Result.OK("编辑成功!"); + } + + /** + * 通过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) { + requirementItemService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "需求管理-批量删除") + @ApiOperation(value="需求管理-批量删除", notes="需求管理-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.requirementItemService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "需求管理-通过id查询") + @ApiOperation(value="需求管理-通过id查询", notes="需求管理-通过id查询") + @GetMapping(value = "/qrxq") + public Result qrxq(@RequestParam(name="id",required=true) String id) { + RequirementItem requirementItem = requirementItemService.getById(id); + if(requirementItem==null) { + return Result.error("未找到对应数据"); + }else { + requirementItem.setRequirementStatus(1); + requirementItemService.updateById(requirementItem); + } + return Result.OK("确认需求成功"); + } + + /** + * 通过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) { + RequirementItem requirementItem = requirementItemService.getById(id); + if(requirementItem==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(requirementItem); + } + /** + * 导出excel + * + * @param request + * @param requirementItem + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, RequirementItem requirementItem) { + return super.exportXls(request, requirementItem, RequirementItem.class, "需求管理"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, RequirementItem.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/entity/RequirementItem.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/entity/RequirementItem.java new file mode 100644 index 0000000..75522d7 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/entity/RequirementItem.java @@ -0,0 +1,112 @@ +package org.jeecg.modules.demo.requirementitem.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 需求管理 + * @Author: jeecg-boot + * @Date: 2023-06-28 + * @Version: V1.0 + */ +@Data +@TableName("requirement_item") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="requirement_item对象", description="需求管理") +public class RequirementItem implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") + 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 = "更新人") + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") + 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; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + /**项目id*/ + @Excel(name = "项目id", width = 15, dictTable = "projectx", dicText = "project_name", dicCode = "id") + @Dict(dictTable = "projectx", dicText = "project_name", dicCode = "id") + @ApiModelProperty(value = "项目id") + private java.lang.String projectId; + /**类型id*/ + @Excel(name = "类型id", width = 15, dictTable = "requirement_type", dicText = "type_name", dicCode = "id") + @Dict(dictTable = "requirement_type", dicText = "type_name", dicCode = "id") + @ApiModelProperty(value = "类型id") + private java.lang.String typeId; + /**上级需求id*/ + @Excel(name = "上级需求id", width = 15) + @ApiModelProperty(value = "上级需求id") + @Dict(dictTable = "requirement_item", dicText = "requirement_name", dicCode = "id") + private java.lang.String upperId; + /**需求编码*/ + @Excel(name = "需求编码", width = 15) + @ApiModelProperty(value = "需求编码") + private java.lang.String requirementCode; + /**中文名称*/ + @Excel(name = "中文名称", width = 15) + @ApiModelProperty(value = "中文名称") + private java.lang.String requirementName; + /**需求等级*/ + @Excel(name = "需求等级", width = 15) + @Dict(dicCode = "requirement_level") + @ApiModelProperty(value = "需求等级") + private java.lang.Integer requirementLevel; + /**需求状态*/ + @Excel(name = "需求状态", width = 15) + @Dict(dicCode = "requirement_status") + @ApiModelProperty(value = "需求状态") + private java.lang.Integer requirementStatus; + /**需求描述*/ + @Excel(name = "需求描述", width = 15) + @ApiModelProperty(value = "需求描述") + private java.lang.String requirementDescribe; + /**需求图片*/ + @Excel(name = "需求图片", width = 15) + @ApiModelProperty(value = "需求图片") + private java.lang.String requirementPic; + /**需求文件*/ + @Excel(name = "需求文件", width = 15) + @ApiModelProperty(value = "需求文件") + private java.lang.String requirementFile; + /**需求层级*/ + @Excel(name = "需求层级", width = 15) + @ApiModelProperty(value = "需求层级") + private java.lang.String requirementHira; + + @TableField(exist = false) + private java.lang.String xqflag; +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/mapper/RequirementItemMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/mapper/RequirementItemMapper.java new file mode 100644 index 0000000..8ff5c40 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/mapper/RequirementItemMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.demo.requirementitem.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.demo.requirementitem.entity.RequirementItem; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 需求管理 + * @Author: jeecg-boot + * @Date: 2023-06-28 + * @Version: V1.0 + */ +public interface RequirementItemMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/mapper/xml/RequirementItemMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/mapper/xml/RequirementItemMapper.xml new file mode 100644 index 0000000..4db5fcb --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/mapper/xml/RequirementItemMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/service/IRequirementItemService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/service/IRequirementItemService.java new file mode 100644 index 0000000..f81711c --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/service/IRequirementItemService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.demo.requirementitem.service; + +import org.jeecg.modules.demo.requirementitem.entity.RequirementItem; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 需求管理 + * @Author: jeecg-boot + * @Date: 2023-06-28 + * @Version: V1.0 + */ +public interface IRequirementItemService extends IService { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/service/impl/RequirementItemServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/service/impl/RequirementItemServiceImpl.java new file mode 100644 index 0000000..8de2eb4 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/service/impl/RequirementItemServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.demo.requirementitem.service.impl; + +import org.jeecg.modules.demo.requirementitem.entity.RequirementItem; +import org.jeecg.modules.demo.requirementitem.mapper.RequirementItemMapper; +import org.jeecg.modules.demo.requirementitem.service.IRequirementItemService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 需求管理 + * @Author: jeecg-boot + * @Date: 2023-06-28 + * @Version: V1.0 + */ +@Service +public class RequirementItemServiceImpl extends ServiceImpl implements IRequirementItemService { + +}