修改bug

This commit is contained in:
yangjun 2023-05-19 23:39:00 +08:00
parent fb0d553c82
commit 88d400c5d0
13 changed files with 576 additions and 0 deletions

View File

@ -0,0 +1,178 @@
package org.jeecg.modules.kc.kcAssessidentity.controller;
import java.util.Arrays;
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.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.kc.kcAssessidentity.entity.KcAssessidentity;
import org.jeecg.modules.kc.kcAssessidentity.service.IKcAssessidentityService;
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: kc_assessidentity
* @Author: jeecg-boot
* @Date: 2023-05-19
* @Version: V1.0
*/
@Api(tags="kc_assessidentity")
@RestController
@RequestMapping("/kcAssessidentity/kcAssessidentity")
@Slf4j
public class KcAssessidentityController extends JeecgController<KcAssessidentity, IKcAssessidentityService> {
@Autowired
private IKcAssessidentityService kcAssessidentityService;
/**
* 分页列表查询
*
* @param kcAssessidentity
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "kc_assessidentity-分页列表查询")
@ApiOperation(value="kc_assessidentity-分页列表查询", notes="kc_assessidentity-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<KcAssessidentity>> queryPageList(KcAssessidentity kcAssessidentity,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<KcAssessidentity> queryWrapper = QueryGenerator.initQueryWrapper(kcAssessidentity, req.getParameterMap());
queryWrapper.apply(StringUtils.isNotBlank(kcAssessidentity.getYwmc()),"assessl1 like concat('%','"+kcAssessidentity.getYwmc()+"','%') or assessl2 like concat('%','"+kcAssessidentity.getYwmc()+"','%') or demand like concat('%','"+kcAssessidentity.getYwmc()+"','%') or assesscode like concat('%','"+kcAssessidentity.getYwmc()+"','%') ");
Page<KcAssessidentity> page = new Page<KcAssessidentity>(pageNo, pageSize);
IPage<KcAssessidentity> pageList = kcAssessidentityService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param kcAssessidentity
* @return
*/
@AutoLog(value = "kc_assessidentity-添加")
@ApiOperation(value="kc_assessidentity-添加", notes="kc_assessidentity-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody KcAssessidentity kcAssessidentity) {
kcAssessidentityService.save(kcAssessidentity);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param kcAssessidentity
* @return
*/
@AutoLog(value = "kc_assessidentity-编辑")
@ApiOperation(value="kc_assessidentity-编辑", notes="kc_assessidentity-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody KcAssessidentity kcAssessidentity) {
kcAssessidentityService.updateById(kcAssessidentity);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "kc_assessidentity-通过id删除")
@ApiOperation(value="kc_assessidentity-通过id删除", notes="kc_assessidentity-通过id删除")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
kcAssessidentityService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "kc_assessidentity-批量删除")
@ApiOperation(value="kc_assessidentity-批量删除", notes="kc_assessidentity-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.kcAssessidentityService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "kc_assessidentity-通过id查询")
@ApiOperation(value="kc_assessidentity-通过id查询", notes="kc_assessidentity-通过id查询")
@GetMapping(value = "/queryById")
public Result<KcAssessidentity> queryById(@RequestParam(name="id",required=true) String id) {
KcAssessidentity kcAssessidentity = kcAssessidentityService.getById(id);
if(kcAssessidentity==null) {
return Result.error("未找到对应数据");
}
return Result.OK(kcAssessidentity);
}
/**
* 导出excel
*
* @param request
* @param kcAssessidentity
*/
@RequiresPermissions("kcAssessidentity:kc_assessidentity:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, KcAssessidentity kcAssessidentity) {
return super.exportXls(request, kcAssessidentity, KcAssessidentity.class, "kc_assessidentity");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("kcAssessidentity:kc_assessidentity:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, KcAssessidentity.class);
}
}

View File

@ -0,0 +1,56 @@
package org.jeecg.modules.kc.kcAssessidentity.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.*;
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: kc_assessidentity
* @Author: jeecg-boot
* @Date: 2023-05-19
* @Version: V1.0
*/
@Data
@TableName("kc_assessidentity")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="kc_assessidentity对象", description="kc_assessidentity")
public class KcAssessidentity implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.String id;
/**听课身份一级*/
@Excel(name = "听课身份一级", width = 15)
@ApiModelProperty(value = "听课身份一级")
private java.lang.String assessl1;
/**听课身份二级*/
@Excel(name = "听课身份二级", width = 15)
@ApiModelProperty(value = "听课身份二级")
private java.lang.String assessl2;
/**要求听课次数*/
@Excel(name = "要求听课次数", width = 15)
@ApiModelProperty(value = "要求听课次数")
private java.lang.Integer demand;
/**身份编码*/
@Excel(name = "身份编码", width = 15)
@ApiModelProperty(value = "身份编码")
private java.lang.String assesscode;
@TableField(exist = false)
private String ywmc;
}

