Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

EventTemplate控制器编写

Browse Source
This commit is contained in:
hanyong
2022-09-23 16:33:58 +08:00
parent 099ed8c669
commit 7f18439b12
9 changed files with 69 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java
View File

@@ -8,9 +8,8 @@ import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.common.utils.LogUtil;
import com.njcn.system.pojo.param.EventTemplateParam;
import com.njcn.system.pojo.po.EventDict;
import com.njcn.system.pojo.po.EventTemplate;
import com.njcn.system.pojo.vo.EventTemplateTree;
import com.njcn.system.pojo.vo.EventTemplateVO;
import com.njcn.system.service.IEventTemplateService;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
@@ -30,7 +29,7 @@ import java.util.List;
* @date 2022/9/7
*/
@Slf4j
@Api(tags = "事件模板")
@Api(tags = "报告模板")
@RestController
@RequestMapping("/EventTemplate")
@RequiredArgsConstructor
@@ -59,13 +58,13 @@ public class EventTemplateController extends BaseController{
* @date 2022/09/09
*/
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/getList")
@GetMapping("/getList")
@ApiOperation("查询字典数据")
@ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
public HttpResult<Page<EventDict>> getList(@RequestBody @Validated EventTemplateParam.EventTemplateQueryParam queryParam) {
public HttpResult<Page<EventTemplate>> getList(@RequestBody @Validated EventTemplateParam.EventTemplateQueryParam queryParam) {
String methodDescribe = getMethodDescribe("getList");
LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
Page<EventDict> result = iEventTemplateService.getList(queryParam);
Page<EventTemplate> result = iEventTemplateService.getList(queryParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@@ -76,11 +75,10 @@ public class EventTemplateController extends BaseController{
*/
@PostMapping("/add")
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@ApiOperation("新增")
@ApiOperation("新增模板")
@ApiImplicitParam(name = "eventTemplateParam", value = "模板数据", required = true)
public HttpResult<Boolean> add(@RequestBody EventTemplateParam eventTemplateParam){
public HttpResult<Boolean> add(@RequestBody @Validated EventTemplateParam eventTemplateParam){
String methodDescribe = getMethodDescribe("add");
LogUtil.njcnDebug(log, "{}，模板数据为：{}", methodDescribe, eventTemplateParam);
boolean result = iEventTemplateService.add(eventTemplateParam);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
@@ -96,11 +94,10 @@ public class EventTemplateController extends BaseController{
*/
@PostMapping("/update")
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@ApiOperation("修改字典")
@ApiImplicitParam(name = "eventDataUpdateParam", value = "字典表数据", required = true)
public HttpResult<Boolean> update(@RequestBody EventTemplateParam.EventTemplateUpdateParam eventUpdateParam){
@ApiOperation("修改模板")
@ApiImplicitParam(name = "eventUpdateParam", value = "模板实体", required = true)
public HttpResult<Boolean> update(@RequestBody @Validated EventTemplateParam.EventTemplateUpdateParam eventUpdateParam){
String methodDescribe = getMethodDescribe("update");
LogUtil.njcnDebug(log, "{}，字典表数据数据为：{}", methodDescribe, eventUpdateParam);
boolean result = iEventTemplateService.update(eventUpdateParam);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
@@ -114,13 +111,16 @@ public class EventTemplateController extends BaseController{
* @author hany
* @date 2022/09/08
*/
@DeleteMapping("/delete")
@PostMapping("/delete")
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@ApiOperation("删除字典")
@ApiImplicitParam(name = "id", value = "字典表索引", required = true)
public HttpResult<Boolean> delete(@RequestParam("id") String id){
@ApiOperation("删除模板")
@ApiImplicitParam(name = "ids", value = "模板ids", required = true)
public HttpResult<EventTemplate> delete(@RequestBody List<String> ids){
String methodDescribe = getMethodDescribe("delete");
iEventTemplateService.delete(id);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
boolean result = iEventTemplateService.delete(ids);
if(result){
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
}
}

7
pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventTemplateMapper.java
View File

@@ -3,9 +3,8 @@ package com.njcn.system.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.system.pojo.po.EventDict;
import com.njcn.system.pojo.po.EventTemplate;
import com.njcn.system.pojo.vo.EventTemplateTree;
import com.njcn.system.pojo.vo.EventTemplateVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -14,7 +13,7 @@ import java.util.List;
* @author hany
* @createTime 2022/09/08
*/
public interface EventTemplateMapper extends BaseMapper<EventDict> {
public interface EventTemplateMapper extends BaseMapper<EventTemplate> {
/**
* 返回所有树节点（全部report_template_dict表数据）
@@ -30,5 +29,5 @@ public interface EventTemplateMapper extends BaseMapper<EventDict> {
* @param queryWrapper 查询条件
* @return 字典数据
*/
Page<EventDict> page(@Param("page")Page<EventTemplateVO> page, @Param("ew")QueryWrapper<EventTemplateVO> queryWrapper);
Page<EventTemplate> page(@Param("page")Page<EventTemplate> page, @Param("ew") QueryWrapper<EventTemplate> queryWrapper);
}

6
pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EventTemplateMapper.xml
View File

@@ -5,9 +5,9 @@
<mapper namespace="com.njcn.system.mapper.EventTemplateMapper">
<!--获取字典分页列表-->
<select id="page" resultType="EventTemplateVO">
SELECT report_template_dict.*
FROM report_template_dict report_template_dict
<select id="page" resultType="EventTemplate">
SELECT report_template.*
FROM report_template report_template
WHERE ${ew.sqlSegment}
</select>

7
pqs-system/system-boot/src/main/java/com/njcn/system/service/IEventTemplateService.java
View File

@@ -2,7 +2,7 @@ package com.njcn.system.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.system.pojo.param.EventTemplateParam;
import com.njcn.system.pojo.po.EventDict;
import com.njcn.system.pojo.po.EventTemplate;
import com.njcn.system.pojo.vo.EventTemplateTree;
import java.util.List;
@@ -24,7 +24,7 @@ public interface IEventTemplateService {
* @param queryParam 查询参数
* @return 字典列表
*/
Page<EventDict> getList(EventTemplateParam.EventTemplateQueryParam queryParam);
Page<EventTemplate> getList(EventTemplateParam.EventTemplateQueryParam queryParam);
/**
* 新增
@@ -39,6 +39,7 @@ public interface IEventTemplateService {
/**
* 删除
* @param ids 模板ids
*/
boolean delete(String id);
boolean delete(List<String> ids);
}

3
pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java
View File

@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.config.GeneralInfo;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.poi.excel.ExcelUtil;
import com.njcn.system.enums.AuditLogEnum;
import com.njcn.system.mapper.AuditMapper;
import com.njcn.system.mapper.UserLogMapper;
@@ -135,7 +134,7 @@ public class AuditServiceImpl extends ServiceImpl<UserLogMapper, UserLog> implem
File filePath = new File(generalInfo.getBusinessTempPath());
filePath.mkdirs();
File file = new File(filePath.getPath() + File.separator + nowTime +" sys_user_log.xlsx");
ExcelUtil.exportExcelWithTargetFile(file, UserLogExcel.class, excelList);
// ExcelUtil.exportExcelWithTargetFile(file, UserLogExcel.class, excelList);
//备份为txt
// QueryWrapper<UserLog> queryWrapper = new QueryWrapper<>();

54
pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java
View File

@@ -5,7 +5,6 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.pojo.enums.common.DataStateEnum;
@@ -15,9 +14,8 @@ import com.njcn.system.enums.EventResponseEnum;
import com.njcn.system.enums.TemplateTreeEnum;
import com.njcn.system.mapper.EventTemplateMapper;
import com.njcn.system.pojo.param.EventTemplateParam;
import com.njcn.system.pojo.po.EventDict;
import com.njcn.system.pojo.po.EventTemplate;
import com.njcn.system.pojo.vo.EventTemplateTree;
import com.njcn.system.pojo.vo.EventTemplateVO;
import com.njcn.system.service.IEventTemplateService;
import com.njcn.web.factory.PageFactory;
import lombok.AllArgsConstructor;
@@ -36,7 +34,7 @@ import java.util.stream.Collectors;
*/
@Service
@AllArgsConstructor
public class EventTemplateServiceImpl extends ServiceImpl<EventTemplateMapper, EventDict> implements IEventTemplateService {
public class EventTemplateServiceImpl extends ServiceImpl<EventTemplateMapper, EventTemplate> implements IEventTemplateService {
private final EventTemplateMapper eventTemplateMapper;
@@ -66,7 +64,7 @@ public class EventTemplateServiceImpl extends ServiceImpl<EventTemplateMapper, E
EventTemplateTree eventTemplateTree = new EventTemplateTree();
eventTemplateTree.setId("9999999");
eventTemplateTree.setLevel(0);
eventTemplateTree.setName("报告基础项");
eventTemplateTree.setName("新增模板");
if (CollectionUtil.isNotEmpty(reportList)) {
eventTemplateTree.setChildren(reportList);
}
@@ -92,82 +90,74 @@ public class EventTemplateServiceImpl extends ServiceImpl<EventTemplateMapper, E
* @return
*/
@Override
public Page<EventDict> getList(EventTemplateParam.EventTemplateQueryParam queryParam) {
QueryWrapper<EventTemplateVO> queryWrapper = new QueryWrapper<>();
public Page<EventTemplate> getList(EventTemplateParam.EventTemplateQueryParam queryParam) {
QueryWrapper<EventTemplate> queryWrapper = new QueryWrapper<>();
if (ObjectUtil.isNotNull(queryParam)) {
//查询参数不为空，进行条件填充
if (StrUtil.isNotBlank(queryParam.getSearchValue())) {
//字典类型表，仅提供名称模糊查询
//字典类型表，仅提供名称和编码模糊查询
queryWrapper
.and(param -> param.like("report_template_dict.name", queryParam.getSearchValue()));
.and(param -> param.like("report_template.name",queryParam.getSearchValue())
.or().like("report_template.code",queryParam.getSearchValue()));
}
//排序
if (ObjectUtil.isAllNotEmpty(queryParam.getSortBy(), queryParam.getOrderBy())) {
queryWrapper.orderBy(true, queryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy()));
} else {
queryWrapper.eq("report_template_dict.pid",queryParam.getPid());
//没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序
queryWrapper.orderBy(true, true, "report_template_dict.update_time");
queryWrapper.orderBy(true, true, "report_template.update_time");
}
}
queryWrapper.ne("report_template_dict.state", DataStateEnum.DELETED.getCode());
queryWrapper.ne("report_template.state", DataStateEnum.DELETED.getCode());
//初始化分页数据
return this.baseMapper.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper);
}
/**
* 新增
* 新增模板
* @author hany
* @date 2022/09/08
*/
@Override
public boolean add(EventTemplateParam eventTemplateParam) {
checkName(eventTemplateParam,true);
EventDict eventDict = new EventDict();
EventTemplate eventDict = new EventTemplate();
BeanUtils.copyProperties(eventTemplateParam,eventDict);
eventDict.setState(DataStateEnum.ENABLE.getCode());
return this.save(eventDict);
}
/**
* 修改
* 修改模板
*/
@Override
public boolean update(EventTemplateParam.EventTemplateUpdateParam eventTemplateUpdateParam) {
checkName(eventTemplateUpdateParam,false);
EventDict eventDict = new EventDict();
EventTemplate eventDict = new EventTemplate();
BeanUtils.copyProperties(eventTemplateUpdateParam,eventDict);
return this.updateById(eventDict);
}
/**
* 删除
* 删除模板
* @param ids
*/
@Override
public boolean delete(String id) {
LambdaQueryWrapper<EventDict> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(EventDict::getPid,id).eq(EventDict::getState,DataStateEnum.ENABLE.getCode());
int resCount = this.count(lambdaQueryWrapper);
if(resCount>0){
throw new BusinessException(EventResponseEnum.CHILDREN_EXIT);
}
UpdateWrapper<EventDict> updateWrapper = new UpdateWrapper<>();
updateWrapper.lambda().eq(EventDict::getState,DataStateEnum.ENABLE.getCode()).set(EventDict::getState,DataStateEnum.DELETED.getCode()).eq(EventDict::getId,id);
return this.update(updateWrapper);
public boolean delete(List<String> ids) {
return this.removeByIds(ids);
}
/**
* 名称重复校验
*/
private void checkName(EventTemplateParam eventTemplateParam,boolean flag){
LambdaQueryWrapper<EventDict> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(EventDict::getName,eventTemplateParam.getName())
.eq(EventDict::getState, DataStateEnum.ENABLE.getCode());
LambdaQueryWrapper<EventTemplate> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(EventTemplate::getName,eventTemplateParam.getName())
.eq(EventTemplate::getState, DataStateEnum.ENABLE.getCode());
//修改
if(!flag){
if(eventTemplateParam instanceof EventTemplateParam.EventTemplateUpdateParam ){
lambdaQueryWrapper.ne(EventDict::getId,((EventTemplateParam.EventTemplateUpdateParam)eventTemplateParam).getId());
lambdaQueryWrapper.ne(EventTemplate::getId,((EventTemplateParam.EventTemplateUpdateParam)eventTemplateParam).getId());
}
}
int res = this.count(lambdaQueryWrapper);