From 84e99eb99ba264f90a75381da9f7369f5baefb6e Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 28 九月 2022 11:27:38 +0800
Subject: [PATCH] 1.小程序首页相关代码 2.修改bug 3.新增小程序相关接口
---
flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java | 55 ++++
flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java | 13 -
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 277 +++++++++++++++++++++++
flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java | 113 +++++++++
flower_city/src/main/java/com/dg/core/api/ClassifyAdministrationAppletsController.java | 63 +++++
flower_city/src/main/java/com/dg/core/api/AgreementAppletsController.java | 37 +++
flower_city/src/main/java/com/dg/core/api/AutomessageCommonProblemAppletsController.java | 40 +++
flower_city/src/main/java/com/dg/core/controller/AutomessageCommonProblemController.java | 9
flower_city/src/main/resources/mapper/OrganizationChartMapper.xml | 2
flower_city/src/main/java/com/dg/core/api/AreaCodeAppletsController.java | 33 ++
flower_city/src/main/java/com/dg/core/api/SlideshowAppletsController.java | 45 +++
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 24 --
12 files changed, 664 insertions(+), 47 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/api/AgreementAppletsController.java b/flower_city/src/main/java/com/dg/core/api/AgreementAppletsController.java
new file mode 100644
index 0000000..771ca6b
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/api/AgreementAppletsController.java
@@ -0,0 +1,37 @@
+package com.dg.core.api;
+
+
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.db.gen.entity.Agreement;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.IAgreementService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Api(tags = {"相关协议小程序接口"})
+@RestController
+@RequestMapping("/applets/agreement")
+public class AgreementAppletsController {
+
+ @Resource
+ private IAgreementService agreementService;
+
+ /**
+ * 通过协议名获取相关协议
+ * @return
+ */
+ @ApiOperation(value = "通过协议名获取相关协议",response = Agreement.class)
+ @GetMapping(value = "/queryByAgreement")
+ @Authorization
+ public ResultData queryByAgreement(@RequestParam("agreement") String agreement) {
+ return ResultData.success(agreementService.queryByAgreement(agreement));
+ }
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/api/AreaCodeAppletsController.java b/flower_city/src/main/java/com/dg/core/api/AreaCodeAppletsController.java
new file mode 100644
index 0000000..fc49866
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/api/AreaCodeAppletsController.java
@@ -0,0 +1,33 @@
+package com.dg.core.api;
+
+import com.dg.core.controller.BaseController;
+import com.dg.core.db.gen.entity.AreaCode2022;
+import com.dg.core.service.IAreaCodeService;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Api(tags = {"所属地区小程序接口"})
+@RestController
+@RequestMapping("/applet/areaCode")
+public class AreaCodeAppletsController extends BaseController {
+
+ @Resource
+ private IAreaCodeService iAreaCodeService;
+
+ /**
+ * 根据指南id获取所属地区
+ * @return
+ */
+ @ApiOperation(value = "根据指南id获取所属地区",response = AreaCode2022.class)
+ @GetMapping("/getAreaCodeByTransactionId")
+ public TableDataInfo getAreaCodeByTransactionId(@RequestParam("transactionId") Integer transactionId){
+ return getDataTable(iAreaCodeService.getAreaCodeByTransactionId(transactionId));
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/api/AutomessageCommonProblemAppletsController.java b/flower_city/src/main/java/com/dg/core/api/AutomessageCommonProblemAppletsController.java
new file mode 100644
index 0000000..6069c5b
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/api/AutomessageCommonProblemAppletsController.java
@@ -0,0 +1,40 @@
+package com.dg.core.api;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.controller.BaseController;
+import com.dg.core.db.gen.entity.AutomessageCommonProblem;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.IAutomessageCommonProblemService;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Api(tags = {"常见问题小程序接口"})
+@RestController
+@RequestMapping("/applets/automessageCommonProblem")
+public class AutomessageCommonProblemAppletsController extends BaseController {
+
+ @Resource
+ private IAutomessageCommonProblemService iAutomessageCommonProblemService;
+
+
+ /**
+ * 获取常见问题列表(不分页)
+ * @return
+ */
+ @ApiOperation(value = "获取常见问题列表(不分页)",response = AutomessageCommonProblem.class)
+ @GetMapping("/selectList")
+ public ResultData selectList(){
+ return ResultData.success(iAutomessageCommonProblemService.selectList());
+ }
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/api/ClassifyAdministrationAppletsController.java b/flower_city/src/main/java/com/dg/core/api/ClassifyAdministrationAppletsController.java
new file mode 100644
index 0000000..8fb6be0
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/api/ClassifyAdministrationAppletsController.java
@@ -0,0 +1,63 @@
+package com.dg.core.api;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.controller.BaseController;
+import com.dg.core.db.gen.entity.ClassifyAdministration;
+import com.dg.core.service.IClassifyAdministrationService;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * 分类管理
+ */
+@Api(tags = {"分类管理小程序接口"})
+@RestController
+@RequestMapping("/applets/classify")
+public class ClassifyAdministrationAppletsController extends BaseController
+{
+
+ @Autowired(required = true)
+ IClassifyAdministrationService iClassifyAdministrationService;
+
+
+ /**
+ * 获取管理菜单列表(无分页已分级)
+ * @return
+ */
+ @ApiOperation(value = " 获取管理菜单列表(无分页已分级))",response = ClassifyAdministration.class)
+ @GetMapping("/selectListByParentId")
+ public TableDataInfo selectListByParentId(@RequestParam(value = "parentId",required = false) String parentId,
+ @RequestParam(value = "departmentId",required = false) Integer departmentId){
+ int num=iClassifyAdministrationService.countNum("",null);
+ if (parentId==null)
+ parentId="0";
+ return getDataTable(iClassifyAdministrationService.selectConfigListByParentId(parentId, departmentId),num);
+ }
+
+
+
+
+ /**
+ * 获取分类根据id 如果是二级id则获取的是办事指南
+ * @return
+ */
+ @ApiOperation("获取分类根据id 如果是二级id则获取的是办事指南,不传参默认是0")
+ @GetMapping("/queryListById")
+ @Authorization
+ ResultData queryListById(@RequestParam(value = "id",required = false) Integer id){
+ if(id==null)
+ id=0;
+ return iClassifyAdministrationService.queryListById(id);
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
new file mode 100644
index 0000000..df7df6d
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
@@ -0,0 +1,277 @@
+package com.dg.core.api;
+
+
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.controller.BaseController;
+import com.dg.core.db.gen.entity.GuideEvolveEntity;
+import com.dg.core.db.gen.entity.GuideRepairOrder;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.IGuideEvolveService;
+import com.dg.core.service.IGuideRepairOrderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+
+/**
+ * 工单管理
+ */
+@Api(tags = {"工单管理小程序接口"})
+@RestController
+@RequestMapping("/applets/guideRepairOrder")
+public class GuideRepairOrderAppletsController extends BaseController {
+
+ @Resource
+ private IGuideRepairOrderService iGuideRepairOrderService;
+
+ @Autowired
+ private IGuideEvolveService iGuideEvolveService;
+
+ /**
+ * 提交导办订单
+ * @return
+ */
+ @ApiOperation(value = "提交导办订单",response = GuideRepairOrder.class)
+ @PostMapping("/addOrder")
+ @Authorization
+ public ResultData addOrder(@RequestBody GuideRepairOrder guideRepairOrder,@CurrentUser SysUser sysUser) {
+ guideRepairOrder.setSubmitUserId(sysUser.getUserId().toString());
+ guideRepairOrder.setSubmitUserPhone(sysUser.getPhonenumber());
+ return toAjax(iGuideRepairOrderService.addOrder(guideRepairOrder));
+ }
+
+
+ /**
+ * 获取详情
+ * @param Id
+ * @param orderNum
+ * @return
+ */
+ @ApiOperation("获取订单详情")
+ @GetMapping("/orderdata")
+ @Authorization
+ public ResultData selectConfigData(@RequestParam(value = "Id",required = false) String Id,
+ @RequestParam(value = "orderNum",required = false) String orderNum)
+ {
+ if(StringUtils.isEmpty(Id) && StringUtils.isEmpty(orderNum))
+ {
+ return ResultData.error("id或者订单号不能都为空");
+ }
+
+ GuideRepairOrder order=iGuideRepairOrderService.selectConfigData(Id,orderNum);
+ order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id));
+
+ return ResultData.success(order);
+ }
+
+
+
+
+
+ /**
+ * 转派人员
+ * @param order
+ * @return
+ */
+ @ApiOperation("转派人员")
+ @PostMapping("/redeploy")
+ @Authorization
+ public ResultData redeploy(@RequestBody GuideRepairOrder order, @CurrentUser SysUser sysUser)
+ {
+ if(order==null)
+ {
+ return ResultData.error("参数不能为空");
+ }
+
+ if(StringUtils.isEmpty(order.getGuideDepartmentId()))
+ {
+ return ResultData.error("导办部门id不能为空");
+ }
+
+ if(StringUtils.isEmpty(order.getGuideUserId()))
+ {
+ return ResultData.error("导办人员id不能为空");
+ }
+
+ if(StringUtils.isEmpty(order.getGuideUserPhone()))
+ {
+ return ResultData.error("导办人员电话不能为空");
+ }
+
+ //已分配
+ order.setState("2");
+
+ //新增转派记录
+ GuideEvolveEntity entity=new GuideEvolveEntity();
+ entity.setCreateTime(LocalDateTime.now());
+ entity.setUpdateTime(LocalDateTime.now());
+ entity.setState("12");
+ entity.setDepartmentalId(sysUser.getDepartmentId());
+ entity.setToUserId(sysUser.getUserId()+"");
+ entity.setFromUserId(order.getGuideUserId());
+ entity.setFromDepartmentalId(order.getGuideDepartmentId());
+
+ iGuideEvolveService.insertConfig(entity);
+
+ return toAjax(iGuideRepairOrderService.updateConfig(order));
+ }
+
+
+
+ /**
+ * 去处理
+ * @param entity
+ * @return
+ */
+ @ApiOperation("去处理")
+ @PostMapping("/dispose")
+ @Authorization
+ public ResultData dispose(@RequestBody GuideEvolveEntity entity, @CurrentUser SysUser sysUser)
+ {
+ if(entity==null)
+ {
+ return ResultData.error("参数不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getGuideId()))
+ {
+ return ResultData.error("工单id不能为空");
+ }
+
+ GuideRepairOrder order=iGuideRepairOrderService.selectConfigData(entity.getGuideId(),"");
+ if(order==null)
+ {
+ return ResultData.error("该工单不存在!");
+ }
+
+ if(StringUtils.equals(order.getState(),"3"))
+ {
+ return ResultData.error("该工单已办结!");
+ }
+
+ if(!StringUtils.equals(order.getState(),"2"))
+ {
+ return ResultData.error("该工单非是待办状态！");
+ }
+ //待评价
+ order.setState("4");
+ //新增已办结记录
+ entity.setCreateTime(LocalDateTime.now());
+ entity.setUpdateTime(LocalDateTime.now());
+ entity.setState("4");
+ entity.setFromDepartmentalId(sysUser.getDepartmentId());
+ entity.setFromUserId(sysUser.getUserId()+"");
+ iGuideEvolveService.insertConfig(entity);
+ return toAjax(iGuideRepairOrderService.updateConfig(order));
+ }
+
+
+ /**
+ * 取消导办工单
+ * @param entity
+ * @return
+ */
+ @ApiOperation("取消导办工单")
+ @PostMapping("/cancel")
+ @Authorization
+ public ResultData cancel(@RequestBody GuideEvolveEntity entity, @CurrentUser SysUser sysUser)
+ {
+ if(entity==null)
+ {
+ return ResultData.error("参数不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getGuideId()))
+ {
+ return ResultData.error("工单id不能为空");
+ }
+
+ GuideRepairOrder order=iGuideRepairOrderService.selectConfigData(entity.getGuideId(),"");
+ if(order==null)
+ {
+ return ResultData.error("该工单不存在!");
+ }
+
+ if(!StringUtils.equals(order.getState(),"1"))
+ {
+ return ResultData.error("该工单不能取消！");
+ }
+ //取消状态
+ order.setState("5");
+
+ //新增已取消记录
+ entity.setCreateTime(LocalDateTime.now());
+ entity.setUpdateTime(LocalDateTime.now());
+ entity.setState("5");
+ entity.setFromDepartmentalId(sysUser.getDepartmentId());
+ entity.setFromUserId(sysUser.getUserId()+"");
+ iGuideEvolveService.insertConfig(entity);
+ return toAjax(iGuideRepairOrderService.updateConfig(order));
+ }
+
+
+
+ /**
+ * 工单评价
+ * @param entity
+ * @return
+ */
+ @ApiOperation("工单评价")
+ @PostMapping("/evaluate")
+ @Authorization
+ public ResultData evaluate(@RequestBody GuideRepairOrder entity, @CurrentUser SysUser sysUser)
+ {
+ if(entity==null)
+ {
+ return ResultData.error("参数不能为空");
+ }
+
+ if(entity.getId()<=0)
+ {
+ return ResultData.error("工单id不能为空");
+ }
+
+ if(!StringUtils.equals(entity.getState(),"4"))
+ {
+ return ResultData.error("该工单不能评价！");
+ }
+
+ if(StringUtils.isEmpty(entity.getEvaluateState()))
+ {
+ return ResultData.error("满意程度不能为空！");
+ }
+ //已办结
+ entity.setState("3");
+ //新增已办结记录
+ GuideEvolveEntity guideEvolveEntity=new GuideEvolveEntity();
+ guideEvolveEntity.setCreateTime(LocalDateTime.now());
+ guideEvolveEntity.setUpdateTime(LocalDateTime.now());
+ guideEvolveEntity.setState("3");
+ guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
+ guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
+ iGuideEvolveService.insertConfig(guideEvolveEntity);
+
+ return toAjax(iGuideRepairOrderService.updateConfig(entity));
+ }
+
+ /**
+ * 获取个人中心工单数据
+ * @param sysUser 当前登录人员信息
+ * @return
+ */
+ @ApiOperation("获取个人中心工单数据")
+ @GetMapping("/personalCenter")
+ @Authorization
+ public ResultData selectBySubmitId(@CurrentUser SysUser sysUser){
+ return ResultData.success(iGuideRepairOrderService.selectBySubmitId(sysUser.getUserId().toString()));
+ }
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java b/flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java
new file mode 100644
index 0000000..d1d4560
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java
@@ -0,0 +1,55 @@
+package com.dg.core.api;
+
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.controller.BaseController;
+import com.dg.core.db.gen.entity.OrganizationChartEntity;
+import com.dg.core.service.IOrganizationChartService;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+@Api(tags = {"组织架构小程序接口"})
+@RestController
+@RequestMapping("/applets/organization")
+public class OrganizationAppletsController extends BaseController
+{
+
+ @Autowired(required = true)
+ IOrganizationChartService iOrganizationChartService;
+
+ /**
+ * 查询机构列表
+ */
+ @ApiOperation("查询机构列表")
+ @GetMapping("/getList")
+ public TableDataInfo selectConfigList()
+ {
+ return getDataTable(iOrganizationChartService.selectConfigList("",""));
+ }
+
+
+
+ /**
+ * 查询机构列表(不分级不分页按等级排序)
+ */
+ @ApiOperation(value = "查询机构列表(不分级不分页按等级排序)",response = OrganizationChartEntity.class)
+ @GetMapping("/selectList")
+ public TableDataInfo selectList(){
+ return getDataTable(iOrganizationChartService.selectList());
+ }
+
+ /**
+ * 根据id查组织机构
+ */
+ @ApiOperation(value = "根据id查取消组织机构",response = OrganizationChartEntity.class)
+ @GetMapping("/selectById")
+ @Authorization
+ ResultData selectConfigById(@RequestParam("id") String id){
+ return ResultData.success(iOrganizationChartService.selectConfigById(id));
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/api/SlideshowAppletsController.java b/flower_city/src/main/java/com/dg/core/api/SlideshowAppletsController.java
new file mode 100644
index 0000000..52f38d2
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/api/SlideshowAppletsController.java
@@ -0,0 +1,45 @@
+package com.dg.core.api;
+
+import com.dg.core.ResultData;
+import com.dg.core.controller.BaseController;
+import com.dg.core.db.gen.entity.Slideshow;
+import com.dg.core.service.ISlideshowService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = {"轮播图小程序接口"})
+@RestController
+@RequestMapping("/applets/slideshow")
+public class SlideshowAppletsController extends BaseController {
+
+ @Autowired(required = true)
+ ISlideshowService iSlideshowService;
+
+ /**
+ * 查询轮播图列表(不分页)
+ * @return
+ */
+ @ApiOperation(value = "查询轮播图列表(不分页)",response = Slideshow.class)
+ @GetMapping("/selectList")
+ public ResultData selectList(){
+ return ResultData.success(iSlideshowService.selectList());
+
+ }
+
+ /**
+ * 根据id 查询轮播图数据
+ *
+ * @return 参数配置信息
+ */
+ @ApiOperation(value = "根据id 查询轮播图数据",response = Slideshow.class)
+ @GetMapping("/selectById")
+ public ResultData queryById(Integer id){
+ return ResultData.success(iSlideshowService.queryById(id));
+ }
+
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java b/flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java
new file mode 100644
index 0000000..5f6784e
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java
@@ -0,0 +1,113 @@
+package com.dg.core.api;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.controller.BaseController;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.db.gen.entity.TransactionEvent;
+import com.dg.core.db.manual.pojo.QueryResults;
+import com.dg.core.db.manual.pojo.RecommendResult;
+import com.dg.core.db.manual.pojo.Search;
+import com.dg.core.service.ITransactionEventService;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = {"导办事项管理(及办事指南)小程序接口"})
+@RestController
+@RequestMapping("/applets/transaction")
+public class TransactionEventAppletsController extends BaseController
+{
+
+ @Autowired(required = true)
+ ITransactionEventService iTransactionEventService;
+
+ /**
+ * 查询导办事务详情
+ * @param Id
+ * @return
+ */
+ @ApiOperation("查询导办事务详情")
+ @GetMapping("/getData")
+ @Authorization
+ public ResultData selectConfigData(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
+ {
+ Assert.notNull(Id, "Id 不能为空");
+ return ResultData.success(iTransactionEventService.selectConfigData(Id,sysUser));
+ }
+
+
+ /**
+ * 导办事物列表(不分页)
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "导办事物列表(不分页)",response = TransactionEvent.class)
+ @GetMapping("/selectList")
+ public TableDataInfo selectList()
+ {
+ return getDataTable(iTransactionEventService.selectList());
+ }
+
+
+
+
+
+ /**
+ * 导办事务搜索(无分页用于小程序)
+ * @param keyWord
+ * @return
+ */
+ @ApiOperation(value = "导办事务搜索(无分页用于小程序)",response = QueryResults.class)
+ @GetMapping("/queryKeyWord")
+ @Authorization
+ public QueryResults queryKeyWord(@RequestParam(value = "keyWord",required = false) String keyWord)
+ {
+ QueryResults queryResults = iTransactionEventService.queryMatterNameList(keyWord);
+ return queryResults;
+ }
+
+
+
+ /**
+ * 根据分类查询导办事务
+ * @param classifyId
+ * @return
+ */
+ @ApiOperation(value = "根据分类查询导办事务",response = TransactionEvent.class)
+ @GetMapping("/queryByClassifyIdList")
+ public TableDataInfo queryByClassifyIdList(@RequestParam("classifyId") String classifyId,@RequestParam(required = false,name="departmentId") Integer departmentId){
+ return getDataTable(iTransactionEventService.queryByClassifyIdList(classifyId,departmentId),iTransactionEventService.countNumByClassifyIdList(classifyId,departmentId));
+ }
+
+
+ /**
+ * 查询导办事务求和
+ * @return
+ */
+ @ApiOperation(value = "查询导办事务求和",response = TransactionEvent.class)
+ @GetMapping("/sumTransactionNum")
+ public ResultData sumTransactionNum(){
+ return ResultData.success(iTransactionEventService.sumTransactionNum());
+ }
+
+ /**
+ * 智能咨询
+ * @return
+ */
+ @ApiOperation(value = "智能咨询",response = RecommendResult.class)
+ @GetMapping("/smartConsulting")
+ @Authorization
+ public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord){
+ return iTransactionEventService.smartConsulting(keyWord);
+
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/controller/AutomessageCommonProblemController.java b/flower_city/src/main/java/com/dg/core/controller/AutomessageCommonProblemController.java
index b2fdc75..1806a49 100644
--- a/flower_city/src/main/java/com/dg/core/controller/AutomessageCommonProblemController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/AutomessageCommonProblemController.java
@@ -28,15 +28,6 @@
private IAutomessageCommonProblemService iAutomessageCommonProblemService;
- /**
- * 获取常见问题列表(不分页)
- * @return
- */
- @ApiOperation(value = "获取常见问题列表(不分页)",response = AutomessageCommonProblem.class)
- @GetMapping("/selectList")
- public ResultData selectList(){
- return ResultData.success(iAutomessageCommonProblemService.selectList());
- }
/**
* 获取常见问题列表（分页）
diff --git a/flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java b/flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java
index b8123f3..6ccd07b 100644
--- a/flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java
@@ -59,19 +59,6 @@
return getDataTable(iClassifyAdministrationService.selectRootList(pageParam,pageSize,parentId,departmentId),num);
}
- /**
- * 获取管理菜单列表(无分页已分级)
- * @return
- */
- @ApiOperation(value = " 获取管理菜单列表(无分页已分级))",response = ClassifyAdministration.class)
- @GetMapping("/selectListByParentId")
- public TableDataInfo selectListByParentId(@RequestParam(value = "parentId",required = false) String parentId,
- @RequestParam(value = "departmentId",required = false) Integer departmentId){
- int num=iClassifyAdministrationService.countNum("",null);
- if (parentId==null)
- parentId="0";
- return getDataTable(iClassifyAdministrationService.selectConfigListByParentId(parentId, departmentId),num);
- }
/**
diff --git a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
index e39a1c3..af7af91 100644
--- a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
@@ -137,32 +137,8 @@
return queryResults;
}
- /**
- * 导办事务搜索(无分页用于小程序)
- * @param keyWord
- * @return
- */
- @ApiOperation(value = "导办事务搜索(无分页用于小程序)",response = QueryResults.class)
- @GetMapping("/queryKeyWord")
- @Authorization
- public QueryResults queryKeyWord(@RequestParam(value = "keyWord",required = false) String keyWord)
- {
- QueryResults queryResults = iTransactionEventService.queryMatterNameList(keyWord);
- return queryResults;
- }
-
- /**
- * 根据分离查询导办事务
- * @param classifyId
- * @return
- */
- @ApiOperation(value = "根据分类查询导办事务",response = TransactionEvent.class)
- @GetMapping("/queryByClassifyIdList")
- public TableDataInfo queryByClassifyIdList(@RequestParam("classifyId") String classifyId,@RequestParam(required = false,name="departmentId") Integer departmentId){
- return getDataTable(iTransactionEventService.queryByClassifyIdList(classifyId,departmentId),iTransactionEventService.countNumByClassifyIdList(classifyId,departmentId));
- }
/**
* 根据分类id查询导办事务(分页)
diff --git a/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml b/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml
index 7a7ca8d..49a6e61 100644
--- a/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml
+++ b/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml
@@ -47,7 +47,7 @@
where id= #{id}
</select>
- <select id="selectList" resultMap="OrganizationChartResult">
+ <select id="queryList" resultMap="OrganizationChartResult">
<include refid="selectOrganizationChartVo"/>
<where>
<if test="parentId != null and parentId != ''">
--
Gitblit v1.7.1