2024-04-30 将遗漏的两个接口加入，完善角色管理中接口权限

JYW

2024-04-30 faaf296cbb86bcb2fb5e3de2541852d91e35e3c5

2024-04-30 将遗漏的两个接口加入，完善角色管理中接口权限

 cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java

@@ -33,8 +33,8 @@
    private CapacityScopeService capacityScopeService;

    private ProductService productService;
    @ValueClassify("能力范围")
    @ApiOperation(value = "能力范围-获取项目检验参数列表")
    @ValueAuth
    @ApiOperation(value = "获取项目检验参数列表")
    @PostMapping("/selectItemParameterList")
    public Result selectItemParameterList(@RequestBody Map<String, Object> data) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
@@ -42,25 +42,25 @@
        return Result.success(capacityScopeService.selectItemParameterList(page, itemParameter));
    }
    @ValueClassify("能力范围")
    @ApiOperation(value = "能力范围-添加项目检验参数")
    @ApiOperation(value = "添加项目检验参数")
    @PostMapping("/addItemParameter")
    public Result addItemParameter(@RequestBody StructureItemParameter itemParameter) {
        return Result.success(capacityScopeService.addItemParameter(itemParameter));
    }
    @ValueClassify(value="能力范围")
    @ApiOperation(value = "能力范围-删除项目检验参数")
    @ApiOperation(value = "删除项目检验参数")
    @PostMapping("/delItemParameter")
    public Result<?> delItemParameter(Integer id) {
        return Result.success(capacityScopeService.delItemParameter(id));
    }
    @ValueClassify(value="能力范围")
    @ApiOperation(value = "能力范围-修改项目检验参数")
    @ApiOperation(value = "修改项目检验参数")
    @PostMapping("/upItemParameter")
    public Result<?> upItemParameter(@RequestBody StructureItemParameter itemParameter) {
        return Result.success(capacityScopeService.upItemParameter(itemParameter));
    }
    @ValueClassify(value="能力范围")
    @ApiOperation(value = "能力范围-获取检验对象")
    @ApiOperation(value = "获取检验对象")
    @PostMapping("/selectTestObjectList")
    public Result selectTestObjectList(@RequestBody Map<String, Object> data) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
@@ -68,37 +68,36 @@
        return Result.success(capacityScopeService.selectTestObjectList(page, pageTestObjectDto));
    }
    @ValueClassify(value="能力范围")
    @ApiOperation(value = "能力范围-添加检验对象")
    @ApiOperation(value = "添加检验对象")
    @PostMapping("/addTestObject")
    public Result addTestObject(@RequestBody StructureTestObject testObject) {
        return Result.success(capacityScopeService.addTestObject(testObject));
    }
    @ValueClassify(value="能力范围")
    @ApiOperation(value = "能力范围-删除检验对象")
    @ApiOperation(value = "删除检验对象")
    @PostMapping("/delTestObject")
    public Result<?> delTestObject(Integer id) {
        return Result.success(capacityScopeService.delTestObject(id));
    }
    @ValueClassify(value="能力范围")
    @ApiOperation(value = "能力范围-修改检验对象")
    @ApiOperation(value = "修改检验对象")
    @PostMapping("/upTestObject")
    public Result upTestObject(@RequestBody StructureTestObject testObject) {
        return Result.success(capacityScopeService.upTestObject(testObject));
    }

    @ApiOperation(value = "能力范围-获取检验对象枚举")
    @GetMapping("/selectTestObjectByName")
    @ValueAuth
    @ApiOperation(value = "获取检验对象枚举")
    @GetMapping("/selectTestObjectByName")
    public Result selectTestObjectByName() {
        return Result.success(capacityScopeService.selectTestObjectByName());
    }
    @ValueClassify(value="能力范围")
    @ApiOperation(value = "能力范围-设备里面选择检验项目(树形结构)")
    @ValueClassify("设备工具明细")
    @ApiOperation(value = "设备里面选择检验项目(树形结构)")
    @PostMapping("/getInsProduction")
    public Result getInsProduction(){
        return Result.success(capacityScopeService.getInsProduction());
    }
    @ValueClassify(value="能力范围")
    @ValueClassify(value="产品维护")
    @ApiOperation(value = "维护检验对象的产品")
    @PostMapping("/selectProductListByObjectId")
    public Result selectProductListByObjectId(@RequestBody Map<String, Object> data) throws Exception {
@@ -106,25 +105,21 @@
        Product product = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Product.class);
        return Result.success(productService.selectProductListByObjectId(page, product));
    }


    @ValueClassify(value="能力范围")
    @ApiOperation(value = "添加产品")
    @PostMapping("/addProduct")
    @ValueAuth
    public Result addProduct(@RequestBody Product product) {
        return Result.success(productService.addProduct(product));
    }

    @ValueClassify(value="能力范围")
    @ApiOperation(value = "修改产品")
    @PostMapping("/upProduct")
    @ValueAuth
    public Result upProduct(@RequestBody Product product) {
        return Result.success(productService.upProduct(product));
    }

    @ValueClassify(value="能力范围")
    @ApiOperation(value = "删除产品")
    @PostMapping("/delProduct")
    @ValueAuth
    public Result delProduct(Integer id) {
        return Result.success(productService.delProduct(id));
    }

 cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java

