From 150c89bd7d5037024468417f5ac11fd518ca44d3 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期一, 17 七月 2023 21:29:51 +0800
Subject: [PATCH] 增加请求“添加检验申请单”
---
inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml | 8 +
standard-server/src/main/resources/mapper/SpecificationsMapper.xml | 9 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java | 5 +
inspection-server/pom.xml | 11 ++
standard-server/src/main/resources/mapper/ProductMapper.xml | 7 +
user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserClient.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 96 +++++++++++++++++++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java | 3
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java | 5 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java | 11 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 11 ++
sys/src/main/resources/application-dev.yml | 2
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java | 12 +++
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java | 5 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java | 8 ++
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java | 4 +
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/SpecificationsMapper.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java | 2
standard-server/src/main/java/com/yuanchu/limslaboratory/service/SpecificationsService.java | 4 +
standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java | 6 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java | 5 +
21 files changed, 212 insertions(+), 6 deletions(-)
diff --git a/inspection-server/pom.xml b/inspection-server/pom.xml
index edd5cda..591fb39 100644
--- a/inspection-server/pom.xml
+++ b/inspection-server/pom.xml
@@ -16,6 +16,15 @@
<packaging>jar</packaging>
<dependencies>
-
+ <dependency>
+ <groupId>com.yunchu.limslaboratory</groupId>
+ <artifactId>framework</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.yunchu.limslaboratory</groupId>
+ <artifactId>standard-server</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
</dependencies>
</project>
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
index 3e22a62..1d35b2e 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
@@ -1,20 +1,114 @@
package com.yuanchu.limslaboratory.controller;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.yuanchu.limslaboratory.pojo.Inspection;
+import com.yuanchu.limslaboratory.pojo.InspectionProductList;
+import com.yuanchu.limslaboratory.pojo.Product;
+import com.yuanchu.limslaboratory.service.InspectionProductListService;
+import com.yuanchu.limslaboratory.service.InspectionService;
+import com.yuanchu.limslaboratory.service.ProductService;
+import com.yuanchu.limslaboratory.service.SpecificationsService;
+import com.yuanchu.limslaboratory.utils.JackSonUtil;
+import com.yuanchu.limslaboratory.utils.RedisUtil;
+import com.yuanchu.limslaboratory.vo.Result;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
+@ApiModel(value = "妫�楠屾ā鍧�")
@RestController
@RequestMapping("/inspection")
public class InspectionController {
+ @Autowired
+ private InspectionService inspectionService;
+
+ @Autowired
+ private ProductService productService;
+
+ @Autowired
+ private SpecificationsService specificationsService;
+
+ @Autowired
+ private InspectionProductListService inspectionProductListService;
+
+ @ApiOperation("娣诲姞妫�楠岀敵璇峰崟")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "materialId", value = "鐗╂枡淇℃伅id", dataTypeClass = Integer.class, required = true),
+ })
+ @PostMapping("/addInspection")
+ @Transactional(rollbackFor = Exception.class)
+ public Result addInspection(@RequestHeader("X-Token") String token, int materialId,int type) throws Exception {
+ List<Product> list = productService.selectProductByMaterialId(materialId);
+ Map<String, Object> map = specificationsService.selectSNameSNName(materialId);
+ if (map==null)return Result.fail("鎵句笉鍒拌鐗╂枡淇℃伅");
+ Object object = RedisUtil.get(token);
+ Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
+ Inspection inspection = new Inspection();
+ inspection.setId(IdWorker.getIdStr())
+ .setType(type)
+ .setInspectionStatus(0)
+ .setState(1)
+ .setVersion(1)
+ .setUserName("" + unmarshal.get("name"))
+ .setMaterialNum(Integer.valueOf("" + map.get("num")))
+ .setMaterialSupplier("" + map.get("supplier"))
+ .setMaterialName("" + map.get("m_name"))
+ .setMaterialLocation("" + map.get("location"))
+ .setMaterialBatch("" + map.get("batch"))
+ .setMaterialReelNumber("" + map.get("reel_number"))
+ .setSpecificationsSerialNumber("" + map.get("ss_name"))
+ .setSpecificationsVoltageLevel("" + map.get("voltage_level"))
+ .setSpecificationsCrossSection("" + map.get("cross_section"))
+ .setSpecificationsNumberOfCores("" + map.get("number_of_cores"))
+ .setSpecificationsInstruct("" + map.get("instruct"));
+ int judge1 = 0;
+ int judge2 = 0;
+ try {
+ judge1 = inspectionService.addInspection(inspection);
+ List<InspectionProductList> list2 = new ArrayList<>();
+ list.forEach(a -> {
+ InspectionProductList inspectionProductList = new InspectionProductList();
+ inspectionProductList.setName(a.getName())
+ .setMethod(a.getMethod())
+ .setUnit(a.getUnit())
+ .setRequired(a.getRequired())
+ .setInternal(a.getInternal())
+ .setState(1)
+ .setVersion(1)
+ .setInspectionId(inspection.getId())
+ .setUserId(Integer.parseInt("" + unmarshal.get("id")))
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date());
+ list2.add(inspectionProductList);
+ });
+ judge2 = inspectionProductListService.addInspectionProductList(list2);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return Result.success(judge1 > 0 && judge2 > 0 ? "鎻愪氦鎴愬姛" : "鎻愪氦澶辫触", judge1 > 0 && judge2 > 0);
+ }
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
index 296c623..2a3cb96 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
@@ -3,6 +3,9 @@
import com.yuanchu.limslaboratory.pojo.Inspection;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+import java.util.Map;
+
/**
* <p>
* Mapper 鎺ュ彛
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java
index 9cc381c..ebe00d3 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java
@@ -2,6 +2,12 @@
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yuanchu.limslaboratory.pojo.Product;
+import com.yuanchu.limslaboratory.service.InspectionProductListService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -13,4 +19,6 @@
*/
public interface InspectionProductListMapper extends BaseMapper<InspectionProductList> {
+ int addInspectionProductList(List<InspectionProductList> list);
+
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java
index e55775d..e37a342 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java
@@ -12,6 +12,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
/**
* <p>
@@ -22,6 +23,7 @@
* @since 2023-07-17
*/
@Data
+@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="Inspection瀵硅薄", description="")
public class Inspection implements Serializable {
@@ -31,6 +33,9 @@
@ApiModelProperty(value = "鎶ユ缂栧彿")
private String id;
+ @ApiModelProperty(value = "鎶ユ绫诲瀷")
+ private Integer type;
+
@ApiModelProperty(value = "鎶ユ鐘舵�� 1锛氬凡妫�楠岋紱0鏈楠�")
private Integer inspectionStatus;
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
index 8b543c9..291a62c 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
@@ -11,6 +11,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
/**
* <p>
@@ -23,6 +24,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="InspectionProductList瀵硅薄", description="")
+@Accessors(chain = true)
public class InspectionProductList implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java
index db31469..a8559b5 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java
@@ -2,6 +2,9 @@
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.limslaboratory.pojo.Product;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +16,6 @@
*/
public interface InspectionProductListService extends IService<InspectionProductList> {
+ int addInspectionProductList(List<InspectionProductList> list);
+
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java
index 5f85c4d..45bb54f 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java
@@ -3,6 +3,9 @@
import com.yuanchu.limslaboratory.pojo.Inspection;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+import java.util.Map;
+
/**
* <p>
* 鏈嶅姟绫�
@@ -13,4 +16,6 @@
*/
public interface InspectionService extends IService<Inspection> {
+ int addInspection(Inspection inspection);
+
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java
index c862407..7efeb91 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java
@@ -2,9 +2,13 @@
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.yuanchu.limslaboratory.mapper.InspectionProductListMapper;
+import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.service.InspectionProductListService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -17,4 +21,11 @@
@Service
public class InspectionProductListServiceImpl extends ServiceImpl<InspectionProductListMapper, InspectionProductList> implements InspectionProductListService {
+ @Resource
+ InspectionProductListMapper inspectionProductListMapper;
+
+ @Override
+ public int addInspectionProductList(List<InspectionProductList> list) {
+ return inspectionProductListMapper.addInspectionProductList(list);
+ }
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
index 4cfef0f..68a5caf 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
@@ -6,6 +6,10 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
/**
* <p>
* 鏈嶅姟瀹炵幇绫�
@@ -17,4 +21,11 @@
@Service
public class InspectionServiceImpl extends ServiceImpl<InspectionMapper, Inspection> implements InspectionService {
+ @Resource
+ private InspectionMapper inspectionMapper;
+
+ @Override
+ public int addInspection(Inspection inspection) {
+ return inspectionMapper.insert(inspection);
+ }
}
diff --git a/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml b/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
index d85407a..f66e7a0 100644
--- a/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
+++ b/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
@@ -1,5 +1,11 @@
<?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.InspectionProductListMapper">
-
+ <insert id="addInspectionProductList">
+ INSERT INTO inspection_product_list (name, method, ask, unit, required, internal, create_time, update_time, inspection_id, user_id) VALUES
+ <foreach collection="list" separator="," item="i">
+ (#{i.name}, #{i.method}, #{i.ask}, #{i.unit}, #{i.required}, #{i.internal}, #{i.createTime}, #{i.updateTime}, #{i.inspectionId},
+ #{i.userId})
+ </foreach>
+ </insert>
</mapper>
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
index 57ca6ee..bed47e1 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
@@ -3,6 +3,8 @@
import com.yuanchu.limslaboratory.pojo.Product;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
* <p>
* Mapper 鎺ュ彛
@@ -13,4 +15,6 @@
*/
public interface ProductMapper extends BaseMapper<Product> {
+ List<Product> selectProductByMaterialId(int materialId);
+
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/SpecificationsMapper.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/SpecificationsMapper.java
index 38b90bd..65e60f9 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/SpecificationsMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/SpecificationsMapper.java
@@ -21,4 +21,6 @@
public interface SpecificationsMapper extends BaseMapper<Specifications> {
IPage<ListSpecificationsInformation> listSpecificationsInformation(String specificationsName, String serialNumberId, Page<Objects> page);
+
+ Map<String, Object> selectSNameSNName(int materialId);
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
index 0fc62ef..5fc4971 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
@@ -3,6 +3,9 @@
import com.yuanchu.limslaboratory.pojo.Product;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+import java.util.Map;
+
/**
* <p>
* 鏈嶅姟绫�
@@ -13,4 +16,7 @@
*/
public interface ProductService extends IService<Product> {
+ /*閫氳繃鐗╂枡id鑾峰彇鐗╂枡淇″強涓嬪睘鐨勯」鐩垪琛�*/
+ List<Product> selectProductByMaterialId(int materialId);
+
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/SpecificationsService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/SpecificationsService.java
index 8991ba5..669d38d 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/SpecificationsService.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/SpecificationsService.java
@@ -2,10 +2,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.mapper.SpecificationsMapper;
import com.yuanchu.limslaboratory.pojo.Specifications;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.limslaboratory.vo.ListSpecificationsInformation;
+import javax.annotation.Resource;
import java.util.Map;
import java.util.Objects;
@@ -22,4 +24,6 @@
Integer addSpecificationsInformation(Specifications specifications);
IPage<ListSpecificationsInformation> listSpecificationsInformation(String specificationsName, String serialNumberId, Page<Objects> page);
+
+ Map<String,Object> selectSNameSNName(int materialId);
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
index 8079756..844a971 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
@@ -4,7 +4,12 @@
import com.yuanchu.limslaboratory.mapper.ProductMapper;
import com.yuanchu.limslaboratory.service.ProductService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -17,4 +22,11 @@
@Service
public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> implements ProductService {
+ @Resource
+ private ProductMapper productMapper;
+
+ @Override
+ public List<Product> selectProductByMaterialId(int materialId) {
+ return productMapper.selectProductByMaterialId(materialId);
+ }
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java
index 099e61e..479141e 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java
@@ -59,4 +59,9 @@
public IPage<ListSpecificationsInformation> listSpecificationsInformation(String specificationsName, String serialNumberId, Page<Objects> page) {
return specificationsMapper.listSpecificationsInformation(specificationsName,serialNumberId,page);
}
+
+ @Override
+ public Map<String, Object> selectSNameSNName(int materialId) {
+ return specificationsMapper.selectSNameSNName(materialId);
+ }
}
diff --git a/standard-server/src/main/resources/mapper/ProductMapper.xml b/standard-server/src/main/resources/mapper/ProductMapper.xml
index 4868b93..fd6ca60 100644
--- a/standard-server/src/main/resources/mapper/ProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductMapper.xml
@@ -1,5 +1,10 @@
<?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.ProductMapper">
-
+ <select id="selectProductByMaterialId" resultType="Product">
+ select id, name, method, father, unit, required, internal
+ from product
+ where material_id = #{material_id}
+ and state = 1
+ </select>
</mapper>
diff --git a/standard-server/src/main/resources/mapper/SpecificationsMapper.xml b/standard-server/src/main/resources/mapper/SpecificationsMapper.xml
index f5a4457..77b425a 100644
--- a/standard-server/src/main/resources/mapper/SpecificationsMapper.xml
+++ b/standard-server/src/main/resources/mapper/SpecificationsMapper.xml
@@ -20,4 +20,13 @@
AND s.`name` = #{specificationsName}
</if>
</select>
+
+ <select id="selectSNameSNName" resultType="Map">
+ select m.num,m.supplier,m.name m_name,m.location,m.batch,m.reel_number,concat(s.name,'/',sn.name) ss_name,s.voltage_level,s.cross_section,s.number_of_cores,s.instruct from material m,specifications s,serial_number sn
+ where m.specifications_id = s.id
+ and s.serial_id = sn.id
+ and m.id = #{materialId}
+ order by s.create_time desc
+ limit 1
+ </select>
</mapper>
diff --git a/sys/src/main/resources/application-dev.yml b/sys/src/main/resources/application-dev.yml
index af6697f..219ba04 100644
--- a/sys/src/main/resources/application-dev.yml
+++ b/sys/src/main/resources/application-dev.yml
@@ -27,7 +27,7 @@
# 榈烽洀缃戠粶IP鎴栬�呭煙鍚�
customer:
- url: http://127.0.0.1:6789
+ url: http://114.132.189.42:8011
mybatis-plus:
configuration:
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserClient.java b/user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserClient.java
index da0c9fa..8a3df54 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserClient.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserClient.java
@@ -8,7 +8,7 @@
import java.util.Map;
-@FeignClient(value = "userservice", url = "localhost:6789")
+@FeignClient(value = "userservice", url = "${customer.url}")
public interface UserClient {
@PostMapping("/business/login")
--
Gitblit v1.9.3