View File

@ -0,0 +1,17 @@
package org.jeecg.modules.kc.kcAssessidentity.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.kc.kcAssessidentity.entity.KcAssessidentity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: kc_assessidentity
* @Author: jeecg-boot
* @Date: 2023-05-19
* @Version: V1.0
*/
public interface KcAssessidentityMapper extends BaseMapper<KcAssessidentity> {
}

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="org.jeecg.modules.kc.kcAssessidentity.mapper.KcAssessidentityMapper">
</mapper>

View File

@ -0,0 +1,14 @@
package org.jeecg.modules.kc.kcAssessidentity.service;
import org.jeecg.modules.kc.kcAssessidentity.entity.KcAssessidentity;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: kc_assessidentity
* @Author: jeecg-boot
* @Date: 2023-05-19
* @Version: V1.0
*/
public interface IKcAssessidentityService extends IService<KcAssessidentity> {
}

View File

@ -0,0 +1,19 @@
package org.jeecg.modules.kc.kcAssessidentity.service.impl;
import org.jeecg.modules.kc.kcAssessidentity.entity.KcAssessidentity;
import org.jeecg.modules.kc.kcAssessidentity.mapper.KcAssessidentityMapper;
import org.jeecg.modules.kc.kcAssessidentity.service.IKcAssessidentityService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: kc_assessidentity
* @Author: jeecg-boot
* @Date: 2023-05-19
* @Version: V1.0
*/
@Service
public class KcAssessidentityServiceImpl extends ServiceImpl<KcAssessidentityMapper, KcAssessidentity> implements IKcAssessidentityService {
}

View File

