雪花算法重复id优化+关掉异步进程+优化加班工时生成条件

zss

2024-07-26 d7458cb8e91c48375a54d4ccdb84a7e0b4e06534

雪花算法重复id优化+关掉异步进程+优化加班工时生成条件

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

@@ -253,5 +253,12 @@
        dataConfigService.removeBatchByIds(collect);
        return Result.success();
    }

    @ValueAuth
    @ApiOperation(value = "菜单")
    @PostMapping("/menu")
    public Result menu() {
        return Result.success(deviceService.menu());
    }
}


 cnas-server/src/main/java/com/yuanchu/mom/dto/ADto.java

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

import lombok.Data;

import java.util.List;

@Data
public class ADto {

    private int k;
    private String v;
    private String i;
    private String p;
    private boolean self;
    private List<BDto> c;
}

 cnas-server/src/main/java/com/yuanchu/mom/dto/BDto.java

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

import lombok.Data;

@Data
public class BDto {

    private int k;
    private String v;
    private String i;
    private String u;
    private String p;
    private String g;
}

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

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

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.dto.ADto;
import com.yuanchu.mom.dto.DeviceDto;
import com.yuanchu.mom.pojo.Device;
import com.yuanchu.mom.vo.Result;
@@ -36,4 +37,6 @@
    Device selectDeviceByCode(String code);

    Result<?> dataAcquisition(HttpServletRequest request, Integer id, String entrustCode, String sampleCode);

    List<ADto> menu();
}

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

@@ -1,5 +1,8 @@
package com.yuanchu.mom.service.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -7,13 +10,17 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.ADto;
import com.yuanchu.mom.dto.BDto;
import com.yuanchu.mom.dto.DeviceDto;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.DeviceMapper;
import com.yuanchu.mom.mapper.StructureItemParameterMapper;
import com.yuanchu.mom.mapper.UserMapper;
import com.yuanchu.mom.pojo.DataConfig;
import com.yuanchu.mom.pojo.Device;
import com.yuanchu.mom.pojo.StructureItemParameter;
import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.service.DataConfigService;
import com.yuanchu.mom.service.DeviceService;
import com.yuanchu.mom.utils.DataAcquisition;
@@ -29,6 +36,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * è®¾å¤‡(Device)表服务实现类
@@ -40,6 +48,8 @@
    private GetLook getLook;

    private DeviceMapper deviceMapper;

    private UserMapper userMapper;

    private StructureItemParameterMapper structureItemParameterMapper;

