8-10提交代码

“zhuo”

2023-08-10 390e54f20695b7f369fb50f584447d193543539d

8-10提交代码

 cnas-server/pom.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,30 @@
<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <artifactId>lims-laboratory</artifactId>
        <groupId>com.yuanchu</groupId>
        <version>0.0.1-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <groupId>com.yuanchu.limslaboratory</groupId>
    <artifactId>cnas-server</artifactId>
    <packaging>jar</packaging>

    <properties>
        <maven.compiler.source>8</maven.compiler.source>
        <maven.compiler.target>8</maven.compiler.target>
    </properties>

    <dependencies>
        <dependency>
            <groupId>com.yunchu.limslaboratory</groupId>
            <artifactId>framework</artifactId>
            <version>${project.parent.version}</version>
        </dependency>
    </dependencies>


</project>

 cnas-server/src/main/java/com/yuanchu/limslaboratory/controller/CnasAnnualPlanController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.yuanchu.limslaboratory.controller;

import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.stereotype.Controller;

/**
 * <p>
 * å®¡æ ¸å¹´åº¦è®¡åˆ’表 å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-08-10 11:50:11
 */
@Controller
@RequestMapping("/cnasAnnualPlan")
public class CnasAnnualPlanController {

}

 cnas-server/src/main/java/com/yuanchu/limslaboratory/mapper/CnasAnnualPlanMapper.java

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

import com.yuanchu.limslaboratory.pojo.CnasAnnualPlan;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 * å®¡æ ¸å¹´åº¦è®¡åˆ’表 Mapper æŽ¥å£
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-08-10 11:50:11
 */
public interface CnasAnnualPlanMapper extends BaseMapper<CnasAnnualPlan> {

}

 cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasAnnualPlan.java

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;

/**
 * <p>
 * å®¡æ ¸å¹´åº¦è®¡åˆ’表
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-08-10 11:50:11
 */
@Getter
@Setter
@TableName("cnas_annual_plan")
public class CnasAnnualPlan implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * ä¸»é”®id
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    /**
     * æ€§è´¨,0:内审,1:管理评审
     */
    private Integer auditType;

    /**
     * éƒ¨é—¨
     */
    private String department;

    /**
     * å®¡æ ¸ç›®çš„
     */
    private String auditPurpose;

    /**
     * å®¡æ ¸ç»„é•¿
     */
    private String auditLeader;

    /**
     * å®¡æ ¸ç»„员
     */
    private String auditEmp;

    /**
     * å®¡æ ¸ä¾æ®
     */
    private String auditPursuant;

    /**
     * å®¡æ ¸èŒƒå›´
     */
    private String auditScope;

    /**
     * ç¼–制人员
     */
    private String writeUser;

    /**
     * å½•å…¥äººå‘˜
     */
    private String keyboarder;

    /**
     * è®¡åˆ’时间
     */
    private LocalDateTime planTime;

    /**
     * ä¸åˆæ ¼é¡¹ç›®æ•°
     */
    private Integer count;

    /**
     * å®¡æ ¸çŠ¶æ€,0:即将开始,1:完成,2:逾期
     */
    private Integer auditState;

    private Integer state;

    /**
     * å®¡æ ¸æ—¥æœŸ
     */
    private LocalDateTime auditTime;

    private LocalDateTime createTime;

    private LocalDateTime updateTime;
}

 cnas-server/src/main/java/com/yuanchu/limslaboratory/service/CnasAnnualPlanService.java

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

import com.yuanchu.limslaboratory.pojo.CnasAnnualPlan;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * å®¡æ ¸å¹´åº¦è®¡åˆ’表 æœåŠ¡ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-08-10 11:50:11
 */
public interface CnasAnnualPlanService extends IService<CnasAnnualPlan> {

}

 cnas-server/src/main/java/com/yuanchu/limslaboratory/service/impl/CnasAnnualPlanServiceImpl.java

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

import com.yuanchu.limslaboratory.pojo.CnasAnnualPlan;
import com.yuanchu.limslaboratory.mapper.CnasAnnualPlanMapper;
import com.yuanchu.limslaboratory.service.CnasAnnualPlanService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * å®¡æ ¸å¹´åº¦è®¡åˆ’表 æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2023-08-10 11:50:11
 */
