From 48a1ec5ccb5afa48cfc7cb40e6e5d2744f5efd20 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期五, 01 三月 2024 18:01:33 +0800
Subject: [PATCH] 检验模块增加，标准库开发

---
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java |   38 +++++
 user-server/src/main/resources/mapper/EnumMapper.xml                                   |    1 
 inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java          |   20 ++
 inspect-server/src/main/java/com/yuanchu/mom/dto/FactoryDto.java                       |   18 ++
 inspect-server/src/main/resources/mapper/StandardTreeMapper.xml                        |   52 +++++++
 inspect-server/src/main/java/com/yuanchu/mom/dto/SampleDto.java                        |   18 ++
 inspect-server/src/main/java/com/yuanchu/mom/dto/SampleTypeDto.java                    |   18 ++
 pom.xml                                                                                |    1 
 cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java   |    7 +
 inspect-server/src/main/java/com/yuanchu/mom/dto/LaboratoryDto.java                    |   18 ++
 inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java            |   23 +++
 system-run/src/main/resources/application-dev.yml                                      |    2 
 inspect-server/src/main/java/com/yuanchu/mom/dto/ModelDto.java                         |   15 ++
 inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardTree.java                    |   96 +++++++++++++
 cnas-server/src/main/java/com/yuanchu/mom/service/CapacityScopeService.java            |    3 
 inspect-server/src/test/java/TestClass.java                                            |    2 
 cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java      |    8 +
 user-server/src/main/java/com/yuanchu/mom/service/impl/EnumServiceImpl.java            |    2 
 inspect-server/pom.xml                                                                 |   27 +++
 cnas-server/pom.xml                                                                    |    1 
 inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java    |   31 ++++
 system-run/pom.xml                                                                     |    6 
 22 files changed, 404 insertions(+), 3 deletions(-)

diff --git a/cnas-server/pom.xml b/cnas-server/pom.xml
index 0c8dcaf..801e39a 100644
--- a/cnas-server/pom.xml
+++ b/cnas-server/pom.xml
@@ -2,6 +2,7 @@
 <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>mom</artifactId>
         <groupId>com.yuanchu.mom</groupId>
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
index a664256..449c60a 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
@@ -1,6 +1,7 @@
 package com.yuanchu.mom.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
 import com.yuanchu.mom.dto.PageTestObjectDto;
 import com.yuanchu.mom.pojo.StructureItemParameter;
 import com.yuanchu.mom.pojo.StructureTestObject;
@@ -79,5 +80,12 @@
     public Result upTestObject(@RequestBody StructureTestObject testObject) {
         return Result.success(capacityScopeService.upTestObject(testObject));
     }
+
+    @ApiOperation(value = "鑾峰彇妫�楠屽璞℃灇涓�")
+    @GetMapping("/selectTestObjectByName")
+    @ValueAuth
+    public Result selectTestObjectByName() {
+        return Result.success(capacityScopeService.selectTestObjectByName());
+    }
 }
 
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/CapacityScopeService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/CapacityScopeService.java
index 10872a9..26c1d07 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/CapacityScopeService.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/CapacityScopeService.java
@@ -6,6 +6,7 @@
 import com.yuanchu.mom.pojo.StructureItemParameter;
 import com.yuanchu.mom.pojo.StructureTestObject;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -31,5 +32,7 @@
     int delTestObject(Integer id);
 
     int upTestObject(StructureTestObject testObject);
+
+    List<StructureTestObject> selectTestObjectByName();
 }
 
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java
index 7fe1161..280c08b 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java
@@ -1,5 +1,6 @@
 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;
@@ -15,6 +16,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -83,5 +85,10 @@
     public int upTestObject(StructureTestObject testObject) {
         return structureTestObjectMapper.updateById(testObject);
     }
+
+    @Override
+    public List<StructureTestObject> selectTestObjectByName() {
+        return structureTestObjectMapper.selectList(Wrappers.<StructureTestObject>lambdaQuery().select(StructureTestObject::getSpecimenName));
+    }
 }
 