@@ -165,4 +175,781 @@
        }
        return Result.success(map);
    }

    @Override
    public List<ADto> menu() {
        //查询所有设备信息
        List<Device> devices = baseMapper.selectList(null);
        List<String> name = devices.stream().map(Device::getDeviceName).collect(Collectors.toList());

        //查询所有用户信息
        List<User> users = userMapper.selectList(null);
        List<String> collect = users.stream().map(User::getName).collect(Collectors.toList());
        String menu="[\n" +
                "\t{\n" +
                "\t\tk: 0,\n" +
                "\t\tv: \"个人首页\",\n" +
                "\t\ti: \"font icon-shouyefill\",\n" +
                "\t\tself: true,\n" +
                "\t\tc: [{\n" +
                "\t\t\tk: 0,\n" +
                "\t\t\tv: \"个人首页\",\n" +
                "\t\t\ti: \"font icon-shouyefill\",\n" +
                "\t\t\tu: \"index-index\"\n" +
                "\t\t}]\n" +
                "\t},\n" +
                "\t{\n" +
                "\t\tv: \"业务管理\",\n" +
                "\t\ti: \"font icon-kexueyanjiuheshiyankaifa\",\n" +
                "\t\tp: \"selectInsOrderParameter selectInsOrderPlanList pageInsReport costStatistics selectWarehouse\",\n" +
                "\t\tc: [\n" +
                "      {\n" +
                "        v: \"原材料检验下单\",\n" +
                "        i: \"font icon-erjidaohang\",\n" +
                "        u: \"b1-material-inspection-order\",\n" +
                "        p: \"selectInsOrderParameter\"\n" +
                "      },\n" +
                "      {\n" +
                "\t\t\tv: \"检验下单\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"b1-inspection-order\",\n" +
                "\t\t\tp: \"selectInsOrderParameter\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"检验任务\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"b1-inspect-order-plan\",\n" +
                "\t\t\tp: \"selectInsOrderPlanList\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"报告编制\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"b1-report-preparation\",\n" +
                "\t\t\tp: \"pageInsReport\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"费用统计\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"b1-expenses\",\n" +
                "\t\t\tp: \"costStatistics\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"样品管理\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"b1-sample\",\n" +
                "\t\t\tp: \"selectWarehouse\"\n" +
                "\t\t},{\n" +
                "\t\t\tv: \"不合格管理\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"b1-unpass\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}\n" +
                "\t]\n" +
                "\t},\n" +
                "\t{\n" +
                "\t\tv: \"标准集\",\n" +
                "\t\ti: \"font icon-biaozhunji\",\n" +
                "\t\tp: \"selectStandardTreeList selectStandardTemplatePageList\",\n" +
                "\t\tc: [{\n" +
                "\t\t\tv: \"标准库\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"b2-standard\",\n" +
                "\t\t\tp: \"selectStandardTreeList\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"原始记录模板\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"b2-standard-template\",\n" +
                "\t\t\tp: \"selectStandardTemplatePageList\"\n" +
                "\t\t}]\n" +
                "\t},\n" +
                "\t{\n" +
                "\t\tv: \"绩效管理\",\n" +
                "\t\ti: \"font icon-jixiaoguanli\",\n" +
                "\t\tp: \"\",\n" +
                "\t\tc: [{\n" +
                "\t\t\tv: \"工时管理\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"b3-work-time-management\",\n" +
                "\t\t\tp: \"selectAuxiliaryWorkingHours\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"人员考勤\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"人员考评\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"b3-personnel-evaluation\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"人员考核\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"技能等级\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"工资结算\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"班次\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"b3-classes\",\n" +
                "\t\t\tp: \"performanceShiftPage performanceShiftPageYear\"\n" +
                "\t\t}]\n" +
                "\t},\n" +
                "\t{\n" +
                "\t\tv: \"统计图表\",\n" +
                "\t\ti: \"font icon-tongjitubiao\",\n" +
                "\t\tp: \"\",\n" +
                "\t\tc: [{\n" +
                "\t\t\tv: \"实验室要素\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"每日业务统计\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"b4-daily-business-statistics\",\n" +
                "\t\t\tp: \"businessStatisticsByDay\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"检测项目统计\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"b4-inspection-item-statistics\",\n" +
                "\t\t\tp: \"testProductByDay\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"样品缺陷指数\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"b4-sample-defects\",\n" +
                "\t\t\tp: \"selectSampleDefects\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"耗材统计\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"人员工作报表\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}]\n" +
                "\t},\n" +
                "\t{\n" +
                "\t\tv: \"电子看板\",\n" +
                "\t\ti: \"font icon-dianzikanban-fan\",\n" +
                "\t\tp: \"\",\n" +
                "\t\tc: [{\n" +
                "\t\t\tv: \"客户接待\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"任务展示\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"设备状态及饱和度\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}]\n" +
                "\t},\n" +
                "\t{\n" +
                "\t\tv: \"系统功能\",\n" +
                "\t\ti: \"el-icon-s-tools\",\n" +
                "\t\tp: \"\",\n" +
                "\t\tc: [{\n" +
                "\t\t\tv: \"数据字典\",\n" +
                "\t\t\ti: \"el-icon-s-tools\",\n" +
                "\t\t\tu: \"enums\",\n" +
                "\t\t\tp: \"selectEnumList\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"角色管理\",\n" +
                "\t\t\ti: \"el-icon-s-tools\",\n" +
                "\t\t\tu: \"role-manage\",\n" +
                "\t\t\tp: \"selectRoleLists\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"用户管理\",\n" +
                "\t\t\ti: \"el-icon-s-tools\",\n" +
                "\t\t\tu: \"person-manage\",\n" +
                "\t\t\tp: \"selectUserList\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"客户管理\",\n" +
                "\t\t\ti: \"el-icon-s-tools\",\n" +
                "\t\t\tu: \"custom_manage\",\n" +
                "\t\t\tp: \"selectCustomPageList\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"系统日志\",\n" +
                "\t\t\ti: \"el-icon-s-tools\",\n" +
                "\t\t\tu: \"system-log\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"消息详情\",\n" +
                "\t\t\ti: \"el-icon-s-tools\",\n" +
                "\t\t\tu: \"notice-detail\",\n" +
                "\t\t\tp: \"abcd\"\n" +
                "\t\t}]\n" +
                "\t},\n" +
                "\t{\n" +
                "\t\tv: \"4 é€šç”¨è¦æ±‚\",\n" +
                "\t\ti: \"font icon-tongyongyaoqiu\",\n" +
                "\t\tp: \"\",\n" +
                "\t\tc: [{\n" +
                "\t\t\t\tv: \"通用要求\",\n" +
                "\t\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\t\tu: \"\",\n" +
                "\t\t\t\tg: \"4 é€šç”¨è¦æ±‚\",\n" +
                "\t\t\t\tp: \"\"\n" +
                "\t\t\t},\n" +
                "\t\t\t{\n" +
                "\t\t\t\tv: \"公正性\",\n" +
                "\t\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\t\tu: \"\",\n" +
                "\t\t\t\tg: \"4.1 å…¬æ­£æ€§\",\n" +
                "\t\t\t\tp: \"\"\n" +
                "\t\t\t},\n" +
                "\t\t\t{\n" +
                "\t\t\t\tv: \"保密性\",\n" +
                "\t\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\t\tu: \"\",\n" +
                "\t\t\t\tg: \"4.2 ä¿å¯†æ€§\",\n" +
                "\t\t\t\tp: \"\"\n" +
                "\t\t\t}\n" +
                "\t\t]\n" +
                "\t},\n" +
                "\t{\n" +
                "\t\tv: \"5 ç»“构要求\",\n" +
                "\t\ti: \"font icon-jiegouyaoqiu\",\n" +
                "\t\tp: \"\",\n" +
                "\t\tc: [{\n" +
                "\t\t\tv: \"实验室的法律地位\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"A实验室的法律地位\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"全权负责的管理层\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"B全权负责的管理层\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"实验室资质\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"a5-laboratory-qualifications\",\n" +
                "\t\t\tg: \"C能力范围和资质\",\n" +
                "\t\t\tp: \"getCertificationDetail\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"能力范围\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"a5-capacity-scope\",\n" +
                "\t\t\tg: \"C能力范围和资质\",\n" +
                "\t\t\tp: \"selectItemParameterList selectTestObjectList\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"场所或设施\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"a5-laboratory-management\",\n" +
                "\t\t\tg: \"D场所或设施\",\n" +
                "\t\t\tp: \"selectItemParameter\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"组织相关文件\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"E组织相关文件\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"人员岗位任职\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"F人员岗位任职\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"沟通和宣贯\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"G沟通和宣贯\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}]\n" +
                "\t}, {\n" +
                "\t\tv: \"6 èµ„源要求\",\n" +
                "\t\ti: \"font icon-ziyuanyaoqiu\",\n" +
                "\t\tp: \"\",\n" +
                "\t\tc: [{\n" +
                "\t\t\tv: \"总则\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.1 æ€»åˆ™\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"人员总览\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"a6-personnel-overview\",\n" +
                "\t\t\tg: \"6.2 äººå‘˜\",\n" +
                "\t\t\tp: \"selectPersonnelOverview\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"人员明细\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"a6-personnel-detail\",\n" +
                "\t\t\tg: \"6.2 äººå‘˜\",\n" +
                "\t\t\tp: \"selectDepartmentLim\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"人员培训\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.2 äººå‘˜\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"人员监督\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.2 äººå‘˜\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"岗位职责\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.2 äººå‘˜\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"人员基本信息\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.2 äººå‘˜\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"工作履历\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.2 äººå‘˜\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"奖惩记录\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.2 äººå‘˜\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"培训记录\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.2 äººå‘˜\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"监督记录\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.2 äººå‘˜\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"任职授权记录\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.2 äººå‘˜\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"人员能力监控记录\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.2 äººå‘˜\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"沟通记录\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.2 äººå‘˜\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"外来人员管理\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"a6-external-personnel-management\",\n" +
                "\t\t\tg: \"6.3 è®¾æ–½å’ŒçŽ¯å¢ƒæ¡ä»¶\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"实验室设施场所信息\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.3 è®¾æ–½å’ŒçŽ¯å¢ƒæ¡ä»¶\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"设施和环境条件要求\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.3 è®¾æ–½å’ŒçŽ¯å¢ƒæ¡ä»¶\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"环境条件引用\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.3 è®¾æ–½å’ŒçŽ¯å¢ƒæ¡ä»¶\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"安全区代表检查\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.3 è®¾æ–½å’ŒçŽ¯å¢ƒæ¡ä»¶\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"安全内务\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.3 è®¾æ–½å’ŒçŽ¯å¢ƒæ¡ä»¶\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"废物处理交接记录\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"a6-waste-handover\",\n" +
                "\t\t\tg: \"6.3 è®¾æ–½å’ŒçŽ¯å¢ƒæ¡ä»¶\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"设备总览\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"a6-device-overview\",\n" +
                "\t\t\tg: \"6.4 è®¾å¤‡\",\n" +
                "\t\t\tp: \"selectDeviceParameter\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"设备工具明细\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"a6-device-management\",\n" +
                "\t\t\tg: \"6.4 è®¾å¤‡\",\n" +
                "\t\t\tp: \"selectDeviceParameter\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"资源预定\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.4 è®¾å¤‡\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"作业指导书\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.4 è®¾å¤‡\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"设备运行总览\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.4 è®¾å¤‡\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"设备档案\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.4 è®¾å¤‡\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"设备验收\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.4 è®¾å¤‡\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"设备校准\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.4 è®¾å¤‡\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"设备核查\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.4 è®¾å¤‡\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"设备维护\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.4 è®¾å¤‡\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"设备借用\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.4 è®¾å¤‡\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"设备故障\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.4 è®¾å¤‡\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"使用记录\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.4 è®¾å¤‡\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"设备停用/启用\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.4 è®¾å¤‡\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"量值溯源计划\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.5 è®¡é‡æº¯æºæ€§\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"标准物质清单\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"a6-standard-material-list\",\n" +
                "\t\t\tg: \"6.5 è®¡é‡æº¯æºæ€§\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"标准物质验收\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.5 è®¡é‡æº¯æºæ€§\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"标准物质领用\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"a6-standard-material-requisition\",\n" +
                "\t\t\tg: \"6.5 è®¡é‡æº¯æºæ€§\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"过期标样处置\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.5 è®¡é‡æº¯æºæ€§\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"服务和供应品采购\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.6 å¤–部提供的产品和服务\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t},{\n" +
                "\t\t\tv: \"供应商管理\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"6.6 å¤–部提供的产品和服务\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}]\n" +
                "\t},\n" +
                "\t{\n" +
                "\t\tv: \"7 è¿‡ç¨‹è¦æ±‚\",\n" +
                "\t\ti: \"font icon-guochengyaoqiu\",\n" +
                "\t\tp: \"\",\n" +
                "\t\tc: [{\n" +
                "\t\t\tv: \"检验委托单\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"7.1 è¦æ±‚、标书和合同评审\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"合同评审\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"7.1 è¦æ±‚、标书和合同评审\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"实验室的检测能力档案\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"a7-standard-method\",\n" +
                "\t\t\tg: \"7.2 æ–¹æ³•çš„选择、验证和确认\",\n" +
                "\t\t\tp: \"selectStandardMethodList\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"标准查新\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"7.2 æ–¹æ³•çš„选择、验证和确认\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"标准方法的变更\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"7.2 æ–¹æ³•çš„选择、验证和确认\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"方法验证\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"7.2 æ–¹æ³•çš„选择、验证和确认\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"抽样\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"7.3 æŠ½æ ·\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"检测或校准物品的处置\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"7.4 æ£€æµ‹æˆ–校准物品的处置\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"技术记录\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"7.5 æŠ€æœ¯è®°å½•\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"测量不确定度的评定\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"7.6 æµ‹é‡ä¸ç¡®å®šåº¦çš„评定\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"确保结果有效性\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"7.7 ç¡®ä¿ç»“果有效性\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"报告结果\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"7.8 æŠ¥å‘Šç»“æžœ\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"投诉详情\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"7.9 æŠ•è¯‰\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"投诉情况汇总表\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"7.9 æŠ•è¯‰\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"不符合项\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"7.10 ä¸ç¬¦åˆå·¥ä½œ\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"不符合项的分布\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"7.10 ä¸ç¬¦åˆå·¥ä½œ\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"数据控制和信息管理\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"7.11 æ•°æ®æŽ§åˆ¶å’Œä¿¡æ¯ç®¡ç†\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}]\n" +
                "\t},\n" +
                "\t{\n" +
                "\t\tv: \"8 ä½“系管理要求\",\n" +
                "\t\ti: \"font icon-guanlitixiyaoqiu\",\n" +
                "\t\tp: \"\",\n" +
                "\t\tc: [{\n" +
                "\t\t\tv: \"方式\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"8.1 æ–¹å¼\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"管理体系文件\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"8.2 ç®¡ç†ä½“系文件\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"文件清单\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"8.3 ç®¡ç†ä½“系文件的控制\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"文件受控\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"8.3 ç®¡ç†ä½“系文件的控制\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"文件发放回收\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"8.3 ç®¡ç†ä½“系文件的控制\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"文件变更\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"8.3 ç®¡ç†ä½“系文件的控制\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"文件作废\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"8.3 ç®¡ç†ä½“系文件的控制\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"记录的控制\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"8.4 è®°å½•çš„控制\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"应对风险和机遇的措施\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"8.5 åº”对风险和机遇的措施\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"客户基本信息管理\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"8.6 æ”¹è¿›\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"客户满意度\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"8.6 æ”¹è¿›\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"纠正措施\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"8.7 çº æ­£æŽªæ–½\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"内审管理\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"8.8 å†…审管理\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}, {\n" +
                "\t\t\tv: \"管理评审\",\n" +
                "\t\t\ti: \"font icon-erjidaohang\",\n" +
                "\t\t\tu: \"\",\n" +
                "\t\t\tg: \"8.9 ç®¡ç†è¯„审\",\n" +
                "\t\t\tp: \"\"\n" +
                "\t\t}]\n" +
                "\t}\n" +
                "]";
        List<ADto> aDtos = JSONArray.parseArray(menu, ADto.class);
        List<BDto> bDtos = aDtos.get(9).getC();
        for (String s : name) {
            BDto bDto = new BDto();
            bDto.setV(s);
            bDto.setI("font icon-erjidaohang");
            bDto.setU("a6-device-overview");
            bDto.setG("6.4 è®¾å¤‡");
            bDto.setP("selectDeviceParameter");
            bDtos.add(bDto);
        }
        for (String s : collect) {
            BDto bDto = new BDto();
            bDto.setV(s);
            bDto.setI("font icon-erjidaohang");
            bDto.setU("a6-personnel-overview");
            bDto.setG("6.2 äººå‘˜");
            bDto.setP("selectPersonnelOverview");
            bDtos.add(bDto);
        }

        return aDtos;
    }
}

 inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java

