From 704dabff95639f73f32279168fe25cc1ac844445 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Wed, 3 Sep 2025 19:59:45 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E9=9B=86=E5=AE=BF?= =?UTF-8?q?=E5=8C=BA=E5=88=97=E8=A1=A8=202=E3=80=81=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CommunityDormitoryController.java | 171 +++++++++++++++++++++ .../entity/CommunityDormitory.java | 54 +++++++ .../mapper/CommunityDormitoryMapper.java | 17 ++ .../mapper/xml/CommunityDormitoryMapper.xml | 5 + .../service/ICommunityDormitoryService.java | 14 ++ .../impl/CommunityDormitoryServiceImpl.java | 19 +++ .../vue/CommunityDormitoryList.vue | 171 +++++++++++++++++++++ .../vue/modules/CommunityDormitoryForm.vue | 104 +++++++++++++ .../CommunityDormitoryModal.Style#Drawer.vue | 84 ++++++++++ .../vue/modules/CommunityDormitoryModal.vue | 60 ++++++++ .../vue3/CommunityDormitory.api.ts | 61 ++++++++ .../vue3/CommunityDormitory.data.ts | 23 +++ .../vue3/CommunityDormitoryList.vue | 162 +++++++++++++++++++ .../vue3/components/CommunityDormitoryModal.vue | 58 +++++++ .../controller/HanHaiMemberController.java | 2 +- .../modules/hanHaiMember/entity/HanHaiMember.java | 12 +- .../hanHaiMember/mapper/HanHaiMemberMapper.java | 2 +- .../hanHaiMember/service/IHanHaiMemberService.java | 2 +- .../service/impl/HanHaiMemberServiceImpl.java | 2 +- .../modules/hanHaiMember/vue/HanHaiMemberList.vue | 10 +- .../hanHaiMember/vue/modules/HanHaiMemberForm.vue | 9 +- .../modules/hanHaiMember/vue3/HanHaiMember.data.ts | 14 +- .../api/communityController/ConfigController.java | 7 + .../communityController/UserInfoController.java | 6 +- .../jeecg/modules/api/service/ConfigService.java | 2 + .../jeecg/modules/api/service/UserInfoService.java | 4 +- .../api/service/impl/ConfigServiceImpl.java | 40 +++++ .../api/service/impl/UserInfoServiceImpl.java | 21 +-- 28 files changed, 1110 insertions(+), 26 deletions(-) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/controller/CommunityDormitoryController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/entity/CommunityDormitory.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/mapper/CommunityDormitoryMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/mapper/xml/CommunityDormitoryMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/service/ICommunityDormitoryService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/service/impl/CommunityDormitoryServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue/CommunityDormitoryList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue/modules/CommunityDormitoryForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue/modules/CommunityDormitoryModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue/modules/CommunityDormitoryModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue3/CommunityDormitory.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue3/CommunityDormitory.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue3/CommunityDormitoryList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue3/components/CommunityDormitoryModal.vue diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/controller/CommunityDormitoryController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/controller/CommunityDormitoryController.java new file mode 100644 index 0000000..be58021 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/controller/CommunityDormitoryController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.communityDormitory.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.communityDormitory.entity.CommunityDormitory; +import org.jeecg.modules.communityDormitory.service.ICommunityDormitoryService; + +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-09-03 + * @Version: V1.0 + */ +@Api(tags="集宿区信息表") +@RestController +@RequestMapping("/communityDormitory/communityDormitory") +@Slf4j +public class CommunityDormitoryController extends JeecgController { + @Autowired + private ICommunityDormitoryService communityDormitoryService; + + /** + * 分页列表查询 + * + * @param communityDormitory + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "集宿区信息表-分页列表查询") + @ApiOperation(value="集宿区信息表-分页列表查询", notes="集宿区信息表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CommunityDormitory communityDormitory, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(communityDormitory, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = communityDormitoryService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param communityDormitory + * @return + */ + @AutoLog(value = "集宿区信息表-添加") + @ApiOperation(value="集宿区信息表-添加", notes="集宿区信息表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CommunityDormitory communityDormitory) { + communityDormitoryService.save(communityDormitory); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param communityDormitory + * @return + */ + @AutoLog(value = "集宿区信息表-编辑") + @ApiOperation(value="集宿区信息表-编辑", notes="集宿区信息表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CommunityDormitory communityDormitory) { + communityDormitoryService.updateById(communityDormitory); + 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) { + communityDormitoryService.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.communityDormitoryService.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) { + CommunityDormitory communityDormitory = communityDormitoryService.getById(id); + if(communityDormitory==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(communityDormitory); + } + + /** + * 导出excel + * + * @param request + * @param communityDormitory + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CommunityDormitory communityDormitory) { + return super.exportXls(request, communityDormitory, CommunityDormitory.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, CommunityDormitory.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/entity/CommunityDormitory.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/entity/CommunityDormitory.java new file mode 100644 index 0000000..8cf5e09 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/entity/CommunityDormitory.java @@ -0,0 +1,54 @@ +package org.jeecg.modules.communityDormitory.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-09-03 + * @Version: V1.0 + */ +@Data +@TableName("community_dormitory") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="community_dormitory对象", description="集宿区信息表") +public class CommunityDormitory 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; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/mapper/CommunityDormitoryMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/mapper/CommunityDormitoryMapper.java new file mode 100644 index 0000000..275d7f8 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/mapper/CommunityDormitoryMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.communityDormitory.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.communityDormitory.entity.CommunityDormitory; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 集宿区信息表 + * @Author: jeecg-boot + * @Date: 2025-09-03 + * @Version: V1.0 + */ +public interface CommunityDormitoryMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/mapper/xml/CommunityDormitoryMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/mapper/xml/CommunityDormitoryMapper.xml new file mode 100644 index 0000000..3ca124e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/mapper/xml/CommunityDormitoryMapper.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/communityDormitory/service/ICommunityDormitoryService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/service/ICommunityDormitoryService.java new file mode 100644 index 0000000..449addf --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/service/ICommunityDormitoryService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.communityDormitory.service; + +import org.jeecg.modules.communityDormitory.entity.CommunityDormitory; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 集宿区信息表 + * @Author: jeecg-boot + * @Date: 2025-09-03 + * @Version: V1.0 + */ +public interface ICommunityDormitoryService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/service/impl/CommunityDormitoryServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/service/impl/CommunityDormitoryServiceImpl.java new file mode 100644 index 0000000..d9e81e8 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/service/impl/CommunityDormitoryServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.communityDormitory.service.impl; + +import org.jeecg.modules.communityDormitory.entity.CommunityDormitory; +import org.jeecg.modules.communityDormitory.mapper.CommunityDormitoryMapper; +import org.jeecg.modules.communityDormitory.service.ICommunityDormitoryService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 集宿区信息表 + * @Author: jeecg-boot + * @Date: 2025-09-03 + * @Version: V1.0 + */ +@Service +public class CommunityDormitoryServiceImpl extends ServiceImpl implements ICommunityDormitoryService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue/CommunityDormitoryList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue/CommunityDormitoryList.vue new file mode 100644 index 0000000..9107d71 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue/CommunityDormitoryList.vue @@ -0,0 +1,171 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue/modules/CommunityDormitoryForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue/modules/CommunityDormitoryForm.vue new file mode 100644 index 0000000..f2c2bdc --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue/modules/CommunityDormitoryForm.vue @@ -0,0 +1,104 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue/modules/CommunityDormitoryModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue/modules/CommunityDormitoryModal.Style#Drawer.vue new file mode 100644 index 0000000..5a2f28a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue/modules/CommunityDormitoryModal.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/communityDormitory/vue/modules/CommunityDormitoryModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue/modules/CommunityDormitoryModal.vue new file mode 100644 index 0000000..9d055b2 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue/modules/CommunityDormitoryModal.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/communityDormitory/vue3/CommunityDormitory.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue3/CommunityDormitory.api.ts new file mode 100644 index 0000000..8e73491 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue3/CommunityDormitory.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/communityDormitory/communityDormitory/list', + save='/communityDormitory/communityDormitory/add', + edit='/communityDormitory/communityDormitory/edit', + deleteOne = '/communityDormitory/communityDormitory/delete', + deleteBatch = '/communityDormitory/communityDormitory/deleteBatch', + importExcel = '/communityDormitory/communityDormitory/importExcel', + exportXls = '/communityDormitory/communityDormitory/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/communityDormitory/vue3/CommunityDormitory.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue3/CommunityDormitory.data.ts new file mode 100644 index 0000000..8a5f60c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue3/CommunityDormitory.data.ts @@ -0,0 +1,23 @@ +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' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '集宿区名称', + field: 'title', + component: 'Input', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue3/CommunityDormitoryList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue3/CommunityDormitoryList.vue new file mode 100644 index 0000000..d10063e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue3/CommunityDormitoryList.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/communityDormitory/vue3/components/CommunityDormitoryModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue3/components/CommunityDormitoryModal.vue new file mode 100644 index 0000000..4368637 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/communityDormitory/vue3/components/CommunityDormitoryModal.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/hanHaiMember/controller/HanHaiMemberController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java index 1c1dd24..9c88348 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-08-05 + * @Date: 2025-09-03 * @Version: V1.0 */ @Api(tags="han_hai_member") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java index cb11138..79f6534 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java @@ -21,7 +21,7 @@ import lombok.experimental.Accessors; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-08-05 + * @Date: 2025-09-03 * @Version: V1.0 */ @Data @@ -202,9 +202,13 @@ public class HanHaiMember implements Serializable { @Dict(dicCode = "community_role") @ApiModelProperty(value = "角色") private java.lang.Integer role; - /**地址*/ - @Excel(name = "地址", width = 15) - @ApiModelProperty(value = "地址") + /**所在集宿区*/ + @Excel(name = "所在集宿区", width = 15) + @ApiModelProperty(value = "所在集宿区") + private java.lang.String area; + /**详细地址*/ + @Excel(name = "详细地址", width = 15) + @ApiModelProperty(value = "详细地址") private java.lang.String address; //积分排名 diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java index 5f8e073..2a9ec67 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-08-05 + * @Date: 2025-09-03 * @Version: V1.0 */ public interface HanHaiMemberMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java index 4645519..31848f4 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-08-05 + * @Date: 2025-09-03 * @Version: V1.0 */ public interface IHanHaiMemberService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java index 1834554..a411548 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-08-05 + * @Date: 2025-09-03 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue index 3e5a15d..361555c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue @@ -154,7 +154,12 @@ dataIndex: 'role_dictText' }, { - title:'地址', + title:'所在集宿区', + align:"center", + dataIndex: 'area' + }, + { + title:'详细地址', align:"center", dataIndex: 'address' }, @@ -198,7 +203,8 @@ fieldList.push({type:'string',value:'appletOpenid',text:'小程序标识',dictCode:''}) fieldList.push({type:'int',value:'score',text:'积分',dictCode:''}) fieldList.push({type:'int',value:'role',text:'角色',dictCode:'community_role'}) - fieldList.push({type:'Text',value:'address',text:'地址',dictCode:''}) + fieldList.push({type:'Text',value:'area',text:'所在集宿区',dictCode:''}) + fieldList.push({type:'Text',value:'address',text:'详细地址',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue index 9d30644..ad1e646 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue @@ -29,8 +29,13 @@ - - + + + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts index bb8f16e..70d6e25 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts @@ -36,7 +36,12 @@ export const columns: BasicColumn[] = [ dataIndex: 'role_dictText' }, { - title: '地址', + title: '所在集宿区', + align:"center", + dataIndex: 'area' + }, + { + title: '详细地址', align:"center", dataIndex: 'address' }, @@ -77,7 +82,12 @@ export const formSchema: FormSchema[] = [ }, }, { - label: '地址', + label: '所在集宿区', + field: 'area', + component: 'Input', + }, + { + label: '详细地址', field: 'address', component: 'Input', }, diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/communityController/ConfigController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/communityController/ConfigController.java index 626ee09..c6a1e31 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/communityController/ConfigController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/communityController/ConfigController.java @@ -64,4 +64,11 @@ public class ConfigController { return configService.queryCategoryGoodsList(pageBean); } + //查询集宿区列表 + @ApiOperation(value="系统配置-查询集宿区列表", notes="系统配置-查询集宿区列表") + @RequestMapping(value = "/queryDormitoryList", method = {RequestMethod.GET}) + public Result queryDormitoryList(PageBean pageBean){ + return configService.queryDormitoryList(pageBean); + } + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/communityController/UserInfoController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/communityController/UserInfoController.java index c1850ca..d34c810 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/communityController/UserInfoController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/communityController/UserInfoController.java @@ -6,8 +6,10 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.api.bean.PageBean; import org.jeecg.modules.api.service.*; +import org.jeecg.modules.bean.LoginReq; import org.jeecg.modules.communityActivityApply.entity.CommunityActivityApply; import org.jeecg.modules.communityScore.entity.CommunityScore; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -36,8 +38,8 @@ public class UserInfoController { //修改个人信息 @ApiOperation(value="我的资料-修改个人信息", notes="我的资料-修改个人信息") @RequestMapping(value = "/updateUser", method = {RequestMethod.POST}) - public Result updateUser(@RequestHeader("X-Access-Token") String token, String nickName,String phone,String headImage,String address){ - return userInfoService.updateUserInfo(token, nickName, phone, headImage, address); + public Result updateUser(@RequestHeader("X-Access-Token") String token, HanHaiMember member){ + return userInfoService.updateUserInfo(token, member); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ConfigService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ConfigService.java index 2f5301d..2d031fb 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ConfigService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ConfigService.java @@ -20,5 +20,7 @@ public interface ConfigService { public Result queryCategoryActivityList(PageBean pageBean); //查询商品分类列表 public Result queryCategoryGoodsList(PageBean pageBean); + //查询集宿区列表 + public Result queryDormitoryList(PageBean pageBean); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/UserInfoService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/UserInfoService.java index 702b793..70baed3 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/UserInfoService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/UserInfoService.java @@ -1,6 +1,8 @@ package org.jeecg.modules.api.service; import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.bean.LoginReq; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; public interface UserInfoService { @@ -8,5 +10,5 @@ public interface UserInfoService { Result queryUserInfo(String token); //修改个人信息 - Result updateUserInfo(String token,String nickName,String phone,String headImage,String address); + Result updateUserInfo(String token, HanHaiMember member); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ConfigServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ConfigServiceImpl.java index bab9c5a..765c19a 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ConfigServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ConfigServiceImpl.java @@ -14,6 +14,8 @@ import org.jeecg.modules.communityCategoryGoods.entity.CommunityCategoryGoods; import org.jeecg.modules.communityCategoryGoods.service.ICommunityCategoryGoodsService; import org.jeecg.modules.communityConfig.entity.CommunityConfig; import org.jeecg.modules.communityConfig.service.ICommunityConfigService; +import org.jeecg.modules.communityDormitory.entity.CommunityDormitory; +import org.jeecg.modules.communityDormitory.service.ICommunityDormitoryService; import org.jeecg.modules.communityQualifications.entity.CommunityQualifications; import org.jeecg.modules.communityQualifications.service.ICommunityQualificationsService; import org.springframework.stereotype.Service; @@ -40,6 +42,9 @@ public class ConfigServiceImpl implements ConfigService { //商品分类 @Resource private ICommunityCategoryGoodsService communityCategoryGoodsService; + //集宿区信息 + @Resource + private ICommunityDormitoryService communityDormitoryService; /******************************************************************************************************************/ //查询系统配置列表 @Override @@ -238,4 +243,39 @@ public class ConfigServiceImpl implements ConfigService { } } + //查询集宿区列表 + @Override + public Result queryDormitoryList(PageBean pageBean) { + log.info("开始查询集宿区信息列表"); + //返回信息 + String massege = ""; + //分页信息 + Page page = null; + //查询信息 + LambdaQueryChainWrapper query = null; + //返回信息 + Page pageList = null; + + try{ + //分页 + page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + query = communityDormitoryService + .lambdaQuery(); + + //组装查询条件 + //按照创建时间降序排列 + query.orderByDesc(CommunityDormitory::getCreateTime); + + //获取集宿区信息信息列表 + pageList = query.page(page); + + log.info("集宿区信息列表查询结束"); + return Result.OK("集宿区信息列表", pageList); + }catch (Exception e){ + log.error("集宿区信息列表查询失败"); + e.printStackTrace(); + return Result.error("集宿区信息列表查询失败"); + } + } + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/UserInfoServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/UserInfoServiceImpl.java index 8b7a506..4061c6f 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/UserInfoServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/UserInfoServiceImpl.java @@ -5,6 +5,7 @@ import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.api.service.UserInfoService; +import org.jeecg.modules.bean.LoginReq; import org.jeecg.modules.communityActivityCollection.entity.CommunityActivityCollection; import org.jeecg.modules.communityActivityCollection.service.ICommunityActivityCollectionService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; @@ -57,7 +58,7 @@ public class UserInfoServiceImpl implements UserInfoService { //修改个人信息 @Override - public Result updateUserInfo(String token,String nickName,String phone,String headImage,String address){ + public Result updateUserInfo(String token, HanHaiMember member){ log.info("开始修改个人信息"); //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); @@ -65,18 +66,18 @@ public class UserInfoServiceImpl implements UserInfoService { try{ //用户昵称不能为空 - if(StringUtils.isBlank(nickName)){ + if(StringUtils.isBlank(member.getNickName())){ log.error("用户昵称不能为空"); return Result.error("用户昵称不能为空"); } - if(StringUtils.isBlank(headImage)){ + if(StringUtils.isBlank(member.getNickName())){ log.error("头像不能为空"); return Result.error("头像不能为空"); } - if(StringUtils.isNotEmpty(phone)){ + if(StringUtils.isNotEmpty(member.getPhone())){ HanHaiMember one = hanHaiMemberService .lambdaQuery() - .eq(HanHaiMember::getPhone, phone) + .eq(HanHaiMember::getPhone, member.getPhone()) .ne(HanHaiMember::getId, hanHaiMember.getId()) .one(); if(null != one){ @@ -84,10 +85,12 @@ public class UserInfoServiceImpl implements UserInfoService { } } - hanHaiMember.setNickName(nickName); - hanHaiMember.setPhone(phone); - hanHaiMember.setHeadImage(headImage); - hanHaiMember.setAddress(address); + hanHaiMember.setNickName(member.getNickName()); + hanHaiMember.setPhone(member.getPhone()); + hanHaiMember.setHeadImage(member.getHeadImage()); + hanHaiMember.setName(member.getName()); + hanHaiMember.setArea(member.getArea()); + hanHaiMember.setAddress(member.getAddress()); boolean result = hanHaiMemberService.updateById(hanHaiMember); if(result){