李林
2024-03-04 467697f78bf5c953a81a978e5f2e67737de45569
标准库开发
已修改2个文件
已添加11个文件
466 ■■■■■ 文件已修改
cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-server/src/main/java/com/yuanchu/mom/mapper/StandardMethodMapper.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-server/src/main/java/com/yuanchu/mom/service/StandardMethodService.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodServiceImpl.java 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-server/src/main/resources/mapper/StandardMethodMapper.xml 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardMethodListMapper.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardMethodList.java 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/service/StandardMethodListService.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
package com.yuanchu.mom.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.pojo.StandardMethod;
import com.yuanchu.mom.service.StandardMethodService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.Value;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
@Api("标准方法")
@RestController
@RequestMapping("/standardMethod")
@AllArgsConstructor
public class StandardMethodController {
    private StandardMethodService standardMethodService;
    @ApiOperation(value = "获取标准方法列表")
    @PostMapping("/selectStandardMethodList")
    public Result selectStandardMethodList(@RequestBody Map<String, Object> data) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
        StandardMethod standardMethod = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), StandardMethod.class);
        return Result.success(standardMethodService.selectStandardMethodList(page, standardMethod));
    }
    @ApiOperation(value = "获取标准方法枚举")
    @GetMapping("/selectStandardMethods")
    @ValueAuth
    public Result selectStandardMethods(){
        return Result.success(standardMethodService.selectStandardMethods());
    }
}
cnas-server/src/main/java/com/yuanchu/mom/mapper/StandardMethodMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.yuanchu.mom.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.StandardMethod;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.mom.pojo.StructureItemParameter;
/**
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€standard_method(标准方法)】的数据库操作Mapper
* @createDate 2024-03-03 19:21:41
* @Entity com.yuanchu.mom.pojo.StandardMethod
*/
public interface StandardMethodMapper extends BaseMapper<StandardMethod> {
    IPage<StandardMethod> selectStandardMethodList(Page page, QueryWrapper<StandardMethod> ew);
}
cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,76 @@
package com.yuanchu.mom.pojo;
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * æ ‡å‡†æ–¹æ³•
 * @TableName standard_method
 */