@@ -20,7 +20,7 @@
    /**
     * ä¸»é”®id
     */
    @TableId(type = IdType.ASSIGN_ID)
    @TableId(value = "id",type = IdType.ASSIGN_ID)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;


 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java

@@ -650,7 +650,7 @@
                                auxiliaryOutputWorkingHours.setWeek(String.valueOf(DateUtil.weekOfYear(DateUtil.offsetDay(parse, 1))));//周次
                                auxiliaryOutputWorkingHours.setCheck(userId);//检测人
                            }
                            if (ObjectUtils.isEmpty(insProductResult) || (ObjectUtils.isNotEmpty(insProductResult) && !insProductResult.getInsValue().equals(result.getInsValue()))) {
                            if (ObjectUtils.isEmpty(insProductResult) && !result.getInsValue().equals("[]") || (ObjectUtils.isNotEmpty(insProductResult) && !insProductResult.getInsValue().equals(result.getInsValue()) && !insProductResult.getInsValue().equals("[]"))) {
                                auxiliaryOutputWorkingHoursMapper.insert(auxiliaryOutputWorkingHours);
                            }
                        }

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java

@@ -10,6 +10,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.dto.ProductDto;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.StandardProductListMapper;
import com.yuanchu.mom.mapper.StandardTreeMapper;
import com.yuanchu.mom.pojo.InsSample;
@@ -138,6 +139,11 @@
    @Override
    public Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
        String[] trees = tree.split(" - ");
        try{
            String tree1 = trees[2];
        }catch (Exception e){
            throw new ErrorException("操作太快,系统传参错误!!!!");
        }
        List<StandardProductList> list = new ArrayList<>();
        if (trees.length == 3) {
            List<StandardTree> treeList = new ArrayList<>();
@@ -234,7 +240,7 @@
        }
        if (page == 1) {
            Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
            CompletableFuture.supplyAsync(() -> {
//            CompletableFuture.supplyAsync(() -> {
                System.out.println("开始开始开始开始!!!!!!!!!!");
                if (trees.length == 5) {
                    standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate()
@@ -245,7 +251,37 @@
                            .eq(StandardProductList::getStandardMethodListId, id)
                            .like(StandardProductList::getTree, tree));
                }
                standardProductListService2.saveBatch(list.stream().map(a -> {

                boolean success = false;
                int retryCount = 0;
                while (!success && retryCount < 100) {
                    try {
                        standardProductListService2.saveBatch(list.stream().map(a -> {
                            a.setFactory(trees[0]);
                            a.setLaboratory(trees[1]);
                            a.setSampleType(trees[2]);
                            a.setCreateUser(userId);
                            a.setUpdateUser(userId);
                            a.setStandardMethodListId(id);
                            return a;
                        }).collect(Collectors.toList()));;
                        success = true;
                    } catch (Exception e) {
                        retryCount++;
                        System.out.println("重复"+ retryCount+"次");
                        // å¤„理重复 ID çš„记录，重新生成 ID å¹¶ç»§ç»­å°è¯•æ’å…¥
                        for (StandardProductList productList : list) {
                            productList.setId(IdWorker.getId());
                        }
                    }
                }
                if (!success) {
                    throw new RuntimeException("插入失败");
                }else {
                    System.out.println("结束结束结束结束@@@@@@@@@@@@");
                }

             /*   standardProductListService2.saveBatch(list.stream().map(a -> {
                    a.setFactory(trees[0]);
                    a.setLaboratory(trees[1]);
                    a.setSampleType(trees[2]);
@@ -253,14 +289,13 @@
                    a.setUpdateUser(userId);
                    a.setStandardMethodListId(id);
                    return a;
                }).collect(Collectors.toList()));
                System.out.println("结束结束结束结束@@@@@@@@@@@@");
                return null;
            }).thenAccept(res -> {
            }).exceptionally(e -> {
                e.printStackTrace();
                return null;
            });
                }).collect(Collectors.toList()));*/
//                return null;
//            }).thenAccept(res -> {
//            }).exceptionally(e -> {
//                e.printStackTrace();
//                return null;
//            });
        }
        Map<String, Object> map = new HashMap<>();
        Collections.sort(list, (o1, o2) -> {

 performance-server/src/main/java/com/yuanchu/mom/service/impl/ShiftTimeServiceImpl.java

@@ -1,5 +1,7 @@
package com.yuanchu.mom.service.impl;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.pojo.ShiftTime;
import com.yuanchu.mom.mapper.ShiftTimeMapper;
import com.yuanchu.mom.service.ShiftTimeService;
@@ -8,6 +10,7 @@

import javax.annotation.Resource;
import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -25,6 +28,10 @@

    @Override
    public void shiftTimeAdd(ShiftTime shiftTime) {
        List<ShiftTime> shiftTimes = shiftTimeMapper.selectList(Wrappers.<ShiftTime>lambdaQuery().eq(ShiftTime::getShift, shiftTime.getShift()));
        if (shiftTimes.size() > 0) {
           throw new ErrorException("已存在该班次的时间配置,请删掉后再新增!");
        }
        shiftTimeMapper.insert(shiftTime);
    }