From 0da31a7d5355ca68242b81d119674d6fa78ef908 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Mon, 28 Oct 2024 19:17:48 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9F=A5=E8=AF=A2=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=202=E3=80=81shiro=E6=9D=83=E9=99=90=E9=85=8D=E7=BD=AE=203?= =?UTF-8?q?=E3=80=81swagger=E6=9D=83=E9=99=90=E9=85=8D=E7=BD=AE=204?= =?UTF-8?q?=E3=80=81sql=E6=9F=A5=E7=9C=8B=E6=89=93=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/jeecg/config/Swagger2Config.java | 3 +- .../java/org/jeecg/config/shiro/ShiroConfig.java | 2 + .../controller/MytestUserController.java | 171 +++++++++++++++++++ .../modules/mytestUser/entity/MytestUser.java | 62 +++++++ .../mytestUser/mapper/MytestUserMapper.java | 17 ++ .../mytestUser/mapper/xml/MytestUserMapper.xml | 5 + .../mytestUser/service/IMytestUserService.java | 14 ++ .../service/impl/MytestUserServiceImpl.java | 19 +++ .../modules/mytestUser/vue/MytestUserList.vue | 183 +++++++++++++++++++++ .../mytestUser/vue/modules/MytestUserForm.vue | 114 +++++++++++++ .../vue/modules/MytestUserModal.Style#Drawer.vue | 84 ++++++++++ .../mytestUser/vue/modules/MytestUserModal.vue | 60 +++++++ .../modules/mytestUser/vue3/MytestUser.api.ts | 61 +++++++ .../modules/mytestUser/vue3/MytestUser.data.ts | 43 +++++ .../modules/mytestUser/vue3/MytestUserList.vue | 162 ++++++++++++++++++ .../mytestUser/vue3/components/MytestUserModal.vue | 58 +++++++ .../api/mytestController/UserController.java | 44 +++++ .../java/org/jeecg/modules/apiBean/PageBean.java | 19 +++ .../jeecg/modules/apiService/UserApiService.java | 16 ++ .../apiService/impl/UserApiServiceImpl.java | 64 +++++++ .../src/main/resources/application-dev.yml | 2 +- 21 files changed, 1201 insertions(+), 2 deletions(-) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/controller/MytestUserController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/entity/MytestUser.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/mapper/MytestUserMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/mapper/xml/MytestUserMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/service/IMytestUserService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/service/impl/MytestUserServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue/MytestUserList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue/modules/MytestUserForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue/modules/MytestUserModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue/modules/MytestUserModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue3/MytestUser.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue3/MytestUser.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue3/MytestUserList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue3/components/MytestUserModal.vue create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/mytestController/UserController.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/PageBean.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserApiService.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserApiServiceImpl.java diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java index 83cecf2..f8b65f5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java @@ -68,7 +68,8 @@ public class Swagger2Config implements WebMvcConfigurer { .apiInfo(apiInfo()) .select() //此包路径下的类，才生成接口文档 - .apis(RequestHandlerSelectors.basePackage("org.jeecg.modules.api")) + //.apis(RequestHandlerSelectors.basePackage("org.jeecg.modules.api")) + .apis(RequestHandlerSelectors.basePackage("org.jeecg.modules.api.mytestController")) //加了ApiOperation注解的类，才生成接口文档 .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class)) .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index ac70b7f..4ee344a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -72,6 +72,8 @@ public class ShiroConfig { } } + filterChainDefinitionMap.put("/api/**", "anon"); //测试小程序 + filterChainDefinitionMap.put("/sys/oss/file/upload", "anon"); //图片上传验证放开 filterChainDefinitionMap.put("/sys/common/upload", "anon"); //图片上传验证放开 filterChainDefinitionMap.put("/sys/cas/client/validateLogin", "anon"); //cas验证登录 diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/controller/MytestUserController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/controller/MytestUserController.java new file mode 100644 index 0000000..146362b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/controller/MytestUserController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.mytestUser.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.mytestUser.entity.MytestUser; +import org.jeecg.modules.mytestUser.service.IMytestUserService; + +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: 2024-10-28 + * @Version: V1.0 + */ +@Api(tags="用户信息表") +@RestController +@RequestMapping("/mytestUser/mytestUser") +@Slf4j +public class MytestUserController extends JeecgController { + @Autowired + private IMytestUserService mytestUserService; + + /** + * 分页列表查询 + * + * @param mytestUser + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "用户信息表-分页列表查询") + @ApiOperation(value="用户信息表-分页列表查询", notes="用户信息表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(MytestUser mytestUser, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(mytestUser, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = mytestUserService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param mytestUser + * @return + */ + @AutoLog(value = "用户信息表-添加") + @ApiOperation(value="用户信息表-添加", notes="用户信息表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody MytestUser mytestUser) { + mytestUserService.save(mytestUser); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param mytestUser + * @return + */ + @AutoLog(value = "用户信息表-编辑") + @ApiOperation(value="用户信息表-编辑", notes="用户信息表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody MytestUser mytestUser) { + mytestUserService.updateById(mytestUser); + 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) { + mytestUserService.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.mytestUserService.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) { + MytestUser mytestUser = mytestUserService.getById(id); + if(mytestUser==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(mytestUser); + } + + /** + * 导出excel + * + * @param request + * @param mytestUser + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, MytestUser mytestUser) { + return super.exportXls(request, mytestUser, MytestUser.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, MytestUser.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/entity/MytestUser.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/entity/MytestUser.java new file mode 100644 index 0000000..9123784 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/entity/MytestUser.java @@ -0,0 +1,62 @@ +package org.jeecg.modules.mytestUser.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: 2024-10-28 + * @Version: V1.0 + */ +@Data +@TableName("mytest_user") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="mytest_user对象", description="用户信息表") +public class MytestUser 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 name; + /**年龄*/ + @Excel(name = "年龄", width = 15) + @ApiModelProperty(value = "年龄") + private java.lang.String age; + /**性别*/ + @Excel(name = "性别", width = 15) + @ApiModelProperty(value = "性别") + private java.lang.String sex; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/mapper/MytestUserMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/mapper/MytestUserMapper.java new file mode 100644 index 0000000..3c6c949 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/mapper/MytestUserMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.mytestUser.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.mytestUser.entity.MytestUser; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 用户信息表 + * @Author: jeecg-boot + * @Date: 2024-10-28 + * @Version: V1.0 + */ +public interface MytestUserMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/mapper/xml/MytestUserMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/mapper/xml/MytestUserMapper.xml new file mode 100644 index 0000000..e22db00 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/mapper/xml/MytestUserMapper.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/mytestUser/service/IMytestUserService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/service/IMytestUserService.java new file mode 100644 index 0000000..475c1e3 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/service/IMytestUserService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.mytestUser.service; + +import org.jeecg.modules.mytestUser.entity.MytestUser; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 用户信息表 + * @Author: jeecg-boot + * @Date: 2024-10-28 + * @Version: V1.0 + */ +public interface IMytestUserService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/service/impl/MytestUserServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/service/impl/MytestUserServiceImpl.java new file mode 100644 index 0000000..e5687a5 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/service/impl/MytestUserServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.mytestUser.service.impl; + +import org.jeecg.modules.mytestUser.entity.MytestUser; +import org.jeecg.modules.mytestUser.mapper.MytestUserMapper; +import org.jeecg.modules.mytestUser.service.IMytestUserService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 用户信息表 + * @Author: jeecg-boot + * @Date: 2024-10-28 + * @Version: V1.0 + */ +@Service +public class MytestUserServiceImpl extends ServiceImpl implements IMytestUserService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue/MytestUserList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue/MytestUserList.vue new file mode 100644 index 0000000..1c69f99 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue/MytestUserList.vue @@ -0,0 +1,183 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue/modules/MytestUserForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue/modules/MytestUserForm.vue new file mode 100644 index 0000000..8aa9319 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue/modules/MytestUserForm.vue @@ -0,0 +1,114 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue/modules/MytestUserModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue/modules/MytestUserModal.Style#Drawer.vue new file mode 100644 index 0000000..cc2b649 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue/modules/MytestUserModal.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/mytestUser/vue/modules/MytestUserModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue/modules/MytestUserModal.vue new file mode 100644 index 0000000..c972a20 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue/modules/MytestUserModal.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/mytestUser/vue3/MytestUser.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue3/MytestUser.api.ts new file mode 100644 index 0000000..173cbb4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue3/MytestUser.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/mytestUser/mytestUser/list', + save='/mytestUser/mytestUser/add', + edit='/mytestUser/mytestUser/edit', + deleteOne = '/mytestUser/mytestUser/delete', + deleteBatch = '/mytestUser/mytestUser/deleteBatch', + importExcel = '/mytestUser/mytestUser/importExcel', + exportXls = '/mytestUser/mytestUser/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/mytestUser/vue3/MytestUser.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue3/MytestUser.data.ts new file mode 100644 index 0000000..f575be2 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue3/MytestUser.data.ts @@ -0,0 +1,43 @@ +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: 'name' + }, + { + title: '年龄', + align:"center", + dataIndex: 'age' + }, + { + title: '性别', + align:"center", + dataIndex: 'sex' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '姓名', + field: 'name', + component: 'Input', + }, + { + label: '年龄', + field: 'age', + component: 'Input', + }, + { + label: '性别', + field: 'sex', + component: 'Input', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue3/MytestUserList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue3/MytestUserList.vue new file mode 100644 index 0000000..857c9ad --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue3/MytestUserList.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/mytestUser/vue3/components/MytestUserModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue3/components/MytestUserModal.vue new file mode 100644 index 0000000..3d1d434 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/mytestUser/vue3/components/MytestUserModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/mytestController/UserController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/mytestController/UserController.java new file mode 100644 index 0000000..188f0f4 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/mytestController/UserController.java @@ -0,0 +1,44 @@ +package org.jeecg.modules.api.mytestController; + +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.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.UserApiService; +import org.jeecg.modules.mytestUser.entity.MytestUser; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +@Api(tags="单表数据相关接口") +@RestController +@RequestMapping("/api/user") +@Slf4j +public class UserController { + + @Resource + private UserApiService userApiService; + + @ApiOperation(value="查询列表带分页一", notes="colums = params") + @RequestMapping(value = "/queryAllList1", method = {RequestMethod.GET}) + public Result queryAllList1(MytestUser user, PageBean pageBean, HttpServletRequest req){ + return userApiService.queryAllList1(user, pageBean, req); + } + + @ApiOperation(value="查询列表带分页二", notes="colums = params") + @RequestMapping(value = "/queryAllList2", method = {RequestMethod.GET}) + public Result queryAllList2(MytestUser user, PageBean pageBean){ + return userApiService.queryAllList2(user, pageBean); + } + + @ApiOperation(value="查询列表带分页三", notes="colums = params") + @RequestMapping(value = "/queryAllList3", method = {RequestMethod.GET}) + public Result queryAllList3(MytestUser user, PageBean pageBean){ + return userApiService.queryAllList3(user, pageBean); + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/PageBean.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/PageBean.java new file mode 100644 index 0000000..c4513d2 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/PageBean.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.apiBean; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class PageBean { + /**显示条数*/ + @ApiModelProperty(value = "显示条数" ) + private Integer pageSize; + /**当前页*/ + @ApiModelProperty(value = "当前页" ) + private Integer pageNo; + + public PageBean() { + this.pageNo = 1; + this.pageSize = 1000; + } +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserApiService.java new file mode 100644 index 0000000..91b6c02 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserApiService.java @@ -0,0 +1,16 @@ +package org.jeecg.modules.apiService; + +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.mytestUser.entity.MytestUser; + +import javax.servlet.http.HttpServletRequest; + +public interface UserApiService { + + //查询测试 + public Result queryAllList1(MytestUser user, PageBean pageBean, HttpServletRequest req); + public Result queryAllList2(MytestUser user, PageBean pageBean); + public Result queryAllList3(MytestUser user, PageBean pageBean); + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserApiServiceImpl.java new file mode 100644 index 0000000..e6a2f6f --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserApiServiceImpl.java @@ -0,0 +1,64 @@ +package org.jeecg.modules.apiService.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.UserApiService; +import org.jeecg.modules.mytestUser.entity.MytestUser; +import org.jeecg.modules.mytestUser.service.IMytestUserService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +@Service +public class UserApiServiceImpl implements UserApiService { + + @Resource + private IMytestUserService mytestUserService; + + @Override + public Result queryAllList1(MytestUser user, PageBean pageBean, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap()); + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = mytestUserService.page(page, queryWrapper); + + return Result.OK("用户信息列表", pageList); + } + + @Override + public Result queryAllList2(MytestUser user, PageBean pageBean) { + + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = mytestUserService + .lambdaQuery() + .page(page); + + return Result.OK("用户信息列表", pageList); + } + + @Override + public Result queryAllList3(MytestUser user, PageBean pageBean) { + + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + LambdaQueryChainWrapper query = mytestUserService.lambdaQuery(); + + if(null != user.getName()){ + query.like(MytestUser::getName, user.getName()); + } + if(null != user.getAge()){ + query.eq(MytestUser::getAge, user.getAge()); + } + if(null != user.getSex()){ + query.in(MytestUser::getName, user.getSex()); + } + + Page pageList = query.page(page); + + return Result.OK("用户信息列表", pageList); + } + +} diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml index f3f2e15..be04011 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -170,7 +170,7 @@ mybatis-plus: table-underline: true configuration: # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 - # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 返回类型为Map,显示null对应的字段 call-setters-on-nulls: true #jeecg专用配置