From 933d55237900511a9e4836886040213cafe20131 Mon Sep 17 00:00:00 2001
From: Aug <17674666882@163.com>
Date: Fri, 10 Jan 2025 18:24:20 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=94=A8=E6=88=B7=E5=AE=9E=E5=90=8D?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E3=80=90?=
=?UTF-8?q?=E6=89=80=E5=B1=9E=E5=85=AC=E5=8F=B8=E3=80=91=202=E3=80=81?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 82 ++++-----
.../controller/CarrentModuleController.java | 171 +++++++++++++++++++
.../carrentModule/entity/CarrentModule.java | 66 +++++++
.../carrentModule/mapper/CarrentModuleMapper.java | 17 ++
.../mapper/xml/CarrentModuleMapper.xml | 5 +
.../service/ICarrentModuleService.java | 14 ++
.../service/impl/CarrentModuleServiceImpl.java | 19 +++
.../carrentModule/vue/CarrentModuleList.vue | 190 +++++++++++++++++++++
.../vue/modules/CarrentModuleForm.vue | 119 +++++++++++++
.../modules/CarrentModuleModal.Style#Drawer.vue | 84 +++++++++
.../vue/modules/CarrentModuleModal.vue | 60 +++++++
.../carrentModule/vue3/CarrentModule.api.ts | 61 +++++++
.../carrentModule/vue3/CarrentModule.data.ts | 56 ++++++
.../carrentModule/vue3/CarrentModuleList.vue | 162 ++++++++++++++++++
.../vue3/components/CarrentModuleModal.vue | 58 +++++++
.../controller/CarrentUserController.java | 2 +-
.../modules/carrentUser/entity/CarrentUser.java | 25 +--
.../carrentUser/mapper/CarrentUserMapper.java | 2 +-
.../carrentUser/service/ICarrentUserService.java | 2 +-
.../service/impl/CarrentUserServiceImpl.java | 2 +-
.../modules/carrentUser/vue/CarrentUserList.vue | 28 +--
.../carrentUser/vue/modules/CarrentUserForm.vue | 21 ++-
.../modules/carrentUser/vue3/CarrentUser.data.ts | 51 +++---
23 files changed, 1204 insertions(+), 93 deletions(-)
create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/controller/CarrentModuleController.java
create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/entity/CarrentModule.java
create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/mapper/CarrentModuleMapper.java
create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/mapper/xml/CarrentModuleMapper.xml
create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/service/ICarrentModuleService.java
create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/service/impl/CarrentModuleServiceImpl.java
create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/CarrentModuleList.vue
create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/modules/CarrentModuleForm.vue
create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/modules/CarrentModuleModal.Style#Drawer.vue
create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/modules/CarrentModuleModal.vue
create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/CarrentModule.api.ts
create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/CarrentModule.data.ts
create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/CarrentModuleList.vue
create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/components/CarrentModuleModal.vue
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 646fd1f..3dc8d44 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,14 +4,6 @@
-
-
-
-
-
-
-
-
@@ -153,7 +145,7 @@
-
+
1731385713383
@@ -281,7 +273,14 @@
1736421140462
-
+
+ 1736497668414
+
+
+
+ 1736497668414
+
+
@@ -319,7 +318,8 @@
-
+
+
@@ -338,62 +338,62 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -402,10 +402,10 @@
-
+
-
+
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/controller/CarrentModuleController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/controller/CarrentModuleController.java
new file mode 100644
index 0000000..36908ac
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/controller/CarrentModuleController.java
@@ -0,0 +1,171 @@
+package org.jeecg.modules.carrentModule.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.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.carrentModule.entity.CarrentModule;
+import org.jeecg.modules.carrentModule.service.ICarrentModuleService;
+
+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.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: 2025-01-03
+ * @Version: V1.0
+ */
+@Api(tags="活动模块表")
+@RestController
+@RequestMapping("/carrentModule/carrentModule")
+@Slf4j
+public class CarrentModuleController extends JeecgController {
+ @Autowired
+ private ICarrentModuleService carrentModuleService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param carrentModule
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "活动模块表-分页列表查询")
+ @ApiOperation(value="活动模块表-分页列表查询", notes="活动模块表-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result> queryPageList(CarrentModule carrentModule,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(carrentModule, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = carrentModuleService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 添加
+ *
+ * @param carrentModule
+ * @return
+ */
+ @AutoLog(value = "活动模块表-添加")
+ @ApiOperation(value="活动模块表-添加", notes="活动模块表-添加")
+ @PostMapping(value = "/add")
+ public Result add(@RequestBody CarrentModule carrentModule) {
+ carrentModuleService.save(carrentModule);
+ return Result.OK("添加成功!");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param carrentModule
+ * @return
+ */
+ @AutoLog(value = "活动模块表-编辑")
+ @ApiOperation(value="活动模块表-编辑", notes="活动模块表-编辑")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result edit(@RequestBody CarrentModule carrentModule) {
+ carrentModuleService.updateById(carrentModule);
+ 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) {
+ carrentModuleService.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.carrentModuleService.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) {
+ CarrentModule carrentModule = carrentModuleService.getById(id);
+ if(carrentModule==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(carrentModule);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param carrentModule
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, CarrentModule carrentModule) {
+ return super.exportXls(request, carrentModule, CarrentModule.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, CarrentModule.class);
+ }
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/entity/CarrentModule.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/entity/CarrentModule.java
new file mode 100644
index 0000000..60b87cc
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/entity/CarrentModule.java
@@ -0,0 +1,66 @@
+package org.jeecg.modules.carrentModule.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.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: 2025-01-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("carrent_module")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="carrent_module对象", description="活动模块表")
+public class CarrentModule implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private java.lang.String id;
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private java.lang.String createBy;
+ /**创建日期*/
+ @ApiModelProperty(value = "创建日期")
+ private java.util.Date createTime;
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private java.lang.String updateBy;
+ /**更新日期*/
+ @ApiModelProperty(value = "更新日期")
+ private java.util.Date updateTime;
+ /**标题*/
+ @Excel(name = "标题", width = 15)
+ @ApiModelProperty(value = "标题")
+ private java.lang.String title;
+ /**图片*/
+ @Excel(name = "图片", width = 15)
+ @ApiModelProperty(value = "图片")
+ private java.lang.String image;
+ /**排序编号*/
+ @Excel(name = "排序编号", width = 15)
+ @ApiModelProperty(value = "排序编号")
+ private java.lang.Integer orderNo;
+ /**跳转地址*/
+ @Excel(name = "跳转地址", width = 15)
+ @ApiModelProperty(value = "跳转地址")
+ private java.lang.String path;
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/mapper/CarrentModuleMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/mapper/CarrentModuleMapper.java
new file mode 100644
index 0000000..d8e5d69
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/mapper/CarrentModuleMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.carrentModule.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.carrentModule.entity.CarrentModule;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 活动模块表
+ * @Author: jeecg-boot
+ * @Date: 2025-01-03
+ * @Version: V1.0
+ */
+public interface CarrentModuleMapper extends BaseMapper {
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/mapper/xml/CarrentModuleMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/mapper/xml/CarrentModuleMapper.xml
new file mode 100644
index 0000000..dbccc49
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/mapper/xml/CarrentModuleMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/service/ICarrentModuleService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/service/ICarrentModuleService.java
new file mode 100644
index 0000000..ed5664a
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/service/ICarrentModuleService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.carrentModule.service;
+
+import org.jeecg.modules.carrentModule.entity.CarrentModule;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 活动模块表
+ * @Author: jeecg-boot
+ * @Date: 2025-01-03
+ * @Version: V1.0
+ */
+public interface ICarrentModuleService extends IService {
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/service/impl/CarrentModuleServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/service/impl/CarrentModuleServiceImpl.java
new file mode 100644
index 0000000..a006564
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/service/impl/CarrentModuleServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.carrentModule.service.impl;
+
+import org.jeecg.modules.carrentModule.entity.CarrentModule;
+import org.jeecg.modules.carrentModule.mapper.CarrentModuleMapper;
+import org.jeecg.modules.carrentModule.service.ICarrentModuleService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 活动模块表
+ * @Author: jeecg-boot
+ * @Date: 2025-01-03
+ * @Version: V1.0
+ */
+@Service
+public class CarrentModuleServiceImpl extends ServiceImpl implements ICarrentModuleService {
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/CarrentModuleList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/CarrentModuleList.vue
new file mode 100644
index 0000000..33b5f55
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/CarrentModuleList.vue
@@ -0,0 +1,190 @@
+
+
+
+
+
+
+
+
+
新增
+
导出
+
+ 导入
+
+
+
+
+
+ 删除
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 编辑
+
+
+
+ 更多
+
+
+ 详情
+
+
+ handleDelete(record.id)">
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/modules/CarrentModuleForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/modules/CarrentModuleForm.vue
new file mode 100644
index 0000000..976ccf8
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/modules/CarrentModuleForm.vue
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/modules/CarrentModuleModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/modules/CarrentModuleModal.Style#Drawer.vue
new file mode 100644
index 0000000..e40db33
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/modules/CarrentModuleModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/modules/CarrentModuleModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/modules/CarrentModuleModal.vue
new file mode 100644
index 0000000..3a56f5c
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue/modules/CarrentModuleModal.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/CarrentModule.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/CarrentModule.api.ts
new file mode 100644
index 0000000..657715a
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/CarrentModule.api.ts
@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+ list = '/carrentModule/carrentModule/list',
+ save='/carrentModule/carrentModule/add',
+ edit='/carrentModule/carrentModule/edit',
+ deleteOne = '/carrentModule/carrentModule/delete',
+ deleteBatch = '/carrentModule/carrentModule/deleteBatch',
+ importExcel = '/carrentModule/carrentModule/importExcel',
+ exportXls = '/carrentModule/carrentModule/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+ defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+ return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+ handleSuccess();
+ });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+ Modal.confirm({
+ title: '确认删除',
+ content: '是否删除选中数据',
+ okText: '确认',
+ cancelText: '取消',
+ onOk: () => {
+ return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+ handleSuccess();
+ });
+ }
+ });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+ let url = isUpdate ? Api.edit : Api.save;
+ return defHttp.post({url: url, params});
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/CarrentModule.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/CarrentModule.data.ts
new file mode 100644
index 0000000..0710a47
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/CarrentModule.data.ts
@@ -0,0 +1,56 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+ {
+ title: '标题',
+ align:"center",
+ dataIndex: 'title'
+ },
+ {
+ title: '图片',
+ align:"center",
+ dataIndex: 'image',
+ customRender:render.renderAvatar,
+ },
+ {
+ title: '排序编号',
+ align:"center",
+ dataIndex: 'orderNo'
+ },
+ {
+ title: '跳转地址',
+ align:"center",
+ dataIndex: 'path'
+ },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+ {
+ label: '标题',
+ field: 'title',
+ component: 'Input',
+ },
+ {
+ label: '图片',
+ field: 'image',
+ component: 'JImageUpload',
+ componentProps:{
+ },
+ },
+ {
+ label: '排序编号',
+ field: 'orderNo',
+ component: 'InputNumber',
+ },
+ {
+ label: '跳转地址',
+ field: 'path',
+ component: 'Input',
+ },
+];
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/CarrentModuleList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/CarrentModuleList.vue
new file mode 100644
index 0000000..3c82618
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/CarrentModuleList.vue
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+ 新增
+ 导出
+ 导入
+
+
+
+
+
+ 删除
+
+
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无文件
+ 下载
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/components/CarrentModuleModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/components/CarrentModuleModal.vue
new file mode 100644
index 0000000..1de9219
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentModule/vue3/components/CarrentModuleModal.vue
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/controller/CarrentUserController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/controller/CarrentUserController.java
index 7c27caa..29eb83c 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/controller/CarrentUserController.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/controller/CarrentUserController.java
@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 个人实名信息表
* @Author: jeecg-boot
- * @Date: 2024-12-26
+ * @Date: 2025-01-10
* @Version: V1.0
*/
@Api(tags="个人实名信息表")
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/entity/CarrentUser.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/entity/CarrentUser.java
index 381a5bc..760cea2 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/entity/CarrentUser.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/entity/CarrentUser.java
@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 个人实名信息表
* @Author: jeecg-boot
- * @Date: 2024-12-26
+ * @Date: 2025-01-10
* @Version: V1.0
*/
@Data
@@ -55,16 +55,13 @@ public class CarrentUser implements Serializable {
@Excel(name = "联系方式", width = 15)
@ApiModelProperty(value = "联系方式")
private java.lang.String phone;
- /**身份证号码*/
- @Excel(name = "身份证号码", width = 15)
- @ApiModelProperty(value = "身份证号码")
- private java.lang.String cerNo;
- /**身份证正面照*/
- @Excel(name = "身份证正面照", width = 15)
- @ApiModelProperty(value = "身份证正面照")
- private java.lang.String cerImage;
+ /**所属单位*/
+ @Excel(name = "所属单位", width = 15)
+ @ApiModelProperty(value = "所属单位")
+ private java.lang.String company;
/**状态*/
- @Excel(name = "状态", width = 15)
+ @Excel(name = "状态", width = 15, dicCode = "authentic_status")
+ @Dict(dicCode = "authentic_status")
@ApiModelProperty(value = "状态")
private java.lang.String status;
/**关联用户id*/
@@ -72,4 +69,12 @@ public class CarrentUser implements Serializable {
@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@ApiModelProperty(value = "关联用户id")
private java.lang.String userId;
+ /**身份证正面照片*/
+ @Excel(name = "身份证正面照片", width = 15)
+ @ApiModelProperty(value = "身份证正面照片")
+ private java.lang.String cerImage;
+ /**身份证号*/
+ @Excel(name = "身份证号", width = 15)
+ @ApiModelProperty(value = "身份证号")
+ private java.lang.String cerNo;
}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/mapper/CarrentUserMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/mapper/CarrentUserMapper.java
index 5214984..62d79db 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/mapper/CarrentUserMapper.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/mapper/CarrentUserMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 个人实名信息表
* @Author: jeecg-boot
- * @Date: 2024-12-26
+ * @Date: 2025-01-10
* @Version: V1.0
*/
public interface CarrentUserMapper extends BaseMapper {
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/ICarrentUserService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/ICarrentUserService.java
index 9de5c34..1d81f41 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/ICarrentUserService.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/ICarrentUserService.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 个人实名信息表
* @Author: jeecg-boot
- * @Date: 2024-12-26
+ * @Date: 2025-01-10
* @Version: V1.0
*/
public interface ICarrentUserService extends IService {
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/impl/CarrentUserServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/impl/CarrentUserServiceImpl.java
index 61355da..87c73e0 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/impl/CarrentUserServiceImpl.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/service/impl/CarrentUserServiceImpl.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 个人实名信息表
* @Author: jeecg-boot
- * @Date: 2024-12-26
+ * @Date: 2025-01-10
* @Version: V1.0
*/
@Service
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/CarrentUserList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/CarrentUserList.vue
index b53a7d8..e19ef94 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/CarrentUserList.vue
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/CarrentUserList.vue
@@ -133,26 +133,31 @@
dataIndex: 'phone'
},
{
- title:'身份证号码',
+ title:'所属单位',
align:"center",
- dataIndex: 'cerNo'
- },
- {
- title:'身份证正面照',
- align:"center",
- dataIndex: 'cerImage',
- scopedSlots: {customRender: 'imgSlot'}
+ dataIndex: 'company'
},
{
title:'状态',
align:"center",
- dataIndex: 'status'
+ dataIndex: 'status_dictText'
},
{
title:'关联用户id',
align:"center",
dataIndex: 'userId_dictText'
},
+ {
+ title:'身份证正面照片',
+ align:"center",
+ dataIndex: 'cerImage',
+ scopedSlots: {customRender: 'imgSlot'}
+ },
+ {
+ title:'身份证号',
+ align:"center",
+ dataIndex: 'cerNo'
+ },
{
title: '操作',
dataIndex: 'action',
@@ -189,10 +194,11 @@
let fieldList=[];
fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
fieldList.push({type:'string',value:'phone',text:'联系方式',dictCode:''})
- fieldList.push({type:'string',value:'cerNo',text:'身份证号码',dictCode:''})
- fieldList.push({type:'string',value:'cerImage',text:'身份证正面照',dictCode:''})
+ fieldList.push({type:'string',value:'company',text:'所属单位',dictCode:''})
fieldList.push({type:'string',value:'status',text:'状态',dictCode:'authentic_status'})
fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
+ fieldList.push({type:'Text',value:'cerImage',text:'身份证正面照片',dictCode:''})
+ fieldList.push({type:'string',value:'cerNo',text:'身份证号',dictCode:''})
this.superFieldList = fieldList
}
}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserForm.vue
index 6090d8f..4d2c20c 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserForm.vue
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue/modules/CarrentUserForm.vue
@@ -14,18 +14,13 @@
-
-
-
-
-
-
-
+
+
-
+
@@ -33,6 +28,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUser.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUser.data.ts
index de94e47..864e277 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUser.data.ts
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentUser/vue3/CarrentUser.data.ts
@@ -15,26 +15,31 @@ export const columns: BasicColumn[] = [
dataIndex: 'phone'
},
{
- title: '身份证号码',
+ title: '所属单位',
align:"center",
- dataIndex: 'cerNo'
- },
- {
- title: '身份证正面照',
- align:"center",
- dataIndex: 'cerImage',
- customRender:render.renderAvatar,
+ dataIndex: 'company'
},
{
title: '状态',
align:"center",
- dataIndex: 'status'
+ dataIndex: 'status_dictText'
},
{
title: '关联用户id',
align:"center",
dataIndex: 'userId_dictText'
},
+ {
+ title: '身份证正面照片',
+ align:"center",
+ dataIndex: 'cerImage',
+ customRender:render.renderAvatar,
+ },
+ {
+ title: '身份证号',
+ align:"center",
+ dataIndex: 'cerNo'
+ },
];
//查询数据
export const searchFormSchema: FormSchema[] = [
@@ -52,21 +57,17 @@ export const formSchema: FormSchema[] = [
component: 'Input',
},
{
- label: '身份证号码',
- field: 'cerNo',
+ label: '所属单位',
+ field: 'company',
component: 'Input',
},
- {
- label: '身份证正面照',
- field: 'cerImage',
- component: 'JImageUpload',
- componentProps:{
- },
- },
{
label: '状态',
field: 'status',
- component: 'Input',
+ component: 'JDictSelectTag',
+ componentProps:{
+ dictCode:"authentic_status"
+ },
},
{
label: '关联用户id',
@@ -76,4 +77,16 @@ export const formSchema: FormSchema[] = [
dictCode:"han_hai_member,nick_name,id"
},
},
+ {
+ label: '身份证正面照片',
+ field: 'cerImage',
+ component: 'JImageUpload',
+ componentProps:{
+ },
+ },
+ {
+ label: '身份证号',
+ field: 'cerNo',
+ component: 'Input',
+ },
];