@TableName(value ="standard_method")
@Data
public class StandardMethod extends OrderBy implements Serializable {
    /**
     *
     */
    @TableId(type = IdType.AUTO)
    private Integer id;
    /**
     * æ ‡å‡†ç¼–号
     */
    @ValueTableShow(1)
    @ApiModelProperty(value = "标准编号")
    private String code;
    /**
     * æ ‡å‡†æ–¹æ³•
     */
    @ValueTableShow(2)
    @ApiModelProperty(value = "标准方法")
    private String name;
    /**
     * å¤‡æ³¨
     */
    @ValueTableShow(3)
    @ApiModelProperty(value = "备注")
    private String remark;
    @ApiModelProperty(value = "创建人id")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;
    @ApiModelProperty(value = "修改人id")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;
    @ValueTableShow(4)
    @ApiModelProperty(value = "创建人")
    private String createUserName;
    @ValueTableShow(6)
    @ApiModelProperty(value = "更新人")
    private String updateUserName;
    @ValueTableShow(5)
    @ApiModelProperty(value = "创建时间")
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;
    @ValueTableShow(7)
    @ApiModelProperty(value = "更新时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime updateTime;
}
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
@@ -104,11 +104,13 @@
    @ApiModelProperty(value = "创建时间")
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ValueTableShow(14)
    private LocalDateTime createTime;
    @ApiModelProperty(value = "修改时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ValueTableShow(15)
    private LocalDateTime updateTime;
}
cnas-server/src/main/java/com/yuanchu/mom/service/StandardMethodService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package com.yuanchu.mom.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.StandardMethod;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.StructureItemParameter;
import java.util.List;
import java.util.Map;
/**
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€standard_method(标准方法)】的数据库操作Service
* @createDate 2024-03-03 19:21:41
*/
public interface StandardMethodService extends IService<StandardMethod> {
    Map<String, Object> selectStandardMethodList(Page page, StandardMethod standardMethod);
    List<StandardMethod> selectStandardMethods();
}
cnas-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,52 @@
package com.yuanchu.mom.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.pojo.StandardMethod;
import com.yuanchu.mom.pojo.StructureItemParameter;
import com.yuanchu.mom.service.StandardMethodService;
import com.yuanchu.mom.mapper.StandardMethodMapper;
import com.yuanchu.mom.utils.QueryWrappers;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€standard_method(标准方法)】的数据库操作Service实现
* @createDate 2024-03-03 19:21:41
*/
@Service
@AllArgsConstructor
public class StandardMethodServiceImpl extends ServiceImpl<StandardMethodMapper, StandardMethod>
    implements StandardMethodService{
    private GetLook getLook;
    private StandardMethodMapper standardMethodMapper;
    @Override
    public Map<String, Object> selectStandardMethodList(Page page, StandardMethod standardMethod) {
        Map<String, Object> map = new HashMap<>();
        map.put("head", PrintChina.printChina(StandardMethod.class));
        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectStandardMethodList");
        if(map1.get("look")==1) standardMethod.setCreateUser(map1.get("userId"));
        map.put("body", standardMethodMapper.selectStandardMethodList(page, QueryWrappers.queryWrappers(standardMethod)));
        return map;
    }
    @Override
    public List<StandardMethod> selectStandardMethods() {
        return standardMethodMapper.selectList(Wrappers.<StandardMethod>lambdaQuery().select(StandardMethod::getId,StandardMethod::getCode,StandardMethod::getName));
    }
}
cnas-server/src/main/resources/mapper/StandardMethodMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
<?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.StandardMethodMapper">
    <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.StandardMethod">
        <id property="id" column="id" jdbcType="INTEGER"/>
        <result property="code" column="code" jdbcType="VARCHAR"/>
        <result property="name" column="name" jdbcType="VARCHAR"/>
        <result property="remark" column="remark" jdbcType="VARCHAR"/>
        <result property="createUser" column="create_user" jdbcType="INTEGER"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
        <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>
    <sql id="Base_Column_List">
        id,code,name,
        remark,create_user,create_time,
        update_user,update_time
    </sql>
    <select id="selectStandardMethodList" resultType="com.yuanchu.mom.pojo.StandardMethod">
        select * from (
        select sm.id,
        sm.code,
        sm.name,
        sm.remark,
        u1.name create_user_name,
        sm.create_time,
        u2.name update_user_name,
        sm.update_time
        from standard_method sm
        left join user u1 on sm.create_user = u1.id
        left join user u2 on sm.update_user = u2.id
        ) a
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
    </select>
</mapper>
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
@@ -2,6 +2,7 @@
import cn.hutool.core.util.ObjectUtil;
import com.yuanchu.mom.pojo.StandardTree;
import com.yuanchu.mom.service.StandardMethodListService;
import com.yuanchu.mom.service.StandardTreeService;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.ApiOperation;
@@ -15,6 +16,8 @@
    private StandardTreeService standardTreeService;
    private StandardMethodListService standardMethodListService;
    @ApiOperation(value = "获取标准树")
    @GetMapping("/selectStandardTreeList")
    public Result selectStandardTreeList(){
@@ -28,4 +31,16 @@
        return Result.success(standardTreeService.addStandardTree(standardTree));
    }
    @ApiOperation(value = "给标准树添加检验标准")
    @PostMapping("/addStandardMethodList")
    public Result addStandardMethodList(String tree, Integer standardId){
        return Result.success(standardMethodListService.addStandardMethodList(standardId, tree));
    }
    @ApiOperation(value = "根据标准树进行标准查询")
    @PostMapping("/selectsStandardMethodByFLSSM")
    public Result selectsStandardMethodByFLSSM(){
        return Result.success();
    }
}
inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardMethodListMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package com.yuanchu.mom.mapper;
import com.yuanchu.mom.pojo.StandardMethodList;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.Map;
/**
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€standard_method_list(标准树下的标准列表)】的数据库操作Mapper
* @createDate 2024-03-04 13:44:04
* @Entity com.yuanchu.mom.pojo.StandardMethodList
*/
public interface StandardMethodListMapper extends BaseMapper<StandardMethodList> {
    Map<String, String> selectStandardMethodById(Integer id);
}
inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardMethodList.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,84 @@
package com.yuanchu.mom.pojo;
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yuanchu.mom.annotation.ValueTableShow;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.Data;
/**
 * æ ‡å‡†æ ‘下的标准列表
 * @TableName standard_method_list
 */