diff --git a/inspect-server/pom.xml b/inspect-server/pom.xml
new file mode 100644
index 0000000..46bb1cf
--- /dev/null
+++ b/inspect-server/pom.xml
@@ -0,0 +1,27 @@
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>mom</artifactId>
+        <groupId>com.yuanchu.mom</groupId>
+        <version>1.0.0</version>
+    </parent>
+
+    <artifactId>inspect-server</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>inspect-server</name>
+    <description>inspect-server</description>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.yuanchu.mom</groupId>
+            <artifactId>framework</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
new file mode 100644
index 0000000..0afdd07
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
@@ -0,0 +1,31 @@
+package com.yuanchu.mom.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.yuanchu.mom.pojo.StandardTree;
+import com.yuanchu.mom.service.StandardTreeService;
+import com.yuanchu.mom.vo.Result;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/standardTree")
+public class StandardTreeController {
+
+    private StandardTreeService standardTreeService;
+
+    @ApiOperation(value = "鑾峰彇鏍囧噯鏍�")
+    @GetMapping("/selectStandardTreeList")
+    public Result selectStandardTreeList(){
+        return Result.success(standardTreeService.selectStandardTreeList());
+    }
+
+    @ApiOperation(value = "娣诲姞鏍囧噯鏍�")
+    @PostMapping("/addStandardTree")
+    public Result addStandardTree(@RequestBody StandardTree standardTree){
+        if(standardTree.getModel().equals("")) standardTree.setModel(null);
+        return Result.success(standardTreeService.addStandardTree(standardTree));
+    }
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/FactoryDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/FactoryDto.java
new file mode 100644
index 0000000..a4b3f6d
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/FactoryDto.java
@@ -0,0 +1,18 @@
+package com.yuanchu.mom.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FactoryDto {
+
+    private String code = "[1]";
+
+    private String label;
+
+    private String value;
+
+    private List<LaboratoryDto> children;
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/LaboratoryDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/LaboratoryDto.java
new file mode 100644
index 0000000..a4a022d
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/LaboratoryDto.java
@@ -0,0 +1,18 @@
+package com.yuanchu.mom.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class LaboratoryDto {
+
+    private String code = "[2]";
+
+    private String label;
+
+    private String value;
+
+    private List<SampleTypeDto> children;
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/ModelDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/ModelDto.java
new file mode 100644
index 0000000..2d7e7c0
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/ModelDto.java
@@ -0,0 +1,15 @@
+package com.yuanchu.mom.dto;
+
+import lombok.Data;
+
+@Data
+public class ModelDto {
+
+    private String code = "[5]";
+
+    private String label;
+
+    private String value;
+
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleDto.java
new file mode 100644
index 0000000..d5fef78
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleDto.java
@@ -0,0 +1,18 @@
+package com.yuanchu.mom.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SampleDto {
+
+    private String code = "[4]";
+
+    private String label;
+
+    private String value;
+
+    private List<ModelDto> children;
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleTypeDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleTypeDto.java
new file mode 100644
index 0000000..fdac749
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleTypeDto.java
@@ -0,0 +1,18 @@
+package com.yuanchu.mom.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SampleTypeDto {
+
+    private String code = "[3]";
+
+    private String label;
+
+    private String value;
+
+    private List<SampleDto> children;
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java
new file mode 100644
index 0000000..66cf8d6
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java
@@ -0,0 +1,23 @@
+package com.yuanchu.mom.mapper;
+
+import com.yuanchu.mom.dto.FactoryDto;
+import com.yuanchu.mom.pojo.StandardTree;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恠tandard_tree(鏍囧噯鏍�)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-03-01 15:06:44
+* @Entity com.yuanchu.mom.pojo.StandardTree
+*/
+public interface StandardTreeMapper extends BaseMapper<StandardTree> {
+
+    List<FactoryDto> selectStandardTreeList();
+
+}
+
+
+
+
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardTree.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardTree.java
new file mode 100644
index 0000000..75e2774
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardTree.java
@@ -0,0 +1,96 @@
+package com.yuanchu.mom.pojo;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import javax.validation.constraints.NotNull;
+
+import java.io.Serializable;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+/**
+* 鏍囧噯鏍�
+* @TableName standard_tree
+*/
+@TableName(value ="standard_tree")
+@Data
+public class StandardTree implements Serializable {
+
+    /**
+    * 
+    */
+    @NotNull(message="[]涓嶈兘涓虹┖")
+    @ApiModelProperty("")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+    /**
+    * 宸ュ巶
+    */
+    @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+    @ApiModelProperty("宸ュ巶")
+    @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+    private String factory;
+    /**
+    * 瀹為獙瀹�
+    */
+    @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+    @ApiModelProperty("瀹為獙瀹�")
+    @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+    private String laboratory;
+    /**
+    * 鏍峰搧澶х被
+    */
+    @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+    @ApiModelProperty("鏍峰搧澶х被")
+    @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+    private String sampleType;
+    /**
+    * 鏍峰搧
+    */
+    @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+    @ApiModelProperty("鏍峰搧")
+    @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+    private String sample;
+    /**
+    * 鍨嬪彿
+    */
+    @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+    @ApiModelProperty("鍨嬪彿")
+    @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+    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;
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
new file mode 100644
index 0000000..a3b195b
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
@@ -0,0 +1,20 @@
+package com.yuanchu.mom.service;
+
+import com.yuanchu.mom.dto.FactoryDto;
+import com.yuanchu.mom.pojo.StandardTree;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恠tandard_tree(鏍囧噯鏍�)銆戠殑鏁版嵁搴撴搷浣淪ervice
+* @createDate 2024-03-01 15:06:44
+*/
+public interface StandardTreeService extends IService<StandardTree> {
+
+    List<FactoryDto> selectStandardTreeList();
+
+    int addStandardTree(StandardTree standardTree);
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
new file mode 100644
index 0000000..139ce93
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
@@ -0,0 +1,38 @@
+package com.yuanchu.mom.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.dto.FactoryDto;
+import com.yuanchu.mom.pojo.StandardTree;
+import com.yuanchu.mom.service.StandardTreeService;
+import com.yuanchu.mom.mapper.StandardTreeMapper;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恠tandard_tree(鏍囧噯鏍�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2024-03-01 15:06:44
+*/
+@Service
+@AllArgsConstructor
+public class StandardTreeServiceImpl extends ServiceImpl<StandardTreeMapper, StandardTree>
+    implements StandardTreeService{
+
+    private StandardTreeMapper standardTreeMapper;
+
+    @Override
+    public List<FactoryDto> selectStandardTreeList() {
+        return standardTreeMapper.selectStandardTreeList();
+    }
+
+    @Override
+    public int addStandardTree(StandardTree standardTree) {
+        return standardTreeMapper.insert(standardTree);
+    }
+}
+
+
+
+
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
new file mode 100644
index 0000000..1d093f8
--- /dev/null
+++ b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -0,0 +1,52 @@
+<?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.StandardTreeMapper">
+
+    <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.StandardTree">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="factory" column="factory" jdbcType="VARCHAR"/>
+            <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
+            <result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
+            <result property="sample" column="sample" jdbcType="VARCHAR"/>
+            <result property="model" column="model" 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>
+
+    <resultMap id="FactoryDto" type="com.yuanchu.mom.dto.FactoryDto">
+        <result property="label" column="factory"/>
+        <result property="value" column="factory"/>
+        <collection property="children" resultMap="LaboratoryDto"/>
+    </resultMap>
+
+    <resultMap id="LaboratoryDto" type="com.yuanchu.mom.dto.LaboratoryDto">
+        <result property="label" column="laboratory"/>
+        <result property="value" column="laboratory"/>
+        <collection property="children" resultMap="SampleTypeDto"/>
+    </resultMap>
+
+    <resultMap id="SampleTypeDto" type="com.yuanchu.mom.dto.SampleTypeDto">
+        <result property="label" column="sample_type"/>
+        <result property="value" column="sample_type"/>
+        <collection property="children" resultMap="SampleDto"/>
+    </resultMap>
+
+    <resultMap id="SampleDto" type="com.yuanchu.mom.dto.SampleDto">
+        <result property="label" column="sample"/>
+        <result property="value" column="sample"/>
+        <collection property="children" resultMap="ModelDto"/>
+    </resultMap>
+
+    <resultMap id="ModelDto" type="com.yuanchu.mom.dto.ModelDto">
+        <result property="label" column="model"/>
+        <result property="value" column="model"/>
+    </resultMap>
+
+    <select id="selectStandardTreeList" resultMap="FactoryDto">
+        select factory,laboratory,sample_type,sample,model from standard_tree
+    </select>
+</mapper>
diff --git a/inspect-server/src/test/java/TestClass.java b/inspect-server/src/test/java/TestClass.java
new file mode 100644
index 0000000..96f05a0
--- /dev/null
+++ b/inspect-server/src/test/java/TestClass.java
@@ -0,0 +1,2 @@
+public class TestClass {
+}
diff --git a/pom.xml b/pom.xml
index 538a30a..76601b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,7 @@
         <module>user-server</module>
         <module>system-run</module>
         <module>cnas-server</module>
+        <module>inspect-server</module>
     </modules>
 
     <properties>
diff --git a/system-run/pom.xml b/system-run/pom.xml
index 9732476..f85f04e 100644
--- a/system-run/pom.xml
+++ b/system-run/pom.xml
@@ -34,6 +34,12 @@
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.yuanchu.mom</groupId>
+            <artifactId>inspect-server</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+
         <!--druid-->
         <dependency>
             <groupId>com.alibaba</groupId>
diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index b036fad..347d78f 100644
--- a/system-run/src/main/resources/application-dev.yml
+++ b/system-run/src/main/resources/application-dev.yml
@@ -59,7 +59,7 @@
     # redis鏁版嵁搴撶储寮�(榛樿涓�0)锛屾垜浠娇鐢ㄧ储寮曚负3鐨勬暟鎹簱锛岄伩鍏嶅拰鍏朵粬鏁版嵁搴撳啿绐�
     database: 0
     # redis鏈嶅姟鍣ㄥ湴鍧�锛堥粯璁や负localhost锛�
-    host: 192.168.0.134
+    host: 127.0.0.1
     # redis绔彛锛堥粯璁や负6379锛�
     port: 6379
     # redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/impl/EnumServiceImpl.java b/user-server/src/main/java/com/yuanchu/mom/service/impl/EnumServiceImpl.java
index e0170b4..95d3928 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/impl/EnumServiceImpl.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/impl/EnumServiceImpl.java
@@ -58,7 +58,7 @@
 
     @Override
     public List<Enums> selectEnumByCategory(String category) {
-        return enumMapper.selectList(Wrappers.<Enums>lambdaQuery().eq(Enums::getCategory, category).select(Enums::getLabel,Enums::getValue));
+        return enumMapper.selectList(Wrappers.<Enums>lambdaQuery().eq(Enums::getCategory, category).select(Enums::getLabel,Enums::getValue).orderByAsc(Enums::getOrderNum).orderByAsc(Enums::getId));
     }
 }
 
diff --git a/user-server/src/main/resources/mapper/EnumMapper.xml b/user-server/src/main/resources/mapper/EnumMapper.xml
index 3f10307..989c580 100644
--- a/user-server/src/main/resources/mapper/EnumMapper.xml
+++ b/user-server/src/main/resources/mapper/EnumMapper.xml
@@ -26,7 +26,6 @@
         from enums e
         left join user u2 on u2.id = e.create_user
         left join user u3 on u3.id = e.update_user
-        order by category,order_num,id
         ) a
         <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
             ${ew.customSqlSegment}

--
Gitblit v1.9.3