LIMS管理系统框架-开发8-3

XiaoRuby

2023-08-03 fbba4ea24430b14eee18b190b7e08f1a58a8e504

LIMS管理系统框架-开发8-3

 framework/src/main/java/com/yuanchu/limslaboratory/mybatis_config/MyBaseMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.yuanchu.limslaboratory.mybatis_config;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import java.util.List;

/**
 * è‡ªå®šä¹‰æ·»åŠ mybatis-plus批量添加
 * @param <T>
 */
public interface MyBaseMapper <T> extends BaseMapper<T> {

    int insertBatchSomeColumn(List<T> entityList);
}


 framework/src/main/java/com/yuanchu/limslaboratory/mybatis_config/MyBatisPlusConfig.java

ÎļþÃû´Ó framework/src/main/java/com/yuanchu/limslaboratory/config/MyBatisPlusConfig.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.yuanchu.limslaboratory.config;
package com.yuanchu.limslaboratory.mybatis_config;

import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
@@ -7,6 +7,7 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;


@Configuration
public class MyBatisPlusConfig {

@@ -17,6 +18,15 @@
    }

    /**
     * å¼€å¯æ‰¹é‡æ·»åŠ 
     * @return
     */
    @Bean
    public MySqlInjector sqlInjector() {
        return new MySqlInjector();
    }

    /**
     * éœ€è¦é…ç½®æ‹¦æˆªå™¨ï¼Œä¸ç„¶åœ¨AddDevice中的total无法获取到
     * @return
     */

 framework/src/main/java/com/yuanchu/limslaboratory/mybatis_config/MyMetaObjectHandler.java

ÎļþÃû´Ó framework/src/main/java/com/yuanchu/limslaboratory/handler/MyMetaObjectHandler.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.yuanchu.limslaboratory.handler;
package com.yuanchu.limslaboratory.mybatis_config;

import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import org.apache.ibatis.reflection.MetaObject;

 framework/src/main/java/com/yuanchu/limslaboratory/mybatis_config/MySqlInjector.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.yuanchu.limslaboratory.mybatis_config;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.core.injector.AbstractMethod;
import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
import com.baomidou.mybatisplus.extension.injector.methods.InsertBatchSomeColumn;

import java.util.List;

/**
 * æ‰¹é‡æ·»åŠ 
 */
public class MySqlInjector extends DefaultSqlInjector {

    @Override
    public List<AbstractMethod> getMethodList(Class<?> mapperClass) {
        List<AbstractMethod> methodList = super.getMethodList(mapperClass);
        //增加自定义方法，字段注解上不等于FieldFill.DEFAULT的字段才会插入
        methodList.add(new InsertBatchSomeColumn(i -> i.getFieldFill() != FieldFill.DEFAULT));
        return methodList;
    }

}

 framework/src/main/java/com/yuanchu/limslaboratory/utils/MyUtil.java

