Merge remote-tracking branch 'origin/master'

zss

2024-07-13 595b0dcb119b9f594926ffaafafdb68799ae993b

Merge remote-tracking branch 'origin/master'

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

@@ -175,11 +175,11 @@
        InputStream inputStream = file.getInputStream();
        List<StructureItemParameter> lists = new ArrayList<>();
        AtomicReference<String> sample = new AtomicReference<>();
        ExcelUtil.readBySax(inputStream, 0, (i, l, list1) -> {
            if (i == 0 && l == 1) {
        ExcelUtil.readBySax(inputStream, -1, (i, l, list1) -> {
            if (l == 1) {
                sample.set(list1.get(1) + "");
            }
            if (i == 0 && l >= 1) {
            if (l >= 1) {
                StructureItemParameter str = new StructureItemParameter();
                if (list1.get(1) == null) {
                    str.setSample(null);
@@ -340,14 +340,18 @@
                    str.setTemplateId(null);
                }
                try {
                    if (list1.get(22) != null) {
                    if (list1.get(22) != null && list1.get(22) != "") {
                        str.setInspectionItemClass(list1.get(22) + "");
                    } else {
                        str.setInspectionItemClass(null);
                    }
                } catch (Exception e) {
                }
                try {
                    if (list1.get(23) != null) {
                    if (list1.get(23) != null && list1.get(23) != "") {
                        str.setInspectionItemClassEn(list1.get(23) + "");
                    } else {
                        str.setInspectionItemClassEn(null);
                    }
                } catch (Exception e) {
                }
@@ -363,7 +367,7 @@
        structureItemParameterService.removeNoSample(sample.get());
        // å¦‚果数据库里面的数据存在那么就执行更新拷贝操作
        try {
            structureItemParameterService.saveBatch(lists);
            structureItemParameterService.saveOrUpdateBatch(lists);
        } catch (Exception e) {
            e.printStackTrace();
            throw new RuntimeException("服务端报错啦!!!");

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

@@ -1,27 +1,34 @@
package com.yuanchu.mom.controller;


import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.DataConfigDto;
import com.yuanchu.mom.dto.DeviceDto;
import com.yuanchu.mom.dto.DeviceDto1;
import com.yuanchu.mom.pojo.DataConfig;
import com.yuanchu.mom.pojo.Device;
import com.yuanchu.mom.service.DataConfigService;
import com.yuanchu.mom.service.DeviceService;
import com.yuanchu.mom.utils.DataAcquisition;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
@@ -36,6 +43,9 @@

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

    @Autowired
    private DataConfigService dataConfigService;

    @ValueClassify("设备")
    @ApiOperation(value = "查询设备详情列表")
@@ -134,22 +144,55 @@
        return Result.success(deviceService.selectDeviceByCode(code));
    }

    @ValueClassify("设备")
    @ApiOperation(value = "查询数采配置")
    @PostMapping("/getNumberCollect")
    public Result<?> getNumberCollect(Integer id) {
        DeviceDto1 deviceDto1 = new DeviceDto1();
        BeanUtils.copyProperties(deviceService.getById(id),deviceDto1);
        return Result.success(deviceDto1);
//    @ValueClassify("设备")
//    @ApiOperation(value = "查询数采配置")
//    @PostMapping("/getNumberCollect")
//    public Result<?> getNumberCollect(Integer id) {
//        DeviceDto1 deviceDto1 = new DeviceDto1();
//        BeanUtils.copyProperties(deviceService.getById(id),deviceDto1);
//        return Result.success(deviceDto1);
//    }
//
//    @ValueClassify("设备")
//    @ApiOperation(value = "维护数采配置")
//    @PostMapping("/numberCollect")
//    public Result<?> numberCollect(@RequestBody DeviceDto1 deviceDto1) {
//        Device device = new Device();
//        BeanUtils.copyProperties(deviceDto1,device);
//        return Result.success(deviceService.updateById(device));
//    }

    @ValueAuth
    @ApiModelProperty("/数采")
    @GetMapping("/text")
    public Result<?> text(HttpServletRequest request) {
        return Result.success(DataAcquisition.dataAcquisitionEntrance(request, new Device()));
    }

    @ValueClassify("设备")
    @ApiOperation(value = "维护数采配置")
    @PostMapping("/numberCollect")
    public Result<?> numberCollect(@RequestBody DeviceDto1 deviceDto1) {
        Device device = new Device();
        BeanUtils.copyProperties(deviceDto1,device);
        return Result.success(deviceService.updateById(device));
    @PostMapping("/saveDataAcquisitionConfiguration")
    public Result<?> saveDataAcquisitionConfiguration(@RequestBody DataConfigDto dataConfigList) {
        dataConfigService.saveOrUpdateBatch(dataConfigList.getDataConfigList());
        return Result.success();
    }

    @ValueClassify("设备")
    @ApiOperation(value = "查询数采配置")
    @GetMapping("/queryDataAcquisitionConfiguration")
    public Result<?> queryDataAcquisitionConfiguration(@RequestParam("deviceId") Integer deviceId, @RequestParam("insProductItem") String insProductItem) {
        List<DataConfig> list = dataConfigService.list(Wrappers.<DataConfig>lambdaQuery()
                .eq(DataConfig::getDeviceId, deviceId)
                .eq(DataConfig::getInsProductItem, insProductItem));
        return Result.success(list);
    }

    @ValueClassify("设备")
    @ApiOperation(value = "删除数采配置")
    @DeleteMapping("/deleteDataAcquisitionConfiguration")
    public Result<?> deleteDataAcquisitionConfiguration(@RequestParam("id") Integer id) {
        dataConfigService.removeById(id);
        return Result.success();
    }
}


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

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

import com.yuanchu.mom.pojo.DataConfig;
import lombok.Data;

import java.util.List;

@Data
public class DataConfigDto {

    private List<DataConfig> dataConfigList;
}

 cnas-server/src/main/java/com/yuanchu/mom/mapper/DataConfigMapper.java

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

import com.yuanchu.mom.pojo.DataConfig;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 *  Mapper æŽ¥å£
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-07-13 12:23:00
 */
public interface DataConfigMapper extends BaseMapper<DataConfig> {

}

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

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;

/**
 * <p>
 * 
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-07-13 12:23:00
 */
@Data
@NoArgsConstructor
@AllArgsConstructor
@TableName("device_data_config")
@ApiModel(value = "DataConfig对象", description = "")
public class DataConfig implements Serializable {

    private static final long serialVersionUID = 1L;

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

    @ApiModelProperty("文件后缀")
    private String fileType;

    @ApiModelProperty("采集地址")
    private String collectUrl;

    @ApiModelProperty("存储地址")
    private String storageUrl;

    @ApiModelProperty("公式")
    private String formula;

    @ApiModelProperty("参照X")
    private String referx;

    @ApiModelProperty("参照Y")
    private String refery;

    @ApiModelProperty("x")
    private Integer x;

    @ApiModelProperty("y")
    private Integer y;

    @ApiModelProperty("设备id")
    private Integer deviceId;

    @ApiModelProperty("检验项目名称")
    private String insProductItem;
}

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

@@ -118,25 +118,4 @@
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "IP")
    private String ip;

    @ApiModelProperty(value = "采集地址")
    private String collectUrl;

    @ApiModelProperty(value = "存储地址")
    private String storageUrl;

    @ApiModelProperty(value = "参照")
    private String refer;

    @ApiModelProperty(value = "X")
    private String x;

    @ApiModelProperty(value = "Y")
    private String y;

    @ApiModelProperty(value = "公式")
    private String formula;
}

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

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

import com.yuanchu.mom.pojo.DataConfig;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 *  æœåŠ¡ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-07-13 12:23:00
 */
public interface DataConfigService extends IService<DataConfig> {

}

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

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

import com.yuanchu.mom.pojo.DataConfig;
import com.yuanchu.mom.mapper.DataConfigMapper;
import com.yuanchu.mom.service.DataConfigService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-07-13 12:23:00
 */
@Service
public class DataConfigServiceImpl extends ServiceImpl<DataConfigMapper, DataConfig> implements DataConfigService {

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
<?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.mom.mapper.DataConfigMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.DataConfig">
        <id column="id" property="id" />
        <result column="file_type" property="fileType" />
        <result column="collect_url" property="collectUrl" />
        <result column="storage_url" property="storageUrl" />
        <result column="formula" property="formula" />
        <result column="referx" property="referx" />
        <result column="refery" property="refery" />
        <result column="x" property="x" />
        <result column="y" property="y" />
    </resultMap>

</mapper>

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

@@ -18,5 +18,4 @@
@RestController
@RequestMapping("/insFiber")
public class InsFiberController {

}

 inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardProductListMapper.java

@@ -17,7 +17,7 @@

    IPage<StandardProductList> standardProductListIPage(Integer id, String tree, IPage<StandardProductList> page, String laboratory, String insItem, String insItems);

    StandardProductList getOne(Integer standardMethodListId, String inspectionItem, String sample, String inspectionItemSubclass, String model);
    StandardProductList getOne(Integer standardMethodListId, String inspectionItem, String sample, String inspectionItemSubclass, String model, String inspectionItemClass);

    List<StandardProductList> selectDetail(@Param("standardMethodListId") Integer standardMethodListId, @Param("state") int state, @Param("model") String model);


 inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java

@@ -41,7 +41,7 @@

    String getLaboratory(String str);

    Integer getStructureItemParameterId(String sampleType, String item, String itemChild);
    Integer getStructureItemParameterId(String sampleType, String item, String itemChild, String inspectionItemClass);

    List<ProductDto> selectPList(String name);


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

@@ -222,7 +222,7 @@
                }
                StandardProductList db_str;
                try {
                    db_str = standardProductListMapper.getOne(str.getStandardMethodListId(), str.getInspectionItem(), str.getSample(), str.getInspectionItemSubclass(), str.getModel());
                    db_str = standardProductListMapper.getOne(str.getStandardMethodListId(), str.getInspectionItem(), str.getSample(), str.getInspectionItemSubclass(), str.getModel(), str.getInspectionItemClass());
                } catch (Exception e) {
                    throw new ErrorException("重复查询：" + str.getInspectionItem() + " " + str.getInspectionItemSubclass());
                }
@@ -269,9 +269,9 @@
                str.setState(1);
                str.setTree(str.getFactory() + " - " + str.getLaboratory() + " - " + str.getSampleType() + " - " + str.getSample() + " - " + (str.getModel() == null ? "" : str.getModel()));
                try {
                    str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\"" + str.getSampleType() + "\"", str.getInspectionItem(), str.getInspectionItemSubclass()));
                    str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\"" + str.getSampleType() + "\"", str.getInspectionItem(), str.getInspectionItemSubclass(), str.getInspectionItemClass()));
                } catch (Exception e) {
                    str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\"" + str.getSampleType() + "\",\"" + str.getSample() + "\"", str.getInspectionItem(), str.getInspectionItemSubclass()));
                    str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\"" + str.getSampleType() + "\",\"" + str.getSample() + "\"", str.getInspectionItem(), str.getInspectionItemSubclass(), str.getInspectionItemClass()));
                }
                if (str.getStructureItemParameterId() == null) {
                    throw new ErrorException("检验项目不存在：" + str.getInspectionItem() + " " + str.getInspectionItemSubclass());
@@ -350,7 +350,7 @@
                }
                StandardProductList db_str;
                try {
                    db_str = standardProductListMapper.getOne(str.getStandardMethodListId(), str.getInspectionItem(), str.getSample(), str.getInspectionItemSubclass(), str.getModel());
                    db_str = standardProductListMapper.getOne(str.getStandardMethodListId(), str.getInspectionItem(), str.getSample(), str.getInspectionItemSubclass(), str.getModel(), str.getInspectionItemClass());
                } catch (Exception e) {
                    throw new ErrorException("重复查询：" + str.getInspectionItem() + " " + str.getInspectionItemSubclass());
                }
