laboratory-server/pom.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>lims-laboratory</artifactId> <groupId>com.yuanchu</groupId> <version>0.0.1-SNAPSHOT</version> </parent> <groupId>com.yunchu.limslaboratory</groupId> <artifactId>laboratory-server</artifactId> <version>0.0.1-SNAPSHOT</version> <name>laboratory-server</name> <description>laboratory-server</description> <packaging>jar</packaging> <dependencies> <dependency> <groupId>com.yunchu.limslaboratory</groupId> <artifactId>framework</artifactId> <version>${project.parent.version}</version> </dependency> </dependencies> </project> laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/ClassifyController.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,20 @@ package com.yuanchu.limslaboratory.controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** * <p> * å端æ§å¶å¨ * </p> * * @author æ±èéµ·éç½ç»ç§ææéå ¬å¸ * @since 2023-07-20 */ @RestController @RequestMapping("/classify") public class ClassifyController { } laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/EquipmentPointController.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,20 @@ package com.yuanchu.limslaboratory.controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** * <p> * å端æ§å¶å¨ * </p> * * @author æ±èéµ·éç½ç»ç§ææéå ¬å¸ * @since 2023-07-20 */ @RestController @RequestMapping("/equipment-point") public class EquipmentPointController { } laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/InstrumentController.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,20 @@ package com.yuanchu.limslaboratory.controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** * <p> * å端æ§å¶å¨ * </p> * * @author æ±èéµ·éç½ç»ç§ææéå ¬å¸ * @since 2023-07-20 */ @RestController @RequestMapping("/instrument") public class InstrumentController { } laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MetricalInformationController.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,20 @@ package com.yuanchu.limslaboratory.controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** * <p> * å端æ§å¶å¨ * </p> * * @author æ±èéµ·éç½ç»ç§ææéå ¬å¸ * @since 2023-07-20 */ @RestController @RequestMapping("/metrical-information") public class MetricalInformationController { } laboratory-server/src/main/java/com/yuanchu/limslaboratory/entity/Classify.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,50 @@ package com.yuanchu.limslaboratory.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; /** * <p> * * </p> * * @author æ±èéµ·éç½ç»ç§ææéå ¬å¸ * @since 2023-07-20 */ @Data @EqualsAndHashCode(callSuper = false) @ApiModel(value="Classify对象", description="") public class Classify implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "å类主é®") @TableId(value = "id", type = IdType.AUTO) private Integer id; @ApiModelProperty(value = "åç±»ç¶åç§°") private String name; @ApiModelProperty(value = "åç±»ååç§°") private String sonName; @ApiModelProperty(value = "é»è¾å é¤") private Integer state; @ApiModelProperty(value = "å建æ¶é´") private LocalDateTime createTime; @ApiModelProperty(value = "æ´æ°æ¶é´") private LocalDateTime updateTime; @ApiModelProperty(value = "ä¹è§é") private Integer version; } laboratory-server/src/main/java/com/yuanchu/limslaboratory/entity/EquipmentPoint.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,62 @@ package com.yuanchu.limslaboratory.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; /** * <p> * * </p> * * @author æ±èéµ·éç½ç»ç§ææéå ¬å¸ * @since 2023-07-20 */ @Data @EqualsAndHashCode(callSuper = false) @ApiModel(value="EquipmentPoint对象", description="") public class EquipmentPoint implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "主é®") @TableId(value = "id", type = IdType.AUTO) private Integer id; @ApiModelProperty(value = "仪å¨Id å ³è") private Integer instrumentId; @ApiModelProperty(value = "ç¨æ·Id å ³è") private Integer userId; @ApiModelProperty(value = "ç ç¹ç¼å·") private String equipmentPoint; @ApiModelProperty(value = "ç ç¹åç§°") private String equipmentPointName; @ApiModelProperty(value = "åä½") private String unit; @ApiModelProperty(value = "æè¿°") private String describe; @ApiModelProperty(value = "åå»ºæ¥æ") private LocalDateTime createTime; @ApiModelProperty(value = "æ´æ°æ¥æ") private LocalDateTime updateTime; @ApiModelProperty(value = "é»è¾å é¤") private Integer state; @ApiModelProperty(value = "ä¹è§é") private Integer version; } laboratory-server/src/main/java/com/yuanchu/limslaboratory/entity/Instrument.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,92 @@ package com.yuanchu.limslaboratory.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; /** * <p> * * </p> * * @author æ±èéµ·éç½ç»ç§ææéå ¬å¸ * @since 2023-07-20 */ @Data @EqualsAndHashCode(callSuper = false) @ApiModel(value="Instrument对象", description="") public class Instrument implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "主é®") @TableId(value = "id", type = IdType.AUTO) private Integer id; @ApiModelProperty(value = "åç±»ID å ³è") private Integer classifyId; @ApiModelProperty(value = "仪å¨è®¾å¤ç¼å·") private String equipmentCode; @ApiModelProperty(value = "仪å¨è®¾å¤åç§°") private String equipmentName; @ApiModelProperty(value = "é»è®¤1ï¼1ï¼è¿è¡ã2ï¼æ éã3ï¼æ¥ä¿®ã4ï¼æ£ä¿®ã5ï¼å¾ æº") private Integer condition; @ApiModelProperty(value = "è§æ ¼åå·") private String specificationsModels; @ApiModelProperty(value = "æµéèå´") private String measuringRange; @ApiModelProperty(value = "误差") private String errorRate; @ApiModelProperty(value = "ç产åå®¶") private String manufacturer; @ApiModelProperty(value = "å°è´§æ¥æ") private LocalDateTime arrivalDate; @ApiModelProperty(value = "éªæ¶æ¥æ") private LocalDateTime acceptanceDate; @ApiModelProperty(value = "åæ¾å°") private String storagePlace; @ApiModelProperty(value = "ä¿ç®¡äºº") private Integer keeper; @ApiModelProperty(value = "æ¯å¦æ¯ææ°é") private Integer whetherDataAcquisition; @ApiModelProperty(value = "æ¯å¦éè¦ä»ªå¨è®¾å¤è®¡éï¼å¦æéè¦è®¡éå¨æå¿ å¡«ï¼å¦æä¸éè¦è®¡é卿ä¸å¿ å¡«") private Integer equipmentMeasurement; @ApiModelProperty(value = "è®¡éæªæ¢æææ") private LocalDateTime termValidity; @ApiModelProperty(value = "æè¿°") private String describe; @ApiModelProperty(value = "å建æ¶é´") private LocalDateTime createTime; @ApiModelProperty(value = "æ´æ°æ¶é´") private LocalDateTime updateTime; @ApiModelProperty(value = "é»è¾å é¤") private Integer state; @ApiModelProperty(value = "ä¹è§é") private Integer version; } laboratory-server/src/main/java/com/yuanchu/limslaboratory/entity/MetricalInformation.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,71 @@ package com.yuanchu.limslaboratory.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; /** * <p> * * </p> * * @author æ±èéµ·éç½ç»ç§ææéå ¬å¸ * @since 2023-07-20 */ @Data @EqualsAndHashCode(callSuper = false) @ApiModel(value="MetricalInformation对象", description="") public class MetricalInformation implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "主é®") @TableId(value = "id", type = IdType.AUTO) private Integer id; @ApiModelProperty(value = "ç¨æ·å ³èId") private Integer userId; @ApiModelProperty(value = "计éåä½") private String measurementUnit; @ApiModelProperty(value = "å¼å§æ¥æ") private LocalDateTime beginDate; @ApiModelProperty(value = "ç»ææ¥æ") private LocalDateTime endDate; @ApiModelProperty(value = "ä¸ç¡®å®åº¦") private String uncertainty; @ApiModelProperty(value = "ç»æ 1ï¼åæ ¼ï¼2ï¼ç«æ£åå¯ç¨ï¼3ï¼ä¸åæ ¼") private Integer result; @ApiModelProperty(value = "æ§è½ææ ") private String performanceIndex; @ApiModelProperty(value = "夿³¨") private String remarks; @ApiModelProperty(value = "æä»¶è·¯å¾") private String filePath; @ApiModelProperty(value = "å建æ¶é´") private LocalDateTime createTime; @ApiModelProperty(value = "æ´æ°æ¶é´") private LocalDateTime updateTime; @ApiModelProperty(value = "é»è¾å é¤") private Integer state; @ApiModelProperty(value = "ä¹è§é") private Integer version; } laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/ClassifyMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,16 @@ package com.yuanchu.limslaboratory.mapper; import com.yuanchu.limslaboratory.entity.Classify; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * <p> * Mapper æ¥å£ * </p> * * @author æ±èéµ·éç½ç»ç§ææéå ¬å¸ * @since 2023-07-20 */ public interface ClassifyMapper extends BaseMapper<Classify> { } laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/EquipmentPointMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,16 @@ package com.yuanchu.limslaboratory.mapper; import com.yuanchu.limslaboratory.entity.EquipmentPoint; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * <p> * Mapper æ¥å£ * </p> * * @author æ±èéµ·éç½ç»ç§ææéå ¬å¸ * @since 2023-07-20 */ public interface EquipmentPointMapper extends BaseMapper<EquipmentPoint> { } laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,16 @@ package com.yuanchu.limslaboratory.mapper; import com.yuanchu.limslaboratory.entity.Instrument; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * <p> * Mapper æ¥å£ * </p> * * @author æ±èéµ·éç½ç»ç§ææéå ¬å¸ * @since 2023-07-20 */ public interface InstrumentMapper extends BaseMapper<Instrument> { } laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/MetricalInformationMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,16 @@ package com.yuanchu.limslaboratory.mapper; import com.yuanchu.limslaboratory.entity.MetricalInformation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * <p> * Mapper æ¥å£ * </p> * * @author æ±èéµ·éç½ç»ç§ææéå ¬å¸ * @since 2023-07-20 */ public interface MetricalInformationMapper extends BaseMapper<MetricalInformation> { } laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/ClassifyService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,16 @@ package com.yuanchu.limslaboratory.service; import com.yuanchu.limslaboratory.entity.Classify; import com.baomidou.mybatisplus.extension.service.IService; /** * <p> * æå¡ç±» * </p> * * @author æ±èéµ·éç½ç»ç§ææéå ¬å¸ * @since 2023-07-20 */ public interface ClassifyService extends IService<Classify> { } laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/EquipmentPointService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,16 @@ package com.yuanchu.limslaboratory.service; import com.yuanchu.limslaboratory.entity.EquipmentPoint; import com.baomidou.mybatisplus.extension.service.IService; /** * <p> * æå¡ç±» * </p> * * @author æ±èéµ·éç½ç»ç§ææéå ¬å¸ * @since 2023-07-20 */ public interface EquipmentPointService extends IService<EquipmentPoint> { } laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,16 @@ package com.yuanchu.limslaboratory.service; import com.yuanchu.limslaboratory.entity.Instrument; import com.baomidou.mybatisplus.extension.service.IService; /** * <p> * æå¡ç±» * </p> * * @author æ±èéµ·éç½ç»ç§ææéå ¬å¸ * @since 2023-07-20 */ public interface InstrumentService extends IService<Instrument> { } laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/MetricalInformationService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,16 @@ package com.yuanchu.limslaboratory.service; import com.yuanchu.limslaboratory.entity.MetricalInformation; import com.baomidou.mybatisplus.extension.service.IService; /** * <p> * æå¡ç±» * </p> * * @author æ±èéµ·éç½ç»ç§ææéå ¬å¸ * @since 2023-07-20 */ public interface MetricalInformationService extends IService<MetricalInformation> { } laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ClassifyServiceImpl.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,20 @@ package com.yuanchu.limslaboratory.service.impl; import com.yuanchu.limslaboratory.entity.Classify; import com.yuanchu.limslaboratory.mapper.ClassifyMapper; import com.yuanchu.limslaboratory.service.ClassifyService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** * <p> * æå¡å®ç°ç±» * </p> * * @author æ±èéµ·éç½ç»ç§ææéå ¬å¸ * @since 2023-07-20 */ @Service public class ClassifyServiceImpl extends ServiceImpl<ClassifyMapper, Classify> implements ClassifyService { } laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EquipmentPointServiceImpl.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,20 @@ package com.yuanchu.limslaboratory.service.impl; import com.yuanchu.limslaboratory.entity.EquipmentPoint; import com.yuanchu.limslaboratory.mapper.EquipmentPointMapper; import com.yuanchu.limslaboratory.service.EquipmentPointService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** * <p> * æå¡å®ç°ç±» * </p> * * @author æ±èéµ·éç½ç»ç§ææéå ¬å¸ * @since 2023-07-20 */ @Service public class EquipmentPointServiceImpl extends ServiceImpl<EquipmentPointMapper, EquipmentPoint> implements EquipmentPointService { } laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,20 @@ package com.yuanchu.limslaboratory.service.impl; import com.yuanchu.limslaboratory.entity.Instrument; import com.yuanchu.limslaboratory.mapper.InstrumentMapper; import com.yuanchu.limslaboratory.service.InstrumentService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** * <p> * æå¡å®ç°ç±» * </p> * * @author æ±èéµ·éç½ç»ç§ææéå ¬å¸ * @since 2023-07-20 */ @Service public class InstrumentServiceImpl extends ServiceImpl<InstrumentMapper, Instrument> implements InstrumentService { } laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MetricalInformationServiceImpl.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,20 @@ package com.yuanchu.limslaboratory.service.impl; import com.yuanchu.limslaboratory.entity.MetricalInformation; import com.yuanchu.limslaboratory.mapper.MetricalInformationMapper; import com.yuanchu.limslaboratory.service.MetricalInformationService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** * <p> * æå¡å®ç°ç±» * </p> * * @author æ±èéµ·éç½ç»ç§ææéå ¬å¸ * @since 2023-07-20 */ @Service public class MetricalInformationServiceImpl extends ServiceImpl<MetricalInformationMapper, MetricalInformation> implements MetricalInformationService { } laboratory-server/src/main/resources/mapper/ClassifyMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +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.ClassifyMapper"> </mapper> laboratory-server/src/main/resources/mapper/EquipmentPointMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +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.EquipmentPointMapper"> </mapper> laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +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.InstrumentMapper"> </mapper> laboratory-server/src/main/resources/mapper/MetricalInformationMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +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.MetricalInformationMapper"> </mapper> pom.xml
@@ -21,6 +21,7 @@ <module>framework</module> <module>standard-server</module> <module>inspection-server</module> <module>laboratory-server</module> </modules> <properties> standard-server/src/main/java/com/yuanchu/limslaboratory/controller/MaterialController.java
@@ -52,6 +52,16 @@ return Result.success(listMaterialInformation); } @ApiOperation("ç©æåº-->æ ¹æ®è§æ ¼IDæ¥è¯¢ç©æè¯¦æ ") @GetMapping("/list_id") @ApiImplicitParams(value = { @ApiImplicitParam(value = "ç©æID", name = "materialId", dataTypeClass = String.class) }) public Result<?> getListIdMaterialInformation(String materialId) { Material listIdMaterialInformation = materialService.ListIdMaterialInformation(materialId); return Result.success(listIdMaterialInformation); } @ApiOperation("ç©æåº-->æ ¹æ®ç©æIDå é¤ç©æ") @DeleteMapping("/delete") @ApiImplicitParams(value = { standard-server/src/main/java/com/yuanchu/limslaboratory/controller/SpecificationsController.java
@@ -6,8 +6,10 @@ import com.yuanchu.limslaboratory.pojo.Specifications; import com.yuanchu.limslaboratory.service.SpecificationsService; import com.yuanchu.limslaboratory.utils.JackSonUtil; import com.yuanchu.limslaboratory.utils.MyUtil; import com.yuanchu.limslaboratory.utils.RedisUtil; import com.yuanchu.limslaboratory.vo.Result; import com.yuanchu.limslaboratory.vo.UpdateSpeStateSpecifications; import com.yuanchu.limslaboratory.vo.UpdateSpecificationsInformation; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -98,4 +100,14 @@ } return Result.fail("å é¤å¤±è´¥ï¼"); } @ApiOperation("æ ååº-->产åè§æ ¼-->æ´æ°è§æ ¼ç¶æ") @PutMapping("/update_spe_state") public Result<?> updateSpeStateSpecifications(@RequestBody UpdateSpeStateSpecifications updateSpeStateSpecifications) { Integer isStandardsSuccess = specificationsService.updateSpeStateSpecifications(updateSpeStateSpecifications); if (isStandardsSuccess == 1) { return Result.success("æä½æåï¼"); } return Result.fail("æä½å¤±è´¥ï¼"); } } standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
@@ -48,4 +48,11 @@ List<String> specificationsIdDeleteMaterial(List<Integer> deleteSpecificationsId); Map selectMaterialById(String materialId); /** * æ ¹æ®Idæ¥è¯¢è§æ ¼è¯¦æ * @param materialId * @return */ Material ListIdMaterialInformation(String materialId); } standard-server/src/main/java/com/yuanchu/limslaboratory/service/SpecificationsService.java
@@ -5,6 +5,7 @@ import com.yuanchu.limslaboratory.mapper.SpecificationsMapper; import com.yuanchu.limslaboratory.pojo.Specifications; import com.baomidou.mybatisplus.extension.service.IService; import com.yuanchu.limslaboratory.vo.UpdateSpeStateSpecifications; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; @@ -39,4 +40,6 @@ Integer deleteSpecifications(Integer specificationsId); List<Integer> SerialNumberIdDeleteSpecifications(List<String> deleteSerialNumberId); Integer updateSpeStateSpecifications(UpdateSpeStateSpecifications updateSpeStateSpecifications); } standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
@@ -43,6 +43,15 @@ return materialMapper.selectMaterialById(materialId); } @Override public Material ListIdMaterialInformation(String materialId) { LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(Material::getId, materialId); wrapper.select(Material::getId, Material::getName, Material::getSupplier, Material::getLocation, Material::getNum, Material::getBatch, Material::getReelNumber); return materialMapper.selectOne(wrapper); } @Autowired private ProductService productService; standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java
@@ -9,6 +9,7 @@ import com.yuanchu.limslaboratory.mapper.SpecificationsMapper; import com.yuanchu.limslaboratory.service.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yuanchu.limslaboratory.vo.UpdateSpeStateSpecifications; import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -116,4 +117,12 @@ } return list; } @Override public Integer updateSpeStateSpecifications(UpdateSpeStateSpecifications updateSpeStateSpecifications) { LambdaUpdateWrapper<Specifications> updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(Specifications::getId, updateSpeStateSpecifications.getId()); updateWrapper.set(Specifications::getSpe_state, updateSpeStateSpecifications.getSpe_state()); return specificationsMapper.update(new Specifications(), updateWrapper); } } standard-server/src/main/java/com/yuanchu/limslaboratory/vo/UpdateSpeStateSpecifications.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,18 @@ package com.yuanchu.limslaboratory.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) @ApiModel(value="æ ååº-->è§æ ¼åå·-->ç¨äºå¯¹è§æ ¼ç¶æçä¿®æ¹", description="ç¨äºå¯¹è§æ ¼ç¶æçä¿®æ¹") public class UpdateSpeStateSpecifications { @ApiModelProperty(value = "è§æ ¼id", example = "2", required = true) private Integer id; @ApiModelProperty(value = "è§æ ¼ç¶æ 0ï¼åç¨ï¼1ï¼æ£å¸¸ï¼-1ï¼è稿", example = "1", required = true) private Integer spe_state; } sys/pom.xml
@@ -16,6 +16,13 @@ <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> @@ -37,10 +44,10 @@ <version>${project.parent.version}</version> </dependency> <!--åºç¡æ¡æ¶ç±»--> <!--å®éªå®¤æ¨¡å--> <dependency> <groupId>com.yunchu.limslaboratory</groupId> <artifactId>framework</artifactId> <artifactId>laboratory-server</artifactId> <version>${project.parent.version}</version> </dependency> user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
@@ -97,7 +97,6 @@ if (!ObjectUtils.isEmpty(o)){ unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(o), Map.class); Map<String, String> map = userService.selectUserByUserId((Integer) unmarshal.get("id")); MyUtil.PrintLog(map.toString()); return Result.success(map); } return Result.fail("Tokené误ï¼");