@@ -26,8 +26,8 @@
public class CertificationController {

    private CertificationService certificationService;
    @ValueClassify("实验室资质")
    @ApiOperation(value = "资质说明-查询资质明细列表")
    @ValueAuth
    @ApiOperation(value = "查询资质明细列表")
    @PostMapping("/getCertificationDetail")
    public Result getCertificationDetail(@RequestBody Map<String, Object> data) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
@@ -35,13 +35,13 @@
        return Result.success(certificationService.getCertificationDetail(page, certification));
    }
    @ValueClassify("实验室资质")
    @ApiOperation(value = "资质说明-添加资质明细列表")
    @ApiOperation(value = "添加资质明细列表")
    @PostMapping("/addCertificationDetail")
    public Result addCertificationDetail(@RequestBody Certification certification) {
        return Result.success(certificationService.addCertificationDetail(certification));
    }
    @ValueClassify("实验室资质")
    @ApiOperation(value = "资质说明-删除资质明细列表")
    @ApiOperation(value = "删除资质明细列表")
    @PostMapping("/delCertificationDetail")
    public Result<?> delCertificationDetail( String ids) {
        return Result.success(certificationService.delCertificationDetail(ids));

 cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java

@@ -1,6 +1,7 @@
package com.yuanchu.mom.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.UserDto;
import com.yuanchu.mom.dto.UserPageDto;
@@ -33,25 +34,25 @@

    DepartmentService departmentService;
    @ValueClassify("人员明细")
    @ApiOperation(value = "人员明细-添加部门")
    @ApiOperation(value = "添加部门")
    @PostMapping("/addDepartment")
    public Result addDepartment(@RequestBody Department department) {
        return Result.success(departmentService.addDepartment(department));
    }
    @ValueClassify("人员明细")
    @ApiOperation(value = "人员明细-获取部门树")
    @ValueAuth
    @ApiOperation(value = "获取部门树")
    @GetMapping("/selectDepartment")
    public Result selectDepartment() {
        return Result.success(departmentService.selectDepartment());
    }
    @ValueClassify("人员明细")
    @ApiOperation(value = "人员明细-删除部门")
    @ApiOperation(value = "删除部门")
    @PostMapping("/delDepartment")
    public Result delDepartment(Integer id) {
        return Result.success(departmentService.delDepartment(id));
    }
    @ValueClassify("人员明细")
    @ApiOperation(value = "人员明细-根据选择的树展示相关的人员")
    @ValueAuth
    @ApiOperation(value = "根据选择的树展示相关的人员")
    @PostMapping("/showUserById")
    public Result showUserById(@RequestBody Map<String, Object> data) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);

 cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java

