Merge remote-tracking branch 'origin/master'

Fixiaobai

2023-08-24 fc4f4e0dd0ddb92065a81fcce6e99cc5dbf80068

Merge remote-tracking branch 'origin/master'

 inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java

@@ -65,4 +65,5 @@
        map.put("row", linkBasicPage.getRecords());
        return Result.success(map);
    }

}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkDetectionController.java

@@ -43,8 +43,8 @@
    @ApiOperation("链接-->获取样品名称")
    @GetMapping("/material")
    public Result<?> getMaterialIdAndName(@RequestHeader("link") String link) {
        String redisLink = RedisUtil.get("link").toString();
        if (redisLink.equals(link)){
        String redisLink = RedisUtil.get("viewId").toString();
        if (linkBasicInformationService.isIfViewUUID(redisLink)){
            LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>();
            wrapper.select(Material::getId, Material::getName, Material::getCode);
            List<Map<String, Object>> maps = materialService.listMaps(wrapper);
@@ -56,8 +56,8 @@
    @ApiOperation("链接-->获取规格型号")
    @GetMapping("/specification")
    public Result<?> getSpecificationIdAndName(@RequestHeader("link") String link, String materialId) {
        String redisLink = RedisUtil.get("link").toString();
        if (redisLink.equals(link)){
        String redisLink = RedisUtil.get("viewId").toString();
        if (linkBasicInformationService.isIfViewUUID(redisLink)){
            List<Map<String, Object>> specificationIdAndName = standardService.getSpecificationIdAndName(materialId);
            return Result.success(specificationIdAndName);
        }
@@ -67,8 +67,9 @@
    @ApiOperation("链接-->添加检验申请单")
    @PostMapping("/addInspection")
    public Result<?> addLinkBasicInformation(@RequestHeader("link") String link, @RequestBody LinkBasicInformation linkBasicInformation) {
        String redisLink = RedisUtil.get("link").toString();
        if (redisLink.equals(link)){
        String redisLink = RedisUtil.get("viewId").toString();
        if (linkBasicInformationService.isIfViewUUID(redisLink)){
            linkBasicInformation.setUUID(redisLink);
            String code = linkBasicInformationService.addLinkBasicInformation(linkBasicInformation);
            if (!ObjectUtils.isEmpty(code)){
                return Result.success("添加成功！", code);
@@ -79,4 +80,22 @@
        return Result.fail("抱歉链接错误或已过期！");

    }

    @ApiOperation(value = "生成二维码所需的唯一码")
    @GetMapping("/getViewUUID")
    public Result<?> getViewUUID(int day){
        return Result.success("生成成功",linkBasicInformationService.getViewUUID(day));
    }

    @ApiOperation(value = "查询二维码所需的唯一码")
    @GetMapping("/selectViewUUID")
    public Result<?> selectViewUUID(){
        return Result.success("查询成功",linkBasicInformationService.selectViewUUID());
    }

    @ApiOperation(value = "检验唯一码是否有效")
    @GetMapping("/isIfViewUUID")
    public Result<?> isIfViewUUID(String viewId){
        return Result.success("查询成功",linkBasicInformationService.isIfViewUUID(viewId));
    }
}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java

@@ -40,6 +40,7 @@
    })
    @GetMapping("/selectAllPlan")
    public Result selectAllPlan(String code, String beginTime, String endTime, Integer status) {
        System.out.println(planService.selectAllPlan(code, beginTime, endTime, status).toString());
        return Result.success(planService.selectAllPlan(code, beginTime, endTime, status));
    }


 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkBasicInformation.java

@@ -86,4 +86,7 @@
    @TableField(exist = false)
    @ApiModelProperty(value = "检验信息")
    private List<LinkDetection> linkDetectionList;

    @ApiModelProperty(value = "生成id：作用于有效期内查询内容所用")
    private String UUID;
}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java

@@ -31,5 +31,9 @@
     */
    List<Map<String, Object>> selectLinkAll();

    String getViewUUID(int day);

    Map<String, String> selectViewUUID();

    boolean isIfViewUUID(String uuid);
}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java

@@ -4,17 +4,16 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
import com.yuanchu.limslaboratory.mapper.LinkBasicInformationMapper;
import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
import com.yuanchu.limslaboratory.service.LinkBasicInformationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.service.LinkDetectionService;
import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * <p>
@@ -56,5 +55,30 @@
        return linkBasicInformationMapper.selectLinkAll();
    }

    @Override
    public String getViewUUID(int day) {
        String id = String.valueOf(UUID.randomUUID());
        RedisUtil.set("viewId", id, day * 24 * 60);
        return id;
    }

    @Override
    public Map<String, String> selectViewUUID() {
        Map<String, String> map = new HashMap<>();
        try {
            map.put("id", RedisUtil.get("viewId").toString());
            map.put("time", String.valueOf(RedisUtil.getExpire("viewId")));
        } catch (Exception e) {
            map.put("id", null);
            map.put("time", null);
        }
        return map;
    }

    @Override
    public boolean isIfViewUUID(String uuid) {
        return uuid.equals(RedisUtil.get("viewId"));
    }


}