@ -0,0 +1,177 @@
package org.jeecg.modules.kc.kcCollege.controller;
import java.util.Arrays;
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.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.kc.kcCollege.entity.KcCollege;
import org.jeecg.modules.kc.kcCollege.service.IKcCollegeService;
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: kc_college
* @Author: jeecg-boot
* @Date: 2023-05-19
* @Version: V1.0
*/
@Api(tags="kc_college")
@RestController
@RequestMapping("/kcCollege/kcCollege")
@Slf4j
public class KcCollegeController extends JeecgController<KcCollege, IKcCollegeService> {
@Autowired
private IKcCollegeService kcCollegeService;
/**
* 分页列表查询
*
* @param kcCollege
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "kc_college-分页列表查询")
@ApiOperation(value="kc_college-分页列表查询", notes="kc_college-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<KcCollege>> queryPageList(KcCollege kcCollege,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<KcCollege> queryWrapper = QueryGenerator.initQueryWrapper(kcCollege, req.getParameterMap());
queryWrapper.apply(StringUtils.isNotBlank(kcCollege.getYwmc()),"cn like concat('%','"+kcCollege.getYwmc()+"','%') or type like concat('%','"+kcCollege.getYwmc()+"','%') or dwh like concat('%','"+kcCollege.getYwmc()+"','%') ");
Page<KcCollege> page = new Page<KcCollege>(pageNo, pageSize);
IPage<KcCollege> pageList = kcCollegeService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param kcCollege
* @return
*/
@AutoLog(value = "kc_college-添加")
@ApiOperation(value="kc_college-添加", notes="kc_college-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody KcCollege kcCollege) {
kcCollegeService.save(kcCollege);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param kcCollege
* @return
*/
@AutoLog(value = "kc_college-编辑")
@ApiOperation(value="kc_college-编辑", notes="kc_college-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody KcCollege kcCollege) {
kcCollegeService.updateById(kcCollege);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "kc_college-通过id删除")
@ApiOperation(value="kc_college-通过id删除", notes="kc_college-通过id删除")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
kcCollegeService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "kc_college-批量删除")
@ApiOperation(value="kc_college-批量删除", notes="kc_college-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.kcCollegeService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "kc_college-通过id查询")
@ApiOperation(value="kc_college-通过id查询", notes="kc_college-通过id查询")
@GetMapping(value = "/queryById")
public Result<KcCollege> queryById(@RequestParam(name="id",required=true) String id) {
KcCollege kcCollege = kcCollegeService.getById(id);
if(kcCollege==null) {
return Result.error("未找到对应数据");
}
return Result.OK(kcCollege);
}
/**
* 导出excel
*
* @param request
* @param kcCollege
*/
@RequiresPermissions("kcCollege:kc_college:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, KcCollege kcCollege) {
return super.exportXls(request, kcCollege, KcCollege.class, "kc_college");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("kcCollege:kc_college:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, KcCollege.class);
}
}

View File

@ -0,0 +1,51 @@
package org.jeecg.modules.kc.kcCollege.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.*;
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: kc_college
* @Author: jeecg-boot
* @Date: 2023-05-19
* @Version: V1.0
*/
@Data
@TableName("kc_college")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="kc_college对象", description="kc_college")
public class KcCollege implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.String id;
/**登录用户姓名*/
@Excel(name = "登录用户姓名", width = 15)
@ApiModelProperty(value = "登录用户姓名")
private java.lang.String cn;
/**类型*/
@Excel(name = "类型", width = 15)
@ApiModelProperty(value = "类型")
private java.lang.Integer type;
/**单位号*/
@Excel(name = "单位号", width = 15)
@ApiModelProperty(value = "单位号")
private java.lang.String dwh;
@TableField(exist = false)
private String ywmc;
}

View File

@ -0,0 +1,17 @@
package org.jeecg.modules.kc.kcCollege.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.kc.kcCollege.entity.KcCollege;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: kc_college
* @Author: jeecg-boot
* @Date: 2023-05-19
* @Version: V1.0
*/
public interface KcCollegeMapper extends BaseMapper<KcCollege> {
}

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="org.jeecg.modules.kc.kcCollege.mapper.KcCollegeMapper">
</mapper>

View File

@ -0,0 +1,14 @@
package org.jeecg.modules.kc.kcCollege.service;
import org.jeecg.modules.kc.kcCollege.entity.KcCollege;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: kc_college
* @Author: jeecg-boot
* @Date: 2023-05-19
* @Version: V1.0
*/
public interface IKcCollegeService extends IService<KcCollege> {
}

View File

@ -0,0 +1,19 @@
package org.jeecg.modules.kc.kcCollege.service.impl;
import org.jeecg.modules.kc.kcCollege.entity.KcCollege;
import org.jeecg.modules.kc.kcCollege.mapper.KcCollegeMapper;
import org.jeecg.modules.kc.kcCollege.service.IKcCollegeService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: kc_college
* @Author: jeecg-boot
* @Date: 2023-05-19
* @Version: V1.0
*/
@Service
public class KcCollegeServiceImpl extends ServiceImpl<KcCollegeMapper, KcCollege> implements IKcCollegeService {
}

View File

@ -67,4 +67,8 @@ public class KcTplb implements Serializable {
@Excel(name = "内容", width = 15)
@ApiModelProperty(value = "内容")
private java.lang.String content;
@Excel(name = "链接地址", width = 15)
@ApiModelProperty(value = "链接地址")
private java.lang.String urlPath;
}