1.添加智能质询访问表实体类 2.添加智能质询访问相关功能并统计数据 3.修改门户网搜索结果
6个文件已修改
5个文件已添加
224 ■■■■ 已修改文件
flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSmartConsulting.java 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSmartConsultingMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/db/manual/mapper/util/MapperGenerator.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/IAutomessageSmartConsultingService.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/impl/IAutomessageSmartConsultingServiceImpl.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/AutomessageSmartConsultingMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/TransactionEventMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java
@@ -5,105 +5,123 @@
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.AutomessageSmartConsulting;
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.IAutomessageSmartConsultingService;
import com.dg.core.service.ITransactionEventService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
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.time.LocalDateTime;
import java.util.List;
@Api(tags = {"导办事项管理(及办事指南)小程序接口"})
@RestController
@RequestMapping("/applets/transaction")
public class TransactionEventAppletsController extends BaseController
{
public class TransactionEventAppletsController extends BaseController {
    @Autowired(required = true)
    ITransactionEventService iTransactionEventService;
    @Autowired(required = true)
    IAutomessageSmartConsultingService iAutomessageSmartConsultingService;
    /**
     * 查询导办事务详情
     *
     * @param Id
     * @return
     */
    @ApiOperation("查询导办事务详情")
    @GetMapping("/getData")
    public ResultData selectConfigData(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
    {
    public ResultData selectConfigData(@RequestParam("Id") String Id, @CurrentUser SysUser sysUser) {
        Assert.notNull(Id, "Id 不能为空");
        return ResultData.success(iTransactionEventService.selectConfigData(Id,sysUser));
        return ResultData.success(iTransactionEventService.selectConfigData(Id, sysUser));
    }
    /**
     * 导办事物列表(不分页)
     *
     * @param
     * @return
     */
    @ApiOperation(value = "导办事物列表(不分页)",response = TransactionEvent.class)
    @ApiOperation(value = "导办事物列表(不分页)", response = TransactionEvent.class)
    @GetMapping("/selectList")
    public TableDataInfo selectList(@RequestParam(value = "keyWord",required = false) String keyWord)
    {
    public TableDataInfo selectList(@RequestParam(value = "keyWord", required = false) String keyWord) {
        return getDataTable(iTransactionEventService.selectList(keyWord));
    }
    /**
     * 导办事务搜索(无分页用于小程序)
     *
     * @param keyWord
     * @return
     */
    @ApiOperation(value = "导办事务搜索(无分页用于小程序)",response = QueryResults.class)
    @ApiOperation(value = "导办事务搜索(无分页用于小程序)", response = QueryResults.class)
    @ApiImplicitParams({
            @ApiImplicitParam(name = "isSmartConsulting", value = "是否是智能咨询(1.是 2.否)", required = true, dataType = "String", paramType = "query")
    })
    @GetMapping("/queryKeyWord")
    public QueryResults queryKeyWord(@RequestParam(value = "keyWord",required = false) String keyWord)
    {
    public QueryResults queryKeyWord(@RequestParam(value = "keyWord", required = false) String keyWord, @RequestParam(value = "isSmartConsulting", required = false) String isSmartConsulting, @CurrentUser SysUser sysUser) {
        QueryResults queryResults = iTransactionEventService.queryMatterNameList(keyWord);
        if (isSmartConsulting != null && isSmartConsulting.equals("1")) {
            AutomessageSmartConsulting automessageSmartConsulting = new AutomessageSmartConsulting();
            if (sysUser != null) {
                automessageSmartConsulting.setCreateUserId(sysUser.getUserId());
            }
            automessageSmartConsulting.setType(1);
            automessageSmartConsulting.setCreateTime(LocalDateTime.now());
            iAutomessageSmartConsultingService.add(automessageSmartConsulting);
        }
        return queryResults;
    }
    /**
     *  根据分类查询导办事务
     * 根据分类查询导办事务
     *
     * @param classifyId
     * @return
     */
    @ApiOperation(value = "根据分类查询导办事务",response = TransactionEvent.class)
    @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));
    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)
    @ApiOperation(value = "查询导办事务求和", response = TransactionEvent.class)
    @GetMapping("/sumTransactionNum")
    public ResultData  sumTransactionNum(){
    public ResultData sumTransactionNum() {
        return ResultData.success(iTransactionEventService.sumTransactionNum());
    }
    /**
     * 智能咨询
     *
     * @return
     */
    @ApiOperation(value = "智能咨询",response = RecommendResult.class)
    @ApiOperation(value = "智能咨询", response = RecommendResult.class)
    @GetMapping("/smartConsulting")
    public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord){
        return  iTransactionEventService.smartConsulting(keyWord);
    public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord) {
        return iTransactionEventService.smartConsulting(keyWord);
    }
flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java
@@ -48,6 +48,9 @@
    @Autowired
    private ISysUserRecordService iSysUserRecordService;
    @Autowired(required = true)
    IAutomessageSmartConsultingService iAutomessageSmartConsultingService;
    @ApiOperation("首页统计不同状态工单数")
    @GetMapping("/getWorkOrder")
@@ -658,6 +661,17 @@
    /***************************************************    部门数据统计 end   **********************************************************/
    /**
     * 统计访问量
     * @return
     */
    @ApiOperation("统计访问量")
    @GetMapping("/countSmartConsulting")
    public ResultData countSmartConsulting(){
       return  ResultData.success(iAutomessageSmartConsultingService.countSmartConsulting()) ;
    }
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
@@ -5,6 +5,7 @@
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.AjaxResult;
import com.dg.core.db.gen.entity.AutomessageSmartConsulting;
import com.dg.core.db.gen.entity.Slideshow;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.db.gen.entity.TransactionEvent;
@@ -14,6 +15,7 @@
import com.dg.core.file.FtpConstants;
import com.dg.core.file.MimeTypeUtils;
import com.dg.core.file.SFTPUtil;
import com.dg.core.service.IAutomessageSmartConsultingService;
import com.dg.core.service.IOrganizationChartService;
import com.dg.core.service.ITransactionEventService;
import com.dg.core.util.TableDataInfo;
@@ -27,6 +29,7 @@
import org.springframework.web.multipart.MultipartFile;
import java.io.InputStream;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
@@ -45,6 +48,9 @@
    @Autowired(required = true)
    IOrganizationChartService iOrganizationChartService;
    @Autowired(required = true)
    IAutomessageSmartConsultingService iAutomessageSmartConsultingService;
    /**
     * 查询导办事务详情
@@ -265,7 +271,14 @@
     */
    @ApiOperation(value = "智能咨询",response = RecommendResult.class)
    @GetMapping("/smartConsulting")
    public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord){
    public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord,@CurrentUser SysUser sysUser){
        AutomessageSmartConsulting automessageSmartConsulting = new AutomessageSmartConsulting();
        if (sysUser!=null){
            automessageSmartConsulting.setCreateUserId(sysUser.getUserId());
        }
        automessageSmartConsulting.setType(2);
        automessageSmartConsulting.setCreateTime(LocalDateTime.now());
        iAutomessageSmartConsultingService.add(automessageSmartConsulting);
        return  iTransactionEventService.smartConsulting(keyWord);
    }
flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSmartConsulting.java
New file
@@ -0,0 +1,57 @@
package com.dg.core.db.gen.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
 * <p>
 *
 * </p>
 *
 * @author fengjin
 * @since 2022-11-16
 */
@TableName("automessage_smart_consulting")
@Data
@ApiModel("智能咨询访问类")
public class AutomessageSmartConsulting implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 主键id
     */
    @ApiModelProperty("主键id")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 创建时间
     */
    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;
    /**
     * 咨询类型:1.小程序访问 2.门户网访问
     */
    @ApiModelProperty("咨询类型:1.小程序访问 2.门户网访问")
    private Integer type;
    /**
     * 咨询人id 可以为 空
     */
    @ApiModelProperty("咨询人id 可以为 空")
    private String createUserId;
}
flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSmartConsultingMapper.java
New file
@@ -0,0 +1,16 @@
package com.dg.core.db.gen.mapper;
import com.dg.core.db.gen.entity.AutomessageSmartConsulting;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author fengjin
 * @since 2022-11-16
 */
public interface AutomessageSmartConsultingMapper extends BaseMapper<AutomessageSmartConsulting> {
}
flower_city/src/main/java/com/dg/core/db/manual/mapper/util/MapperGenerator.java
@@ -34,7 +34,7 @@
                })
                .strategyConfig(builder -> {
//                    builder.addInclude("");
                    builder.addInclude("automessage_policy_documents") // 设置需要生成的表名
                    builder.addInclude("automessage_smart_consulting") // 设置需要生成的表名
                            .addTablePrefix("t_", "c_"); // 设置过滤表前缀
                })
                .templateConfig(builder -> {
flower_city/src/main/java/com/dg/core/service/IAutomessageSmartConsultingService.java
New file
@@ -0,0 +1,18 @@
package com.dg.core.service;
import com.dg.core.db.gen.entity.AutomessageSmartConsulting;
public interface IAutomessageSmartConsultingService {
    /**
     * 新增智能咨询访问记录
     * @return
     */
    int add(AutomessageSmartConsulting automessageSmartConsulting);
    /**
     * 统计访问量
     * @return
     */
    Long countSmartConsulting();
}
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -463,4 +463,6 @@
    }
}
flower_city/src/main/java/com/dg/core/service/impl/IAutomessageSmartConsultingServiceImpl.java
New file
@@ -0,0 +1,23 @@
package com.dg.core.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dg.core.db.gen.entity.AutomessageSmartConsulting;
import com.dg.core.db.gen.mapper.AutomessageSmartConsultingMapper;
import com.dg.core.service.IAutomessageSmartConsultingService;
import org.springframework.stereotype.Service;
@Service
public class IAutomessageSmartConsultingServiceImpl extends ServiceImpl<AutomessageSmartConsultingMapper, AutomessageSmartConsulting> implements IAutomessageSmartConsultingService {
   @Override
   public int add(AutomessageSmartConsulting automessageSmartConsulting){
       return   baseMapper.insert(automessageSmartConsulting);
   }
    @Override
   public  Long countSmartConsulting(){
     return baseMapper.selectCount(new QueryWrapper<AutomessageSmartConsulting>().lambda());
   }
}
flower_city/src/main/resources/mapper/AutomessageSmartConsultingMapper.xml
New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dg.core.db.gen.mapper.AutomessageSmartConsultingMapper">
</mapper>
flower_city/src/main/resources/mapper/TransactionEventMapper.xml
@@ -458,8 +458,8 @@
                                                      where id=(select parent_id from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)),
                                                     '>',(select classify_name from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)) content,
                         browse_num views,2 type from automessage_transaction_event UNION
                 SELECT id ,name title,'政策文件' content,null        views,5 type FROM     automessage_policy_documents where type=2      UNION
                 SELECT id ,name title,'法律法规' content,null        views,6 type FROM     automessage_policy_documents where type=1
                 SELECT id ,name title,concat((select organization_name from automessage_organization_chart where id=automessage_policy_documents.department_id ),'>','政策文件') content,null        views,5 type FROM     automessage_policy_documents where type=2      UNION
                 SELECT id ,name title,concat((select organization_name from automessage_organization_chart where id=automessage_policy_documents.department_id ),'>','法律法规') content,null        views,6 type FROM     automessage_policy_documents where type=1
             ) k
        where  k.title like concat('%',#{keyWord}, '%') or k.content  like concat('%', #{keyWord}, '%')
    </select>