From f497ed6854e94cfc91cdeca43b8bb8edb29ceadd Mon Sep 17 00:00:00 2001
From: mors <3067699729@qq.com>
Date: Mon, 10 Apr 2023 16:19:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/modulex/ModulexList.vue | 300 ++++++++++++++++++
.../src/views/modulex/modules/ModulexForm.vue | 237 ++++++++++++++
.../views/modulex/modules/ModulexModal.vue | 60 ++++
.../modules/ModulexModal__Style#Drawer.vue | 84 +++++
.../projectUserRole/ProjectUserRoleList.vue | 195 ++++++++++++
.../modules/ProjectUserRoleForm.vue | 124 ++++++++
.../modules/ProjectUserRoleModal.vue | 60 ++++
.../ProjectUserRoleModal__Style#Drawer.vue | 84 +++++
.../src/views/projectx/ProjectxList.vue | 290 +++++++++++++++++
.../views/projectx/modules/ProjectxForm.vue | 193 +++++++++++
.../views/projectx/modules/ProjectxModal.vue | 60 ++++
.../modules/ProjectxModal__Style#Drawer.vue | 84 +++++
.../src/views/system/DictList.vue | 8 +-
.../modulex/controller/ModulexController.java | 159 ++++++++++
.../jeecg/modules/modulex/entity/Modulex.java | 163 ++++++++++
.../modules/modulex/mapper/ModulexMapper.java | 15 +
.../modulex/mapper/xml/ModulexMapper.xml | 5 +
.../modulex/service/IModulexService.java | 19 ++
.../service/impl/ModulexServiceImpl.java | 30 ++
.../controller/ProjectUserRoleController.java | 156 +++++++++
.../entity/ProjectUserRole.java | 73 +++++
.../mapper/ProjectUserRoleMapper.java | 15 +
.../mapper/xml/ProjectUserRoleMapper.xml | 5 +
.../service/IProjectUserRoleService.java | 14 +
.../impl/ProjectUserRoleServiceImpl.java | 19 ++
.../controller/ProjectxController.java | 156 +++++++++
.../modules/projectx/entity/Projectx.java | 111 +++++++
.../projectx/mapper/ProjectxMapper.java | 14 +
.../projectx/mapper/xml/ProjectxMapper.xml | 4 +
.../projectx/service/IProjectxService.java | 16 +
.../service/impl/ProjectxServiceImpl.java | 18 ++
31 files changed, 2770 insertions(+), 1 deletion(-)
create mode 100644 ant-design-vue-jeecg/src/views/modulex/ModulexList.vue
create mode 100644 ant-design-vue-jeecg/src/views/modulex/modules/ModulexForm.vue
create mode 100644 ant-design-vue-jeecg/src/views/modulex/modules/ModulexModal.vue
create mode 100644 ant-design-vue-jeecg/src/views/modulex/modules/ModulexModal__Style#Drawer.vue
create mode 100644 ant-design-vue-jeecg/src/views/projectUserRole/ProjectUserRoleList.vue
create mode 100644 ant-design-vue-jeecg/src/views/projectUserRole/modules/ProjectUserRoleForm.vue
create mode 100644 ant-design-vue-jeecg/src/views/projectUserRole/modules/ProjectUserRoleModal.vue
create mode 100644 ant-design-vue-jeecg/src/views/projectUserRole/modules/ProjectUserRoleModal__Style#Drawer.vue
create mode 100644 ant-design-vue-jeecg/src/views/projectx/ProjectxList.vue
create mode 100644 ant-design-vue-jeecg/src/views/projectx/modules/ProjectxForm.vue
create mode 100644 ant-design-vue-jeecg/src/views/projectx/modules/ProjectxModal.vue
create mode 100644 ant-design-vue-jeecg/src/views/projectx/modules/ProjectxModal__Style#Drawer.vue
create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/controller/ModulexController.java
create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/entity/Modulex.java
create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/mapper/ModulexMapper.java
create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/mapper/xml/ModulexMapper.xml
create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/IModulexService.java
create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java
create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/controller/ProjectUserRoleController.java
create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/entity/ProjectUserRole.java
create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/mapper/ProjectUserRoleMapper.java
create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/mapper/xml/ProjectUserRoleMapper.xml
create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/service/IProjectUserRoleService.java
create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/service/impl/ProjectUserRoleServiceImpl.java
create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/controller/ProjectxController.java
create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/entity/Projectx.java
create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/mapper/ProjectxMapper.java
create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/mapper/xml/ProjectxMapper.xml
create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/service/IProjectxService.java
create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/service/impl/ProjectxServiceImpl.java
diff --git a/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue b/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue
new file mode 100644
index 0000000..f5bcf13
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue
@@ -0,0 +1,300 @@
+
+
+
+
+
+
+
+
+
新增
+
导出
+
+ 导入
+
+
+
+
+
+ 删除
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 编辑
+
+
+
+ 更多
+
+
+ 详情
+
+
+ handleDelete(record.id)">
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/modulex/modules/ModulexForm.vue b/ant-design-vue-jeecg/src/views/modulex/modules/ModulexForm.vue
new file mode 100644
index 0000000..4e1e56c
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/modulex/modules/ModulexForm.vue
@@ -0,0 +1,237 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/modulex/modules/ModulexModal.vue b/ant-design-vue-jeecg/src/views/modulex/modules/ModulexModal.vue
new file mode 100644
index 0000000..ce43e95
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/modulex/modules/ModulexModal.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/modulex/modules/ModulexModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/modulex/modules/ModulexModal__Style#Drawer.vue
new file mode 100644
index 0000000..cd8ec17
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/modulex/modules/ModulexModal__Style#Drawer.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/projectUserRole/ProjectUserRoleList.vue b/ant-design-vue-jeecg/src/views/projectUserRole/ProjectUserRoleList.vue
new file mode 100644
index 0000000..f4c48dc
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/projectUserRole/ProjectUserRoleList.vue
@@ -0,0 +1,195 @@
+
+
+
+
+
+
+
+
+
新增
+
导出
+
+ 导入
+
+
+
+
+
+ 删除
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 编辑
+
+
+
+ 更多
+
+
+ 详情
+
+
+ handleDelete(record.id)">
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/projectUserRole/modules/ProjectUserRoleForm.vue b/ant-design-vue-jeecg/src/views/projectUserRole/modules/ProjectUserRoleForm.vue
new file mode 100644
index 0000000..03bd00e
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/projectUserRole/modules/ProjectUserRoleForm.vue
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/projectUserRole/modules/ProjectUserRoleModal.vue b/ant-design-vue-jeecg/src/views/projectUserRole/modules/ProjectUserRoleModal.vue
new file mode 100644
index 0000000..5e7a53d
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/projectUserRole/modules/ProjectUserRoleModal.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/projectUserRole/modules/ProjectUserRoleModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/projectUserRole/modules/ProjectUserRoleModal__Style#Drawer.vue
new file mode 100644
index 0000000..3feb048
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/projectUserRole/modules/ProjectUserRoleModal__Style#Drawer.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/projectx/ProjectxList.vue b/ant-design-vue-jeecg/src/views/projectx/ProjectxList.vue
new file mode 100644
index 0000000..8712f85
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/projectx/ProjectxList.vue
@@ -0,0 +1,290 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
新增
+
导出
+
+ 导入
+
+
+
+
+
+
+
+ 删除
+
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 角色管理
+
+ 模块管理
+
+
+
+
+ 编辑
+
+
+
+ 更多
+
+
+ 详情
+
+
+ handleDelete(record.id)">
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/projectx/modules/ProjectxForm.vue b/ant-design-vue-jeecg/src/views/projectx/modules/ProjectxForm.vue
new file mode 100644
index 0000000..199451a
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/projectx/modules/ProjectxForm.vue
@@ -0,0 +1,193 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/projectx/modules/ProjectxModal.vue b/ant-design-vue-jeecg/src/views/projectx/modules/ProjectxModal.vue
new file mode 100644
index 0000000..a8ca02a
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/projectx/modules/ProjectxModal.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/projectx/modules/ProjectxModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/projectx/modules/ProjectxModal__Style#Drawer.vue
new file mode 100644
index 0000000..a598100
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/projectx/modules/ProjectxModal__Style#Drawer.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/system/DictList.vue b/ant-design-vue-jeecg/src/views/system/DictList.vue
index 30fc051..f97cfe0 100644
--- a/ant-design-vue-jeecg/src/views/system/DictList.vue
+++ b/ant-design-vue-jeecg/src/views/system/DictList.vue
@@ -115,6 +115,12 @@
align: "left",
dataIndex: 'description',
},
+ {
+ title: '创建时间',
+ align: "center",
+ sorter: true,
+ dataIndex: 'createTime',
+ },
{
title: '操作',
dataIndex: 'action',
@@ -204,5 +210,5 @@
}
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/controller/ModulexController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/controller/ModulexController.java
new file mode 100644
index 0000000..beebbcb
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/controller/ModulexController.java
@@ -0,0 +1,159 @@
+package org.jeecg.modules.modulex.controller;
+
+
+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.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.modulex.entity.Modulex;
+import org.jeecg.modules.modulex.service.IModulexService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+ /**
+ * @Description: 模块管理
+ * @Author: jeecg-boot
+ * @Date: 2023-04-10
+ * @Version: V1.0
+ */
+@Api(tags="模块管理")
+@RestController
+@RequestMapping("/modulex/modulex")
+@Slf4j
+public class ModulexController extends JeecgController {
+ @Autowired
+ private IModulexService modulexService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param modulex
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "模块管理-分页列表查询")
+ @ApiOperation(value="模块管理-分页列表查询", notes="模块管理-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result> queryPageList(Modulex modulex,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(modulex, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = modulexService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 添加
+ *
+ * @param modulex
+ * @return
+ */
+ @AutoLog(value = "模块管理-添加")
+ @ApiOperation(value="模块管理-添加", notes="模块管理-添加")
+ @PostMapping(value = "/add")
+ public Result> add(@RequestBody Modulex modulex) {
+ //版本号 顺序累加;初始值1
+ Integer newVersion = modulexService.getMaxVersion(modulex.getVerison());
+ modulex.setVerison(newVersion+1);
+ modulexService.save(modulex);
+ return Result.OK("添加成功!");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param modulex
+ * @return
+ */
+ @AutoLog(value = "模块管理-编辑")
+ @ApiOperation(value="模块管理-编辑", notes="模块管理-编辑")
+ @PutMapping(value = "/edit")
+ public Result> edit(@RequestBody Modulex modulex) {
+ modulexService.updateById(modulex);
+ 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) {
+ modulexService.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.modulexService.removeByIds(Arrays.asList(ids.split(",")));
+ 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) {
+ Modulex modulex = modulexService.getById(id);
+ if(modulex==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(modulex);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param modulex
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, Modulex modulex) {
+ return super.exportXls(request, modulex, Modulex.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, Modulex.class);
+ }
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/entity/Modulex.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/entity/Modulex.java
new file mode 100644
index 0000000..2a1a376
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/entity/Modulex.java
@@ -0,0 +1,163 @@
+package org.jeecg.modules.modulex.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 org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 模块管理
+ * @Author: jeecg-boot
+ * @Date: 2023-04-10
+ * @Version: V1.0
+ */
+@Data
+@TableName("modulex")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="modulex对象", description="模块管理")
+public class Modulex implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private String id;
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private String createBy;
+ /**创建日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建日期")
+ private Date createTime;
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private String updateBy;
+ /**更新日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "更新日期")
+ private Date updateTime;
+ /**上级模块id*/
+ @Excel(name = "上级模块id", width = 15)
+ @ApiModelProperty(value = "上级模块id")
+ private String pid;
+ /**项目id*/
+ @Excel(name = "项目id", width = 15)
+ @ApiModelProperty(value = "项目id")
+ private String projectId;
+ /**中文名称*/
+ @Excel(name = "中文名称", width = 15)
+ @ApiModelProperty(value = "中文名称")
+ private String moduleName;
+ /**英文名称*/
+ @Excel(name = "英文名称", width = 15)
+ @ApiModelProperty(value = "英文名称")
+ private String moduleEnName;
+ /**模块编码*/
+ @Excel(name = "模块编码", width = 15)
+ @ApiModelProperty(value = "模块编码")
+ private String moduleCode;
+ /**内容描述*/
+ @Excel(name = "内容描述", width = 15)
+ @ApiModelProperty(value = "内容描述")
+ private String pmDescribe;
+ /**责任人*/
+ @Excel(name = "责任人", width = 15)
+ @ApiModelProperty(value = "责任人")
+ private String managerUsers;
+ /**
+ * 任务等级
+ * 值:1、2、3、4、5,默认2
+ */
+ @Excel(name = "任务等级", width = 15)
+ @ApiModelProperty(value = "任务等级")
+ @Dict(dicCode = "work_level")
+ private Integer workLevel;
+ /**
+ * 任务状态
+ * 值:未发布0、已发布1、开发中2、已完成3、已驳回8;默认0
+ */
+ @Excel(name = "任务状态", width = 15)
+ @ApiModelProperty(value = "任务状态")
+ @Dict(dicCode = "work_status")
+ private Integer workStatus;
+ /**发布时间*/
+ @Excel(name = "发布时间", width = 15, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "发布时间")
+ private Date publishTime;
+ /**任务时长*/
+ @Excel(name = "任务时长", width = 15)
+ @ApiModelProperty(value = "任务时长")
+ private Double duration;
+ /**开始时间*/
+ @Excel(name = "开始时间", width = 15, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "开始时间")
+ private Date startTime;
+ /**提交时间*/
+ @Excel(name = "提交时间", width = 15, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "提交时间")
+ private Date submitTime;
+ /**实际时长*/
+ @Excel(name = "实际时长", width = 15)
+ @ApiModelProperty(value = "实际时长")
+ private Double realDuration;
+ /**用户角色*/
+ @Excel(name = "用户角色", width = 15)
+ @ApiModelProperty(value = "用户角色")
+ private String userRole;
+ /**关联实体*/
+ @Excel(name = "关联实体", width = 15)
+ @ApiModelProperty(value = "关联实体")
+ private String relatedBean;
+ /**原型图*/
+ @Excel(name = "原型图", width = 15)
+ @ApiModelProperty(value = "原型图")
+ private String prototypes;
+ /**分析图*/
+ @Excel(name = "分析图", width = 15)
+ @ApiModelProperty(value = "分析图")
+ private String diagrams;
+ /**
+ * 模块状态
+ * 值:正常1、停用0、废弃9;默认1
+ */
+ @Excel(name = "模块状态", width = 15)
+ @ApiModelProperty(value = "模块状态")
+ @Dict(dicCode = "a_status")
+ private Integer status;
+ /**
+ * 版本状态
+ * "值:当前1、历史0;默认1"
+ */
+ @Excel(name = "版本状态", width = 15)
+ @ApiModelProperty(value = "版本状态")
+ @Dict(dicCode = "verison_status")
+ private Integer verisonStatus;
+ /**
+ * 版本号
+ * 顺序累加;初始值1
+ */
+ @Excel(name = "版本号", width = 15)
+ @ApiModelProperty(value = "版本号")
+ private Integer verison;
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/mapper/ModulexMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/mapper/ModulexMapper.java
new file mode 100644
index 0000000..b2e6424
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/mapper/ModulexMapper.java
@@ -0,0 +1,15 @@
+package org.jeecg.modules.modulex.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.modulex.entity.Modulex;
+
+/**
+ * @Description: 模块管理
+ * @Author: jeecg-boot
+ * @Date: 2023-04-10
+ * @Version: V1.0
+ */
+public interface ModulexMapper extends BaseMapper {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/mapper/xml/ModulexMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/mapper/xml/ModulexMapper.xml
new file mode 100644
index 0000000..81d91c2
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/mapper/xml/ModulexMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/IModulexService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/IModulexService.java
new file mode 100644
index 0000000..9efcc5d
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/IModulexService.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.modulex.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.modulex.entity.Modulex;
+
+/**
+ * @Description: 模块管理
+ * @Author: jeecg-boot
+ * @Date: 2023-04-10
+ * @Version: V1.0
+ */
+public interface IModulexService extends IService {
+
+ /**
+ * 得到最大的版本号
+ */
+ Integer getMaxVersion(Integer verison);
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java
new file mode 100644
index 0000000..8835e6f
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java
@@ -0,0 +1,30 @@
+package org.jeecg.modules.modulex.service.impl;
+
+import org.jeecg.modules.modulex.entity.Modulex;
+import org.jeecg.modules.modulex.mapper.ModulexMapper;
+import org.jeecg.modules.modulex.service.IModulexService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * @Description: 模块管理
+ * @Author: jeecg-boot
+ * @Date: 2023-04-10
+ * @Version: V1.0
+ */
+@Service
+public class ModulexServiceImpl extends ServiceImpl implements IModulexService {
+
+ /**
+ * 得到最大的版本号
+ */
+ @Override
+ public Integer getMaxVersion(Integer verison) {
+ return this.list().size();
+ }
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/controller/ProjectUserRoleController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/controller/ProjectUserRoleController.java
new file mode 100644
index 0000000..f1b21f4
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/controller/ProjectUserRoleController.java
@@ -0,0 +1,156 @@
+package org.jeecg.modules.projectUserRole.controller;
+
+
+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.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.projectUserRole.entity.ProjectUserRole;
+import org.jeecg.modules.projectUserRole.service.IProjectUserRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+ /**
+ * @Description: 管理项目用户角色
+ * @Author: jeecg-boot
+ * @Date: 2023-04-10
+ * @Version: V1.0
+ */
+@Api(tags="管理项目用户角色")
+@RestController
+@RequestMapping("/projectx/projectUserRole")
+@Slf4j
+public class ProjectUserRoleController extends JeecgController {
+ @Autowired
+ private IProjectUserRoleService projectUserRoleService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param projectUserRole
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "管理项目用户角色-分页列表查询")
+ @ApiOperation(value="管理项目用户角色-分页列表查询", notes="管理项目用户角色-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result> queryPageList(ProjectUserRole projectUserRole,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectUserRole, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = projectUserRoleService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 添加
+ *
+ * @param projectUserRole
+ * @return
+ */
+ @AutoLog(value = "管理项目用户角色-添加")
+ @ApiOperation(value="管理项目用户角色-添加", notes="管理项目用户角色-添加")
+ @PostMapping(value = "/add")
+ public Result> add(@RequestBody ProjectUserRole projectUserRole) {
+ projectUserRoleService.save(projectUserRole);
+ return Result.OK("添加成功!");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param projectUserRole
+ * @return
+ */
+ @AutoLog(value = "管理项目用户角色-编辑")
+ @ApiOperation(value="管理项目用户角色-编辑", notes="管理项目用户角色-编辑")
+ @PutMapping(value = "/edit")
+ public Result> edit(@RequestBody ProjectUserRole projectUserRole) {
+ projectUserRoleService.updateById(projectUserRole);
+ 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) {
+ projectUserRoleService.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.projectUserRoleService.removeByIds(Arrays.asList(ids.split(",")));
+ 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) {
+ ProjectUserRole projectUserRole = projectUserRoleService.getById(id);
+ if(projectUserRole==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(projectUserRole);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param projectUserRole
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, ProjectUserRole projectUserRole) {
+ return super.exportXls(request, projectUserRole, ProjectUserRole.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, ProjectUserRole.class);
+ }
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/entity/ProjectUserRole.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/entity/ProjectUserRole.java
new file mode 100644
index 0000000..8d95b08
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/entity/ProjectUserRole.java
@@ -0,0 +1,73 @@
+package org.jeecg.modules.projectUserRole.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 org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 管理项目用户角色
+ * @Author: jeecg-boot
+ * @Date: 2023-04-10
+ * @Version: V1.0
+ */
+@Data
+@TableName("project_user_role")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="project_user_role对象", description="管理项目用户角色")
+public class ProjectUserRole implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private String id;
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private String createBy;
+ /**创建日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建日期")
+ private Date createTime;
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private String updateBy;
+ /**更新日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "更新日期")
+ private Date updateTime;
+ /**项目id*/
+ @Excel(name = "项目id", width = 15)
+ @ApiModelProperty(value = "项目id")
+ private String projectId;
+ /**角色名称*/
+ @Excel(name = "角色名称", width = 15)
+ @ApiModelProperty(value = "角色名称")
+ private String userRole;
+ /**角色描述*/
+ @Excel(name = "角色描述", width = 15)
+ @ApiModelProperty(value = "角色描述")
+ private String pmDescribe;
+ /**父用户*/
+ @Excel(name = "父用户", width = 15)
+ @ApiModelProperty(value = "父用户")
+ private String sourceId;
+ /**上级用户*/
+ @Excel(name = "上级用户", width = 15)
+ @ApiModelProperty(value = "上级用户")
+ private String pid;
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/mapper/ProjectUserRoleMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/mapper/ProjectUserRoleMapper.java
new file mode 100644
index 0000000..6e32440
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/mapper/ProjectUserRoleMapper.java
@@ -0,0 +1,15 @@
+package org.jeecg.modules.projectUserRole.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.projectUserRole.entity.ProjectUserRole;
+
+/**
+ * @Description: 管理项目用户角色
+ * @Author: jeecg-boot
+ * @Date: 2023-04-10
+ * @Version: V1.0
+ */
+public interface ProjectUserRoleMapper extends BaseMapper {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/mapper/xml/ProjectUserRoleMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/mapper/xml/ProjectUserRoleMapper.xml
new file mode 100644
index 0000000..40dc6a2
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/mapper/xml/ProjectUserRoleMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/service/IProjectUserRoleService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/service/IProjectUserRoleService.java
new file mode 100644
index 0000000..6c85182
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/service/IProjectUserRoleService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.projectUserRole.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.projectUserRole.entity.ProjectUserRole;
+
+/**
+ * @Description: 管理项目用户角色
+ * @Author: jeecg-boot
+ * @Date: 2023-04-10
+ * @Version: V1.0
+ */
+public interface IProjectUserRoleService extends IService {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/service/impl/ProjectUserRoleServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/service/impl/ProjectUserRoleServiceImpl.java
new file mode 100644
index 0000000..0b4db9f
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectUserRole/service/impl/ProjectUserRoleServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.projectUserRole.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.projectUserRole.entity.ProjectUserRole;
+import org.jeecg.modules.projectUserRole.mapper.ProjectUserRoleMapper;
+import org.jeecg.modules.projectUserRole.service.IProjectUserRoleService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 管理项目用户角色
+ * @Author: jeecg-boot
+ * @Date: 2023-04-10
+ * @Version: V1.0
+ */
+@Service
+public class ProjectUserRoleServiceImpl extends ServiceImpl implements IProjectUserRoleService {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/controller/ProjectxController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/controller/ProjectxController.java
new file mode 100644
index 0000000..a7a9048
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/controller/ProjectxController.java
@@ -0,0 +1,156 @@
+package org.jeecg.modules.projectx.controller;
+
+
+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.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.projectx.entity.Projectx;
+import org.jeecg.modules.projectx.service.IProjectxService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+ /**
+ * @Description: 项目管理 管理项目基本信息
+ * @Author: jeecg-boot
+ * @Date: 2023-04-10
+ * @Version: V1.0
+ */
+@Api(tags="项目管理 管理项目基本信息")
+@RestController
+@RequestMapping("/projectx/projectx")
+@Slf4j
+public class ProjectxController extends JeecgController {
+ @Autowired
+ private IProjectxService projectxService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param projectx
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "项目管理 管理项目基本信息-分页列表查询")
+ @ApiOperation(value="项目管理 管理项目基本信息-分页列表查询", notes="项目管理 管理项目基本信息-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result> queryPageList(Projectx projectx,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectx, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = projectxService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 添加
+ *
+ * @param projectx
+ * @return
+ */
+ @AutoLog(value = "项目管理 管理项目基本信息-添加")
+ @ApiOperation(value="项目管理 管理项目基本信息-添加", notes="项目管理 管理项目基本信息-添加")
+ @PostMapping(value = "/add")
+ public Result> add(@RequestBody Projectx projectx) {
+ projectxService.save(projectx);
+ return Result.OK("添加成功!");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param projectx
+ * @return
+ */
+ @AutoLog(value = "项目管理 管理项目基本信息-编辑")
+ @ApiOperation(value="项目管理 管理项目基本信息-编辑", notes="项目管理 管理项目基本信息-编辑")
+ @PutMapping(value = "/edit")
+ public Result> edit(@RequestBody Projectx projectx) {
+ projectxService.updateById(projectx);
+ 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) {
+ projectxService.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.projectxService.removeByIds(Arrays.asList(ids.split(",")));
+ 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) {
+ Projectx projectx = projectxService.getById(id);
+ if(projectx==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(projectx);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param projectx
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, Projectx projectx) {
+ return super.exportXls(request, projectx, Projectx.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, Projectx.class);
+ }
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/entity/Projectx.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/entity/Projectx.java
new file mode 100644
index 0000000..b09eb84
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/entity/Projectx.java
@@ -0,0 +1,111 @@
+package org.jeecg.modules.projectx.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 org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 项目管理 管理项目基本信息
+ * @Author: jeecg-boot
+ * @Date: 2023-04-10
+ * @Version: V1.0
+ */
+@Data
+@TableName("projectx")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="projectx对象", description="项目管理 管理项目基本信息")
+public class Projectx implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private String id;
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private String createBy;
+ /**创建日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建日期")
+ private Date createTime;
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private String updateBy;
+ /**更新日期*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "更新日期")
+ private Date updateTime;
+ /**项目中文名称*/
+ @Excel(name = "项目中文名称", width = 15)
+ @ApiModelProperty(value = "项目中文名称")
+ private String projectName;
+ /**项目英文名称*/
+ @Excel(name = "项目英文名称", width = 15)
+ @ApiModelProperty(value = "项目英文名称")
+ private String projectEnName;
+ /**项目编码*/
+ @Excel(name = "项目编码", width = 15)
+ @ApiModelProperty(value = "项目编码")
+ private String projectCode;
+ /**项目描述*/
+ @Excel(name = "项目描述", width = 15)
+ @ApiModelProperty(value = "项目描述")
+ private String pmDescribe;
+ /**项目图片*/
+ @Excel(name = "项目图片", width = 15)
+ @ApiModelProperty(value = "项目图片")
+ private String projectPic;
+ /**项目网址*/
+ @Excel(name = "项目网址", width = 15)
+ @ApiModelProperty(value = "项目网址")
+ private String projectUrl;
+ /**源码地址*/
+ @Excel(name = "源码地址", width = 15)
+ @ApiModelProperty(value = "源码地址")
+ private String projectCodeUrl;
+ /**数据库名*/
+ @Excel(name = "数据库名", width = 15)
+ @ApiModelProperty(value = "数据库名")
+ private String projectDbName;
+ /**数据地址*/
+ @Excel(name = "数据地址", width = 15)
+ @ApiModelProperty(value = "数据地址")
+ private String projectDbUrl;
+ /**开始时间*/
+ @Excel(name = "开始时间", width = 15, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "开始时间")
+ private Date startTime;
+ /**完成时间*/
+ @Excel(name = "完成时间", width = 15, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "完成时间")
+ private Date completeTime;
+ /**复制来源*/
+ @Excel(name = "复制来源", width = 15)
+ @ApiModelProperty(value = "复制来源")
+ private String sourceProjectId;
+ /**项目状态*/
+ @Excel(name = "项目状态", width = 15)
+ @ApiModelProperty(value = "项目状态")
+ @Dict(dicCode = "project_status")
+ private Integer projectStatus;
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/mapper/ProjectxMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/mapper/ProjectxMapper.java
new file mode 100644
index 0000000..96bfc53
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/mapper/ProjectxMapper.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.projectx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.projectx.entity.Projectx;
+
+/**
+ * @Description: 项目管理 管理项目基本信息
+ * @Author: jeecg-boot
+ * @Date: 2023-04-10
+ * @Version: V1.0
+ */
+public interface ProjectxMapper extends BaseMapper {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/mapper/xml/ProjectxMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/mapper/xml/ProjectxMapper.xml
new file mode 100644
index 0000000..e276eae
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/mapper/xml/ProjectxMapper.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/service/IProjectxService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/service/IProjectxService.java
new file mode 100644
index 0000000..9644080
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/service/IProjectxService.java
@@ -0,0 +1,16 @@
+package org.jeecg.modules.projectx.service;
+
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.projectx.entity.Projectx;
+
+/**
+ * @Description: 项目管理 管理项目基本信息
+ * @Author: jeecg-boot
+ * @Date: 2023-04-10
+ * @Version: V1.0
+ */
+public interface IProjectxService extends IService {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/service/impl/ProjectxServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/service/impl/ProjectxServiceImpl.java
new file mode 100644
index 0000000..5c7c114
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/projectx/service/impl/ProjectxServiceImpl.java
@@ -0,0 +1,18 @@
+package org.jeecg.modules.projectx.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.projectx.entity.Projectx;
+import org.jeecg.modules.projectx.mapper.ProjectxMapper;
+import org.jeecg.modules.projectx.service.IProjectxService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 项目管理 管理项目基本信息
+ * @Author: jeecg-boot
+ * @Date: 2023-04-10
+ * @Version: V1.0
+ */
+@Service
+public class ProjectxServiceImpl extends ServiceImpl implements IProjectxService {
+
+}