This commit is contained in:
1378012178@qq.com 2025-04-15 09:46:02 +08:00
commit db5f285d5b
10 changed files with 467 additions and 0 deletions

View File

@ -0,0 +1,86 @@
package com.nu.modules.NuBizAdvisoryInfo.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nu.modules.NuBizAdvisoryInfo.entity.NuBizAdvisoryInfo;
import com.nu.modules.NuBizAdvisoryInfo.service.INuBizAdvisoryInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.CommonAPI;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
/**
* @Description: 咨询信息
* @Author: jeecg-boot
* @Date: 2025-04-07
* @Version: V1.0
*/
@Api(tags="咨询信息")
@RestController
@RequestMapping("/h5Api/nuBizAdvisoryInfo")
@Slf4j
public class H5ApiAdvisoryInfoController extends JeecgController<NuBizAdvisoryInfo, INuBizAdvisoryInfoService> {
@Autowired
private INuBizAdvisoryInfoService nuBizAdvisoryInfoService;
@Lazy
@Autowired
private CommonAPI commonApi;
/**
* 添加咨询信息
*
* @param nuBizAdvisoryInfo
* @return
*/
@PostMapping(value = "/add")
public Result<Object> add(@RequestBody NuBizAdvisoryInfo nuBizAdvisoryInfo) {
nuBizAdvisoryInfoService.save(nuBizAdvisoryInfo);
return Result.OK(nuBizAdvisoryInfo);
}
@GetMapping(value = "/queryByOpenId")
public Result<NuBizAdvisoryInfo> queryByOpenId(@RequestParam(name="openId",required=true) String openId) {
QueryWrapper<NuBizAdvisoryInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("open_id",openId);
NuBizAdvisoryInfo nuBizAdvisoryInfo = nuBizAdvisoryInfoService.getOne(queryWrapper);
if(nuBizAdvisoryInfo==null) {
return Result.error("未找到对应数据");
}
if(StringUtils.isNotBlank(nuBizAdvisoryInfo.getAdvisoryType())){
String dictText = commonApi.translateDict("advisory_type",nuBizAdvisoryInfo.getAdvisoryType());
nuBizAdvisoryInfo.setAdvisoryTypeName(dictText);
}
if(StringUtils.isNotBlank(nuBizAdvisoryInfo.getSex())){
String dictText = commonApi.translateDict("sex",nuBizAdvisoryInfo.getSex());
nuBizAdvisoryInfo.setSexName(dictText);
}
if(StringUtils.isNotBlank(nuBizAdvisoryInfo.getSysOrgCode())){
String dictText = commonApi.translateDictFromTable("sys_depart","depart_name","id",nuBizAdvisoryInfo.getSysOrgCode());
nuBizAdvisoryInfo.setSysOrgCodeName(dictText);
}
if(StringUtils.isNotBlank(nuBizAdvisoryInfo.getStatus())){
String dictText = commonApi.translateDict("advisory_approval",nuBizAdvisoryInfo.getStatus());
nuBizAdvisoryInfo.setStatusName(dictText);
}
return Result.OK(nuBizAdvisoryInfo);
}
}

View File