@@ -361,7 +361,6 @@
                if (list.get(10) != null) {
                    str.setMethodS(list.get(10) + "");
                }

                if (list.get(13) == null) {
                    str.setTell(null);
                } else {
@@ -397,9 +396,9 @@
                str.setState(1);
                str.setTree(str.getFactory() + " - " + str.getLaboratory() + " - " + str.getSampleType() + " - " + str.getSample() + " - " + (str.getModel() == null ? "" : str.getModel()));
                try {
                    str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\"" + str.getSampleType() + "\"", str.getInspectionItem(), str.getInspectionItemSubclass()));
                    str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\"" + str.getSampleType() + "\"", str.getInspectionItem(), str.getInspectionItemSubclass(), str.getInspectionItemClass()));
                } catch (Exception e) {
                    str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\"" + str.getSampleType() + "\",\"" + str.getSample() + "\"", str.getInspectionItem(), str.getInspectionItemSubclass()));
                    str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\"" + str.getSampleType() + "\",\"" + str.getSample() + "\"", str.getInspectionItem(), str.getInspectionItemSubclass(), str.getInspectionItemClass()));
                }
                if (str.getStructureItemParameterId() == null) {
                    throw new ErrorException("检验项目不存在：" + str.getInspectionItem() + " " + str.getInspectionItemSubclass());

 inspect-server/src/main/resources/mapper/InsSampleMapper.xml

@@ -305,6 +305,8 @@
        select ip.id          ip_id,
               inspection_item,
               inspection_item_en,
               inspection_item_class,
               inspection_item_class_en,
               inspection_item_subclass,
               inspection_item_subclass_en,
               ip.factory     ip_factory,

 inspect-server/src/main/resources/mapper/StandardProductListMapper.xml

@@ -61,6 +61,9 @@
        <if test="model!=null">
            and model = #{model}
        </if>
        <if test="inspectionItemClass != null and inspectionItemClass != ''">
            and inspection_item_class = #{inspectionItemClass}
        </if>
    </select>
    <select id="selectDetail" resultType="com.yuanchu.mom.pojo.StandardProductList">
        select * from standard_product_list

 inspect-server/src/main/resources/mapper/StandardTreeMapper.xml

@@ -308,6 +308,9 @@
        <if test="itemChild != null and itemChild != ''">
            and inspection_item_subclass = #{itemChild}
        </if>
        <if test="inspectionItemClass != null and inspectionItemClass != ''">
            and inspection_item_class = #{inspectionItemClass}
        </if>
        <if test="itemChild == null or itemChild == ''">
            and (inspection_item_subclass is null or inspection_item_subclass = '')
        </if>

 system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java

@@ -16,12 +16,13 @@
// æ¼”示例子，执行 main æ–¹æ³•æŽ§åˆ¶å°è¾“入模块表名回车自动生成对应项目目录中
public class CodeGenerator {

    public static String database_url = "jdbc:mysql://localhost:3306/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8";
    public static String database_url = "jdbc:mysql://10.1.200.86:3306/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8";
    public static String database_username = "root";
    public static String database_password= "123456";
    public static String database_password= "zttZTT123!";
    public static String author = "江苏鵷雏网络科技有限公司";
    public static String model_name = "/cnas-server"; // å¦‚果为分布式填子模块名称，如果不是分布式为空即可
    public static String setParent = "com.yuanchu.mom"; // åŒ…路径
    public static String tablePrefix = "device_"; // è®¾ç½®è¿‡æ»¤è¡¨å‰ç¼€
    public static void main(String[] args) {
        String projectPath = System.getProperty("user.dir");
        FastAutoGenerator.create(database_url, database_username, database_password)
@@ -43,7 +44,7 @@
                // ç­–略配置
                .strategyConfig(builder -> {
                    builder.addInclude(scanner("表名，多个空格分割").split(" ")) // è®¾ç½®éœ€è¦ç”Ÿæˆçš„表名
                            .addTablePrefix("sys_") // è®¾ç½®è¿‡æ»¤è¡¨å‰ç¼€
                            .addTablePrefix(tablePrefix) // è®¾ç½®è¿‡æ»¤è¡¨å‰ç¼€
                            // Entity ç­–略配置
                            .entityBuilder()
                            .enableLombok() //开启 Lombok