@@ -62,4 +62,16 @@
        }
        return sb.toString();
    }

    public static String getTimeSixNumberCode(String prefix){
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
        String format = simpleDateFormat.format(new Date());
        String timeStr = format.replace("-", "");
        long incrNum = RedisUtil.incr("num", 1);
        if(incrNum == 1){
            RedisUtil.expire("num", 60 * 60 * 24);
        }
        String sixIncr = String.format("%06d", incrNum);
        return prefix + timeStr + sixIncr;
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,98 @@
package com.yuanchu.limslaboratory.controller;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
import com.yuanchu.limslaboratory.pojo.Material;
import com.yuanchu.limslaboratory.pojo.Standard;
import com.yuanchu.limslaboratory.service.LinkBasicInformationService;
import com.yuanchu.limslaboratory.service.MaterialService;
import com.yuanchu.limslaboratory.service.StandardService;
import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Map;

/**
 * <p>
 *  å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-08-03
 */
@Api(tags = "报检管理-->委托检验-->链接")
@RestController
@RequestMapping("/link-basic")
public class LinkBasicInformationController {

    @Autowired
    private LinkBasicInformationService linkBasicInformationService;

    @Autowired
    private MaterialService materialService;

    @Autowired
    private StandardService standardService;

    @ApiOperation("获取链接")
    @GetMapping("/link")
    public Result<?> getLink() {
        Object link1 = null;
        try {
            link1 = RedisUtil.get("link");
        } catch (Exception e) {
            String uuid = IdWorker.get32UUID();
            RedisUtil.set("link", uuid, 60 * 24);
            return Result.success("success", uuid);
        }
        return Result.success(link1);
    }

    @ApiOperation("获取样品名称")
    @GetMapping("/material")
    public Result<?> getMaterialIdAndName(@RequestHeader("link") String link) {
        String redisLink = RedisUtil.get("link").toString();
        if (redisLink.equals(link)){
            LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>();
            wrapper.select(Material::getId, Material::getName, Material::getCode);
            List<Map<String, Object>> maps = materialService.listMaps(wrapper);
            return Result.success(maps);
        }
        return Result.fail("抱歉链接错误或已过期！");
    }

    @ApiOperation("获取规格型号")
    @GetMapping("/specification")
    public Result<?> getSpecificationIdAndName(@RequestHeader("link") String link, String materialId) {
        String redisLink = RedisUtil.get("link").toString();
        if (redisLink.equals(link)){
            List<Map<String, Object>> specificationIdAndName = standardService.getSpecificationIdAndName(materialId);
            return Result.success(specificationIdAndName);
        }
        return Result.fail("抱歉链接错误或已过期！");
    }

    @ApiOperation("添加检验申请单")
    @PostMapping("/addInspection")
    public Result<?> addLinkBasicInformation(@RequestHeader("link") String link, @RequestBody LinkBasicInformation linkBasicInformation) {
        String redisLink = RedisUtil.get("link").toString();
        if (redisLink.equals(link)){
            String code = linkBasicInformationService.addLinkBasicInformation(linkBasicInformation);
            if (!ObjectUtils.isEmpty(code)){
                return Result.success("添加成功！", code);
            } else {
                return Result.fail("添加失败!");
            }
        }
        return Result.fail("抱歉链接错误或已过期！");

    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,57 @@
package com.yuanchu.limslaboratory.controller;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.RawMaterial;
import com.yuanchu.limslaboratory.service.RawMaterialService;
import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import java.util.HashMap;
import java.util.Map;
import java.util.Objects;

/**
 * <p>
 *  å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-07-28
 */
@Api(tags = "1、物料表")
@RestController
@RequestMapping("/raw-material")
public class RawMaterialController {

    @Autowired
    private RawMaterialService rawMaterialService;

    @ApiOperation("查询所有检验计划分配")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "pageNo", value = "起始页", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "pageSize", value = "每一页数量", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "materialCoding", value = "材料编码", dataTypeClass = String.class),
            @ApiImplicitParam(name = "materialName", value = "材料名称", dataTypeClass = String.class),
            @ApiImplicitParam(name = "condition", value = "状态", dataTypeClass = String.class),
            @ApiImplicitParam(name = "createTime", value = "来料日期", dataTypeClass = String.class)
    })
    @GetMapping("/selectAll")
    public Result<?> selectRawMaterial(Integer pageSize, Integer pageNo, String materialCoding, String materialName, String condition, String createTime) {
        IPage<RawMaterial> iPage = rawMaterialService.selectRawMaterial(materialCoding, materialName, condition, createTime, new Page<Objects>(pageNo, pageSize));
        Map<String, Object> map = new HashMap<>();
        map.put("row", iPage.getRecords());
        map.put("total", iPage.getTotal());
        return Result.success(map);
    }
}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/LinkBasicInformationMapper.java

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

import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 *  Mapper æŽ¥å£
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-08-03
 */
public interface LinkBasicInformationMapper extends BaseMapper<LinkBasicInformation> {

}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/LinkDetectionMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.yuanchu.limslaboratory.mapper;

import com.yuanchu.limslaboratory.mybatis_config.MyBaseMapper;
import com.yuanchu.limslaboratory.pojo.LinkDetection;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 *  Mapper æŽ¥å£
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-08-03
 */
public interface LinkDetectionMapper extends MyBaseMapper<LinkDetection> {

}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/RawMaterialMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package com.yuanchu.limslaboratory.mapper;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.RawMaterial;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import java.util.Map;
import java.util.Objects;

/**
 * <p>
 *  Mapper æŽ¥å£
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-07-28
 */
public interface RawMaterialMapper extends BaseMapper<RawMaterial> {

    IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, String condition, String createTime, Page<Objects> page);
}

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

