2024-04-29 自定义注解，给每个接口加上自定义注解

JYW

2024-04-29 a9015e429e40f83afdffd43552d34b82e67a75ff

2024-04-29 自定义注解，给每个接口加上自定义注解

 cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.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.PageTestObjectDto;
import com.yuanchu.mom.pojo.Product;
import com.yuanchu.mom.pojo.StructureItemParameter;
@@ -32,7 +33,7 @@
    private CapacityScopeService capacityScopeService;

    private ProductService productService;

    @ValueClassify("能力范围")
    @ApiOperation(value = "能力范围-获取项目检验参数列表")
    @PostMapping("/selectItemParameterList")
    public Result selectItemParameterList(@RequestBody Map<String, Object> data) throws Exception {
@@ -40,25 +41,25 @@
        StructureItemParameter itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), StructureItemParameter.class);
        return Result.success(capacityScopeService.selectItemParameterList(page, itemParameter));
    }

    @ValueClassify("能力范围")
    @ApiOperation(value = "能力范围-添加项目检验参数")
    @PostMapping("/addItemParameter")
    public Result addItemParameter(@RequestBody StructureItemParameter itemParameter) {
        return Result.success(capacityScopeService.addItemParameter(itemParameter));
    }

    @ValueClassify(value="能力范围")
    @ApiOperation(value = "能力范围-删除项目检验参数")
    @PostMapping("/delItemParameter")
    public Result<?> delItemParameter(Integer id) {
        return Result.success(capacityScopeService.delItemParameter(id));
    }

    @ValueClassify(value="能力范围")
    @ApiOperation(value = "能力范围-修改项目检验参数")
    @PostMapping("/upItemParameter")
    public Result<?> upItemParameter(@RequestBody StructureItemParameter itemParameter) {
        return Result.success(capacityScopeService.upItemParameter(itemParameter));
    }

    @ValueClassify(value="能力范围")
    @ApiOperation(value = "能力范围-获取检验对象")
    @PostMapping("/selectTestObjectList")
    public Result selectTestObjectList(@RequestBody Map<String, Object> data) throws Exception {
@@ -66,19 +67,19 @@
        PageTestObjectDto pageTestObjectDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), PageTestObjectDto.class);
        return Result.success(capacityScopeService.selectTestObjectList(page, pageTestObjectDto));
    }

    @ValueClassify(value="能力范围")
    @ApiOperation(value = "能力范围-添加检验对象")
    @PostMapping("/addTestObject")
    public Result addTestObject(@RequestBody StructureTestObject testObject) {
        return Result.success(capacityScopeService.addTestObject(testObject));
    }

    @ValueClassify(value="能力范围")
    @ApiOperation(value = "能力范围-删除检验对象")
    @PostMapping("/delTestObject")
    public Result<?> delTestObject(Integer id) {
        return Result.success(capacityScopeService.delTestObject(id));
    }

    @ValueClassify(value="能力范围")
    @ApiOperation(value = "能力范围-修改检验对象")
    @PostMapping("/upTestObject")
    public Result upTestObject(@RequestBody StructureTestObject testObject) {
@@ -91,13 +92,13 @@
    public Result selectTestObjectByName() {
        return Result.success(capacityScopeService.selectTestObjectByName());
    }

    @ValueClassify(value="能力范围")
    @ApiOperation(value = "能力范围-设备里面选择检验项目(树形结构)")
    @PostMapping("/getInsProduction")
    public Result getInsProduction(){
        return Result.success(capacityScopeService.getInsProduction());
    }

    @ValueClassify(value="能力范围")
    @ApiOperation(value = "维护检验对象的产品")
    @PostMapping("/selectProductListByObjectId")
    public Result selectProductListByObjectId(@RequestBody Map<String, Object> data) throws Exception {
@@ -106,6 +107,7 @@
        return Result.success(productService.selectProductListByObjectId(page, product));
    }


    @ApiOperation(value = "添加产品")
    @PostMapping("/addProduct")
    @ValueAuth

 cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.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.pojo.Certification;
import com.yuanchu.mom.pojo.Device;
import com.yuanchu.mom.service.CertificationService;
@@ -25,22 +26,21 @@
public class CertificationController {

    private CertificationService certificationService;

    @ValueClassify("实验室资质")
    @ApiOperation(value = "资质说明-查询资质明细列表")
    @PostMapping("/getCertificationDetail")
    public Result getCertificationDetail(@RequestBody Map<String, Object> data) throws Exception {
        System.out.println(data);
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
        Certification certification = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Certification.class);
        return Result.success(certificationService.getCertificationDetail(page, certification));
    }

    @ValueClassify("实验室资质")
    @ApiOperation(value = "资质说明-添加资质明细列表")
    @PostMapping("/addCertificationDetail")
    public Result addCertificationDetail(@RequestBody Certification certification) {
        return Result.success(certificationService.addCertificationDetail(certification));
    }

    @ValueClassify("实验室资质")
    @ApiOperation(value = "资质说明-删除资质明细列表")
    @PostMapping("/delCertificationDetail")
    public Result<?> delCertificationDetail( String 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.ValueClassify;
import com.yuanchu.mom.dto.UserDto;
import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.pojo.Department;
@@ -31,25 +32,25 @@
public class DepartmentController {

    DepartmentService departmentService;

    @ValueClassify("人员明细")
    @ApiOperation(value = "人员明细-添加部门")
    @PostMapping("/addDepartment")
    public Result addDepartment(@RequestBody Department department) {
        return Result.success(departmentService.addDepartment(department));
    }

    @ValueClassify("人员明细")
    @ApiOperation(value = "人员明细-获取部门树")
    @GetMapping("/selectDepartment")
    public Result selectDepartment() {
        return Result.success(departmentService.selectDepartment());
    }

    @ValueClassify("人员明细")
    @ApiOperation(value = "人员明细-删除部门")
    @PostMapping("/delDepartment")
    public Result delDepartment(Integer id) {
        return Result.success(departmentService.delDepartment(id));
    }

    @ValueClassify("人员明细")
    @ApiOperation(value = "人员明细-根据选择的树展示相关的人员")
    @PostMapping("/showUserById")
    public Result showUserById(@RequestBody Map<String, Object> data) throws Exception {
@@ -57,6 +58,5 @@
        UserDto user = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserDto.class);
        return Result.success(departmentService.showUserById(page, user));
    }


}

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

@@ -4,6 +4,7 @@
import cn.hutool.core.lang.UUID;
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.DeviceDto;
import com.yuanchu.mom.pojo.Device;
import com.yuanchu.mom.service.DeviceService;
@@ -36,7 +37,7 @@

    @Value("${file.path}")
    private String filePath;

    @ValueClassify("设备工具明细")
    @ApiOperation(value = "查询设备详情列表")
    @PostMapping("/selectDeviceParameter")
    public Result selectDeviceParameter(@RequestBody Map<String, Object> data) throws Exception {
@@ -44,19 +45,19 @@
        DeviceDto itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), DeviceDto.class);
        return Result.success(deviceService.selectDeviceParameter(page, itemParameter));
    }

    @ValueClassify("设备工具明细")
    @ApiOperation(value = "添加设备详情参数")
    @PostMapping("/addDeviceParameter")
    public Result addDeviceParameter(@RequestBody Device itemParameter) {
        return Result.success(deviceService.addDeviceParameter(itemParameter));
    }

    @ValueClassify("设备工具明细")
    @ApiOperation(value = "删除设备详情参数")
    @PostMapping("/delDeviceParameter")
    public Result<?> delDeviceParameter(Integer id) {
        return Result.success(deviceService.delDeviceParameter(id));
    }

    @ValueClassify("设备工具明细")
    @ApiOperation(value = "修改设备详情参数")
    @PostMapping("/upDeviceParameter")
    public Result<?> upDeviceParameter(@RequestBody Device itemParameter) {

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

@@ -4,6 +4,7 @@
import cn.hutool.core.lang.UUID;
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.Laboratory;
import com.yuanchu.mom.service.LaboratoryService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -30,7 +31,7 @@

    @Resource
    private LaboratoryService laboratoryService;

    @ValueClassify("场所或设施")
    @ApiOperation(value = "查询实验室管理列表")
    @PostMapping("/selectItemParameter")
    public Result selectItemParameter(@RequestBody Map<String, Object> data) throws Exception {
@@ -38,19 +39,19 @@
        Laboratory itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Laboratory.class);
        return Result.success(laboratoryService.selectItemParameter(page, itemParameter));
    }

    @ValueClassify("场所或设施")
    @ApiOperation(value = "添加实验室参数")
    @PostMapping("/addParameter")
    public Result addParameter(@RequestBody Laboratory itemParameter) {
        return Result.success(laboratoryService.addParameter(itemParameter));
    }

    @ValueClassify("场所或设施")
    @ApiOperation(value = "删除实验室参数")
    @PostMapping("/delParameter")
    public Result<?> delParameter(Integer id) {
        return Result.success(laboratoryService.delParameter(id));
    }

    @ValueClassify("场所或设施")
    @ApiOperation(value = "修改实验室参数")
    @PostMapping("/upParameter")
    public Result<?> upParameter(@RequestBody Laboratory itemParameter) {

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

@@ -1,5 +1,6 @@
package com.yuanchu.mom.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.pojo.Laboratory;
import com.yuanchu.mom.pojo.Seal;
import com.yuanchu.mom.service.SealService;
@@ -27,9 +28,11 @@

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

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

    }

    @ApiOperation(value = "修改印章参数")
    @PostMapping("/upSeal")
    public  Result upSeal(@RequestBody Seal seal){
        return Result.success(sealService.upSeal(seal));
    }
    @ValueClassify("场所或设施")
    @ApiOperation(value="查询印章列表")
    @PostMapping("/selectSeal")
    public  Result selectSeal(@RequestBody Map<String, Object> data) throws Exception {
        System.out.println(data);
        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

@@ -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.pojo.StandardMethod;
import com.yuanchu.mom.pojo.StructureItemParameter;
import com.yuanchu.mom.service.StandardMethodService;
@@ -23,7 +24,7 @@
public class StandardMethodController {

    private StandardMethodService standardMethodService;

    @ValueClassify("实验室的检测能力档案")
    @ApiOperation(value = "获取标准方法列表")
    @PostMapping("/selectStandardMethodList")
    public Result selectStandardMethodList(@RequestBody Map<String, Object> data) throws Exception {
@@ -38,19 +39,19 @@
    public Result selectStandardMethods(){
        return Result.success(standardMethodService.selectStandardMethods());
    }

    @ValueClassify("实验室的检测能力档案")
    @ApiOperation(value = "添加标准方法")
    @PostMapping("/addStandardMethod")
    public Result addStandardMethod(@RequestBody StandardMethod standardMethod) {
        return Result.success(standardMethodService.addStandardMethod(standardMethod));
    }

    @ValueClassify("实验室的检测能力档案")
    @ApiOperation(value = "删除标准方法")
    @PostMapping("/delStandardMethod")
    public Result<?> delStandardMethod(Integer id) {
        return Result.success(standardMethodService.delStandardMethod(id));
    }

    @ValueClassify("实验室的检测能力档案")
    @ApiOperation(value = "修改标准方法")
    @PostMapping("/upStandardMethod")
    public Result<?> upStandardMethod(@RequestBody StandardMethod standardMethod) {

 cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java

@@ -21,7 +21,6 @@
    @TableId(type = IdType.AUTO)
    private Integer id;


    @ApiModelProperty(value = "实验室id")
    private Integer labId;


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

@@ -40,7 +40,6 @@
        Map<String, Object> map = new HashMap<>();
        map.put("head", PrintChina.printChina(Seal.class));
        map.put("body", sealMapper.selectSeal(page, QueryWrappers.queryWrappers(seal)));

        return map;
    }
    @Override

 cnas-server/src/main/resources/mapper/SealMapper.xml

@@ -4,7 +4,7 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.SealMapper">
    <select id="selectSeal" resultType="com.yuanchu.mom.pojo.Seal">
        select l.id,s.lab_id,l.laboratory_name ,s.address, s.type as type,s.create_time
        select l.id,s.lab_id,l.laboratory_name ,s.address, s.type as Type,s.create_time
        from seal s  LEFT JOIN laboratory l  on s.lab_id=l.id
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}

 cnas-server/src/main/resources/mapper/StandardMethodMapper.xml

@@ -17,26 +17,26 @@

    <select id="selectStandardMethodList" resultType="com.yuanchu.mom.pojo.StandardMethod">
        select * from (
        select sm.id,
        sm.code,
        sm.name,
        sm.structure_test_object_id,
        sto.specimen_name sample_type,
        sm.remark,
        u1.name create_user_name,
        sm.create_time,
        u2.name update_user_name,
        sm.update_time,
        sm.is_product,
        sm.field,
        sm.name_en,
        sm.is_use,
        sm.qualification_id
        from standard_method sm
        left join user u1 on sm.create_user = u1.id
        left join user u2 on sm.update_user = u2.id
        left join structure_test_object sto on sm.structure_test_object_id = sto.id
        ) a
                select sm.id,
                sm.code,
                sm.name,
                sm.structure_test_object_id,
                sto.specimen_name sample_type,
                sm.remark,
                u1.name create_user_name,
                sm.create_time,
                u2.name update_user_name,
                sm.update_time,
                sm.is_product,
                sm.field,
                sm.name_en,
                sm.is_use,
                sm.qualification_id
                from standard_method sm
                left join user u1 on sm.create_user = u1.id
                left join user u2 on sm.update_user = u2.id
                left join structure_test_object sto on sm.structure_test_object_id = sto.id
                ) a
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>

 framework/src/main/java/com/yuanchu/mom/annotation/ValueClassify.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
package com.yuanchu.mom.annotation;

import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;

@Retention(RetentionPolicy.RUNTIME)
public @interface ValueClassify {
    String value() default "";
}

 framework/src/main/java/com/yuanchu/mom/common/AllController.java

@@ -1,8 +1,10 @@
package com.yuanchu.mom.common;

import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.mapper.AuthMapper;
import io.swagger.annotations.ApiOperation;
import org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration;
import org.springframework.stereotype.Component;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.method.HandlerMethod;
@@ -11,6 +13,7 @@

import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.lang.reflect.Method;
import java.util.Map;

@Component
@@ -28,31 +31,39 @@
        for (HandlerMethod value : methodMap.values()) {
            ApiOperation annotation = value.getMethodAnnotation(ApiOperation.class);
            ValueAuth valueAuth = value.getMethodAnnotation(ValueAuth.class);
            if (valueAuth==null){
                if (annotation != null) {
            ValueClassify valueClassify = value.getMethodAnnotation(ValueClassify.class);
            if (valueAuth == null) {
                if (valueClassify !=null) {
                    String type = valueClassify.value();
                    String remark = annotation.value();
                    String type = "修改";
                    if (remark.contains("获取")||remark.contains("查询")){
                        type = "查询";
                    } else if(remark.contains("删除")){
                        type = "删除";
                    } else if(remark.contains("添加")||remark.contains("新增")||remark.contains("认领")){
                        type = "添加";
                    } else if(remark.contains("导入")){
                        type = "导入";
                    } else if(remark.contains("导出")){
                        type = "导出";
                    }
                    try {
                        authMapper.insertPower(value.getMethod().getName(), remark, type);
                    }catch (Exception e){
                        System.err.println(value.getMethod());
                    authMapper.insertPower(value.getMethod().getName(),remark,type);
                }else{
                    if (annotation != null) {
                        String remark = annotation.value();
                        String type = "修改";
                        if (remark.contains("获取") || remark.contains("查询")) {
                            type = "查询";
                        } else if (remark.contains("删除")) {
                            type = "删除";
                        } else if (remark.contains("添加") || remark.contains("新增") || remark.contains("认领")) {
                            type = "添加";
                        } else if (remark.contains("导入")) {
                            type = "导入";
                        } else if (remark.contains("导出")) {
                            type = "导出";
                        }
                        try {
                            authMapper.insertPower(value.getMethod().getName(), remark, type);
                        } catch (Exception e) {
                            System.err.println(value.getMethod());
                            e.printStackTrace();
                        }
                    }
                }
                }
            }
            System.out.println("********************权限菜单完成********************");
        }
        System.out.println("********************权限菜单完成********************");
    }

    @PostConstruct
    public void pingStart() {

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

@@ -5,6 +5,7 @@
import com.alibaba.fastjson.JSONArray;
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.CostStatisticsDto;
import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.dto.SampleProductDto;
@@ -41,6 +42,7 @@
    private InsOrderTemplateService insOrderTemplateService;

    //获取检验下单数据
    @ValueClassify("检验下单")
    @ApiOperation(value = "查询检验下单数据")
    @PostMapping("/selectInsOrderParameter")
    public Result selectInsOrderParameter(@RequestBody Map<String, Object> data) throws Exception {
@@ -48,13 +50,13 @@
        SampleOrderDto sampleOrderDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleOrderDto.class);
        return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
    }

    @ValueClassify("检验下单")
    @ApiOperation(value = "检验分配")
    @PostMapping("/upInsOrder")
    public Result<?> upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId) {
        return Result.success(insOrderService.upInsOrder(orderId, sampleId, appointed, userId));
    }

    @ValueClassify("检验下单")
    @ApiOperation(value = "添加检验下单数据")
    @PostMapping("/addInsOrder")
    public Result<?> addInsOrder(@RequestBody Map<String, Object> map) {
@@ -78,7 +80,7 @@
    public Result<?> getInsOrder(Integer orderId) {
        return Result.success(insOrderService.getInsOrder(orderId));
    }

    @ValueClassify("检验下单")
    @ApiOperation(value = "审核检验单进行状态修改")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "id", value = "检验单id", dataTypeClass = Integer.class),
@@ -88,7 +90,7 @@
    public Result<?> upInsOrderOfState(@RequestBody InsOrder insOrder) {
        return Result.success(insOrderService.upInsOrderOfState(insOrder));
    }

    @ValueClassify("检验下单")
    @ApiOperation(value = "添加检验单模板")
    @PostMapping("/addInsOrderTemplate")
    public Result<?> addInsOrderTemplate(@RequestBody InsOrderTemplate insOrderTemplate) {
@@ -124,7 +126,7 @@
        SampleProductDto2 sampleProductDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleProductDto2.class);
        return Result.success(insOrderService.selectSampleAndProductByOrderId(page, sampleProductDto));
    }

    @ValueClassify("费用统计")
    @ApiOperation(value = "费用统计")
    @PostMapping("/costStatistics")
    public Result<?> costStatistics(@RequestBody Map<String, Object> data) throws Exception {
@@ -132,6 +134,7 @@
        CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
        return Result.success(insOrderService.costStatistics(page, costStatisticsDto));
    }
    @ValueClassify("样品缺陷指数")
    @ApiOperation(value = "样品缺陷指数", tags = "样品缺陷指数")
    @PostMapping("/selectSampleDefects")
    public Result selectSampleDefects(Integer size, Integer current, String inspectionItems, String orderNumber) {

 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.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.InsOrderPlanDTO;
import com.yuanchu.mom.service.InsOrderPlanService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -27,6 +28,7 @@

    private InsOrderPlanService insOrderPlanService;

    @ValueClassify("检验任务")
    @ApiOperation(value = "获取检验任务列表")
    @PostMapping("/selectInsOrderPlanList")
    public Result selectInsOrderPlanList(@RequestBody Map<String, Object> data) throws Exception {
@@ -35,31 +37,31 @@
        InsOrderPlanDTO insOrderPlanDTO = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsOrderPlanDTO.class);
        return Result.success(insOrderPlanService.selectInsOrderPlanList(page, insOrderPlanDTO));
    }

    @ValueClassify("检验任务")
    @ApiOperation(value = "认领任务计划")
    @PostMapping("/claimInsOrderPlan")
    public Result claimInsOrderPlan(@RequestBody InsOrderPlanDTO data) {
        return Result.success(insOrderPlanService.claimInsOrderPlan(data));
    }

    @ValueClassify("检验任务")
    @ApiOperation(value = "执行检验操作")
    @PostMapping("/doInsOrder")
    public Result<?> doInsOrder(Integer id, String laboratory) {
        return Result.success(insOrderPlanService.doInsOrder(id, laboratory));
    }

    @ValueClassify("检验任务")
    @ApiOperation(value = "任务交接")
    @PostMapping("/upPlanUser")
    public Result<?> upPlanUser(Integer userId, Integer orderId) {
        return Result.success(insOrderPlanService.upPlanUser(userId, orderId));
    }

    @ValueClassify("检验任务")
    @ApiOperation(value = "复核检验任务")
    @PostMapping("/verifyPlan")
    public Result<?> verifyPlan(Integer orderId, String laboratory, Integer type, String tell) {
        return Result.success(insOrderPlanService.verifyPlan(orderId, laboratory, type, tell));
    }

    @ValueClassify("检验任务")
    @ApiOperation(value = "检验任务提交")
    @PostMapping("/submitPlan")
    public Result<?> submitPlan(Integer orderId, String laboratory) {

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

@@ -1,6 +1,8 @@
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.ReportPageDto;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.service.InsReportService;
@@ -28,7 +30,7 @@

    @Value("${wordUrl}")
    private String wordUrl;

    @ValueClassify("报告编制")
    @ApiOperation(value = "查询检验报告数据")
    @PostMapping("/pageInsReport")
    public Result pageInsReport(@RequestBody Map<String, Object> data) throws Exception {
@@ -39,6 +41,7 @@

    @ApiOperation(value = "报告上传")
    @PostMapping("/inReport")
    @ValueAuth
    public Result inReport(MultipartFile file, Integer id) {
        String urlString;
        String pathName;
@@ -56,31 +59,31 @@
            throw new ErrorException("文件上传失败");
        }
    }

    @ValueClassify("报告编制")
    @ApiOperation(value = "报告还原")
    @PostMapping("/upReportUrl")
    public Result upReportUrl(Integer id) {
        return Result.success(insReportService.upReportUrl(id));
    }

    @ValueClassify("报告编制")
    @ApiOperation(value = "报告在线编制")
    @GetMapping("/upReportFile")
    public Result upReportFile() {
        return Result.success();
    }

    @ValueClassify("报告编制")
    @ApiOperation(value = "提交")
    @PostMapping("/writeReport")
    public Result writeReport(Integer id) {
        return Result.success(insReportService.writeReport(id));
    }

    @ValueClassify("报告编制")
    @ApiOperation(value = "审核")
    @PostMapping("/examineReport")
    public Result examineReport(Integer id, Integer isExamine, String examineTell) {
        return Result.success(insReportService.examineReport(id, isExamine, examineTell));
    }

    @ValueClassify("报告编制")
    @ApiOperation(value = "批准")
    @PostMapping("/ratifyReport")
    public Result ratifyReport(Integer id, Integer isRatify, String ratifyTell) {

 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.ValueClassify;
import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.service.ReportService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -22,31 +23,31 @@
public class ReportController {

    private ReportService reportService;

    @ValueClassify("个人首页")
    @ApiOperation(value = "每日业务统计")
    @GetMapping("/businessStatisticsByDay")
    public Result businessStatisticsByDay(){
        return Result.success(reportService.businessStatisticsByDay());
    }

    @ValueClassify("个人首页")
    @ApiOperation(value = "检测项目统计")
    @GetMapping("/testProductByDay")
    public Result testProductByDay(){
        return Result.success(reportService.testProductByDay());
    }

    @ValueClassify("个人首页")
    @ApiOperation(value = "首页-->日历任务图")
    @GetMapping("/calendarWorkByWeek")
    public Result calendarWorkByWeek(){
        return Result.success(reportService.calendarWorkByWeek());
    }

    @ValueClassify("个人首页")
    @ApiOperation(value = "首页-->添加日程")
    @PostMapping("/addSchedule")
    public Result addSchedule(String time, String text){
        return Result.success(reportService.addSchedule(time,text));
    }

    @ValueClassify("个人首页")
    @ApiOperation(value = "首页-->我的日程")
    @PostMapping("/ScheduleByMe")
    public Result ScheduleByMe(String date){

 inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.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.pojo.StandardTemplate;
import com.yuanchu.mom.service.StandardTemplateService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -21,7 +22,7 @@
public class StandardTemplateController {

    private StandardTemplateService standardTemplateService;

    @ValueClassify("原始记录模板")
    @ApiOperation(value = "获取原始记录模板列表")
    @PostMapping("/selectStandardTemplatePageList")
    public Result selectStandardTemplatePageList(@RequestBody Map<String, Object> data) throws Exception {
@@ -29,19 +30,19 @@
        StandardTemplate standardTemplate = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), StandardTemplate.class);
        return Result.success(standardTemplateService.selectStandardTemplatePageList(page, standardTemplate));
    }

    @ValueClassify("原始记录模板")
    @ApiOperation(value = "添加原始记录模板")
    @PostMapping("/addStandardTemplate")
    public Result addStandardTemplate(@RequestBody StandardTemplate standardTemplate) {
        return Result.success(standardTemplateService.addStandardTemplate(standardTemplate));
    }

    @ValueClassify("原始记录模板")
    @ApiOperation(value = "修改原始记录模板")
    @PostMapping("/upStandardTemplate")
    public Result<?> upStandardTemplate(@RequestBody StandardTemplate standardTemplate) {
        return Result.success(standardTemplateService.upStandardTemplate(standardTemplate));
    }

    @ValueClassify("原始记录模板")
    @ApiOperation(value = "删除原始记录模板")
    @PostMapping("/delStandardTemplate")
    public Result<?> delStandardTemplate(Integer id) {

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

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.pojo.StandardProductList;
import com.yuanchu.mom.pojo.StandardTree;
@@ -24,19 +25,19 @@
    private StandardMethodListService standardMethodListService;

    private StandardProductListService standardProductListService;

    @ValueClassify("标准库")
    @ApiOperation(value = "获取标准树")
    @GetMapping("/selectStandardTreeList")
    public Result selectStandardTreeList(){
        return Result.success(standardTreeService.selectStandardTreeList());
    }

    @ValueClassify("标准库")
    @ApiOperation(value = "添加标准树")
    @PostMapping("/addStandardTree")
    public Result addStandardTree(@RequestBody StandardTree standardTree){
        return Result.success(standardTreeService.addStandardTree(standardTree));
    }

    @ValueClassify("标准库")
    @ApiOperation(value = "给标准树添加检验标准")
    @PostMapping("/addStandardMethodList")
    public Result addStandardMethodList(String tree, Integer standardId){
@@ -49,32 +50,32 @@
    public Result selectsStandardMethodByFLSSM(String tree){
        return Result.success(standardMethodListService.selectsStandardMethodByFLSSM(tree));
    }

    @ValueClassify("标准库")
    @ApiOperation(value = "修改标准库中的要求值")
    @PostMapping("/upStandardProductList")
    public Result upStandardProductList(@RequestBody StandardProductList list){
        return Result.success(standardProductListService.upStandardProductList(list));
    }

    @ValueClassify("标准库")
    @ApiOperation(value = "删除标准树下的检验标准")
    @PostMapping("/delStandardMethodByFLSSM")
    public Result delStandardMethodByFLSSM(Integer id){
        return Result.success(standardMethodListService.delStandardMethodByFLSSM(id));
    }

    @ValueClassify("标准库")
    @ApiOperation(value = "删除标准树下的检验项目")
    @PostMapping("/delStandardProductByIds")
    public Result delStandardProductByIds(String ids){
        JSONArray lists = JSON.parseArray(ids);
        return Result.success(standardProductListService.delStandardProduct(lists));
    }

    @ValueClassify("标准库")
    @ApiOperation(value = "新增标准树下的检验项目")
    @PostMapping("/addStandardProduct")
    public Result addStandardProduct(String ids, String tree){
        return Result.success(standardTreeService.addStandardProduct(ids, tree));
    }

    @ValueClassify("标准库")
    @ApiOperation(value = "删除标准树的层级")
    @PostMapping("/delStandardTree")
    public Result delStandardTree(String tree){

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

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

import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.pojo.Warehouse;
import com.yuanchu.mom.pojo.WarehouseShelf;
import com.yuanchu.mom.service.WarehouseService;
@@ -19,19 +20,19 @@
public class WarehouseController {

    private WarehouseService warehouseService;

    @ValueClassify("样品管理")
    @PostMapping("/addWarehouse")
    @ApiOperation("添加仓库")
    public Result addWarehouse(String name) {
        return Result.success(warehouseService.addWarehouse(name));
    }

    @ValueClassify("样品管理")
    @GetMapping("/selectWarehouse")
    @ApiOperation("查询仓库")
    public Result selectWarehouse() {
        return Result.success(warehouseService.selectWarehouse());
    }

    @ValueClassify("样品管理")
    @PostMapping("/addShelf")
    @ApiOperation("添加货架")
    @ApiImplicitParams({
@@ -43,60 +44,60 @@
    public Result addShelf(@RequestBody WarehouseShelf warehouseShelf) {
        return Result.success(warehouseService.addShelf(warehouseShelf));
    }

    @ValueClassify("样品管理")
    @PostMapping("/delWarehouse")
    @ApiOperation("删除仓库")
    public Result delWarehouse(Integer id) {
        return Result.success(warehouseService.delWarehouse(id));
    }

    @ValueClassify("样品管理")
    @PostMapping("/upWarehouse")
    @ApiOperation("修改仓库")
    public Result upWarehouse(@RequestBody Warehouse warehouse) {
        return Result.success(warehouseService.upWarehouse(warehouse));
    }

    @ValueClassify("样品管理")
    @PostMapping("/delShelf")
    @ApiOperation("删除货架")
    public Result delShelf(Integer id) {
        return Result.success(warehouseService.delShelf(id));
    }

    @ValueClassify("样品管理")
    @PostMapping("/upShelf")
    @ApiOperation("修改货架")
    public Result upShelf(@RequestBody WarehouseShelf warehouseShelf) {
        return Result.success(warehouseService.upShelf(warehouseShelf));
    }

    @ValueClassify("样品管理")
    @GetMapping("/getWarehouse")
    @ApiOperation("查询货架下的存放信息")
    @ValueAuth
    public Result getWarehouse(Integer shelfId) {
        return Result.success(warehouseService.getWarehouse(shelfId));
    }

    @ValueClassify("样品管理")
    @PostMapping("/inWarehouse")
    @ApiOperation("样品入库")
    public Result inWarehouse(String trees, String sampleCode) {
        return Result.success(warehouseService.inWarehouse(trees, sampleCode));
    }

    @ValueClassify("样品管理")
    @PostMapping("/outWarehouse")
    @ApiOperation("样品出库")
    public Result outWarehouse(String sampleCode) {
        return Result.success(warehouseService.outWarehouse(sampleCode));
    }

    @ValueClassify("样品管理")
    @PostMapping("/getSampleRecord")
    @ApiOperation("查询样品详细记录")
    public Result getSampleRecord(Integer id) {
        return Result.success(warehouseService.getSampleRecord(id));
    }

    @ValueClassify("样品管理")
    @PostMapping("/searchSampleId")
    @ApiOperation("通过样品编号进行检索")
    public Result searchSampleId(String sampleCode) {
        return Result.success(warehouseService.searchSampleId(sampleCode));
    }

}

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

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
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.RolePowerDto;
import com.yuanchu.mom.pojo.Enums;
import com.yuanchu.mom.service.EnumService;
@@ -23,6 +24,7 @@

    private EnumService enumService;

    @ValueClassify("数据字典")
    @ApiOperation(value = "获取枚举列表")
    @PostMapping("/selectEnumList")
    public Result selectEnumList(@RequestBody Map<String, Object> data) throws Exception {
@@ -30,32 +32,32 @@
        Enums enums = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Enums.class);
        return Result.success(enumService.selectEnumList(page, enums));
    }

    @ValueClassify("数据字典")
    @ApiOperation(value = "添加枚举")
    @PostMapping("/addEnum")
    public Result addEnum(@RequestBody Enums enums) {
        return Result.success(enumService.addEnum(enums));
    }

    @ValueClassify("数据字典")
    @ApiOperation(value = "修改枚举")
    @PostMapping("/upEnum")
    public Result<?> upEnum(@RequestBody Enums enums) {
        return Result.success(enumService.upEnum(enums));
    }

    @ValueClassify("数据字典")
    @ApiOperation(value = "删除枚举")
    @PostMapping("/delEnum")
    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("数据字典")
    @ApiOperation(value = "获取数据字典的分类")
    @PostMapping("/getDic")
    public Result<?> getDic(){

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

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
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.RolePowerDto;
import com.yuanchu.mom.pojo.Role;
import com.yuanchu.mom.service.PowerService;
@@ -27,14 +28,14 @@
    private RoleService roleService;

    private PowerService powerService;

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


    @ValueClassify("角色管理")
    @ApiOperation(value = "获取角色列表")
    @PostMapping("/selectRoleLists")
    public Result selectRoleLists(@RequestBody Map<String, Object> data) throws Exception {
@@ -42,33 +43,33 @@
        Role role = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Role.class);
        return Result.success(roleService.selectUserList(page, role));
    }

    @ValueClassify("角色管理")
    @ApiOperation(value = "删除角色列表")
    @PostMapping("/delRole")
    public Result delRole(Integer id){
        return Result.success(roleService.delRole(id));
    }

    @ValueClassify("角色管理")
    @ApiOperation(value = "通过角色id查询权限列表")
    @PostMapping("/selectPowerByRoleId")
    public Result<?> selectPowerByRoleId(Integer id) {
        return Result.success(powerService.selectPowerByRoleId(id));
    }

    @ValueClassify("角色管理")
    @ApiOperation(value = "获取菜单")
    @GetMapping("/selectMenuList")
    @ValueAuth
    public Result<?> selectMenuList() {
        return Result.success(roleService.selectMenuList());
    }

    @ValueClassify("角色管理")
    @ApiOperation(value = "添加角色")
    @PostMapping("/addRole")
    public Result<?> addRole(String str) {
        RolePowerDto powers = JSON.parseObject(str, RolePowerDto.class);
        return Result.success(roleService.addRole(powers));
    }

    @ValueClassify("角色管理")
    @ApiOperation(value = "修改角色信息")
    @PostMapping("/upRole")
    public Result<?> upRole(String str) {

 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.ValueClassify;
import com.yuanchu.mom.pojo.PageSystemLogDto;
import com.yuanchu.mom.service.SystemLogService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -27,7 +28,7 @@
public class SystemLogController  {

    private SystemLogService systemLogService;

    @ValueClassify("系统日志")
    @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

@@ -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.Custom;
import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.pojo.User;
@@ -90,7 +91,7 @@
        }
        return Result.fail(map.get("info"));
    }

    @ValueClassify("用户管理")
    @ApiOperation(value = "获取用户列表")
    @PostMapping("/selectUserList")
    public Result selectUserList(@RequestBody Map<String, Object> data) throws Exception {
@@ -98,7 +99,7 @@
        UserPageDto user = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserPageDto.class);
        return Result.success(userService.selectUserList(page, user));
    }

    @ValueClassify("用户管理")
    @ApiOperation(value = "修改用户信息")
    @PostMapping("/updateUser")
    public Result<?> updateUser(@RequestBody User user) {
@@ -106,7 +107,7 @@
        else user.setPassword(DigestUtils.md5DigestAsHex(user.getPassword().getBytes()));
        return Result.success(userService.updateUser(user));
    }

    @ValueClassify("用户管理")
    @ApiOperation(value = "添加用户信息")
    @PostMapping("/addUser")
    public Result<?> addUser(@RequestBody User user) {
@@ -121,7 +122,7 @@
    public Result<?> getUserMenu() {
        return Result.success(userService.getUserMenu());
    }

    @ValueClassify("用户管理")
    @ApiOperation(value = "获取客户列表")
    @PostMapping("/selectCustomPageList")
    public Result selectCustomPageList(@RequestBody Map<String, Object> data) throws Exception {
@@ -129,13 +130,13 @@
        Custom custom = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Custom.class);
        return Result.success(customService.selectCustomPageList(page, custom));
    }

    @ValueClassify("用户管理")
    @ApiOperation(value = "删除客户信息")
    @PostMapping("/delCustomById")
    public Result<?> delCustomById(Integer id) {
        return Result.success(customService.delCustomById(id));
    }

    @ValueClassify("用户管理")
    @ApiOperation(value = "新增客户信息")
    @PostMapping("/addCustom")
    public Result<?> addCustom(@RequestBody Custom custom) {