inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java
@@ -1,22 +1,20 @@ package com.yuanchu.limslaboratory.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; 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.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.limslaboratory.service.LinkBasicInformationService; import com.yuanchu.limslaboratory.service.MaterialService; import com.yuanchu.limslaboratory.service.StandardService; import com.yuanchu.limslaboratory.utils.MyUtil; 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.HashMap; import java.util.List; import java.util.Map; @@ -28,21 +26,15 @@ * @author æ±èéµ·éç½ç»ç§ææéå ¬å¸ * @since 2023-08-03 */ @Api(tags = "æ¥æ£ç®¡ç-->å§ææ£éª-->龿¥") @Api(tags = "æ¥æ£ç®¡ç-->å§ææ£éª") @RestController @RequestMapping("/link-basic") @RequestMapping("/link-basic-table") public class LinkBasicInformationController { @Autowired private LinkBasicInformationService linkBasicInformationService; @Autowired private MaterialService materialService; @Autowired private StandardService standardService; @ApiOperation("è·å龿¥") @ApiOperation("龿¥-->è·å龿¥") @GetMapping("/link") public Result<?> getLink() { Object link1 = null; @@ -56,43 +48,21 @@ 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("æ±æé¾æ¥é误æå·²è¿æï¼"); @ApiOperation(value = "åé¡µè¡¨æ ¼", tags = "123") @ApiImplicitParams(value = { @ApiImplicitParam(name = "pageNo", value = "èµ·å§é¡µ", dataTypeClass = Integer.class, required = true), @ApiImplicitParam(name = "pageSize", value = "æ¯ä¸é¡µæ°é", dataTypeClass = Integer.class, required = true), @ApiImplicitParam(name = "entrustCoding", value = "å§æç¼å·", dataTypeClass = String.class), @ApiImplicitParam(name = "sampleName", value = "æ ·ååç§°", dataTypeClass = String.class), @ApiImplicitParam(name = "entrusted", value = "å§æåä½", dataTypeClass = String.class), @ApiImplicitParam(name = "inspectionStatus", value = "æ£éªç¶æ", dataTypeClass = Integer.class) }) @GetMapping("/page") public Result<?> getLinkBasicPage(Integer pageNo, Integer pageSize, String entrustCoding, String sampleName, String entrusted, Integer inspectionStatus) { IPage<Map<String, Object>> linkBasicPage = linkBasicInformationService.getLinkBasicPage(new Page<Object>(pageNo, pageSize), entrustCoding, sampleName, entrusted, inspectionStatus); Map<String, Object> map = new HashMap<>(); map.put("total", linkBasicPage.getTotal()); map.put("row", linkBasicPage.getRecords()); return Result.success(map); } } inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkDetectionController.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,82 @@ 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.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 LinkDetectionController { @Autowired private LinkBasicInformationService linkBasicInformationService; @Autowired private MaterialService materialService; @Autowired private StandardService standardService; @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/mapper/LinkBasicInformationMapper.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.LinkBasicInformation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List; import java.util.Map; /** * <p> @@ -13,4 +18,5 @@ */ public interface LinkBasicInformationMapper extends BaseMapper<LinkBasicInformation> { IPage<Map<String, Object>> getLinkBasicPage(Page<Object> page, String entrustCoding, String sampleName, String entrusted, Integer inspectionStatus); } inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/LinkDetection.java
@@ -81,4 +81,10 @@ @ApiModelProperty(value = "æ´æ°æ¶é´", hidden = true) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; @ApiModelProperty(value = "æ£éªæ¥æ", hidden = true) private Date dateSurvey; @ApiModelProperty(value = "æ£éªç¶æ", hidden = true) private Integer inspectionStatus; } inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java
@@ -1,8 +1,13 @@ 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.LinkBasicInformation; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Map; /** * <p> @@ -16,4 +21,6 @@ @Transactional(rollbackFor = Exception.class) String addLinkBasicInformation(LinkBasicInformation linkBasicInformation); IPage<Map<String, Object>> getLinkBasicPage(Page<Object> page, String entrustCoding, String sampleName, String entrusted, Integer inspectionStatus); } inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java
@@ -1,5 +1,7 @@ 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.LinkBasicInformation; import com.yuanchu.limslaboratory.mapper.LinkBasicInformationMapper; import com.yuanchu.limslaboratory.service.LinkBasicInformationService; @@ -10,6 +12,8 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; import java.util.Map; /** * <p> @@ -39,4 +43,9 @@ } return null; } @Override public IPage<Map<String, Object>> getLinkBasicPage(Page<Object> page, String entrustCoding, String sampleName, String entrusted, Integer inspectionStatus) { return linkBasicInformationMapper.getLinkBasicPage(page, entrustCoding, sampleName, entrusted, inspectionStatus); } } inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -2,4 +2,23 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.yuanchu.limslaboratory.mapper.LinkBasicInformationMapper"> <select id="getLinkBasicPage" resultType="map"> SELECT l.`id`, l.`entrust_coding`, l.`entrusted`, d.`samples_number`, d.`sample_name`, d.`specifications_models`, DATE_FORMAT(l.`inspection_time`,'%Y-%m-%d') inspectionTime, l.`completion_deadline`, l.`contacts`, d.`date_survey`, d.`inspection_status` FROM link_basic_information l, link_detection d WHERE l.`id` = d.`link_basic_id` AND l.`state` = 1 <if test="entrustCoding != null and entrustCoding != null"> AND l.`entrust_coding` like concat('%', #{entrustCoding}, '%') </if> <if test="sampleName != null and sampleName != null"> AND d.`sample_name` like concat('%', #{sampleName}, '%') </if> <if test="entrusted != null and entrusted != null"> AND l.`contacts` like concat('%', #{entrusted}, '%') </if> <if test="inspectionStatus != null and inspectionStatus != null"> AND d.`inspection_status` = #{inspectionStatus} </if> </select> </mapper>