@@ -37,7 +37,7 @@

    @Value("${file.path}")
    private String filePath;
    @ValueClassify("设备工具明细")
    @ValueAuth
    @ApiOperation(value = "查询设备详情列表")
    @PostMapping("/selectDeviceParameter")
    public Result selectDeviceParameter(@RequestBody Map<String, Object> data) throws Exception {
@@ -88,6 +88,7 @@
    //图片上传
    @ApiOperation(value = "设备图片上传")
    @PostMapping("/uploadFile")
    @ValueAuth
    public Result uploadFile(MultipartFile file) {
        String urlString;
        String pathName;

 cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java

@@ -31,7 +31,7 @@

    @Resource
    private LaboratoryService laboratoryService;
    @ValueClassify("场所或设施")
    @ValueAuth
    @ApiOperation(value = "查询实验室管理列表")
    @PostMapping("/selectItemParameter")
    public Result selectItemParameter(@RequestBody Map<String, Object> data) throws Exception {

 cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java

@@ -26,12 +26,6 @@
    @Resource
    private SealService sealService;

    @ApiOperation(value = "删除印章")
    @PostMapping("/deleteSeal")

    public Result deleteSeal(@RequestBody Integer id) {
        return Result.success(sealService.delSeal(id));
    }
    @ValueClassify("场所或设施")
    @ApiOperation(value = "添加印章参数")
    @PostMapping("/addSeal")
@@ -46,12 +40,6 @@
        }

    }

    @ApiOperation(value = "修改印章参数")
    @PostMapping("/upSeal")
    public  Result upSeal(@RequestBody Seal seal){
        return Result.success(sealService.upSeal(seal));
    }
    @ValueClassify("场所或设施")
    @ApiOperation(value="查询印章列表")
    @PostMapping("/selectSeal")
@@ -59,6 +47,5 @@
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
        Seal seal = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Seal.class);
        return Result.success(sealService.selectSeal(page,seal));

    }
}

 cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java

@@ -24,7 +24,7 @@
public class StandardMethodController {

    private StandardMethodService standardMethodService;
    @ValueClassify("实验室的检测能力档案")
    @ValueAuth
    @ApiOperation(value = "获取标准方法列表")
    @PostMapping("/selectStandardMethodList")
    public Result selectStandardMethodList(@RequestBody Map<String, Object> data) throws Exception {

 cnas-server/src/main/java/com/yuanchu/mom/service/SealService.java

@@ -13,10 +13,7 @@

    //新增
    int addSeal(Seal seal);
    //删除
    int delSeal(int id);
    //更新
    int upSeal(Seal seal);

    //查询
    Map<String, Object> selectSeal(Page page, Seal seal);


 cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java

@@ -25,15 +25,8 @@
        return sealMapper.insert(seal);
    }

    @Override
    public int delSeal(int id) {
        return sealMapper.deleteById(id);
    }

    @Override
    public int upSeal(Seal seal) {
        return sealMapper.updateById(seal);
    }