@ -0,0 +1,184 @@
package com.nu.modules.NuBizAdvisoryInfo.controller;
import java.util.Arrays;
import java.util.HashMap;
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.system.query.QueryRuleEnum;
import org.jeecg.common.util.oConvertUtils;
import com.nu.modules.NuBizAdvisoryInfo.entity.NuBizAdvisoryInfo;
import com.nu.modules.NuBizAdvisoryInfo.service.INuBizAdvisoryInfoService;
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;
import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
* @Description: 咨询信息
* @Author: jeecg-boot
* @Date: 2025-04-07
* @Version: V1.0
*/
@Api(tags="咨询信息")
@RestController
@RequestMapping("/NuBizAdvisoryInfo/nuBizAdvisoryInfo")
@Slf4j
public class NuBizAdvisoryInfoController extends JeecgController<NuBizAdvisoryInfo, INuBizAdvisoryInfoService> {
@Autowired
private INuBizAdvisoryInfoService nuBizAdvisoryInfoService;
/**
* 分页列表查询
*
* @param nuBizAdvisoryInfo
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "咨询信息-分页列表查询")
@ApiOperation(value="咨询信息-分页列表查询", notes="咨询信息-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<NuBizAdvisoryInfo>> queryPageList(NuBizAdvisoryInfo nuBizAdvisoryInfo,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
// 自定义查询规则
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
// 自定义多选的查询规则为LIKE_WITH_OR
customeRuleMap.put("advisoryType", QueryRuleEnum.LIKE_WITH_OR);
customeRuleMap.put("status", QueryRuleEnum.LIKE_WITH_OR);
QueryWrapper<NuBizAdvisoryInfo> queryWrapper = QueryGenerator.initQueryWrapper(nuBizAdvisoryInfo, req.getParameterMap(),customeRuleMap);
Page<NuBizAdvisoryInfo> page = new Page<NuBizAdvisoryInfo>(pageNo, pageSize);
IPage<NuBizAdvisoryInfo> pageList = nuBizAdvisoryInfoService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param nuBizAdvisoryInfo
* @return
*/
@AutoLog(value = "咨询信息-添加")
@ApiOperation(value="咨询信息-添加", notes="咨询信息-添加")
@PostMapping(value = "/add")
public Result<Object> add(@RequestBody NuBizAdvisoryInfo nuBizAdvisoryInfo) {
nuBizAdvisoryInfoService.save(nuBizAdvisoryInfo);
return Result.OK(nuBizAdvisoryInfo);
}
/**
* 编辑
*
* @param nuBizAdvisoryInfo
* @return
*/
@AutoLog(value = "咨询信息-编辑")
@ApiOperation(value="咨询信息-编辑", notes="咨询信息-编辑")
@RequiresPermissions("NuBizAdvisoryInfo:nu_biz_advisory_info:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody NuBizAdvisoryInfo nuBizAdvisoryInfo) {
nuBizAdvisoryInfoService.updateById(nuBizAdvisoryInfo);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "咨询信息-通过id删除")
@ApiOperation(value="咨询信息-通过id删除", notes="咨询信息-通过id删除")
@RequiresPermissions("NuBizAdvisoryInfo:nu_biz_advisory_info:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
nuBizAdvisoryInfoService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "咨询信息-批量删除")
@ApiOperation(value="咨询信息-批量删除", notes="咨询信息-批量删除")
@RequiresPermissions("NuBizAdvisoryInfo:nu_biz_advisory_info:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.nuBizAdvisoryInfoService.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<NuBizAdvisoryInfo> queryById(@RequestParam(name="id",required=true) String id) {
NuBizAdvisoryInfo nuBizAdvisoryInfo = nuBizAdvisoryInfoService.getById(id);
if(nuBizAdvisoryInfo==null) {
return Result.error("未找到对应数据");
}
return Result.OK(nuBizAdvisoryInfo);
}
/**
* 导出excel
*
* @param request
* @param nuBizAdvisoryInfo
*/
@RequiresPermissions("NuBizAdvisoryInfo:nu_biz_advisory_info:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, NuBizAdvisoryInfo nuBizAdvisoryInfo) {
return super.exportXls(request, nuBizAdvisoryInfo, NuBizAdvisoryInfo.class, "咨询信息");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("NuBizAdvisoryInfo:nu_biz_advisory_info:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, NuBizAdvisoryInfo.class);
}
}

View File

@ -0,0 +1,109 @@
package com.nu.modules.NuBizAdvisoryInfo.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.*;
import org.jeecg.common.constant.ProvinceCityArea;
import org.jeecg.common.util.SpringContextUtils;
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: 2025-04-07
* @Version: V1.0
*/
@Data
@TableName("nu_biz_advisory_info")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_biz_advisory_info对象", description="咨询信息")
public class NuBizAdvisoryInfo implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.String id;
/**微信id*/
@Excel(name = "微信id", width = 15)
@ApiModelProperty(value = "微信id")
private java.lang.String openId;
/**微信名称*/
@Excel(name = "微信名称", width = 15)
@ApiModelProperty(value = "微信名称")
private java.lang.String wechatName;
/**咨询人姓名*/
@Excel(name = "咨询人姓名", width = 15)
@ApiModelProperty(value = "咨询人姓名")
private java.lang.String name;
/**性别*/
@Excel(name = "性别", width = 15, dicCode = "sex")
@Dict(dicCode = "sex")
@ApiModelProperty(value = "性别")
private java.lang.String sex;
/**联系电话*/
@Excel(name = "联系电话", width = 15)
@ApiModelProperty(value = "联系电话")
private java.lang.String tel;
/**咨询类型 1入住nu 2入驻机构 3我要加盟*/
@Excel(name = "咨询类型", width = 15, dicCode = "advisory_type")
@Dict(dicCode = "advisory_type")
@ApiModelProperty(value = "咨询类型")
private java.lang.String advisoryType;
/**状态 1审核中 2审核完成 3驳回*/
@Excel(name = "状态", width = 15, dicCode = "advisory_approval")
@Dict(dicCode = "advisory_approval")
@ApiModelProperty(value = "状态")
private java.lang.String status;
/**审核备注*/
@Excel(name = "审核备注", width = 15)
@ApiModelProperty(value = "审核备注")
private java.lang.String content;
/**机构访问地址*/
@Excel(name = "机构访问地址", width = 15)
@ApiModelProperty(value = "机构访问地址")
private java.lang.String serverUrl;
/**创建人*/
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private java.lang.String sysOrgCode;
@TableField(exist = false)
private java.lang.String advisoryTypeName;
@TableField(exist = false)
private java.lang.String sexName;
@TableField(exist = false)
private java.lang.String sysOrgCodeName;
@TableField(exist = false)
private java.lang.String statusName;
}

