From 184bb563d9f6cca39737604a544f73bffdc9bf4c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期六, 14 十月 2023 22:02:30 +0800
Subject: [PATCH] 便民服务 商家评价 金汇地图
---
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiComActWorkGuide.java | 3
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java | 3
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiComActWorkGuideDAO.java | 6 +
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActWorkGuideMapper.xml | 3
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideDetailAppletsVO.java | 3
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java | 179 ++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 196 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideDetailAppletsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideDetailAppletsVO.java
index 66d46f2..ecfe4a7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideDetailAppletsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideDetailAppletsVO.java
@@ -44,5 +44,8 @@
@ApiModelProperty("纬度")
private String lat;
+ @ApiModelProperty(value = "组件json数据")
+ private String jsonObject;
+
private List<ComActWorkGuideMaterialVO> materials = Lists.newArrayList();
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java
index 5e1d2cd..d3bd245 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java
@@ -59,5 +59,8 @@
private String areaCode;
+ @ApiModelProperty(value = "组件json数据")
+ private String jsonObject;
+
private List<ComActWorkGuideMaterialVO> materials = Lists.newArrayList();
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
index 0463dd2..76ee5e5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
@@ -4,9 +4,7 @@
import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComActActRegistVO;
import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
-import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.common.model.vos.jinhui.JinghuiMerchantEvaluateVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiCoinGeneralTableVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiGoldCoinRecordVO;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java
new file mode 100644
index 0000000..f737ae7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java
@@ -0,0 +1,179 @@
+package com.panzhihua.community_backstage.api;
+
+import com.panzhihua.common.model.dtos.community.ComActWorkGuideDTO;
+import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
+import com.panzhihua.common.model.vos.LoginReturnVO;
+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.service.jinhui.JinhuiCommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@Api(tags = {"金汇办事指南API 后台"})
+@RestController
+@RequestMapping("/Jinhui/")
+public class JinhuiAppi
+{
+
+
+ @Resource
+ private JinhuiCommunityService jinhuiCommunityService;
+
+ /**
+ * 办事指南_新增
+ *
+ * @param workGuideDTO
+ * 新增信息
+ * @return 新增结果
+ */
+ @ApiOperation(value = "办事指南_新增")
+ @PostMapping("/addworkguide")
+ @Transactional(rollbackFor = Exception.class)
+ public R addWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO,
+ @RequestParam("userId") String userId)
+ {
+ return jinhuiCommunityService.addWorkGuide(workGuideDTO,userId);
+ }
+
+ /**
+ * 办事指南_编辑
+ *
+ * @param workGuideDTO
+ * @return 编辑结果
+ */
+ @ApiOperation(value = "办事指南_编辑")
+ @PostMapping("/editworkguide")
+ @Transactional(rollbackFor = Exception.class)
+ public R putWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO,
+ @RequestParam("userId") String userId)
+ {
+ return jinhuiCommunityService.putWorkGuide(workGuideDTO,userId);
+ }
+
+ /**
+ * 办事指南_详情
+ *
+ * @param workGuideId
+ * @return 详情
+ */
+ @ApiOperation(value = "办事指南_新增", response = ComActWorkGuideVO.class)
+ @GetMapping("/detailworkguide")
+ public R detailWorkGuide(@RequestParam("workGuideId") String workGuideId,
+ @RequestParam("communityId") String communityId)
+ {
+ return jinhuiCommunityService.detailWorkGuide(workGuideId,communityId);
+ }
+
+ /**
+ * 办事指南_分页
+ *
+ * @param pageActWorkGuideDTO
+ * 查询参数
+ * @return 分页集合
+ */
+ @ApiOperation(value = "办事指南_分页", response = ComActWorkGuideVO.class)
+ @PostMapping("/pageworkguide")
+ public R pageWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO)
+ {
+ return jinhuiCommunityService.pageWorkGuide(pageActWorkGuideDTO);
+ }
+
+ /**
+ * 办事指南_删除
+ *
+ * @param workGuideId
+ * 办事指南id
+ * @return 删除结果
+ */
+ @ApiOperation(value = "办事指南_删除")
+ @PostMapping("/delectworkguide")
+ public R delectWorkGuide(@RequestParam("workGuideId") String workGuideId)
+ {
+ return jinhuiCommunityService.delectWorkGuide(workGuideId);
+ }
+
+ /**
+ * 分页查询办事执念-分类管理 addWorkGuideClassify 分页查询办事执念-分类管理
+ * @param comActWorkGuideClassifyVO 查询参数
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+ @ApiOperation(value = "分页查询办事执念-分类管理", response = ComActWorkGuideClassifyVO.class)
+ @PostMapping("/workGuide/classify/apage")
+ public R pageWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO)
+ {
+ return jinhuiCommunityService.pageWorkGuideClassify(comActWorkGuideClassifyVO);
+ }
+
+ /**
+ * 办事执念-分类管理新增或修改 addWorkGuideClassify 办事执念-分类管理新增或修改
+ * @param comActWorkGuideClassifyVO 新增或修改参数
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+ @ApiOperation(value = "办事执念-分类管理新增或修改")
+ @PostMapping("/workGuide/classify/add")
+ public R addWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO)
+ {
+ return jinhuiCommunityService.addWorkGuideClassify(comActWorkGuideClassifyVO);
+ }
+
+ /**
+ * 办事执念-分类管理删除 addWorkGuideClassify 办事执念-分类管理删除
+ * @param workGuideClassifyId 办事执念-分类管理id
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+ @ApiOperation(value = "办事执念-分类管理删除")
+ @GetMapping("/workGuide/classify/delete")
+ public R deleteWorkGuideClassify(@RequestParam("workGuideClassifyId") String workGuideClassifyId)
+ {
+ return jinhuiCommunityService.deleteWorkGuideClassify(workGuideClassifyId);
+ }
+
+ /**
+ * 办事指南-分类管理列表查询 getWorkGuideClassifyList 办事指南-分类管理列表查询
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+// @GetMapping("/workGuide/classify/getList")
+// public R getWorkGuideClassifyList(@RequestParam("areaCode")String areaCode)
+// {
+// return jinhuiCommunityService.getWorkGuideClassifyList(areaCode);
+// }
+
+ /**
+ * 办事指南列表-按分类查询
+ * @param pageActWorkGuideDTO 请求参数
+ * @return 办事指南分类列表
+ */
+ @ApiOperation(value = "办事指南列表-按分类查询", response = ComActWorkGuideVO.class)
+ @PostMapping("/listworkguide")
+ public R listWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO)
+ {
+ return jinhuiCommunityService.listWorkGuide(pageActWorkGuideDTO);
+ }
+
+ /**
+ * 根据办事指南分类id查询办事指南列表
+ * @param classifyId 办事指南分类id
+ * @return 办事指南列表数据
+ */
+ @ApiOperation(value = "根据办事指南分类id查询办事指南列表", response = ComActWorkGuideVO.class)
+ @GetMapping("/listworkguide/classify")
+ public R listWorkGuideByClassifyId(@RequestParam("classifyId") String classifyId)
+ {
+ return jinhuiCommunityService.listWorkGuideByClassifyId(classifyId);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiComActWorkGuideDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiComActWorkGuideDAO.java
index 6f1a2e7..a4a7d14 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiComActWorkGuideDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiComActWorkGuideDAO.java
@@ -6,6 +6,7 @@
import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
import com.panzhihua.common.model.vos.community.ComActWorkGuideDetailAppletsVO;
import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
+import com.panzhihua.common.model.vos.jinhui.JinhuiGoldCoinRecordVO;
import com.panzhihua.service_jinhui_community.entity.JinhuiComActWorkGuide;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -16,7 +17,8 @@
* @description: 办事指南
**/
@Mapper
-public interface JinhuiComActWorkGuideDAO extends BaseMapper<JinhuiComActWorkGuide> {
+public interface JinhuiComActWorkGuideDAO extends BaseMapper<JinhuiComActWorkGuide>
+{
IPage<ComActWorkGuideVO> pageWorkGuide(Page page, @Param("pageActWorkGuideDTO") PageActWorkGuideDTO pageActWorkGuideDTO);
/**
@@ -27,4 +29,6 @@
*/
List<ComActWorkGuideDetailAppletsVO> getWorkGuideListByClassifyId(@Param("classifyId") String classifyId,
@Param("pageSize") String pageSize);
+
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiComActWorkGuide.java b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiComActWorkGuide.java
index a15ad14..96b2bdd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiComActWorkGuide.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiComActWorkGuide.java
@@ -71,5 +71,8 @@
@ApiModelProperty(value = "社区id")
private String communityId;
+ @ApiModelProperty(value = "组件json数据")
+ private String jsonObject;
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActWorkGuideMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActWorkGuideMapper.xml
index 44e9ad1..9668a39 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActWorkGuideMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActWorkGuideMapper.xml
@@ -19,6 +19,7 @@
<result column="update_by" property="updateBy" />
<result column="community_id" property="communityId" />
<result column="area_code" property="areaCode" />
+ <result column="json_object" property="jsonObject" />
</resultMap>
@@ -39,6 +40,7 @@
address,
phone,
create_at,
+ json_object,
community_id
from jinhui_com_act_work_guide
<where>
@@ -65,6 +67,7 @@
address,
phone,
create_at,
+ json_object,
community_id
from jinhui_com_act_work_guide
where classify = #{classifyId}
--
Gitblit v1.7.1