@Service
public class CnasAnnualPlanServiceImpl extends ServiceImpl<CnasAnnualPlanMapper, CnasAnnualPlan> implements CnasAnnualPlanService {

}

 cnas-server/src/main/resources/mapper/CnasAnnualPlanMapper.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.CnasAnnualPlanMapper">

</mapper>

 inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java

@@ -1,7 +1,5 @@
package com.yuanchu.limslaboratory.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
import com.yuanchu.limslaboratory.service.PlanService;
import com.yuanchu.limslaboratory.vo.Result;
@@ -36,14 +34,14 @@

    @ApiOperation("查询检验计划")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "deviceId", value = "设备名称Id", dataTypeClass = Integer.class),
            @ApiImplicitParam(name = "device", value = "设备名称Id", dataTypeClass = String.class),
            @ApiImplicitParam(name = "beginTime", value = "检验开始时间", dataTypeClass = Date.class),
            @ApiImplicitParam(name = "endTime", value = "检验结束时间", dataTypeClass = Date.class),
            @ApiImplicitParam(name = "userId", value = "检验人", dataTypeClass = Integer.class)
            @ApiImplicitParam(name = "user", value = "检验人", dataTypeClass = String.class)
    })
    @GetMapping("/selectAllPlan")
    public Result selectAllPlan(Integer deviceId, @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime, Integer userId) {
        List<PlanVo> planVoList = planService.selectAllPlan(deviceId, beginTime, endTime, userId);
    public Result selectAllPlan(String device, @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime, String user) {
        List<PlanVo> planVoList = planService.selectAllPlan(device, beginTime, endTime, user);
        return Result.success(planVoList);
    }
}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java

@@ -10,5 +10,5 @@
     * æŸ¥è¯¢æ£€éªŒè®¡åˆ’
     * @return
     */
    List<PlanVo> selectAllPlan(Integer deviceId, Date beginTime, Date endTime, Integer userId);
    List<PlanVo> selectAllPlan(String device, Date beginTime, Date endTime, String user);
}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java

@@ -48,12 +48,6 @@
    @ApiModelProperty(value = "计划结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date finishtime;
    @ApiModelProperty(value = "设备id")
    @JsonSerialize
    private Integer deviceId;
    @ApiModelProperty(value = "检验人id")
    @JsonSerialize
    private Integer userId;

    //判断项目状态
    private Integer state;

 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java

@@ -1,12 +1,9 @@
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.vo.PlanVo;

import java.util.Date;
import java.util.List;
import java.util.Objects;

/**
 * <p>
@@ -21,6 +18,6 @@
     * æŸ¥è¯¢æ£€éªŒè®¡åˆ’
     * @return
     */
    List<PlanVo> selectAllPlan(Integer deviceId, Date beginTime, Date endTime, Integer userId);
    List<PlanVo> selectAllPlan(String device, Date beginTime, Date endTime, String user);

}

 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java