View File

@ -0,0 +1,17 @@
package com.nu.modules.NuBizAdvisoryInfo.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.nu.modules.NuBizAdvisoryInfo.entity.NuBizAdvisoryInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 咨询信息
* @Author: jeecg-boot
* @Date: 2025-04-07
* @Version: V1.0
*/
public interface NuBizAdvisoryInfoMapper extends BaseMapper<NuBizAdvisoryInfo> {
}

View 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.nu.modules.NuBizAdvisoryInfo.mapper.NuBizAdvisoryInfoMapper">
</mapper>

View File

@ -0,0 +1,14 @@
package com.nu.modules.NuBizAdvisoryInfo.service;
import com.nu.modules.NuBizAdvisoryInfo.entity.NuBizAdvisoryInfo;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 咨询信息
* @Author: jeecg-boot
* @Date: 2025-04-07
* @Version: V1.0
*/
public interface INuBizAdvisoryInfoService extends IService<NuBizAdvisoryInfo> {
}

View File

@ -0,0 +1,19 @@
package com.nu.modules.NuBizAdvisoryInfo.service.impl;
import com.nu.modules.NuBizAdvisoryInfo.entity.NuBizAdvisoryInfo;
import com.nu.modules.NuBizAdvisoryInfo.mapper.NuBizAdvisoryInfoMapper;
import com.nu.modules.NuBizAdvisoryInfo.service.INuBizAdvisoryInfoService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 咨询信息
* @Author: jeecg-boot
* @Date: 2025-04-07
* @Version: V1.0
*/
@Service
public class NuBizAdvisoryInfoServiceImpl extends ServiceImpl<NuBizAdvisoryInfoMapper, NuBizAdvisoryInfo> implements INuBizAdvisoryInfoService {
}

View File

@ -105,6 +105,11 @@ public class ShiroConfig {
//filterChainDefinitionMap.put("/sys/common/download/**", "anon");//文件下载不限制token //filterChainDefinitionMap.put("/sys/common/download/**", "anon");//文件下载不限制token
filterChainDefinitionMap.put("/generic/**", "anon");//pdf预览需要文件 filterChainDefinitionMap.put("/generic/**", "anon");//pdf预览需要文件
filterChainDefinitionMap.put("/sys/dict/getDictItems/**", "anon");//获取字典数据
filterChainDefinitionMap.put("/sys/sysDepart/queryInstitutionsList", "anon");//授权接口排除
filterChainDefinitionMap.put("/h5Api/nuBizAdvisoryInfo/**", "anon"); //授权接口排除
filterChainDefinitionMap.put("/sys/getLoginQrcode/**", "anon"); //登录二维码 filterChainDefinitionMap.put("/sys/getLoginQrcode/**", "anon"); //登录二维码
filterChainDefinitionMap.put("/sys/getQrcodeToken/**", "anon"); //监听扫码 filterChainDefinitionMap.put("/sys/getQrcodeToken/**", "anon"); //监听扫码
filterChainDefinitionMap.put("/sys/checkAuth", "anon"); //授权接口排除 filterChainDefinitionMap.put("/sys/checkAuth", "anon"); //授权接口排除

View File

@ -2,6 +2,7 @@ package org.jeecg.modules.system.controller;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
@ -683,4 +684,28 @@ public class SysDepartController {
return Result.error("文件导入失败!"); return Result.error("文件导入失败!");
} }
/**
* 人员入住可选择的机构
* @return
*/
@RequestMapping(value = "/queryInstitutionsList", method = RequestMethod.GET)
public List<Map<String,Object>> queryInstitutionsList() {
List<Map<String,Object>> result = new ArrayList<>();
QueryWrapper<SysDepart> query = new QueryWrapper<>();
query.eq("del_flag","0");
query.eq("org_category","1");
query.eq("org_type","1");
query.isNotNull("server_url");
List<SysDepart> list = sysDepartService.list(query);
for(SysDepart depart : list){
Map<String,Object> map = new HashMap<>();
map.put("id",depart.getId());
map.put("departName",depart.getDepartName());
map.put("serverUrl",depart.getServerUrl());
result.add(map);
}
return result;
}
} }

View File

@ -94,6 +94,9 @@ public class SysDepart implements Serializable {
/**是否有叶子节点: 1是0否*/ /**是否有叶子节点: 1是0否*/
private Integer izLeaf; private Integer izLeaf;
/**各机构服务器后台接口地址*/
private String serverUrl;
//update-begin---author:wangshuai ---date:20200308 for[JTC-119]在部门管理菜单下设置部门负责人新增字段负责人ids和旧的负责人ids //update-begin---author:wangshuai ---date:20200308 for[JTC-119]在部门管理菜单下设置部门负责人新增字段负责人ids和旧的负责人ids
/**部门负责人的ids*/ /**部门负责人的ids*/
@TableField(exist = false) @TableField(exist = false)