@@ -63,9 +63,6 @@
    @TableField("state")
    private Integer state;

    /**
     * æ£€æµ‹æ—¥æœŸ
     */
    @ApiModelProperty(value = "检测日期")
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,89 @@
package com.yuanchu.limslaboratory.pojo;

import com.baomidou.mybatisplus.annotation.*;

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.io.Serializable;
import java.util.Date;
import java.util.List;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * <p>
 *
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-08-03
 */
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="LinkBasicInformation对象", description="")
public class LinkBasicInformation implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键自增", hidden = true)
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty(value = "委托编码", hidden = true)
    private String entrustCoding;

    @ApiModelProperty(value = "委托单位", required = true, example = "阿里巴巴")
    private String entrusted;

    @ApiModelProperty(value = "联系人", required = true, example = "小黑")
    private String contacts;

    @ApiModelProperty(value = "联系电话", required = true, example = "12321423432")
    private String contactNumber;

    @ApiModelProperty(value = "联系地址", required = true, example = "江苏南通")
    private String contactAddress;

    @ApiModelProperty(value = "完成期限", required = true, example = "2023-08-03", dataType = "date")
    private Date completionDeadline;

    @ApiModelProperty(value = "送样时间", required = true, example = "2023-08-03", dataType = "date")
    private Date inspectionTime;

    @ApiModelProperty(value = "送样方式:1送样;2上门", required = true, example = "1")
    private Integer sampleDeliveryMode;

    @ApiModelProperty(value = "送样人：如果送样方式选择了送样，那么必填", example = "小白")
    private String sampleSender;

    @ApiModelProperty(value = "送样人电话：如果送样方式选择了送样，那么必填", example = "123456789676")
    private String sampleDeliveryPhone;

    @ApiModelProperty(value = "报告数", required = true, example = "23")
    private Integer reportNumber;

    @ApiModelProperty(value = "委托备注", example = "委托备注YPBH123456789YPBH123456789YPBH123456789")
    private String entrustRemarks;

    @TableLogic(value = "1", delval = "0")
    @ApiModelProperty(value = "逻辑删除 æ­£å¸¸>=1,删除<=0", hidden = true)
    private Integer state;

    @TableField(fill = FieldFill.INSERT)
    @ApiModelProperty(value = "创建时间", hidden = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createTime;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    @ApiModelProperty(value = "更新时间", hidden = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;

    @TableField(exist = false)
    @ApiModelProperty(value = "检验信息")
    private List<LinkDetection> linkDetectionList;
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,84 @@
package com.yuanchu.limslaboratory.pojo;

import com.baomidou.mybatisplus.annotation.*;

import java.io.Serializable;
import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;

/**
 * <p>
 *
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-08-03
 */
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="LinkDetection对象", description="")
public class LinkDetection implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键", hidden = true)
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @TableField(fill = FieldFill.INSERT)
    @ApiModelProperty(value = "样品编号", required = true, example = "YPBH123456789")
    private String sampleNumber;

    @TableField(fill = FieldFill.INSERT)
    @ApiModelProperty(value = "样品名称", required = true, example = "发动机")
    private String sampleName;

    @TableField(fill = FieldFill.INSERT)
    @ApiModelProperty(value = "规格型号", required = true, example = "GGXH-AAAAA")
    private String specificationsModels;

    @TableField(fill = FieldFill.INSERT)
    @NotBlank(message = "请填写单位！")
    @ApiModelProperty(value = "单位", required = true, example = "百度")
    private String unit;

    @TableField(fill = FieldFill.INSERT)
    @NotNull(message = "请填写样品数量！")
    @ApiModelProperty(value = "样品数量", required = true, example = "20")
    private Integer samplesNumber;

    @TableField(fill = FieldFill.INSERT)
    @NotBlank(message = "试验不能为空！")
    @ApiModelProperty(value = "试验", required = true, example = "做梦")
    private String experiment;

    @TableField(fill = FieldFill.INSERT)
    @ApiModelProperty(value = "备注", example = "通过了")
    private String remarks;

    @TableField(fill = FieldFill.INSERT)
    @ApiModelProperty(value = "LinkBasicInformation对象Id", hidden = true)
    private Integer linkBasicId;

    @TableLogic(value = "1", delval = "0")
    @ApiModelProperty(value = "逻辑删除 æ­£å¸¸>=1,删除<=0", hidden = true)
    private Integer state;

    @TableField(fill = FieldFill.INSERT)
    @ApiModelProperty(value = "创建时间", hidden = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createTime;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    @ApiModelProperty(value = "更新时间", hidden = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,84 @@
package com.yuanchu.limslaboratory.pojo;

import com.baomidou.mybatisplus.annotation.*;

import java.time.LocalDateTime;
import java.io.Serializable;
import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * <p>
 *
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-07-28
 */
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="RawMaterial对象", description="")
public class RawMaterial implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty(value = "供应商名称")
    private String supplierName;

    @ApiModelProperty(value = "材料编码")
    private String materialCoding;

    @ApiModelProperty(value = "材料名称")
    private String materialName;

    @ApiModelProperty(value = "规格型号")
    private String specificationsModels;

    @ApiModelProperty(value = "单位")
    private String unit;

    @ApiModelProperty(value = "数量")
    private Integer quantity;

    @ApiModelProperty(value = "报检日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private LocalDateTime inspectionDate;

    @ApiModelProperty(value = "检验人")
    private String surveyor;

    @ApiModelProperty(value = "检验日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private LocalDateTime dateSurvey;

    @ApiModelProperty(value = "状态")
    private Integer condition;

    @TableLogic(value = "1", delval = "0")
    @ApiModelProperty(value = "逻辑删除 æ­£å¸¸>=1,删除<=0", hidden = true)
    private Integer state;

    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间", hidden = true)
    private Date createTime;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @ApiModelProperty(value = "更新时间", hidden = true)
    private Date updateTime;

    @ApiModelProperty(value = "乐观锁", hidden = true)
    private Integer version;


}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package com.yuanchu.limslaboratory.service;

import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.transaction.annotation.Transactional;

/**
 * <p>
 *  æœåŠ¡ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-08-03
 */
public interface LinkBasicInformationService extends IService<LinkBasicInformation> {

    @Transactional(rollbackFor = Exception.class)
    String addLinkBasicInformation(LinkBasicInformation linkBasicInformation);
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.yuanchu.limslaboratory.service;

import com.yuanchu.limslaboratory.pojo.LinkDetection;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
 * <p>
 *  æœåŠ¡ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-08-03
 */
public interface LinkDetectionService extends IService<LinkDetection> {

    // æ‰¹é‡æ·»åŠ 
    void insertListData(Integer id, List<LinkDetection> linkDetectionList);
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package com.yuanchu.limslaboratory.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.RawMaterial;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.Map;
import java.util.Objects;

/**
 * <p>
 *  æœåŠ¡ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-07-28
 */
public interface RawMaterialService extends IService<RawMaterial> {

    IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, String condition, String createTime, Page<Objects> page);
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,42 @@
package com.yuanchu.limslaboratory.service.impl;

import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
import com.yuanchu.limslaboratory.mapper.LinkBasicInformationMapper;
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

/**
 * <p>
 *  æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-08-03
 */
@Service
public class LinkBasicInformationServiceImpl extends ServiceImpl<LinkBasicInformationMapper, LinkBasicInformation> implements LinkBasicInformationService {

    @Resource
    private LinkBasicInformationMapper linkBasicInformationMapper;

    @Autowired
    private LinkDetectionService linkDetectionService;

    @Override
    public String addLinkBasicInformation(LinkBasicInformation linkBasicInformation) {
        String code = MyUtil.getTimeSixNumberCode("SL");
        linkBasicInformation.setEntrustCoding(code);
        int insert = linkBasicInformationMapper.insert(linkBasicInformation);
        if (insert == 1) {
            linkDetectionService.insertListData(linkBasicInformation.getId(), linkBasicInformation.getLinkDetectionList());
            return code;
        }
        return null;
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,34 @@
package com.yuanchu.limslaboratory.service.impl;

import com.yuanchu.limslaboratory.pojo.LinkDetection;
import com.yuanchu.limslaboratory.mapper.LinkDetectionMapper;
import com.yuanchu.limslaboratory.service.LinkDetectionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

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

/**
 * <p>
 *  æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-08-03
 */
@Service
public class LinkDetectionServiceImpl extends ServiceImpl<LinkDetectionMapper, LinkDetection> implements LinkDetectionService {

    @Resource
    private LinkDetectionMapper linkDetectionMapper;

    // æ‰¹é‡æ·»åŠ 
    @Override
    public void insertListData(Integer id, List<LinkDetection> linkDetectionList) {
        for (LinkDetection linkDetection:linkDetectionList){
            linkDetection.setLinkBasicId(id);
        }
        linkDetectionMapper.insertBatchSomeColumn(linkDetectionList);
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,33 @@
package com.yuanchu.limslaboratory.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.RawMaterial;
import com.yuanchu.limslaboratory.mapper.RawMaterialMapper;
import com.yuanchu.limslaboratory.service.RawMaterialService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Map;
import java.util.Objects;

/**
 * <p>
 *  æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-07-28
 */
@Service
public class RawMaterialServiceImpl extends ServiceImpl<RawMaterialMapper, RawMaterial> implements RawMaterialService {

    @Resource
    private RawMaterialMapper rawMaterialMapper;

    @Override
    public IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, String condition, String createTime, Page<Objects> page) {
        return rawMaterialMapper.selectRawMaterial(materialCoding, materialName, condition, createTime, page);
    }
}

 inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml

copy from laboratory-server/src/main/resources/mapper/pojoMapper.xml
copy to inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
Îļþ´Ó laboratory-server/src/main/resources/mapper/pojoMapper.xml ¸´ÖÆ
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.MeteringPlanMapper">
<mapper namespace="com.yuanchu.limslaboratory.mapper.LinkBasicInformationMapper">

</mapper>

 inspection-server/src/main/resources/mapper/LinkDetectionMapper.xml

ÎļþÃû´Ó laboratory-server/src/main/resources/mapper/pojoMapper.xml ÐÞ¸Ä
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.MeteringPlanMapper">
<mapper namespace="com.yuanchu.limslaboratory.mapper.LinkDetectionMapper">

</mapper>

 inspection-server/src/main/resources/mapper/RawMaterialMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.RawMaterialMapper">

    <select id="selectRawMaterial" resultType="com.yuanchu.limslaboratory.pojo.RawMaterial">
        SELECT *
        FROM raw_material r
        where r.state = 1
        <if test="materialCoding != null and materialCoding != ''">
            AND r.`material_coding` LIKE CONCAT('%',#{materialCoding},'%')
        </if>
        <if test="materialName != null and materialName != ''">
            AND r.`material_name` LIKE CONCAT('%',#{materialName},'%')
        </if>
        <if test="condition != null and condition != ''">
            AND r.`condition` = #{condition}
        </if>
        <if test="createTime != null and createTime != ''">
            AND DATE_FORMAT(r.`create_time`,'%Y-%m-%d') = #{createTime}
        </if>
    </select>
</mapper>

 laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java

@@ -1,6 +1,8 @@
package com.yuanchu.limslaboratory.controller;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.Instrument;
import com.yuanchu.limslaboratory.pojo.MeteringPlan;
import com.yuanchu.limslaboratory.service.MeteringPlanService;
@@ -8,11 +10,14 @@
import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.Map;
import java.util.Objects;

/**
 * <p>
@@ -39,4 +44,27 @@
        }
        return Result.fail("添加计量计划失败! ");
    }

    @ApiOperation("计量计划分页查询")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "pageNo", value = "起始页", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "pageSize", value = "每一页数量", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "measureCodeOrNameOrUnit", value = "每一页数量", dataTypeClass = Integer.class, required = true)
    })
    @GetMapping("/plan_page_list")
    public Result<?> pagingQueryOfMeteringPlan(Integer pageNo, Integer pageSize, String measureCodeOrNameOrUnit) {
        IPage<Map<String, Object>> page = meteringPlanService.pagingQueryOfMeteringPlan(measureCodeOrNameOrUnit, new Page<Objects>(pageNo, pageSize));
        return Result.success(page);
    }

    @ApiOperation("计量台账分页查询")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "pageNo", value = "起始页", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "pageSize", value = "每一页数量", dataTypeClass = Integer.class, required = true)
    })
    @GetMapping("/standing_page_list")
    public Result<?> pagingQueryOfMeasurementLedger(Integer pageNo, Integer pageSize) {
        IPage<Map<String, Object>> page = meteringPlanService.pagingQueryOfMeasurementLedger(new Page<Objects>(pageNo, pageSize));
        return Result.success(page);
    }
}

 laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/MeteringPlanMapper.java

@@ -1,7 +1,12 @@
package com.yuanchu.limslaboratory.mapper;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.MeteringPlan;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import java.util.Map;
import java.util.Objects;

/**
 * <p>
@@ -13,4 +18,5 @@
 */
public interface MeteringPlanMapper extends BaseMapper<MeteringPlan> {

    IPage<Map<String, Object>> pagingQueryOfMeasurementLedger(Page<Objects> page);
}

 laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/MeteringPlanService.java

@@ -1,7 +1,12 @@
package com.yuanchu.limslaboratory.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.MeteringPlan;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.Map;
import java.util.Objects;

/**
 * <p>
@@ -14,4 +19,8 @@
public interface MeteringPlanService extends IService<MeteringPlan> {

    Integer addMeteringPlanInformation(MeteringPlan meteringPlan);

    IPage<Map<String, Object>> pagingQueryOfMeteringPlan(String measureCodeOrNameOrUnit, Page<Objects> page);

    IPage<Map<String, Object>> pagingQueryOfMeasurementLedger(Page<Objects> page);
}

 laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MeteringPlanServiceImpl.java

@@ -1,5 +1,9 @@
package com.yuanchu.limslaboratory.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.Instrument;
import com.yuanchu.limslaboratory.pojo.MeteringPlan;
import com.yuanchu.limslaboratory.mapper.MeteringPlanMapper;
import com.yuanchu.limslaboratory.service.MeteringPlanService;
@@ -11,6 +15,8 @@
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Map;
import java.util.Objects;

/**
 * <p>
@@ -28,14 +34,18 @@

    @Override
    public Integer addMeteringPlanInformation(MeteringPlan meteringPlan) {
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
        String format = simpleDateFormat.format(new Date());
        String replace = format.replace("-", "");
        MyUtil.PrintLog("P" + replace);
        long num = RedisUtil.incr("num", 1);
        
        MyUtil.PrintLog(String.valueOf(num));
//        return meteringPlanMapper.insert(meteringPlan);
        return 1;
        String timeSixNumber = MyUtil.getTimeSixNumberCode("P");
        meteringPlan.setPlannedOrderNumber(timeSixNumber);
        return meteringPlanMapper.insert(meteringPlan);
    }

    @Override
    public IPage<Map<String, Object>> pagingQueryOfMeteringPlan(String measureCodeOrNameOrUnit, Page<Objects> page) {
        return null;
    }

    @Override
    public IPage<Map<String, Object>> pagingQueryOfMeasurementLedger(Page<Objects> page) {
        return meteringPlanMapper.pagingQueryOfMeasurementLedger(page);
    }
}

 laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml

@@ -2,4 +2,10 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.MeteringPlanMapper">

    <select id="pagingQueryOfMeasurementLedger" resultType="map">
        SELECT i.`equipment_code`, i.`equipment_name`, i.`specifications_models`, m.`create_time`, m.`uncertainty`,
               m.`end_date`, i.`term_validity`, i.`storage_place`, i.`conditions`
        FROM instrument i, metrical_information m
        WHERE i.`id` = m.`instrument_id`
    </select>
</mapper>

 standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/StandardMapper.java

@@ -5,6 +5,7 @@
import com.yuanchu.limslaboratory.pojo.Standard;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import java.util.List;
import java.util.Map;

/**
@@ -18,4 +19,6 @@
public interface StandardMapper extends BaseMapper<Standard> {

    IPage<Map<String, Object>> listPageStandardsInformation(Page<Object> page, String idOrNameOfStandards);

    List<Map<String, Object>> getSpecificationIdAndName(String materialId);
}

 standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Product.java

@@ -27,14 +27,14 @@

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "测试标准id", hidden = true)
    @ApiModelProperty(value = "项目id", hidden = true)
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty(value = "测试标准名称", example = "单位长度质量", required = true)
    @ApiModelProperty(value = "项目名称", example = "单位长度质量", required = true)
    private String name;

    @ApiModelProperty(value = "测试标准父类", example = "铝包钢芯铝绞线")
    @ApiModelProperty(value = "项目父类", example = "铝包钢芯铝绞线")
    private String father;

    @ApiModelProperty(value = "单位", example = "km", required = true)

 standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Specifications.java

@@ -34,7 +34,7 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty(value = "产品规格名称", example = "AB", required = true)
    @ApiModelProperty(value = "规格名称", example = "AB", required = true)
    private String name;

    @ApiModelProperty(value = "逻辑删除 æ­£å¸¸>=1,删除<=0", hidden = true)

 standard-server/src/main/java/com/yuanchu/limslaboratory/service/StandardService.java

@@ -7,6 +7,7 @@
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Map;

/**
 * <p>
@@ -29,4 +30,6 @@
    Integer deleteStandardInformation(Integer standardsId);

    Integer addStandardInformation(AddStandardDto addStandardDto);

    List<Map<String, Object>> getSpecificationIdAndName(String materialId);
}

 standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java

@@ -48,7 +48,6 @@
    public IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Integer specificationsId, Page<Objects> page) {
        IPage<Map<String, Object>> iPage = productMapper.pageProductInformation(productCodeOrName, specificationsId, page);
        List<Map<String, Object>> maps = iPage.getRecords();
        MyUtil.PrintLog(maps.toString());
        maps.forEach(map -> {
            int num = Integer.parseInt(map.get("num").toString());
            boolean children = false;

 standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/StandardServiceImpl.java

@@ -92,4 +92,9 @@
        }
        return 0;
    }

    @Override
    public List<Map<String, Object>> getSpecificationIdAndName(String materialId) {
        return standardMapper.getSpecificationIdAndName(materialId);
    }
}

 standard-server/src/main/resources/mapper/ProductMapper.xml

@@ -13,7 +13,7 @@
    </select>

    <select id="selectOneChildren" resultType="map">
        SELECT p.`id`, p.`unit`, p.`required`, p.`internal`
        SELECT p.`id`, p.`name`, p.`unit`, p.`required`, p.`internal`
        FROM product p
        WHERE p.`father` = #{father}
    </select>

 standard-server/src/main/resources/mapper/StandardMapper.xml

@@ -2,4 +2,22 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.StandardMapper">

    <resultMap id="BaseResultMap" type="java.util.Map">
        <id property="specificationsId" column="specificationsId" jdbcType="INTEGER"/>
        <result property="specificationsName" column="specificationsName" jdbcType="VARCHAR"/>
        <collection property="children" resultMap="BaseResultMapChildren" javaType="java.util.List"/>
    </resultMap>
    <resultMap id="BaseResultMapChildren" type="java.util.Map">
        <id property="modelId" column="modelId" jdbcType="INTEGER"/>
        <result property="modelName" column="modelName" jdbcType="VARCHAR"/>
    </resultMap>

    <select id="getSpecificationIdAndName" resultMap="BaseResultMap">
        SELECT s.`id` specificationsId, s.`name` specificationsName, f.id modelId, f.name modelName
        FROM standard s
                 LEFT JOIN (SELECT f.`id`, f.`name`, f.`standard_id` FROM specifications f WHERE f.`state` = 1) f
                           ON s.`id` = f.`standard_id`
        WHERE s.`material_id` = #{materialId}
          AND s.`state` = 1
    </select>
</mapper>

 sys/src/main/java/com/yuanchu/limslaboratory/CodeGenerator.java

@@ -22,7 +22,7 @@
    public static String database_username = "root";
    public static String database_password= "123456";
    public static String author = "江苏鵷雏网络科技有限公司";
    public static String model_name = "/laboratory-server"; // å¦‚果为分布式填子模块名称，如果不是分布式为空即可
    public static String model_name = "/inspection-server"; // å¦‚果为分布式填子模块名称，如果不是分布式为空即可
    public static String setParent = "com.yuanchu.limslaboratory"; // åŒ…路径
    public static Boolean Override = false; // æ˜¯å¦è¦†ç›–原来的文件？


 user-server/src/main/java/com/yuanchu/limslaboratory/shiro/config/ShiroConfig.java

@@ -67,7 +67,7 @@
        map.put("/api-docs", "anon");
        map.put("/v3/**", "anon");


        map.put("/link-basic/*", "anon");
        map.put("/user/login/**","anon");//表示这个为公共资源 ä¸€å®šæ˜¯åœ¨å—限资源上面
//        map.put("/**","jwtFilter");//表示这个资源需要认证和授权