springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
@@ -132,9 +132,8 @@ */ @ApiOperation(value = "办事指南_详情", response = ComActWorkGuideVO.class) @GetMapping("/detailworkguide") public R detailWorkGuide(@RequestParam("workGuideId") String workGuideId, @RequestParam("communityId") String communityId) { return jinhuiCommunityService.detailWorkGuide(workGuideId, communityId); public R detailWorkGuide(@RequestParam("workGuideId") String workGuideId) { return jinhuiCommunityService.detailWorkGuide(workGuideId, getCommunityId()+""); } /** springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiInterspaceTypeVO.java
New file @@ -0,0 +1,49 @@ package com.panzhihua.common.model.vos.jinhui; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.Date; @Data @Builder @AllArgsConstructor @NoArgsConstructor @ApiModel("金汇空间管理") public class JinhuiInterspaceTypeVO implements Serializable { private static final long serialVersionUID = -70884515430727555L; @ApiModelProperty(value = "主键") private String id; @ApiModelProperty(value = "空间名称") private String title; @ApiModelProperty(value = "空间分类") private String intendantName; @ApiModelProperty(value = "创建人id") private String userId; @ApiModelProperty(value = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date creationTime; @ApiModelProperty(value = "更新时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
@@ -5,10 +5,7 @@ import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO; import com.panzhihua.common.model.vos.jinhui.JinghuiMerchantEvaluateVO; import com.panzhihua.common.model.vos.jinhui.JinhuiCoinGeneralTableVO; import com.panzhihua.common.model.vos.jinhui.JinhuiGoldCoinRecordVO; import com.panzhihua.common.model.vos.jinhui.JinhuiInterspaceVO; import com.panzhihua.common.model.vos.jinhui.*; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -330,6 +327,7 @@ /** * 金汇空间预约模块编辑 * @param id * @return */ @PostMapping("/JinhuiInterspace/interspaceEditData") @@ -345,7 +343,54 @@ public R interspaceExpurgateData(@RequestParam("id") String id); /**************************************************************************************************** * * * 空间预约分类 * * ******************************************************************************************************/ /** * 空间预约分类分页查询 * @param * @return */ @GetMapping("/JinhuiInterspace/interspaceTypeGetList") public R interspaceTypeGetList(@RequestParam("pageNum") int pageNum, @RequestParam("pageSize") int pageSize); /** * 空间预约分类单个详情 * @param * @return */ @GetMapping("/JinhuiInterspace/interspaceTypeGetDetails") public R interspaceTypeGetDetails(@RequestParam("id") String id); /** * 空间预约分类新增 * @param * @return */ @PostMapping("/JinhuiInterspace/interspaceTypeAddData") public R interspaceTypeAddData(@RequestBody JinhuiInterspaceTypeVO item); /** * 空间预约分类编辑 * @param * @return */ @PostMapping("/JinhuiInterspace/interspaceTypeEditData") public R interspaceTypeEditData(@RequestBody JinhuiInterspaceTypeVO item); /** * 空间预约分类删除 * @param * @return */ @DeleteMapping("/JinhuiInterspace/interspaceTypeExpurgateData") public R interspaceTypeExpurgateData(@RequestParam("id") String id);
@@ -6,6 +6,7 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO; import com.panzhihua.common.model.vos.community.ComActWorkGuideVO; import com.panzhihua.common.model.vos.jinhui.JinhuiInterspaceTypeVO; import com.panzhihua.common.model.vos.jinhui.JinhuiInterspaceVO; import com.panzhihua.common.service.jinhui.JinhuiCommunityService; import io.swagger.annotations.Api; @@ -63,12 +64,11 @@ * @param workGuideId * @return 详情 */ @ApiOperation(value = "办事指南_新增", response = ComActWorkGuideVO.class) @ApiOperation(value = "办事指南_详情", response = ComActWorkGuideVO.class) @GetMapping("/detailworkguide") public R detailWorkGuide(@RequestParam("workGuideId") String workGuideId, @RequestParam("communityId") String communityId) public R detailWorkGuide(@RequestParam("workGuideId") String workGuideId) { return jinhuiCommunityService.detailWorkGuide(workGuideId,communityId); return jinhuiCommunityService.detailWorkGuide(workGuideId,getCommunityId()+""); } /** @@ -225,7 +225,6 @@ /** * 金汇空间预约模块编辑 * @param id * @return */ @ApiOperation(value = "金汇空间编辑") @@ -250,4 +249,76 @@ /**************************************************************************************************** * * * 空间预约分类 * * ******************************************************************************************************/ @ApiOperation(value = "金汇空间分类列表", response = JinhuiInterspaceTypeVO.class) @GetMapping("/interspaceTypeGetList") public R interspaceTypeGetList(@RequestParam("pageNum") int pageNum, @RequestParam("pageSize") int pageSize) { return jinhuiCommunityService.interspaceTypeGetList(pageNum,pageSize); } /** * 空间预约分类单个详情 * @param * @return */ @ApiOperation(value = "金汇空间分类详情", response = JinhuiInterspaceTypeVO.class) @GetMapping("/JinhuiInterspace/interspaceTypeGetDetails") public R interspaceTypeGetDetails(@RequestParam("id") String id) { return jinhuiCommunityService.interspaceTypeGetDetails(id); } /** * 空间预约分类新增 * @param * @return */ @ApiOperation(value = "金汇空间分类新增") @PostMapping("/JinhuiInterspace/interspaceTypeAddData") public R interspaceTypeAddData(@RequestBody JinhuiInterspaceTypeVO item) { item.setUserId(getUserId()+""); return jinhuiCommunityService.interspaceTypeAddData(item); } /** * 空间预约分类编辑 * @param * @return */ @ApiOperation(value = "金汇空间分类编辑") @PostMapping("/JinhuiInterspace/interspaceTypeEditData") public R interspaceTypeEditData(@RequestBody JinhuiInterspaceTypeVO item) { return jinhuiCommunityService.interspaceTypeEditData(item); } /** * 空间预约分类删除 * @param * @return */ @ApiOperation(value = "金汇空间分类删除") @DeleteMapping("/JinhuiInterspace/interspaceTypeExpurgateData") public R interspaceTypeExpurgateData(@RequestParam("id") String id) { return jinhuiCommunityService.interspaceTypeExpurgateData(id); } } springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiInterspaceApi.java
@@ -1,8 +1,10 @@ package com.panzhihua.service_jinhui_community.api; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.jinhui.JinhuiInterspaceTypeVO; import com.panzhihua.common.model.vos.jinhui.JinhuiInterspaceVO; import com.panzhihua.service_jinhui_community.service.JinhuiInterspaceService; import com.panzhihua.service_jinhui_community.service.JinhuiInterspaceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -19,6 +21,9 @@ @Resource private JinhuiInterspaceService jinhuiInterspaceService; @Resource private JinhuiInterspaceTypeService interspaceTypeService; /** * 金汇空间预约模块分页查询 @@ -80,5 +85,76 @@ } /*********************************************************************************************** * * * 空间预约分类 * * **************************************************************************************************/ /** * 空间预约分类分页查询 * @param * @return */ @GetMapping("/interspaceTypeGetList") public R interspaceTypeGetList(@RequestParam("pageNum") int pageNum, @RequestParam("pageSize") int pageSize) { return interspaceTypeService.getList(pageNum,pageSize); } /** * 空间预约分类单个详情 * @param * @return */ @GetMapping("/interspaceTypeGetDetails") public R interspaceTypeGetDetails(@RequestParam("id") String id) { return R.ok(interspaceTypeService.getDetails(id)); } /** * 空间预约分类新增 * @param * @return */ @PostMapping("/interspaceTypeAddData") public R interspaceTypeAddData(@RequestBody JinhuiInterspaceTypeVO item) { return interspaceTypeService.addData(item); } /** * 空间预约分类编辑 * @param * @return */ @PostMapping("/interspaceTypeEditData") public R interspaceTypeEditData(@RequestBody JinhuiInterspaceTypeVO item) { return interspaceTypeService.editData(item); } /** * 空间预约分类删除 * @param * @return */ @DeleteMapping("/interspaceTypeExpurgateData") public R interspaceTypeExpurgateData(@RequestParam("id") String id) { return interspaceTypeService.expurgateData(id); } } springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiWorkGuideApi.java
@@ -25,6 +25,7 @@ private JinhuiComActWorkGuideService workGuideService; @Resource private JinhuiComActWorkGuideClassifyService comActWorkGuideClassifyService; /** * 办事指南_新增 * springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiInterspaceTypeDao.java
@@ -3,8 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.vos.jinhui.JinhuiInterspaceVO; import com.panzhihua.service_jinhui_community.entity.JinhuiInterspace; import com.panzhihua.common.model.vos.jinhui.JinhuiInterspaceTypeVO; import com.panzhihua.service_jinhui_community.entity.JinhuiInterspaceType; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -17,7 +16,7 @@ * @param * @return */ IPage<JinhuiInterspaceType> getList(Page page, @Param("intendantType") String intendantType); IPage<JinhuiInterspaceType> getList(Page page); @@ -28,10 +27,10 @@ * @param * @return */ int addData(@Param("item") JinhuiInterspaceVO item); int addData(@Param("item") JinhuiInterspaceTypeVO item); int editData(@Param("item") JinhuiInterspaceVO item); int editData(@Param("item") JinhuiInterspaceTypeVO item); int expurgateData(@Param("id") String id); springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiInterspaceTypeService.java
New file @@ -0,0 +1,28 @@ package com.panzhihua.service_jinhui_community.service; import com.baomidou.mybatisplus.extension.service.IService; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.jinhui.JinhuiInterspaceTypeVO; import com.panzhihua.service_jinhui_community.entity.JinhuiInterspaceType; public interface JinhuiInterspaceTypeService extends IService<JinhuiInterspaceType> { /** * 分页查询 * @param * @return */ R getList(int pageNum,int pageSize); JinhuiInterspaceType getDetails(String id); /** * 新增 * @param * @return */ R addData(JinhuiInterspaceTypeVO item); R editData(JinhuiInterspaceTypeVO item); R expurgateData(String id); } springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiInterspaceTypeServiceImpl.java
New file @@ -0,0 +1,67 @@ package com.panzhihua.service_jinhui_community.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.jinhui.JinhuiInterspaceTypeVO; import com.panzhihua.common.model.vos.jinhui.JinhuiInterspaceVO; import com.panzhihua.service_jinhui_community.dao.JinhuiInterspaceDao; import com.panzhihua.service_jinhui_community.dao.JinhuiInterspaceTypeDao; import com.panzhihua.service_jinhui_community.entity.JinhuiInterspace; import com.panzhihua.service_jinhui_community.entity.JinhuiInterspaceType; import com.panzhihua.service_jinhui_community.service.JinhuiInterspaceService; import com.panzhihua.service_jinhui_community.service.JinhuiInterspaceTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @Slf4j @Service public class JinhuiInterspaceTypeServiceImpl extends ServiceImpl<JinhuiInterspaceTypeDao, JinhuiInterspaceType> implements JinhuiInterspaceTypeService { @Override public R getList(int pageNum,int pageSize) { Page page = new Page<JinhuiInterspace>(pageNum,pageSize); return R.ok(baseMapper.getList(page)); } @Override public JinhuiInterspaceType getDetails(String id) { return baseMapper.getDetails(id); } @Override public R addData(JinhuiInterspaceTypeVO item) { int num= baseMapper.addData(item); if(num>0) { return R.ok(); } return R.fail("添加失败"); } @Override public R editData(JinhuiInterspaceTypeVO item) { int num= baseMapper.editData(item); if(num>0) { return R.ok(); } return R.fail("添加失败"); } @Override public R expurgateData(String id) { int num= baseMapper.expurgateData(id); if(num>0) { return R.ok(); } return R.fail("添加失败"); } }
