CaiXiang/SPC
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

config

Browse Source
This commit is contained in:
闫阳
2022-09-02 16:21:20 +08:00
parent 0fb22fa625
commit c0ce68f5b2
77 changed files with 1020 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/controller/ControlGraphController.java
View File

@@ -49,7 +49,7 @@ public class ControlGraphController {
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
@ApiImplicitParam(name = "type", value = "产品特征类型", paramType = "query", dataTypeClass = Integer.class)
})
// @PreAuthorize("@ex.hasAuthority('code:controlGraph:page')")
@PreAuthorize("@ex.hasAuthority('code:controlGraph:page')")
public Result<PageData<ControlGraphDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<ControlGraphDTO> page = controlGraphService.page(params);
@@ -58,7 +58,7 @@ public class ControlGraphController {
@GetMapping("{id}")
@ApiOperation("信息")
// @PreAuthorize("@ex.hasAuthority('code:controlGraph:info')")
@PreAuthorize("@ex.hasAuthority('code:controlGraph:info')")
public Result<ControlGraphDTO> get(@PathVariable("id") Long id){
ControlGraphDTO data = controlGraphService.get(id);
@@ -67,8 +67,8 @@ public class ControlGraphController {
@PostMapping
@ApiOperation("保存")
// @LogOperation("保存")
// @PreAuthorize("@ex.hasAuthority('code:controlGraph:save')")
@LogOperation("保存")
@PreAuthorize("@ex.hasAuthority('code:controlGraph:save')")
public Result<Long> save(@RequestBody ControlGraphDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -80,8 +80,8 @@ public class ControlGraphController {
@PutMapping
@ApiOperation("修改")
// @LogOperation("修改")
// @PreAuthorize("@ex.hasAuthority('code:controlGraph:update')")
@LogOperation("修改")
@PreAuthorize("@ex.hasAuthority('code:controlGraph:update')")
public Result<Long> update(@RequestBody ControlGraphDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -93,8 +93,8 @@ public class ControlGraphController {
@DeleteMapping
@ApiOperation("删除")
// @LogOperation("删除")
// @PreAuthorize("@ex.hasAuthority('code:controlGraph:delete')")
@LogOperation("删除")
@PreAuthorize("@ex.hasAuthority('code:controlGraph:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
@@ -106,12 +106,18 @@ public class ControlGraphController {
@GetMapping("export")
@ApiOperation("导出")
// @LogOperation("导出")
// @PreAuthorize("@ex.hasAuthority('code:controlGraph:export')")
@LogOperation("导出")
@PreAuthorize("@ex.hasAuthority('code:controlGraph:export')")
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<ControlGraphDTO> list = controlGraphService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, ControlGraphExcel.class);
}
@PostMapping(value = "list")
@ApiOperation(value = "获取控制图形列表")
@LogOperation("获取控制图形列表")
public List<ControlGraphDTO> list() {
return controlGraphService.list();
}
}

26
ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/controller/InterpretationSchemeController.java
View File

@@ -50,7 +50,7 @@ public class InterpretationSchemeController {
@ApiImplicitParam(name = "name", value = "名称", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = "code", value = "编码", paramType = "query", dataTypeClass = String.class)
})
// @PreAuthorize("@ex.hasAuthority('code:interpretationScheme:page')")
@PreAuthorize("@ex.hasAuthority('qualityPlanning:interpretationScheme:page')")
public Result<PageData<InterpretationSchemeDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<InterpretationSchemeDTO> page = interpretationSchemeService.page(params);
@@ -59,7 +59,7 @@ public class InterpretationSchemeController {
@GetMapping("{id}")
@ApiOperation("信息")
// @PreAuthorize("@ex.hasAuthority('code:interpretationScheme:info')")
@PreAuthorize("@ex.hasAuthority('qualityPlanning:interpretationScheme:info')")
public Result<InterpretationSchemeDTO> get(@PathVariable("id") Long id){
InterpretationSchemeDTO data = interpretationSchemeService.get(id);
@@ -68,8 +68,8 @@ public class InterpretationSchemeController {
@PostMapping
@ApiOperation("保存")
// @LogOperation("保存")
// @PreAuthorize("@ex.hasAuthority('code:interpretationScheme:save')")
@LogOperation("保存")
@PreAuthorize("@ex.hasAuthority('qualityPlanning:interpretationScheme:save')")
public Result<Long> save(@RequestBody InterpretationSchemeDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -81,8 +81,8 @@ public class InterpretationSchemeController {
@PutMapping
@ApiOperation("修改")
// @LogOperation("修改")
// @PreAuthorize("@ex.hasAuthority('code:interpretationScheme:update')")
@LogOperation("修改")
@PreAuthorize("@ex.hasAuthority('qualityPlanning:interpretationScheme:update')")
public Result<Long> update(@RequestBody InterpretationSchemeDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -94,8 +94,8 @@ public class InterpretationSchemeController {
@DeleteMapping
@ApiOperation("删除")
// @LogOperation("删除")
// @PreAuthorize("@ex.hasAuthority('code:interpretationScheme:delete')")
@LogOperation("删除")
@PreAuthorize("@ex.hasAuthority('qualityPlanning:interpretationScheme:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
@@ -107,12 +107,18 @@ public class InterpretationSchemeController {
@GetMapping("export")
@ApiOperation("导出")
// @LogOperation("导出")
// @PreAuthorize("@ex.hasAuthority('code:interpretationScheme:export')")
@LogOperation("导出")
@PreAuthorize("@ex.hasAuthority('qualityPlanning:interpretationScheme:export')")
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<InterpretationSchemeDTO> list = interpretationSchemeService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, InterpretationSchemeExcel.class);
}
@PostMapping(value = "list")
@ApiOperation(value = "获取判读方案列表")
public List<InterpretationSchemeDTO> list() {
return interpretationSchemeService.list();
}
}

20
ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/controller/MyInterpretationSchemeController.java
View File

@@ -50,7 +50,7 @@ public class MyInterpretationSchemeController {
@ApiImplicitParam(name = "name", value = "名称", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = "code", value = "编码", paramType = "query", dataTypeClass = String.class)
})
// @PreAuthorize("@ex.hasAuthority('code:myInterpretationScheme:page')")
@PreAuthorize("@ex.hasAuthority('qualityPlanning:myInterpretationScheme:page')")
public Result<PageData<MyInterpretationSchemeDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<MyInterpretationSchemeDTO> page = myInterpretationSchemeService.page(params);
@@ -59,7 +59,7 @@ public class MyInterpretationSchemeController {
@GetMapping("{id}")
@ApiOperation("信息")
// @PreAuthorize("@ex.hasAuthority('code:myInterpretationScheme:info')")
@PreAuthorize("@ex.hasAuthority('qualityPlanning:myInterpretationScheme:info')")
public Result<MyInterpretationSchemeDTO> get(@PathVariable("id") Long id){
MyInterpretationSchemeDTO data = myInterpretationSchemeService.get(id);
@@ -68,8 +68,8 @@ public class MyInterpretationSchemeController {
@PostMapping
@ApiOperation("保存")
// @LogOperation("保存")
// @PreAuthorize("@ex.hasAuthority('code:myInterpretationScheme:save')")
@LogOperation("保存")
@PreAuthorize("@ex.hasAuthority('qualityPlanning:myInterpretationScheme:save')")
public Result<Long> save(@RequestBody MyInterpretationSchemeDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -81,8 +81,8 @@ public class MyInterpretationSchemeController {
@PutMapping
@ApiOperation("修改")
// @LogOperation("修改")
// @PreAuthorize("@ex.hasAuthority('code:myInterpretationScheme:update')")
@LogOperation("修改")
@PreAuthorize("@ex.hasAuthority('qualityPlanning:myInterpretationScheme:update')")
public Result<Long> update(@RequestBody MyInterpretationSchemeDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -94,8 +94,8 @@ public class MyInterpretationSchemeController {
@DeleteMapping
@ApiOperation("删除")
// @LogOperation("删除")
// @PreAuthorize("@ex.hasAuthority('code:myInterpretationScheme:delete')")
@LogOperation("删除")
@PreAuthorize("@ex.hasAuthority('qualityPlanning:myInterpretationScheme:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
@@ -107,8 +107,8 @@ public class MyInterpretationSchemeController {
@GetMapping("export")
@ApiOperation("导出")
// @LogOperation("导出")
// @PreAuthorize("@ex.hasAuthority('code:myInterpretationScheme:export')")
@LogOperation("导出")
@PreAuthorize("@ex.hasAuthority('qualityPlanning:myInterpretationScheme:export')")
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<MyInterpretationSchemeDTO> list = myInterpretationSchemeService.list(params);

2
ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/dto/MyInterpretationSchemeDTO.java
View File

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
* @since 2022-08-15
*/
@Data
@ApiModel(value = "判读方案 表DTO对象")
@ApiModel(value = "自定义判读方案 表DTO对象")
public class MyInterpretationSchemeDTO implements Serializable {
private static final long serialVersionUID = 1L;

2
ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/entity/MyInterpretationScheme.java
View File

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
*/
@Data
@TableName("my_interpretation_scheme")
@ApiModel(value = "MyInterpretationScheme对象", description = "判读方案 表")
@ApiModel(value = "MyInterpretationScheme对象", description = "自定义判读方案 表")
public class MyInterpretationScheme implements Serializable {
private static final long serialVersionUID = 1L;

5
ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/mapper/ControlGraphMapper.java
View File

@@ -1,9 +1,12 @@
package com.cnbm.qualityPlanning.mapper;
import com.cnbm.common.dao.BaseDao;
import com.cnbm.qualityPlanning.dto.ControlGraphDTO;
import com.cnbm.qualityPlanning.entity.ControlGraph;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 控制图形 表
*
@@ -12,5 +15,5 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ControlGraphMapper extends BaseDao<ControlGraph> {
List<ControlGraphDTO> list();
}

7
ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/mysql/ControlGraphmysql.sql Normal file
View File

@@ -0,0 +1,7 @@
-- 菜单初始SQL
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1562340593497346049, 1067246875800000035, '控制图形 表', 'qualityPlanning/controlGraph', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340593497346050, 1562340593497346049, '查看', NULL, 'qualityPlanning:controlGraph:page,qualityPlanning:controlGraph:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340593497346051, 1562340593497346049, '新增', NULL, 'qualityPlanning:controlGraph:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340593497346052, 1562340593497346049, '修改', NULL, 'qualityPlanning:controlGraph:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340593497346053, 1562340593497346049, '删除', NULL, 'qualityPlanning:controlGraph:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340593497346054, 1562340593497346049, '导出', NULL, 'qualityPlanning:controlGraph:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

7
ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/mysql/InterpretationSchememysql.sql Normal file
View File

@@ -0,0 +1,7 @@
-- 菜单初始SQL
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1562340725907296257, 1067246875800000035, '判读方案 表', 'qualityPlanning/interpretationScheme', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340725907296258, 1562340725907296257, '查看', NULL, 'qualityPlanning:interpretationScheme:page,qualityPlanning:interpretationScheme:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340725907296259, 1562340725907296257, '新增', NULL, 'qualityPlanning:interpretationScheme:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340725907296260, 1562340725907296257, '修改', NULL, 'qualityPlanning:interpretationScheme:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340725907296261, 1562340725907296257, '删除', NULL, 'qualityPlanning:interpretationScheme:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340725907296262, 1562340725907296257, '导出', NULL, 'qualityPlanning:interpretationScheme:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

7
ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/mysql/MyInterpretationSchememysql.sql Normal file
View File

@@ -0,0 +1,7 @@
-- 菜单初始SQL
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1562340887257968641, 1067246875800000035, '判读方案 表', 'qualityPlanning/myInterpretationScheme', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340887257968642, 1562340887257968641, '查看', NULL, 'qualityPlanning:myInterpretationScheme:page,qualityPlanning:myInterpretationScheme:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340887257968643, 1562340887257968641, '新增', NULL, 'qualityPlanning:myInterpretationScheme:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340887257968644, 1562340887257968641, '修改', NULL, 'qualityPlanning:myInterpretationScheme:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340887257968645, 1562340887257968641, '删除', NULL, 'qualityPlanning:myInterpretationScheme:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1562340887257968646, 1562340887257968641, '导出', NULL, 'qualityPlanning:myInterpretationScheme:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

4
ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/service/IControlGraphService.java
View File

@@ -5,6 +5,7 @@ import com.cnbm.common.service.CrudService;
import com.cnbm.qualityPlanning.dto.ControlGraphDTO;
import com.cnbm.qualityPlanning.entity.ControlGraph;
import java.util.List;
import java.util.Map;
/**
@@ -23,4 +24,7 @@ public interface IControlGraphService extends CrudService<ControlGraph, ControlG
void update(ControlGraphDTO dto);
void delete(Long[] ids);
List<ControlGraphDTO> list();
}

13
ym-quality-planning/src/main/java/com/cnbm/qualityPlanning/service/impl/ControlGraphServiceImpl.java
View File

@@ -11,10 +11,12 @@ import com.cnbm.qualityPlanning.entity.ControlGraph;
import com.cnbm.qualityPlanning.mapper.ControlGraphMapper;
import com.cnbm.qualityPlanning.service.IControlGraphService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
@@ -70,4 +72,15 @@ public class ControlGraphServiceImpl extends CrudServiceImpl<ControlGraphMapper,
//删除
deleteBatchIds(Arrays.asList(ids));
}
@Autowired
private ControlGraphMapper mapper;
@Override
@Transactional(rollbackFor = Exception.class)
public List<ControlGraphDTO> list() {
List<ControlGraphDTO> list = mapper.list();
return list;
}
}

7
ym-quality-planning/src/main/resources/mapper/ControlGraphMapper.xml
View File

@@ -1,6 +1,6 @@
<?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.cnbm.generator.code.mapper.ControlGraphMapper">
<mapper namespace="com.cnbm.qualityPlanning.mapper.ControlGraphMapper">
<resultMap type="com.cnbm.qualityPlanning.entity.ControlGraph" id="ControlGraphMap">
<id column="id" property="id" />
<id column="name" property="name" />
@@ -18,4 +18,9 @@
<id column="version" property="version" />
</resultMap>
<select id="list" resultType="com.cnbm.qualityPlanning.dto.ControlGraphDTO">
select * from control_graph
order by id asc
</select>
</mapper>

2
ym-quality-planning/src/main/resources/mapper/InterpretationSchemeMapper.xml
View File

@@ -1,6 +1,6 @@
<?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.cnbm.generator.code.mapper.InterpretationSchemeMapper">
<mapper namespace="com.cnbm.qualityPlanning.mapper.InterpretationSchemeMapper">
<resultMap type="com.cnbm.qualityPlanning.entity.InterpretationScheme" id="InterpretationSchemeMap">
<id column="id" property="id" />
<id column="code" property="code" />

2
ym-quality-planning/src/main/resources/mapper/MyInterpretationSchemeMapper.xml
View File

@@ -1,6 +1,6 @@
<?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.cnbm.generator.code.mapper.MyInterpretationSchemeMapper">
<mapper namespace="com.cnbm.qualityPlanning.mapper.MyInterpretationSchemeMapper">
<resultMap type="com.cnbm.qualityPlanning.entity.MyInterpretationScheme" id="MyInterpretationSchemeMap">
<id column="id" property="id" />
<id column="code" property="code" />