@TableName(value ="standard_method_list")
@Data
public class StandardMethodList implements Serializable {
    /**
     *
     */
    @TableId(type = IdType.AUTO)
    private Integer id;
    /**
     * æ ‡å‡†ç¼–号
     */
    @ApiModelProperty("标准编号")
    private String code;
    /**
     * æ ‡å‡†åç§°
     */
    @ApiModelProperty("标准称号")
    private String name;
    /**
     * å¤‡æ³¨
     */
    @ApiModelProperty("备注")
    private String remark;
    @ApiModelProperty("工厂")
    private String factory;
    @ApiModelProperty("实验室")
    private String laboratory;
    @ApiModelProperty("样品分类")
    private String sample_type;
    @ApiModelProperty("样品")
    private String sample;
    @ApiModelProperty("型号")
    private String model;
    @ApiModelProperty("")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;
    /**
     *
     */
    @ApiModelProperty("创建时间")
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;
    /**
     *
     */
    @ApiModelProperty("")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;
    /**
     *
     */
    @ApiModelProperty("修改时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime updateTime;
}
inspect-server/src/main/java/com/yuanchu/mom/service/StandardMethodListService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.yuanchu.mom.service;
import com.yuanchu.mom.pojo.StandardMethodList;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€standard_method_list(标准树下的标准列表)】的数据库操作Service
* @createDate 2024-03-04 13:44:04
*/
public interface StandardMethodListService extends IService<StandardMethodList> {
    int addStandardMethodList(Integer standardId, String tree);
}
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,45 @@
package com.yuanchu.mom.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.pojo.StandardMethodList;
import com.yuanchu.mom.service.StandardMethodListService;
import com.yuanchu.mom.mapper.StandardMethodListMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.Map;
/**
* @author Administrator
* @description é’ˆå¯¹è¡¨ã€standard_method_list(标准树下的标准列表)】的数据库操作Service实现
* @createDate 2024-03-04 13:44:04
*/
@Service
@AllArgsConstructor
public class StandardMethodListServiceImpl extends ServiceImpl<StandardMethodListMapper, StandardMethodList>
    implements StandardMethodListService{
    private StandardMethodListMapper standardMethodListMapper;
    @Override
    public int addStandardMethodList(Integer standardId, String tree) {
        String[] trees = tree.split(" - ");
        Map<String, String> map = standardMethodListMapper.selectStandardMethodById(standardId);
        StandardMethodList list = new StandardMethodList();
        list.setCode(map.get("code"));
        list.setName(map.get("name"));
        list.setRemark(map.get("remark"));
        list.setFactory(trees[0]);
        list.setLaboratory(trees[1]);
        list.setSample_type(trees[2]);
        list.setSample(trees[3]);
        try {
            list.setModel(trees[4]);
        }catch (Exception e){}
        return standardMethodListMapper.insert(list);
    }
}
inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
<?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.StandardMethodListMapper">
    <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.StandardMethodList">
            <id property="id" column="id" jdbcType="INTEGER"/>
            <result property="code" column="code" jdbcType="VARCHAR"/>
            <result property="name" column="name" jdbcType="VARCHAR"/>
            <result property="remark" column="remark" jdbcType="VARCHAR"/>
            <result property="standardTreeId" column="standard_tree_id" jdbcType="INTEGER"/>
            <result property="createUser" column="create_user" jdbcType="INTEGER"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>
    <sql id="Base_Column_List">
        id,code,name,
        remark,standard_tree_id,create_user,
        create_time,update_user,update_time
    </sql>
    <select id="selectStandardMethodById" resultType="java.util.Map">
        select code,name,remark from standard_method
        where id = #{id}
    </select>
</mapper>