From 71dbcab3fb934a69c335853b48d3653ed7af90f9 Mon Sep 17 00:00:00 2001 From: lzx_mac <2602107437@qq.com> Date: Wed, 4 Dec 2024 20:15:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=B0=E5=AE=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...g_jeecgframework_boot_applet_rice_api_3_2_0.xml | 13 - admin-pc/.env.development | 2 +- admin-pc/.env.production | 2 +- .../java/org/jeecg/config/shiro/ShiroConfig.java | 13 +- .../java/org/jeecg/api/bean/HousePageList.java | 21 + .../jeecg/api/controller/ApiIndexController.java | 123 +++++ .../org/jeecg/api/service/ApiIndexService.java | 50 +++ .../api/service/impl/ApiIndexServiceImpl.java | 162 +++++++ .../controller/CommonHomeController.java | 171 +++++++ .../modules/commonHome/entity/CommonHome.java | 228 ++++++++++ .../commonHome/mapper/CommonHomeMapper.java | 17 + .../commonHome/mapper/xml/CommonHomeMapper.xml | 5 + .../commonHome/service/ICommonHomeService.java | 14 + .../service/impl/CommonHomeServiceImpl.java | 19 + .../modules/commonHome/vue/CommonHomeList.vue | 462 +++++++++++++++++++ .../commonHome/vue/modules/CommonHomeForm.vue | 319 +++++++++++++ .../vue/modules/CommonHomeModal.Style#Drawer.vue | 84 ++++ .../commonHome/vue/modules/CommonHomeModal.vue | 60 +++ .../modules/commonHome/vue3/CommonHome.api.ts | 61 +++ .../modules/commonHome/vue3/CommonHome.data.ts | 498 +++++++++++++++++++++ .../modules/commonHome/vue3/CommonHomeList.vue | 162 +++++++ .../commonHome/vue3/components/CommonHomeModal.vue | 58 +++ .../controller/CommonNewsController.java | 2 +- .../modules/commonNews/entity/CommonNews.java | 23 +- .../commonNews/mapper/CommonNewsMapper.java | 2 +- .../commonNews/service/ICommonNewsService.java | 2 +- .../service/impl/CommonNewsServiceImpl.java | 2 +- .../modules/commonNews/vue/CommonNewsList.vue | 32 ++ .../commonNews/vue/modules/CommonNewsForm.vue | 25 ++ .../modules/commonNews/vue3/CommonNews.data.ts | 56 +++ module-system/module-system.iml | 3 +- module-system/pom.xml | 9 +- 32 files changed, 2658 insertions(+), 42 deletions(-) delete mode 100644 .idea/libraries/Maven__org_jeecgframework_boot_applet_rice_api_3_2_0.xml create mode 100644 module-common/src/main/java/org/jeecg/api/bean/HousePageList.java create mode 100644 module-common/src/main/java/org/jeecg/api/controller/ApiIndexController.java create mode 100644 module-common/src/main/java/org/jeecg/api/service/ApiIndexService.java create mode 100644 module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonHome/controller/CommonHomeController.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonHome/entity/CommonHome.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonHome/mapper/CommonHomeMapper.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonHome/mapper/xml/CommonHomeMapper.xml create mode 100644 module-common/src/main/java/org/jeecg/modules/commonHome/service/ICommonHomeService.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonHome/service/impl/CommonHomeServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/commonHome/vue/CommonHomeList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonHome/vue/modules/CommonHomeForm.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonHome/vue/modules/CommonHomeModal.Style#Drawer.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonHome/vue/modules/CommonHomeModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonHome/vue3/CommonHome.api.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/commonHome/vue3/CommonHome.data.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/commonHome/vue3/CommonHomeList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/commonHome/vue3/components/CommonHomeModal.vue diff --git a/.idea/libraries/Maven__org_jeecgframework_boot_applet_rice_api_3_2_0.xml b/.idea/libraries/Maven__org_jeecgframework_boot_applet_rice_api_3_2_0.xml deleted file mode 100644 index 81a0fc9..0000000 --- a/.idea/libraries/Maven__org_jeecgframework_boot_applet_rice_api_3_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/admin-pc/.env.development b/admin-pc/.env.development index b1751fa..d3438ac 100644 --- a/admin-pc/.env.development +++ b/admin-pc/.env.development @@ -1,5 +1,5 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=https://houserent-admin.hhlm1688.com/houserent-admin/ +VUE_APP_API_BASE_URL=http://localhost:8001/houserent-admin/ VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview diff --git a/admin-pc/.env.production b/admin-pc/.env.production index 1a73620..07b8555 100644 --- a/admin-pc/.env.production +++ b/admin-pc/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_BASE_URL=https://houserent-admin.hhlm1688.com/houserent-admin/ +VUE_APP_API_BASE_URL=http://localhost:8001/houserent-admin/ VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/module-base/base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/module-base/base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 7503329..4ae5a50 100644 --- a/module-base/base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/module-base/base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -77,18 +77,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/info_common/**", "anon"); filterChainDefinitionMap.put("/applet_post/**", "anon"); filterChainDefinitionMap.put("/config_common/**", "anon"); - - - //三只青蛙 - filterChainDefinitionMap.put("/rice_vip/**", "anon"); - filterChainDefinitionMap.put("/rice_info/**", "anon"); - filterChainDefinitionMap.put("/rice_index/**", "anon"); - - - - - - + filterChainDefinitionMap.put("/common_index/**", "anon"); filterChainDefinitionMap.put("/sys/oss/file/upload", "anon"); //图片上传验证放开 diff --git a/module-common/src/main/java/org/jeecg/api/bean/HousePageList.java b/module-common/src/main/java/org/jeecg/api/bean/HousePageList.java new file mode 100644 index 0000000..d409f88 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/api/bean/HousePageList.java @@ -0,0 +1,21 @@ +package org.jeecg.api.bean; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class HousePageList { + + private String classId; + /**显示条数*/ + @ApiModelProperty(value = "显示条数" ) + private Integer pageSize; + /**当前页*/ + @ApiModelProperty(value = "当前页" ) + private Integer pageNo; + + public HousePageList() { + this.pageNo = 1; + this.pageSize = 1000; + } +} diff --git a/module-common/src/main/java/org/jeecg/api/controller/ApiIndexController.java b/module-common/src/main/java/org/jeecg/api/controller/ApiIndexController.java new file mode 100644 index 0000000..b8fb62e --- /dev/null +++ b/module-common/src/main/java/org/jeecg/api/controller/ApiIndexController.java @@ -0,0 +1,123 @@ +package org.jeecg.api.controller; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.api.bean.HousePageList; +import org.jeecg.api.service.ApiIndexService; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.commonHome.entity.CommonHome; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="项目通用-首页相关") +@RestController +@RequestMapping("/common_index") +@Slf4j +public class ApiIndexController { + + + @Resource + private ApiIndexService apiIndexService; + + //获取通知公告 + @ApiOperation(value="获取通知公告", notes="获取通知公告") + @GetMapping(value = "/getNotice") + public Result getNotice() + { + return apiIndexService.getNotice(); + } + + + //获取租房分类类型 + @ApiOperation(value="获取租房分类类型", notes="获取租房分类类型") + @GetMapping(value = "/getHouseType") + public Result getHouseType() + { + return apiIndexService.getHouseType(); + } + + + //根据租房分类信息获取租房带分页列表信息 + @ApiOperation(value="根据租房分类信息获取租房带分页列表信息", notes="根据租房分类信息获取租房带分页列表信息") + @GetMapping(value = "/getHousePageList") + public Result getHousePageList(HousePageList bean) + { + return apiIndexService.getHousePageList(bean); + } + + + //根据租房详情id获取房源详情 + @ApiOperation(value="根据租房详情id获取房源详情", notes="根据租房详情id获取房源详情") + @GetMapping(value = "/getHouseDetail") + public Result getHouseDetail(String houseId) + { + return apiIndexService.getHouseDetail(houseId); + } + + + //查询我发布的房源列表带分页 + @ApiOperation(value="查询我发布的房源列表带分页", notes="查询我发布的房源列表带分页") + @GetMapping(value = "/getMyHousePageList") + public Result getMyHousePageList(@RequestHeader("X-Access-Token") String token,HousePageList bean) + { + return apiIndexService.getMyHousePageList(token,bean); + } + + //发布或编辑房源 + @ApiOperation(value="发布或编辑房源", notes="发布或编辑房源") + @GetMapping(value = "/saveOrUpdateHouse") + public Result saveOrUpdateHouse(@RequestHeader("X-Access-Token") String token, CommonHome home) + { + return apiIndexService.saveOrUpdateHouse(token,home); + } + + //经纪人账号密码登录 + @ApiOperation(value="经纪人账号密码登录", notes="经纪人账号密码登录") + @GetMapping(value = "/login") + public Result login(@RequestHeader("X-Access-Token") String token,String username,String password) + { + return apiIndexService.login(username,password); + } + + + //房东输入邀请码登录 + @ApiOperation(value="房东输入邀请码登录", notes="房东输入邀请码登录") + @GetMapping(value = "/loginByInviteCode") + public Result loginByInviteCode(@RequestHeader("X-Access-Token") String token,String inviteCode) + { + return apiIndexService.loginByInviteCode(inviteCode); + } + + //获取首页图标的接口 + @ApiOperation(value="获取首页图标的接口", notes="获取首页图标的接口") + @GetMapping(value = "/getIndexIcon") + public Result getIndexIcon() + { + return apiIndexService.getIndexIcon(); + } + + + //获取发现列表页面数据带分页 + @ApiOperation(value="获取发现列表页面数据带分页", notes="获取发现列表页面数据带分页") + @GetMapping(value = "/getFindPageList") + public Result getFindPageList(HousePageList bean) + { + return apiIndexService.getFindPageList(bean); + } + + + //获取发现列表详情 + @ApiOperation(value="获取发现列表详情", notes="获取发现列表详情") + @GetMapping(value = "/getFindDetail") + public Result getFindDetail(String houseId) + { + return apiIndexService.getFindDetail(houseId); + } +} diff --git a/module-common/src/main/java/org/jeecg/api/service/ApiIndexService.java b/module-common/src/main/java/org/jeecg/api/service/ApiIndexService.java new file mode 100644 index 0000000..e25ffd2 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/api/service/ApiIndexService.java @@ -0,0 +1,50 @@ +package org.jeecg.api.service; + +import org.jeecg.api.bean.HousePageList; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.commonHome.entity.CommonHome; +import org.springframework.web.bind.annotation.RequestHeader; + +public interface ApiIndexService { + + //获取通知公告 + Result getNotice(); + + + //获取租房分类类型 + Result getHouseType(); + + + //根据租房分类信息获取租房带分页列表信息 + Result getHousePageList(HousePageList bean); + + //根据标识获取租房详情 + Result getHouseDetail(String houseId); + + //查询我发布的房源列表带分页 + Result getMyHousePageList(String token,HousePageList bean); + + //发布或编辑房源 + Result saveOrUpdateHouse(String token, CommonHome home); + + + //经济人账号密码登录 + Result login(String username, String password); + + + //房东输入邀请码登录 + Result loginByInviteCode(String inviteCode); + + + //获取首页图标的接口 + Result getIndexIcon(); + + + //获取发现列表页面数据带分页 + Result getFindPageList(HousePageList bean); + + + //获取发现列表详情 + Result getFindDetail(String houseId); + +} diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java new file mode 100644 index 0000000..1415b2c --- /dev/null +++ b/module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java @@ -0,0 +1,162 @@ +package org.jeecg.api.service.impl; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.api.bean.HousePageList; +import org.jeecg.api.service.ApiIndexService; +import org.jeecg.api.untils.HttpConf; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.util.RedisUtil; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.commonClass.entity.CommonClass; +import org.jeecg.modules.commonClass.service.ICommonClassService; +import org.jeecg.modules.commonHome.entity.CommonHome; +import org.jeecg.modules.commonHome.service.ICommonHomeService; +import org.jeecg.modules.commonIconImage.entity.CommonIconImage; +import org.jeecg.modules.commonIconImage.service.ICommonIconImageService; +import org.jeecg.modules.commonNews.entity.CommonNews; +import org.jeecg.modules.commonNews.service.ICommonNewsService; +import org.jeecg.modules.commonNotice.entity.CommonNotice; +import org.jeecg.modules.commonNotice.service.ICommonNoticeService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Slf4j +@Service +public class ApiIndexServiceImpl implements ApiIndexService { + + @Resource + private IHanHaiMemberService memberService; + @Resource + private ICommonNoticeService noticeService; + @Resource + private ICommonClassService classService; + @Resource + private ICommonHomeService homeService; + //权限配置 + @Resource + private ShiroRealm shiroRealm; + @Resource + private ICommonIconImageService iconImageService; + @Resource + private ICommonNewsService newsService; + + @Resource + private RedisUtil redisUtil; + @Resource + private HttpConf httpConf; + + + //获取通知公告 + @Override + public Result getNotice(){ + CommonNotice commonNotice = noticeService.lambdaQuery() + .orderByDesc(CommonNotice::getCreateTime) + .list().get(0); + return Result.OK(commonNotice); + } + + + //获取租房分类类型 + @Override + public Result getHouseType(){ + List list = classService.lambdaQuery().list(); + return Result.OK(list); + } + + + //根据租房分类信息获取租房带分页列表信息 + @Override + public Result getHousePageList(HousePageList pageBean){ + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page page1 = homeService + .lambdaQuery() + .orderByDesc(CommonHome::getCreateTime) + .page(page); + return Result.OK(page1); + } + + + + @Override + public Result getHouseDetail(String houseId){ + CommonHome commonHome = homeService.getById(houseId); + return Result.OK(commonHome); + } + + + //查询我发布的房源列表带分页 + @Override + public Result getMyHousePageList(String token,HousePageList pageBean){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page page1 = homeService + .lambdaQuery() + .eq(CommonHome::getUserId,hanHaiMember.getId()) + .orderByDesc(CommonHome::getCreateTime) + .page(page); + return Result.OK(page1); + } + + + + + //发布或编辑房源 + @Override + public Result saveOrUpdateHouse(String token, CommonHome home){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + home.setUserId(hanHaiMember.getId()); + homeService.saveOrUpdate(home); + return Result.OK("发布成功"); + } + + + //经济人账号密码登录 + @Override + public Result login(String username, String password) { + return Result.OK("登录成功"); + } + + + //房东输入邀请码登录 + @Override + public Result loginByInviteCode(String inviteCode) { + return Result.OK("登录成功"); + } + + + + //获取首页图标的接口 + @Override + public Result getIndexIcon(){ + List list = iconImageService.lambdaQuery().list(); + return Result.OK(list); + } + + + + //获取发现列表页面数据带分页 + @Override + public Result getFindPageList(HousePageList pageBean){ + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page page1 = newsService + .lambdaQuery() + .orderByDesc(CommonNews::getCreateTime) + .page(page); + return Result.OK(page1); + } + + + + //获取发现列表详情 + @Override + public Result getFindDetail(String houseId){ + CommonNews byId = newsService.getById(houseId); + return Result.OK(byId); + } +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonHome/controller/CommonHomeController.java b/module-common/src/main/java/org/jeecg/modules/commonHome/controller/CommonHomeController.java new file mode 100644 index 0000000..54d0c12 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonHome/controller/CommonHomeController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.commonHome.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.commonHome.entity.CommonHome; +import org.jeecg.modules.commonHome.service.ICommonHomeService; + +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-12-03 + * @Version: V1.0 + */ +@Api(tags="房源信息表") +@RestController +@RequestMapping("/commonHome/commonHome") +@Slf4j +public class CommonHomeController extends JeecgController { + @Autowired + private ICommonHomeService commonHomeService; + + /** + * 分页列表查询 + * + * @param commonHome + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "房源信息表-分页列表查询") + @ApiOperation(value="房源信息表-分页列表查询", notes="房源信息表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CommonHome commonHome, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(commonHome, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = commonHomeService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param commonHome + * @return + */ + @AutoLog(value = "房源信息表-添加") + @ApiOperation(value="房源信息表-添加", notes="房源信息表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CommonHome commonHome) { + commonHomeService.save(commonHome); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param commonHome + * @return + */ + @AutoLog(value = "房源信息表-编辑") + @ApiOperation(value="房源信息表-编辑", notes="房源信息表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CommonHome commonHome) { + commonHomeService.updateById(commonHome); + 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) { + commonHomeService.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.commonHomeService.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) { + CommonHome commonHome = commonHomeService.getById(id); + if(commonHome==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(commonHome); + } + + /** + * 导出excel + * + * @param request + * @param commonHome + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CommonHome commonHome) { + return super.exportXls(request, commonHome, CommonHome.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, CommonHome.class); + } + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonHome/entity/CommonHome.java b/module-common/src/main/java/org/jeecg/modules/commonHome/entity/CommonHome.java new file mode 100644 index 0000000..8877b82 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonHome/entity/CommonHome.java @@ -0,0 +1,228 @@ +package org.jeecg.modules.commonHome.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-12-03 + * @Version: V1.0 + */ +@Data +@TableName("common_home") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="common_home对象", description="房源信息表") +public class CommonHome 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 image; + /**标题*/ + @Excel(name = "标题", width = 15) + @ApiModelProperty(value = "标题") + private java.lang.String title; + /**分类标识*/ + @Excel(name = "分类标识", width = 15, dictTable = "common_class", dicText = "title", dicCode = "id") + @Dict(dictTable = "common_class", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "分类标识") + private java.lang.String classId; + /**左上角图标*/ + @Excel(name = "左上角图标", width = 15) + @ApiModelProperty(value = "左上角图标") + private java.lang.String iconImage; + /**标签*/ + @Excel(name = "标签", width = 15) + @ApiModelProperty(value = "标签") + private java.lang.String iconTitle; + /**价格*/ + @Excel(name = "价格", width = 15) + @ApiModelProperty(value = "价格") + private java.math.BigDecimal price; + /**单位*/ + @Excel(name = "单位", width = 15) + @ApiModelProperty(value = "单位") + private java.lang.String unit; + /**地址*/ + @Excel(name = "地址", width = 15) + @ApiModelProperty(value = "地址") + private java.lang.String address; + /**浏览量*/ + @Excel(name = "浏览量", width = 15) + @ApiModelProperty(value = "浏览量") + private java.lang.Integer num; + /**年限*/ + @Excel(name = "年限", width = 15) + @ApiModelProperty(value = "年限") + private java.lang.Integer timeGo; + /**热点名称*/ + @Excel(name = "热点名称", width = 15) + @ApiModelProperty(value = "热点名称") + private java.lang.String iconName; + /**所属分类*/ + @Excel(name = "所属分类", width = 15, dictTable = "common_icon_image", dicText = "title", dicCode = "id") + @Dict(dictTable = "common_icon_image", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "所属分类") + private java.lang.String commonClass; + /**视频*/ + @Excel(name = "视频", width = 15) + @ApiModelProperty(value = "视频") + private java.lang.String homeMp4; + /**户型*/ + @Excel(name = "户型", width = 15) + @ApiModelProperty(value = "户型") + private java.lang.String homeType; + /**面积*/ + @Excel(name = "面积", width = 15) + @ApiModelProperty(value = "面积") + private java.lang.String homeMi; + /**房屋结构*/ + @Excel(name = "房屋结构", width = 15) + @ApiModelProperty(value = "房屋结构") + private java.lang.String homeJg; + /**房屋编号*/ + @Excel(name = "房屋编号", width = 15) + @ApiModelProperty(value = "房屋编号") + private java.lang.String homeNo; + /**房屋周边*/ + @Excel(name = "房屋周边", width = 15) + @ApiModelProperty(value = "房屋周边") + private java.lang.String homeBian; + /**房间数量*/ + @Excel(name = "房间数量", width = 15) + @ApiModelProperty(value = "房间数量") + private java.lang.String homeNum; + /**菜地*/ + @Excel(name = "菜地", width = 15) + @ApiModelProperty(value = "菜地") + private java.lang.String homeCai; + /**距离场镇距离*/ + @Excel(name = "距离场镇距离", width = 15) + @ApiModelProperty(value = "距离场镇距离") + private java.lang.String homeJl; + /**距离成都西三环*/ + @Excel(name = "距离成都西三环", width = 15) + @ApiModelProperty(value = "距离成都西三环") + private java.lang.String homeShjl; + /**房屋主体是否改造*/ + @Excel(name = "房屋主体是否改造", width = 15) + @ApiModelProperty(value = "房屋主体是否改造") + private java.lang.String homeGz; + /**房屋面积*/ + @Excel(name = "房屋面积", width = 15) + @ApiModelProperty(value = "房屋面积") + private java.lang.String homeMj; + /**院子总面积*/ + @Excel(name = "院子总面积", width = 15) + @ApiModelProperty(value = "院子总面积") + private java.lang.String homeYzmj; + /**房屋朝向及海拔*/ + @Excel(name = "房屋朝向及海拔", width = 15) + @ApiModelProperty(value = "房屋朝向及海拔") + private java.lang.String homeHb; + /**是否经过安置*/ + @Excel(name = "是否经过安置", width = 15) + @ApiModelProperty(value = "是否经过安置") + private java.lang.String homeAz; + /**交通*/ + @Excel(name = "交通", width = 15) + @ApiModelProperty(value = "交通") + private java.lang.String homeJt; + /**坟包及电塔 工厂噪音*/ + @Excel(name = "坟包及电塔 工厂噪音", width = 15) + @ApiModelProperty(value = "坟包及电塔 工厂噪音") + private java.lang.String homeZy; + /**水电气网*/ + @Excel(name = "水电气网", width = 15) + @ApiModelProperty(value = "水电气网") + private java.lang.String homeSd; + /**停车*/ + @Excel(name = "停车", width = 15) + @ApiModelProperty(value = "停车") + private java.lang.String homeCat; + /**付款方式及押金*/ + @Excel(name = "付款方式及押金", width = 15) + @ApiModelProperty(value = "付款方式及押金") + private java.lang.String homePay; + /**租期*/ + @Excel(name = "租期", width = 15) + @ApiModelProperty(value = "租期") + private java.lang.String homeTime; + /**非正常死亡*/ + @Excel(name = "非正常死亡", width = 15) + @ApiModelProperty(value = "非正常死亡") + private java.lang.String homeSw; + /**邻居对房东评价*/ + @Excel(name = "邻居对房东评价", width = 15) + @ApiModelProperty(value = "邻居对房东评价") + private java.lang.String homePj; + /**佣金*/ + @Excel(name = "佣金", width = 15) + @ApiModelProperty(value = "佣金") + private java.math.BigDecimal homeMoney; + /**钥匙*/ + @Excel(name = "钥匙", width = 15) + @ApiModelProperty(value = "钥匙") + private java.lang.Integer homeYs; + /**户主家庭职业*/ + @Excel(name = "户主家庭职业", width = 15) + @ApiModelProperty(value = "户主家庭职业") + private java.lang.String homeJtzy; + /**报建手续*/ + @Excel(name = "报建手续", width = 15) + @ApiModelProperty(value = "报建手续") + private java.lang.String homeBjsx; + /**府市民云房屋信息档案查询*/ + @Excel(name = "府市民云房屋信息档案查询", width = 15) + @ApiModelProperty(value = "府市民云房屋信息档案查询") + private java.lang.String homeTf; + /**户主年龄*/ + @Excel(name = "户主年龄", width = 15) + @ApiModelProperty(value = "户主年龄") + private java.lang.String homeAge; + /**产权证照片*/ + @Excel(name = "产权证照片", width = 15) + @ApiModelProperty(value = "产权证照片") + private java.lang.String homeImage; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private java.lang.String homeBz; + /**用户*/ + @Excel(name = "用户", width = 15) + @ApiModelProperty(value = "用户") + private java.lang.String userId; +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonHome/mapper/CommonHomeMapper.java b/module-common/src/main/java/org/jeecg/modules/commonHome/mapper/CommonHomeMapper.java new file mode 100644 index 0000000..048702d --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonHome/mapper/CommonHomeMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.commonHome.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.commonHome.entity.CommonHome; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 房源信息表 + * @Author: jeecg-boot + * @Date: 2024-12-03 + * @Version: V1.0 + */ +public interface CommonHomeMapper extends BaseMapper { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonHome/mapper/xml/CommonHomeMapper.xml b/module-common/src/main/java/org/jeecg/modules/commonHome/mapper/xml/CommonHomeMapper.xml new file mode 100644 index 0000000..9311529 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonHome/mapper/xml/CommonHomeMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonHome/service/ICommonHomeService.java b/module-common/src/main/java/org/jeecg/modules/commonHome/service/ICommonHomeService.java new file mode 100644 index 0000000..ecc5201 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonHome/service/ICommonHomeService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.commonHome.service; + +import org.jeecg.modules.commonHome.entity.CommonHome; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 房源信息表 + * @Author: jeecg-boot + * @Date: 2024-12-03 + * @Version: V1.0 + */ +public interface ICommonHomeService extends IService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonHome/service/impl/CommonHomeServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonHome/service/impl/CommonHomeServiceImpl.java new file mode 100644 index 0000000..1c8685f --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonHome/service/impl/CommonHomeServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.commonHome.service.impl; + +import org.jeecg.modules.commonHome.entity.CommonHome; +import org.jeecg.modules.commonHome.mapper.CommonHomeMapper; +import org.jeecg.modules.commonHome.service.ICommonHomeService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 房源信息表 + * @Author: jeecg-boot + * @Date: 2024-12-03 + * @Version: V1.0 + */ +@Service +public class CommonHomeServiceImpl extends ServiceImpl implements ICommonHomeService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/commonHome/vue/CommonHomeList.vue b/module-common/src/main/java/org/jeecg/modules/commonHome/vue/CommonHomeList.vue new file mode 100644 index 0000000..f438f3d --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonHome/vue/CommonHomeList.vue @@ -0,0 +1,462 @@ + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonHome/vue/modules/CommonHomeForm.vue b/module-common/src/main/java/org/jeecg/modules/commonHome/vue/modules/CommonHomeForm.vue new file mode 100644 index 0000000..f189b90 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonHome/vue/modules/CommonHomeForm.vue @@ -0,0 +1,319 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonHome/vue/modules/CommonHomeModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/commonHome/vue/modules/CommonHomeModal.Style#Drawer.vue new file mode 100644 index 0000000..57b05de --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonHome/vue/modules/CommonHomeModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonHome/vue/modules/CommonHomeModal.vue b/module-common/src/main/java/org/jeecg/modules/commonHome/vue/modules/CommonHomeModal.vue new file mode 100644 index 0000000..b6b6bed --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonHome/vue/modules/CommonHomeModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonHome/vue3/CommonHome.api.ts b/module-common/src/main/java/org/jeecg/modules/commonHome/vue3/CommonHome.api.ts new file mode 100644 index 0000000..2b81ba9 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonHome/vue3/CommonHome.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/commonHome/commonHome/list', + save='/commonHome/commonHome/add', + edit='/commonHome/commonHome/edit', + deleteOne = '/commonHome/commonHome/delete', + deleteBatch = '/commonHome/commonHome/deleteBatch', + importExcel = '/commonHome/commonHome/importExcel', + exportXls = '/commonHome/commonHome/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/module-common/src/main/java/org/jeecg/modules/commonHome/vue3/CommonHome.data.ts b/module-common/src/main/java/org/jeecg/modules/commonHome/vue3/CommonHome.data.ts new file mode 100644 index 0000000..6c8b70d --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonHome/vue3/CommonHome.data.ts @@ -0,0 +1,498 @@ +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", + sorter: true, + dataIndex: 'createTime' + }, + { + title: '图片', + align:"center", + dataIndex: 'image', + customRender:render.renderAvatar, + }, + { + title: '标题', + align:"center", + dataIndex: 'title' + }, + { + title: '分类标识', + align:"center", + dataIndex: 'classId_dictText' + }, + { + title: '左上角图标', + align:"center", + dataIndex: 'iconImage', + customRender:render.renderAvatar, + }, + { + title: '标签', + align:"center", + dataIndex: 'iconTitle' + }, + { + title: '价格', + align:"center", + dataIndex: 'price' + }, + { + title: '单位', + align:"center", + dataIndex: 'unit' + }, + { + title: '地址', + align:"center", + dataIndex: 'address' + }, + { + title: '浏览量', + align:"center", + dataIndex: 'num' + }, + { + title: '年限', + align:"center", + dataIndex: 'timeGo' + }, + { + title: '热点名称', + align:"center", + dataIndex: 'iconName' + }, + { + title: '所属分类', + align:"center", + dataIndex: 'commonClass_dictText' + }, + { + title: '视频', + align:"center", + dataIndex: 'homeMp4', + slots: { customRender: 'fileSlot' }, + }, + { + title: '户型', + align:"center", + dataIndex: 'homeType' + }, + { + title: '面积', + align:"center", + dataIndex: 'homeMi' + }, + { + title: '房屋结构', + align:"center", + dataIndex: 'homeJg' + }, + { + title: '房屋编号', + align:"center", + dataIndex: 'homeNo' + }, + { + title: '房屋周边', + align:"center", + dataIndex: 'homeBian' + }, + { + title: '房间数量', + align:"center", + dataIndex: 'homeNum' + }, + { + title: '菜地', + align:"center", + dataIndex: 'homeCai' + }, + { + title: '距离场镇距离', + align:"center", + dataIndex: 'homeJl' + }, + { + title: '距离成都西三环', + align:"center", + dataIndex: 'homeShjl' + }, + { + title: '房屋主体是否改造', + align:"center", + dataIndex: 'homeGz' + }, + { + title: '房屋面积', + align:"center", + dataIndex: 'homeMj' + }, + { + title: '院子总面积', + align:"center", + dataIndex: 'homeYzmj' + }, + { + title: '房屋朝向及海拔', + align:"center", + dataIndex: 'homeHb' + }, + { + title: '是否经过安置', + align:"center", + dataIndex: 'homeAz' + }, + { + title: '交通', + align:"center", + dataIndex: 'homeJt' + }, + { + title: '坟包及电塔 工厂噪音', + align:"center", + dataIndex: 'homeZy' + }, + { + title: '水电气网', + align:"center", + dataIndex: 'homeSd' + }, + { + title: '停车', + align:"center", + dataIndex: 'homeCat' + }, + { + title: '付款方式及押金', + align:"center", + dataIndex: 'homePay' + }, + { + title: '租期', + align:"center", + dataIndex: 'homeTime' + }, + { + title: '非正常死亡', + align:"center", + dataIndex: 'homeSw' + }, + { + title: '邻居对房东评价', + align:"center", + dataIndex: 'homePj' + }, + { + title: '佣金', + align:"center", + dataIndex: 'homeMoney' + }, + { + title: '钥匙', + align:"center", + dataIndex: 'homeYs' + }, + { + title: '户主家庭职业', + align:"center", + dataIndex: 'homeJtzy' + }, + { + title: '报建手续', + align:"center", + dataIndex: 'homeBjsx' + }, + { + title: '府市民云房屋信息档案查询', + align:"center", + dataIndex: 'homeTf', + customRender:render.renderAvatar, + }, + { + title: '户主年龄', + align:"center", + dataIndex: 'homeAge' + }, + { + title: '产权证照片', + align:"center", + dataIndex: 'homeImage', + customRender:render.renderAvatar, + }, + { + title: '备注', + align:"center", + dataIndex: 'homeBz' + }, + { + title: '用户', + align:"center", + dataIndex: 'userId' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ + { + label: "分类标识", + field: "classId", + component: 'JSearchSelect', + componentProps:{ + dict:"common_class,title,id" + }, + colProps: {span: 6}, + }, + { + label: "所属分类", + field: "commonClass", + component: 'JSearchSelect', + componentProps:{ + dict:"common_icon_image,title,id" + }, + colProps: {span: 6}, + }, +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '图片', + field: 'image', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '标题', + field: 'title', + component: 'Input', + }, + { + label: '分类标识', + field: 'classId', + component: 'JSearchSelect', + componentProps:{ + dict:"common_class,title,id" + }, + }, + { + label: '左上角图标', + field: 'iconImage', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '标签', + field: 'iconTitle', + component: 'Input', + }, + { + label: '价格', + field: 'price', + component: 'InputNumber', + }, + { + label: '单位', + field: 'unit', + component: 'Input', + }, + { + label: '地址', + field: 'address', + component: 'Input', + }, + { + label: '浏览量', + field: 'num', + component: 'InputNumber', + }, + { + label: '年限', + field: 'timeGo', + component: 'InputNumber', + }, + { + label: '热点名称', + field: 'iconName', + component: 'Input', + }, + { + label: '所属分类', + field: 'commonClass', + component: 'JSearchSelect', + componentProps:{ + dict:"common_icon_image,title,id" + }, + }, + { + label: '视频', + field: 'homeMp4', + component: 'JUpload', + componentProps:{ + }, + }, + { + label: '户型', + field: 'homeType', + component: 'Input', + }, + { + label: '面积', + field: 'homeMi', + component: 'Input', + }, + { + label: '房屋结构', + field: 'homeJg', + component: 'Input', + }, + { + label: '房屋编号', + field: 'homeNo', + component: 'Input', + }, + { + label: '房屋周边', + field: 'homeBian', + component: 'Input', + }, + { + label: '房间数量', + field: 'homeNum', + component: 'Input', + }, + { + label: '菜地', + field: 'homeCai', + component: 'Input', + }, + { + label: '距离场镇距离', + field: 'homeJl', + component: 'Input', + }, + { + label: '距离成都西三环', + field: 'homeShjl', + component: 'Input', + }, + { + label: '房屋主体是否改造', + field: 'homeGz', + component: 'Input', + }, + { + label: '房屋面积', + field: 'homeMj', + component: 'Input', + }, + { + label: '院子总面积', + field: 'homeYzmj', + component: 'Input', + }, + { + label: '房屋朝向及海拔', + field: 'homeHb', + component: 'Input', + }, + { + label: '是否经过安置', + field: 'homeAz', + component: 'Input', + }, + { + label: '交通', + field: 'homeJt', + component: 'Input', + }, + { + label: '坟包及电塔 工厂噪音', + field: 'homeZy', + component: 'Input', + }, + { + label: '水电气网', + field: 'homeSd', + component: 'Input', + }, + { + label: '停车', + field: 'homeCat', + component: 'Input', + }, + { + label: '付款方式及押金', + field: 'homePay', + component: 'Input', + }, + { + label: '租期', + field: 'homeTime', + component: 'Input', + }, + { + label: '非正常死亡', + field: 'homeSw', + component: 'Input', + }, + { + label: '邻居对房东评价', + field: 'homePj', + component: 'Input', + }, + { + label: '佣金', + field: 'homeMoney', + component: 'InputNumber', + }, + { + label: '钥匙', + field: 'homeYs', + component: 'InputNumber', + }, + { + label: '户主家庭职业', + field: 'homeJtzy', + component: 'Input', + }, + { + label: '报建手续', + field: 'homeBjsx', + component: 'Input', + }, + { + label: '府市民云房屋信息档案查询', + field: 'homeTf', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '户主年龄', + field: 'homeAge', + component: 'Input', + }, + { + label: '产权证照片', + field: 'homeImage', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '备注', + field: 'homeBz', + component: 'Input', + }, + { + label: '用户', + field: 'userId', + component: 'Input', + }, +]; diff --git a/module-common/src/main/java/org/jeecg/modules/commonHome/vue3/CommonHomeList.vue b/module-common/src/main/java/org/jeecg/modules/commonHome/vue3/CommonHomeList.vue new file mode 100644 index 0000000..99ca152 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonHome/vue3/CommonHomeList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonHome/vue3/components/CommonHomeModal.vue b/module-common/src/main/java/org/jeecg/modules/commonHome/vue3/components/CommonHomeModal.vue new file mode 100644 index 0000000..e32a24c --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonHome/vue3/components/CommonHomeModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonNews/controller/CommonNewsController.java b/module-common/src/main/java/org/jeecg/modules/commonNews/controller/CommonNewsController.java index fd51dd3..e0316ad 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonNews/controller/CommonNewsController.java +++ b/module-common/src/main/java/org/jeecg/modules/commonNews/controller/CommonNewsController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 新闻动态表 * @Author: jeecg-boot - * @Date: 2024-11-24 + * @Date: 2024-12-03 * @Version: V1.0 */ @Api(tags="新闻动态表") diff --git a/module-common/src/main/java/org/jeecg/modules/commonNews/entity/CommonNews.java b/module-common/src/main/java/org/jeecg/modules/commonNews/entity/CommonNews.java index d36ab7d..33028c5 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonNews/entity/CommonNews.java +++ b/module-common/src/main/java/org/jeecg/modules/commonNews/entity/CommonNews.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 新闻动态表 * @Author: jeecg-boot - * @Date: 2024-11-24 + * @Date: 2024-12-03 * @Version: V1.0 */ @Data @@ -59,4 +59,25 @@ public class CommonNews implements Serializable { @Excel(name = "星闻内容", width = 15) @ApiModelProperty(value = "星闻内容") private java.lang.String details; + /**价格*/ + @Excel(name = "价格", width = 15) + @ApiModelProperty(value = "价格") + private java.math.BigDecimal price; + /**地址*/ + @Excel(name = "地址", width = 15) + @ApiModelProperty(value = "地址") + private java.lang.String address; + /**说明*/ + @Excel(name = "说明", width = 15) + @ApiModelProperty(value = "说明") + private java.lang.String titleSub; + /**视频*/ + @Excel(name = "视频", width = 15) + @ApiModelProperty(value = "视频") + private java.lang.String iconMp; + /**发布人*/ + @Excel(name = "发布人", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @ApiModelProperty(value = "发布人") + private java.lang.String userId; } diff --git a/module-common/src/main/java/org/jeecg/modules/commonNews/mapper/CommonNewsMapper.java b/module-common/src/main/java/org/jeecg/modules/commonNews/mapper/CommonNewsMapper.java index 5c65d5f..f5ede1b 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonNews/mapper/CommonNewsMapper.java +++ b/module-common/src/main/java/org/jeecg/modules/commonNews/mapper/CommonNewsMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 新闻动态表 * @Author: jeecg-boot - * @Date: 2024-11-24 + * @Date: 2024-12-03 * @Version: V1.0 */ public interface CommonNewsMapper extends BaseMapper { diff --git a/module-common/src/main/java/org/jeecg/modules/commonNews/service/ICommonNewsService.java b/module-common/src/main/java/org/jeecg/modules/commonNews/service/ICommonNewsService.java index 90d513d..7388037 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonNews/service/ICommonNewsService.java +++ b/module-common/src/main/java/org/jeecg/modules/commonNews/service/ICommonNewsService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 新闻动态表 * @Author: jeecg-boot - * @Date: 2024-11-24 + * @Date: 2024-12-03 * @Version: V1.0 */ public interface ICommonNewsService extends IService { diff --git a/module-common/src/main/java/org/jeecg/modules/commonNews/service/impl/CommonNewsServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonNews/service/impl/CommonNewsServiceImpl.java index 627e71e..e67926f 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonNews/service/impl/CommonNewsServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/modules/commonNews/service/impl/CommonNewsServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 新闻动态表 * @Author: jeecg-boot - * @Date: 2024-11-24 + * @Date: 2024-12-03 * @Version: V1.0 */ @Service diff --git a/module-common/src/main/java/org/jeecg/modules/commonNews/vue/CommonNewsList.vue b/module-common/src/main/java/org/jeecg/modules/commonNews/vue/CommonNewsList.vue index 8e00a39..664ab9a 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonNews/vue/CommonNewsList.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonNews/vue/CommonNewsList.vue @@ -99,6 +99,7 @@ import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import CommonNewsModal from './modules/CommonNewsModal' + import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' export default { name: 'CommonNewsList', @@ -144,6 +145,32 @@ dataIndex: 'details', scopedSlots: {customRender: 'htmlSlot'} }, + { + title:'价格', + align:"center", + dataIndex: 'price' + }, + { + title:'地址', + align:"center", + dataIndex: 'address' + }, + { + title:'说明', + align:"center", + dataIndex: 'titleSub' + }, + { + title:'视频', + align:"center", + dataIndex: 'iconMp', + scopedSlots: {customRender: 'fileSlot'} + }, + { + title:'发布人', + align:"center", + dataIndex: 'userId_dictText' + }, { title: '操作', dataIndex: 'action', @@ -182,6 +209,11 @@ fieldList.push({type:'string',value:'title',text:'标题',dictCode:''}) fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''}) fieldList.push({type:'Text',value:'details',text:'星闻内容',dictCode:''}) + fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''}) + fieldList.push({type:'string',value:'address',text:'地址',dictCode:''}) + fieldList.push({type:'string',value:'titleSub',text:'说明',dictCode:''}) + fieldList.push({type:'Text',value:'iconMp',text:'视频',dictCode:''}) + fieldList.push({type:'sel_search',value:'userId',text:'发布人',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'}) this.superFieldList = fieldList } } diff --git a/module-common/src/main/java/org/jeecg/modules/commonNews/vue/modules/CommonNewsForm.vue b/module-common/src/main/java/org/jeecg/modules/commonNews/vue/modules/CommonNewsForm.vue index d380e50..9343ca4 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonNews/vue/modules/CommonNewsForm.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonNews/vue/modules/CommonNewsForm.vue @@ -18,6 +18,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/module-common/src/main/java/org/jeecg/modules/commonNews/vue3/CommonNews.data.ts b/module-common/src/main/java/org/jeecg/modules/commonNews/vue3/CommonNews.data.ts index f1322c3..904abe1 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonNews/vue3/CommonNews.data.ts +++ b/module-common/src/main/java/org/jeecg/modules/commonNews/vue3/CommonNews.data.ts @@ -27,6 +27,32 @@ export const columns: BasicColumn[] = [ dataIndex: 'details', slots: { customRender: 'htmlSlot' }, }, + { + title: '价格', + align:"center", + dataIndex: 'price' + }, + { + title: '地址', + align:"center", + dataIndex: 'address' + }, + { + title: '说明', + align:"center", + dataIndex: 'titleSub' + }, + { + title: '视频', + align:"center", + dataIndex: 'iconMp', + slots: { customRender: 'fileSlot' }, + }, + { + title: '发布人', + align:"center", + dataIndex: 'userId_dictText' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -50,4 +76,34 @@ export const formSchema: FormSchema[] = [ field: 'details', component: 'JCodeEditor', //TODO String后缀暂未添加 }, + { + label: '价格', + field: 'price', + component: 'InputNumber', + }, + { + label: '地址', + field: 'address', + component: 'Input', + }, + { + label: '说明', + field: 'titleSub', + component: 'Input', + }, + { + label: '视频', + field: 'iconMp', + component: 'JUpload', + componentProps:{ + }, + }, + { + label: '发布人', + field: 'userId', + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + }, ]; diff --git a/module-system/module-system.iml b/module-system/module-system.iml index b842340..56c2de4 100644 --- a/module-system/module-system.iml +++ b/module-system/module-system.iml @@ -294,11 +294,10 @@ - + - diff --git a/module-system/pom.xml b/module-system/pom.xml index 2a64c1f..67230c2 100644 --- a/module-system/pom.xml +++ b/module-system/pom.xml @@ -73,14 +73,7 @@ 3.2.0 compile - - - - - org.jeecgframework.boot - applet-rice-api - ${jeecgboot.version} - +