    @Override
    public Map<String, Object> selectSeal(Page page, Seal seal) {

 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java

@@ -42,7 +42,7 @@
    private InsOrderTemplateService insOrderTemplateService;

    //获取检验下单数据
    @ValueClassify("检验下单")
    @ValueAuth
    @ApiOperation(value = "查询检验下单数据")
    @PostMapping("/selectInsOrderParameter")
    public Result selectInsOrderParameter(@RequestBody Map<String, Object> data) throws Exception {
@@ -110,10 +110,9 @@
    public Result<?> selectInsOrderTemplateById(Integer id) {
        return Result.success("成功", insOrderTemplateService.selectInsOrderTemplateById(id));
    }

    @ValueClassify("检验下单")
    @ApiOperation(value = "删除检验单模板")
    @PostMapping("/delInsOrderTemplate")
    @ValueAuth
    public Result<?> delInsOrderTemplate(Integer id) {
        return Result.success(insOrderTemplateService.delInsOrderTemplate(id));
    }
@@ -126,7 +125,7 @@
        SampleProductDto2 sampleProductDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleProductDto2.class);
        return Result.success(insOrderService.selectSampleAndProductByOrderId(page, sampleProductDto));
    }
    @ValueClassify("费用统计")
    @ValueAuth
    @ApiOperation(value = "费用统计")
    @PostMapping("/costStatistics")
    public Result<?> costStatistics(@RequestBody Map<String, Object> data) throws Exception {
@@ -134,8 +133,8 @@
        CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
        return Result.success(insOrderService.costStatistics(page, costStatisticsDto));
    }
    @ValueClassify("样品缺陷指数")
    @ApiOperation(value = "样品缺陷指数", tags = "样品缺陷指数")
    @ValueAuth
    @ApiOperation(value = "样品缺陷指数")
    @PostMapping("/selectSampleDefects")
    public Result selectSampleDefects(Integer size, Integer current, String inspectionItems, String orderNumber) {
        return Result.success(insOrderService.selectSampleDefects(new Page<>(current, size),inspectionItems, orderNumber));

 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java

@@ -28,7 +28,7 @@

    private InsOrderPlanService insOrderPlanService;

    @ValueClassify("检验任务")
    @ValueAuth
    @ApiOperation(value = "获取检验任务列表")
    @PostMapping("/selectInsOrderPlanList")
    public Result selectInsOrderPlanList(@RequestBody Map<String, Object> data) throws Exception {

 inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java

@@ -30,7 +30,7 @@

    @Value("${wordUrl}")
    private String wordUrl;
    @ValueClassify("报告编制")
    @ValueAuth
    @ApiOperation(value = "查询检验报告数据")
    @PostMapping("/pageInsReport")
    public Result pageInsReport(@RequestBody Map<String, Object> data) throws Exception {

 inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java

@@ -2,6 +2,7 @@


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.service.ReportService;
@@ -23,19 +24,19 @@
public class ReportController {

    private ReportService reportService;
    @ValueClassify("个人首页")
    @ValueAuth
    @ApiOperation(value = "每日业务统计")
    @GetMapping("/businessStatisticsByDay")
    public Result businessStatisticsByDay(){
        return Result.success(reportService.businessStatisticsByDay());
    }
    @ValueClassify("个人首页")
    @ValueAuth
    @ApiOperation(value = "检测项目统计")
    @GetMapping("/testProductByDay")
    public Result testProductByDay(){
        return Result.success(reportService.testProductByDay());
    }
    @ValueClassify("个人首页")
    @ValueAuth
    @ApiOperation(value = "首页-->日历任务图")
    @GetMapping("/calendarWorkByWeek")
    public Result calendarWorkByWeek(){
@@ -47,7 +48,7 @@
    public Result addSchedule(String time, String text){
        return Result.success(reportService.addSchedule(time,text));
    }
    @ValueClassify("个人首页")
    @ValueAuth
    @ApiOperation(value = "首页-->我的日程")
    @PostMapping("/ScheduleByMe")
    public Result ScheduleByMe(String date){

 inspect-server/src/main/java/com/yuanchu/mom/controller/SampleOrderController.java

@@ -1,5 +1,6 @@
package com.yuanchu.mom.controller;

import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.service.SampleOrderService;
import com.yuanchu.mom.vo.Result;
import lombok.AllArgsConstructor;
@@ -18,7 +19,7 @@
public class SampleOrderController {

    private SampleOrderService sampleOrderService;

    @ValueAuth
    @GetMapping("/list")
    public Result list() {
        return Result.success(sampleOrderService.selectSampleOrderList());

 inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java

@@ -22,7 +22,7 @@
public class StandardTemplateController {

    private StandardTemplateService standardTemplateService;
    @ValueClassify("原始记录模板")
    @ValueAuth
    @ApiOperation(value = "获取原始记录模板列表")
    @PostMapping("/selectStandardTemplatePageList")
    public Result selectStandardTemplatePageList(@RequestBody Map<String, Object> data) throws Exception {

 inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java

@@ -25,7 +25,7 @@
    private StandardMethodListService standardMethodListService;

    private StandardProductListService standardProductListService;
    @ValueClassify("标准库")
    @ValueAuth
    @ApiOperation(value = "获取标准树")
    @GetMapping("/selectStandardTreeList")
    public Result selectStandardTreeList(){

 inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java

@@ -26,7 +26,7 @@
    public Result addWarehouse(String name) {
        return Result.success(warehouseService.addWarehouse(name));
    }
    @ValueClassify("样品管理")
    @ValueAuth
    @GetMapping("/selectWarehouse")
    @ApiOperation("查询仓库")
    public Result selectWarehouse() {
@@ -68,7 +68,7 @@
    public Result upShelf(@RequestBody WarehouseShelf warehouseShelf) {
        return Result.success(warehouseService.upShelf(warehouseShelf));
    }
    @ValueClassify("样品管理")

    @GetMapping("/getWarehouse")
    @ApiOperation("查询货架下的存放信息")
    @ValueAuth
@@ -88,13 +88,13 @@
        return Result.success(warehouseService.outWarehouse(sampleCode));
    }

    @ValueClassify("样品管理")
    @ValueAuth
    @PostMapping("/getSampleRecord")
    @ApiOperation("查询样品详细记录")
    public Result getSampleRecord(Integer id) {
        return Result.success(warehouseService.getSampleRecord(id));
    }
    @ValueClassify("样品管理")
    @ValueAuth
    @PostMapping("/searchSampleId")
    @ApiOperation("通过样品编号进行检索")
    public Result searchSampleId(String sampleCode) {

 user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java

@@ -24,7 +24,7 @@

    private EnumService enumService;

    @ValueClassify("数据字典")
    @ValueAuth
    @ApiOperation(value = "获取枚举列表")
    @PostMapping("/selectEnumList")
    public Result selectEnumList(@RequestBody Map<String, Object> data) throws Exception {
@@ -50,14 +50,14 @@
    public Result<?> delEnum(Integer id) {
        return Result.success(enumService.delEnum(id));
    }
    @ValueClassify("数据字典")

    @ApiOperation(value = "通过分类查询枚举")
    @PostMapping("/selectEnumByCategory")
    @ValueAuth
    public Result<?> selectEnumByCategory(String category){
        return Result.success(enumService.selectEnumByCategory(category));
    }
    @ValueClassify("数据字典")
    @ValueAuth
    @ApiOperation(value = "获取数据字典的分类")
    @PostMapping("/getDic")
    public Result<?> getDic(){

 user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java

@@ -28,14 +28,14 @@
    private RoleService roleService;

    private PowerService powerService;
    @ValueClassify("角色管理")
    @ValueAuth
    @ApiOperation(value = "获取角色列表枚举")
    @GetMapping("/selectRoleList")
    public Result selectRoleList(){
        return Result.success(roleService.selectList());
    }

    @ValueClassify("角色管理")
    @ValueAuth
    @ApiOperation(value = "获取角色列表")
    @PostMapping("/selectRoleLists")
    public Result selectRoleLists(@RequestBody Map<String, Object> data) throws Exception {
@@ -49,13 +49,13 @@
    public Result delRole(Integer id){
        return Result.success(roleService.delRole(id));
    }
    @ValueClassify("角色管理")
    @ValueAuth
    @ApiOperation(value = "通过角色id查询权限列表")
    @PostMapping("/selectPowerByRoleId")
    public Result<?> selectPowerByRoleId(Integer id) {
        return Result.success(powerService.selectPowerByRoleId(id));
    }
    @ValueClassify("角色管理")

    @ApiOperation(value = "获取菜单")
    @GetMapping("/selectMenuList")
    @ValueAuth

 user-server/src/main/java/com/yuanchu/mom/controller/SystemLogController.java

@@ -3,6 +3,7 @@


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.pojo.PageSystemLogDto;
import com.yuanchu.mom.service.SystemLogService;
@@ -28,7 +29,7 @@
public class SystemLogController  {

    private SystemLogService systemLogService;
    @ValueClassify("系统日志")
    @ValueAuth
    @ApiOperation(value = "获取系统日志列表")
    @PostMapping("/selectSystemLogList")
    public Result selectSystemLogList(@RequestBody Map<String, Object> data) throws Exception {

 user-server/src/main/java/com/yuanchu/mom/controller/UserController.java

@@ -91,7 +91,7 @@
        }
        return Result.fail(map.get("info"));
    }
    @ValueClassify("用户管理")
    @ValueAuth
    @ApiOperation(value = "获取用户列表")
    @PostMapping("/selectUserList")
    public Result selectUserList(@RequestBody Map<String, Object> data) throws Exception {
@@ -122,7 +122,7 @@
    public Result<?> getUserMenu() {
        return Result.success(userService.getUserMenu());
    }
    @ValueClassify("用户管理")
    @ValueAuth
    @ApiOperation(value = "获取客户列表")
    @PostMapping("/selectCustomPageList")
    public Result selectCustomPageList(@RequestBody Map<String, Object> data) throws Exception {
@@ -130,13 +130,13 @@
        Custom custom = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Custom.class);
        return Result.success(customService.selectCustomPageList(page, custom));
    }
    @ValueClassify("用户管理")
    @ValueClassify("客户管理")
    @ApiOperation(value = "删除客户信息")
    @PostMapping("/delCustomById")
    public Result<?> delCustomById(Integer id) {
        return Result.success(customService.delCustomById(id));
    }
    @ValueClassify("用户管理")
    @ValueClassify("客户管理")
    @ApiOperation(value = "新增客户信息")
    @PostMapping("/addCustom")
    public Result<?> addCustom(@RequestBody Custom custom) {