标准管理2.0

pull/3/head
fjj 2023-12-21 22:10:51 +08:00
parent 52ef1fa578
commit e1f085670d
7 changed files with 67 additions and 90 deletions

View File

@ -1,17 +1,20 @@
package net.srt.controller;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import net.srt.vo.StandardManagementParam;
import net.srt.convert.DatastandardConvert;
import net.srt.entity.DatastandardEntity;
import net.srt.framework.common.page.PageResult;
import net.srt.framework.common.utils.Result;
import net.srt.query.StandardManagementQuery;
import net.srt.service.DatastandardService;
import net.srt.vo.StandardManagementVo;
import net.srt.service.StandardService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
* @ClassName : DatastandardController
@ -21,36 +24,41 @@ import javax.validation.Valid;
*/
@RestController
@RequestMapping("/data-standard")
@Tag(name = "数据治理-标准管理")
@AllArgsConstructor
public class DatastandardController {
@Autowired
private StandardService standardService;
DatastandardService datastandardService;
@GetMapping("page")
@Operation(summary = "分页")
public Result<PageResult<StandardManagementVo>> page(@Valid StandardManagementParam query){
return Result.ok(standardService.pagea(query));
public Result<PageResult<StandardManagementVo>> page(@Valid StandardManagementQuery query){
PageResult<StandardManagementVo> page = datastandardService.page(query);
return Result.ok(page);
}
@GetMapping("{id}")
@Operation(summary ="信息")
public Result<StandardManagementVo> get(@PathVariable("id") Integer categoryId) {
DatastandardEntity entity = datastandardService.getById(categoryId);
return Result.ok(DatastandardConvert.INSTANCE.convert(entity));
}
@GetMapping("/table-code/list")
@Operation(summary = "查询表编码")
public Result<List<DatastandardEntity>> getTableCode(){
List<DatastandardEntity> list= datastandardService.getTableCode();
return Result.ok(list);
}
@PostMapping
@Operation(summary = "保存")
public Result<String > add(@RequestBody StandardManagementVo standardManagementVo){
standardService.addStand(standardManagementVo);
public Result<String> save(@RequestBody DatastandardEntity entity) {
datastandardService.save(entity);
return Result.ok();
}
@PutMapping
@Operation(summary = "修改")
public Result<String > update(@RequestBody @Valid StandardManagementVo standardManagementVo){
standardService.updateStand(standardManagementVo);
return Result.ok();
}
@DeleteMapping
@Operation(summary = "删除")
public Result<String > delete(Long id){
standardService.delete(id);
return Result.ok();
}
}

View File

@ -2,12 +2,16 @@ package net.srt.controller;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import net.srt.entity.StandardEntity;
import net.srt.framework.common.utils.BeanUtil;
import net.srt.framework.common.utils.Result;
import net.srt.framework.common.utils.TreeNodeVo;
import net.srt.service.StandardService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@ -30,4 +34,15 @@ public class StandardController {
}
@GetMapping("/{id}")
@Operation(summary = "根据id获取")
public Result<TreeNodeVo> getById(@PathVariable Integer id) {
StandardEntity entity = standardService.getById(id);
TreeNodeVo nodeVo = BeanUtil.copyProperties(entity, TreeNodeVo::new);
nodeVo.setLabel(entity.getName());
nodeVo.setParentPath(entity.getPath().contains("/") ? entity.getPath().substring(0, entity.getPath().lastIndexOf("/")) : null);
return Result.ok(nodeVo);
}
}

View File

@ -1,8 +1,7 @@
package net.srt.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import net.srt.entity.DatagovernanceEntity;
import net.srt.framework.mybatis.dao.BaseDao;
import net.srt.entity.StandardEntity;
import org.apache.ibatis.annotations.Mapper;
/**
@ -12,5 +11,5 @@ import org.apache.ibatis.annotations.Mapper;
* @Date: 2023-12-20 11:30
*/
@Mapper
public interface StandardDao extends BaseDao<DatagovernanceEntity> {
public interface StandardDao extends BaseMapper<StandardEntity> {
}

View File

@ -1,18 +1,22 @@
package net.srt.vo;
package net.srt.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import net.srt.framework.common.query.Query;
/**
* @ClassName : StandardManagementParam
* @ClassName : StandardManagementQuery
* @Description :
* @Author : FJJ
* @Date: 2023-12-20 14:40
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class StandardManagementParam extends Query {
@Schema (description = "标准管理列表")
public class StandardManagementQuery extends Query {
private Integer categoryId;
private String t;
private String cnName;
private String engName;
}

View File

@ -1,11 +1,8 @@
package net.srt.service;
import net.srt.framework.common.page.PageResult;
import net.srt.entity.StandardEntity;
import net.srt.framework.common.utils.TreeNodeVo;
import net.srt.framework.mybatis.service.BaseService;
import net.srt.vo.StandardManagementVo;
import net.srt.entity.DatagovernanceEntity;
import net.srt.vo.StandardManagementParam;
import java.util.List;
@ -15,20 +12,7 @@ import java.util.List;
* @Author : FJJ
* @Date: 2023-12-20 11:31
*/
public interface StandardService extends BaseService<DatagovernanceEntity> {
// Page<StandardManagementVo> listpage(StandardManagementParam standardManagementRequest);
public interface StandardService extends BaseService<StandardEntity> {
List<TreeNodeVo> listTree();
void addStand(StandardManagementVo standardManagementVo);
void updateStand(StandardManagementVo standardManagementVo);
void delete(Long id);
PageResult<StandardManagementVo> pagea(StandardManagementParam query);
// PageResult<StandardManagementVo> list(StandardManagementParam standardManagementRequest);
//
// void add(StandardManagementVo standardManagement);
}

View File

@ -1,17 +1,14 @@
package net.srt.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.AllArgsConstructor;
import net.srt.dao.StandardDao;
import net.srt.vo.StandardManagementParam;
import net.srt.framework.common.page.PageResult;
import net.srt.entity.StandardEntity;
import net.srt.framework.common.utils.BeanUtil;
import net.srt.framework.common.utils.BuildTreeUtils;
import net.srt.framework.common.utils.TreeNodeVo;
import net.srt.framework.mybatis.service.impl.BaseServiceImpl;
import net.srt.vo.StandardManagementVo;
import net.srt.entity.DatagovernanceEntity;
import net.srt.service.StandardService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@ -23,17 +20,15 @@ import java.util.List;
* @Date: 2023-12-20 11:31
*/
@Service
public class StandardServiceImpl extends BaseServiceImpl<StandardDao, DatagovernanceEntity> implements StandardService {
@Autowired
private StandardDao standardDao;
@AllArgsConstructor
public class StandardServiceImpl extends BaseServiceImpl<StandardDao, StandardEntity> implements StandardService {
@Override
public List<TreeNodeVo> listTree() {
LambdaQueryWrapper<DatagovernanceEntity> wrapper = new LambdaQueryWrapper<>();
LambdaQueryWrapper<StandardEntity> wrapper = new LambdaQueryWrapper<>();
dataScopeWithoutOrgId(wrapper);
wrapper.orderByAsc(DatagovernanceEntity::getOrderNo);
List<DatagovernanceEntity> dataFileCategoryEntities = baseMapper.selectList(wrapper);
wrapper.orderByAsc(StandardEntity::getOrderNo);
List<StandardEntity> dataFileCategoryEntities = baseMapper.selectList(wrapper);
List<TreeNodeVo> treeNodeVos = BeanUtil.copyListProperties(dataFileCategoryEntities, TreeNodeVo::new, (oldItem, newItem) -> {
newItem.setLabel(oldItem.getName());
newItem.setValue(oldItem.getId());
@ -45,33 +40,5 @@ public class StandardServiceImpl extends BaseServiceImpl<StandardDao, Datagovern
return BuildTreeUtils.buildTree(treeNodeVos);
}
@Override
public void addStand(StandardManagementVo standardManagementVo) {
}
@Override
public void updateStand(StandardManagementVo standardManagementVo) {
}
@Override
public void delete(Long id) {
}
@Override
public PageResult<StandardManagementVo> pagea(StandardManagementParam query) {
return null;
}
//
// @Override
// public void add(StandardManagementVo standardManagement) {
// UserDetail user = getUser();
// standardManagement.setCreator(user.getUsername());
// standardManagement.setCreateTime(new Date());
// standardMapper.insert(standardManagement);
// }
}

View File

@ -1,12 +1,12 @@
package net.srt.vo;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
@ -17,8 +17,7 @@ import java.util.Date;
*/
@Data
@Schema(description = "标准管理查询")
@TableName(value = "standard_management")
public class StandardManagementVo {
public class StandardManagementVo implements Serializable {
private static final long serialVersionUID = 1L;
@TableId("id")
private Long id;
@ -46,4 +45,5 @@ public class StandardManagementVo {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
private Integer ifStandardRel;
private String group;
}