@@ -29,9 +29,9 @@
     * @return
     */
    @Override
    public List<PlanVo> selectAllPlan(Integer deviceId, Date beginTime, Date endTime, Integer userId) {
    public List<PlanVo> selectAllPlan(String device, Date beginTime, Date endTime, String user) {
        //获取数据库数据
        List<PlanVo> planVos = planMapper.selectAllPlan(deviceId, beginTime, endTime, userId);
        List<PlanVo> planVos = planMapper.selectAllPlan(device, beginTime, endTime, user);
        //添加计划工期和检验进度
        planVos.forEach(planVo -> {
            //添加检验进度

 inspection-server/src/main/resources/mapper/PlanMapper.xml

@@ -14,8 +14,6 @@
        u.name checker,
        ip.start_time starttime,
        ip.end_time finishtime,
        i.id deviceId,
        u.id userId,
        ip.test_state state
        from instrument i
        left join (select ip.*
@@ -28,11 +26,11 @@
        left join inspection_material im on im.id = ip.inspection_material_id
        left join user u on u.id = ip.user_id
        <where>
            <if test="deviceId != null">
                and i.id = #{deviceId}
            <if test="device != null and device != null">
                and i.equipment_name = #{device}
            </if>
            <if test="userId != null">
                and u.id = #{userId}
            <if test="user != null and user != null">
                and u.name = #{user}
            </if>
            <if test="beginTime != null and endTime != null">
                and ip.start_time between #{beginTime} and #{endTime}

 pom.xml

@@ -22,6 +22,7 @@
        <module>standard-server</module>
        <module>inspection-server</module>
        <module>laboratory-server</module>
        <module>cnas-server</module>
    </modules>

    <properties>

 sys/pom.xml

@@ -22,6 +22,12 @@
            <artifactId>framework</artifactId>
            <version>${project.parent.version}</version>
        </dependency>
        <!--cnas模块-->
        <dependency>
            <groupId>com.yuanchu.limslaboratory</groupId>
            <artifactId>cnas-server</artifactId>
            <version>${project.parent.version}</version>
        </dependency>

        <!--用户服务模块-->
        <dependency>
@@ -63,12 +69,14 @@
            <artifactId>mybatis-plus-generator</artifactId>
        </dependency>

        <!-- framework: mybatis-plus代码生成需要一个模板引擎 -->
        <!-- https://mvnrepository.com/artifact/org.apache.velocity/velocity-engine-core -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-freemarker</artifactId>
            <groupId>org.apache.velocity</groupId>
            <artifactId>velocity-engine-core</artifactId>
            <version>2.3</version>
        </dependency>


        <!--mysql-->
        <dependency>
            <groupId>mysql</groupId>

 sys/src/main/java/com/yuanchu/limslaboratory/CodeGenerator.java

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

    public static String database_url = "jdbc:mysql://localhost:3306/mom_ocean?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
    public static String database_username = "root";
    public static String database_url = "jdbc:mysql://192.168.110.209:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
    public static String database_username = "user";
    public static String database_password= "123456";
    public static String author = "江苏鵷雏网络科技有限公司";
    public static String model_name = "/inspect-server"; // å¦‚果为分布式填子模块名称，如果不是分布式为空即可
    public static String setParent = "com.yuanchu.mom"; // åŒ…路径
    public static String model_name = "/cnas-server"; // å¦‚果为分布式填子模块名称，如果不是分布式为空即可
    public static String setParent = "com.yuanchu.limslaboratory"; // åŒ…路径
    public static void main(String[] args) {
        String projectPath = System.getProperty("user.dir");
        System.out.println(projectPath+"===================");
        String s = projectPath + "/lims-after" + model_name + "/src/main/java";
        String s1 = projectPath + "/lims-after" + model_name + "/src/main/resources/mapper";
        System.out.println();
        FastAutoGenerator.create(database_url, database_username, database_password)
                // å…¨å±€é…ç½®
                .globalConfig(builder -> {
                    builder.author(author) // è®¾ç½®ä½œè€…
                            .commentDate("yyyy-MM-dd hh:mm:ss")   //注释日期
                            .outputDir(projectPath + model_name + "/src/main/java") // æŒ‡å®šè¾“出目录
                            .outputDir(s) // æŒ‡å®šè¾“出目录
                            .disableOpenDir() //禁止打开输出目录，默认打开
                    ;
                })
@@ -34,7 +36,7 @@
                .packageConfig(builder -> {
                    builder.entity("pojo");
                    builder.parent(setParent) // è®¾ç½®çˆ¶åŒ…名
                            .pathInfo(Collections.singletonMap(OutputFile.xml, projectPath + model_name +  "/src/main/resources/mapper")); // è®¾ç½®mapperXml生成路径
                            .pathInfo(Collections.singletonMap(OutputFile.xml, s1)); // è®¾ç½®mapperXml生成路径
                })
                // ç­–略配置
                .strategyConfig(builder -> {

 sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java

@@ -1,7 +1,6 @@
package com.yuanchu.limslaboratory;
import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
import com.yuanchu.limslaboratory.service.PlanService;
import com.yuanchu.limslaboratory.utils.MyUtil;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;