From 610d9377a3d11795c9ed9523b1c112f02df94d3e Mon Sep 17 00:00:00 2001 From: loser <12524321+loser111@user.noreply.gitee.com> Date: Mon, 8 May 2023 08:04:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B5=84=E7=AE=A1=E7=90=86=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/RuoYiApplication.java | 2 +- .../src/main/resources/templates/login.html | 2 +- .../resources/templates/supplies/nucleic/add.html | 43 --------------- .../resources/templates/supplies/nucleic/edit.html | 44 ---------------- .../templates/supplies/nucleic/nucleic/add.html | 43 +++++++++++++++ .../templates/supplies/nucleic/nucleic/edit.html | 44 ++++++++++++++++ .../resources/templates/supplies/vaccine/add.html | 43 --------------- .../resources/templates/supplies/vaccine/edit.html | 44 ---------------- .../templates/supplies/vaccine/vaccine/add.html | 43 +++++++++++++++ .../templates/supplies/vaccine/vaccine/edit.html | 44 ++++++++++++++++ .../com/ruoyi/supplies/mapper/NucleicMapper.java | 61 ++++++++++++++++++++++ .../com/ruoyi/supplies/mapper/VaccineMapper.java | 61 ++++++++++++++++++++++ .../com/ruoyi/system/mapper/NucleicMapper.java | 61 ---------------------- .../com/ruoyi/system/mapper/VaccineMapper.java | 61 ---------------------- .../system/service/impl/NucleicServiceImpl.java | 2 +- .../system/service/impl/VaccineServiceImpl.java | 2 +- .../resources/mapper/supplies/NucleicMapper.xml | 6 +-- .../resources/mapper/supplies/VaccineMapper.xml | 2 +- 18 files changed, 304 insertions(+), 304 deletions(-) delete mode 100644 ruoyi-admin/src/main/resources/templates/supplies/nucleic/add.html delete mode 100644 ruoyi-admin/src/main/resources/templates/supplies/nucleic/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/supplies/nucleic/nucleic/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/supplies/nucleic/nucleic/edit.html delete mode 100644 ruoyi-admin/src/main/resources/templates/supplies/vaccine/add.html delete mode 100644 ruoyi-admin/src/main/resources/templates/supplies/vaccine/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/supplies/vaccine/vaccine/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/supplies/vaccine/vaccine/edit.html create mode 100644 ruoyi-system/src/main/java/com/ruoyi/supplies/mapper/NucleicMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/supplies/mapper/VaccineMapper.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/NucleicMapper.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/VaccineMapper.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index a84a725..fc81202 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -16,7 +16,7 @@ public class RuoYiApplication { // System.setProperty("spring.devtools.restart.enabled", "false"); SpringApplication.run(RuoYiApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" + + System.out.println("(♥◠‿◠)ﾉﾞ 启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + " | ( ' ) | \\ _. / ' \n" + diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html index 47fb7fd..fe62353 100644 --- a/ruoyi-admin/src/main/resources/templates/login.html +++ b/ruoyi-admin/src/main/resources/templates/login.html @@ -29,7 +29,7 @@

[ 若依 ]

-

欢迎使用 医院管理系统

+

欢迎使用 可视化医院管理系统

还没有账号？ 立即注册» diff --git a/ruoyi-admin/src/main/resources/templates/supplies/nucleic/add.html b/ruoyi-admin/src/main/resources/templates/supplies/nucleic/add.html deleted file mode 100644 index 847cd01..0000000 --- a/ruoyi-admin/src/main/resources/templates/supplies/nucleic/add.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/supplies/nucleic/edit.html b/ruoyi-admin/src/main/resources/templates/supplies/nucleic/edit.html deleted file mode 100644 index 0c8d0a1..0000000 --- a/ruoyi-admin/src/main/resources/templates/supplies/nucleic/edit.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/supplies/nucleic/nucleic/add.html b/ruoyi-admin/src/main/resources/templates/supplies/nucleic/nucleic/add.html new file mode 100644 index 0000000..847cd01 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/supplies/nucleic/nucleic/add.html @@ -0,0 +1,43 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/supplies/nucleic/nucleic/edit.html b/ruoyi-admin/src/main/resources/templates/supplies/nucleic/nucleic/edit.html new file mode 100644 index 0000000..0c8d0a1 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/supplies/nucleic/nucleic/edit.html @@ -0,0 +1,44 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/supplies/vaccine/add.html b/ruoyi-admin/src/main/resources/templates/supplies/vaccine/add.html deleted file mode 100644 index 8155519..0000000 --- a/ruoyi-admin/src/main/resources/templates/supplies/vaccine/add.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/supplies/vaccine/edit.html b/ruoyi-admin/src/main/resources/templates/supplies/vaccine/edit.html deleted file mode 100644 index 64c245f..0000000 --- a/ruoyi-admin/src/main/resources/templates/supplies/vaccine/edit.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/supplies/vaccine/vaccine/add.html b/ruoyi-admin/src/main/resources/templates/supplies/vaccine/vaccine/add.html new file mode 100644 index 0000000..8155519 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/supplies/vaccine/vaccine/add.html @@ -0,0 +1,43 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/supplies/vaccine/vaccine/edit.html b/ruoyi-admin/src/main/resources/templates/supplies/vaccine/vaccine/edit.html new file mode 100644 index 0000000..64c245f --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/supplies/vaccine/vaccine/edit.html @@ -0,0 +1,44 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/supplies/mapper/NucleicMapper.java b/ruoyi-system/src/main/java/com/ruoyi/supplies/mapper/NucleicMapper.java new file mode 100644 index 0000000..25532ea --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/supplies/mapper/NucleicMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.supplies.mapper; + +import java.util.List; +import com.ruoyi.system.domain.Nucleic; + +/** + * 核酸管理Mapper接口 + * + * @author zlx + * @date 2023-04-22 + */ +public interface NucleicMapper +{ + /** + * 查询核酸管理 + * + * @param nucleicId 核酸管理主键 + * @return 核酸管理 + */ + public Nucleic selectNucleicByNucleicId(Long nucleicId); + + /** + * 查询核酸管理列表 + * + * @param nucleic 核酸管理 + * @return 核酸管理集合 + */ + public List selectNucleicList(Nucleic nucleic); + + /** + * 新增核酸管理 + * + * @param nucleic 核酸管理 + * @return 结果 + */ + public int insertNucleic(Nucleic nucleic); + + /** + * 修改核酸管理 + * + * @param nucleic 核酸管理 + * @return 结果 + */ + public int updateNucleic(Nucleic nucleic); + + /** + * 删除核酸管理 + * + * @param nucleicId 核酸管理主键 + * @return 结果 + */ + public int deleteNucleicByNucleicId(Long nucleicId); + + /** + * 批量删除核酸管理 + * + * @param nucleicIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteNucleicByNucleicIds(String[] nucleicIds); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/supplies/mapper/VaccineMapper.java b/ruoyi-system/src/main/java/com/ruoyi/supplies/mapper/VaccineMapper.java new file mode 100644 index 0000000..d1dd85e --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/supplies/mapper/VaccineMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.supplies.mapper; + +import java.util.List; +import com.ruoyi.system.domain.Vaccine; + +/** + * 疫苗管理Mapper接口 + * + * @author zlx + * @date 2023-04-22 + */ +public interface VaccineMapper +{ + /** + * 查询疫苗管理 + * + * @param vaccineId 疫苗管理主键 + * @return 疫苗管理 + */ + public Vaccine selectVaccineByVaccineId(Long vaccineId); + + /** + * 查询疫苗管理列表 + * + * @param vaccine 疫苗管理 + * @return 疫苗管理集合 + */ + public List selectVaccineList(Vaccine vaccine); + + /** + * 新增疫苗管理 + * + * @param vaccine 疫苗管理 + * @return 结果 + */ + public int insertVaccine(Vaccine vaccine); + + /** + * 修改疫苗管理 + * + * @param vaccine 疫苗管理 + * @return 结果 + */ + public int updateVaccine(Vaccine vaccine); + + /** + * 删除疫苗管理 + * + * @param vaccineId 疫苗管理主键 + * @return 结果 + */ + public int deleteVaccineByVaccineId(Long vaccineId); + + /** + * 批量删除疫苗管理 + * + * @param vaccineIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteVaccineByVaccineIds(String[] vaccineIds); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/NucleicMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/NucleicMapper.java deleted file mode 100644 index 928580e..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/NucleicMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import com.ruoyi.system.domain.Nucleic; - -/** - * 核酸管理Mapper接口 - * - * @author ruoyi - * @date 2023-04-22 - */ -public interface NucleicMapper -{ - /** - * 查询核酸管理 - * - * @param nucleicId 核酸管理主键 - * @return 核酸管理 - */ - public Nucleic selectNucleicByNucleicId(Long nucleicId); - - /** - * 查询核酸管理列表 - * - * @param nucleic 核酸管理 - * @return 核酸管理集合 - */ - public List selectNucleicList(Nucleic nucleic); - - /** - * 新增核酸管理 - * - * @param nucleic 核酸管理 - * @return 结果 - */ - public int insertNucleic(Nucleic nucleic); - - /** - * 修改核酸管理 - * - * @param nucleic 核酸管理 - * @return 结果 - */ - public int updateNucleic(Nucleic nucleic); - - /** - * 删除核酸管理 - * - * @param nucleicId 核酸管理主键 - * @return 结果 - */ - public int deleteNucleicByNucleicId(Long nucleicId); - - /** - * 批量删除核酸管理 - * - * @param nucleicIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteNucleicByNucleicIds(String[] nucleicIds); -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/VaccineMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/VaccineMapper.java deleted file mode 100644 index 43f07d9..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/VaccineMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.system.mapper; - -import java.util.List; -import com.ruoyi.system.domain.Vaccine; - -/** - * 疫苗管理Mapper接口 - * - * @author zlx - * @date 2023-04-22 - */ -public interface VaccineMapper -{ - /** - * 查询疫苗管理 - * - * @param vaccineId 疫苗管理主键 - * @return 疫苗管理 - */ - public Vaccine selectVaccineByVaccineId(Long vaccineId); - - /** - * 查询疫苗管理列表 - * - * @param vaccine 疫苗管理 - * @return 疫苗管理集合 - */ - public List selectVaccineList(Vaccine vaccine); - - /** - * 新增疫苗管理 - * - * @param vaccine 疫苗管理 - * @return 结果 - */ - public int insertVaccine(Vaccine vaccine); - - /** - * 修改疫苗管理 - * - * @param vaccine 疫苗管理 - * @return 结果 - */ - public int updateVaccine(Vaccine vaccine); - - /** - * 删除疫苗管理 - * - * @param vaccineId 疫苗管理主键 - * @return 结果 - */ - public int deleteVaccineByVaccineId(Long vaccineId); - - /** - * 批量删除疫苗管理 - * - * @param vaccineIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteVaccineByVaccineIds(String[] vaccineIds); -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/NucleicServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/NucleicServiceImpl.java index b7336a3..941340a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/NucleicServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/NucleicServiceImpl.java @@ -3,7 +3,7 @@ package com.ruoyi.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.NucleicMapper; +import com.ruoyi.supplies.mapper.NucleicMapper; import com.ruoyi.system.domain.Nucleic; import com.ruoyi.system.service.INucleicService; import com.ruoyi.common.core.text.Convert; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VaccineServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VaccineServiceImpl.java index b9e1cea..dc9f28e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VaccineServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VaccineServiceImpl.java @@ -3,7 +3,7 @@ package com.ruoyi.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.VaccineMapper; +import com.ruoyi.supplies.mapper.VaccineMapper; import com.ruoyi.system.domain.Vaccine; import com.ruoyi.system.service.IVaccineService; import com.ruoyi.common.core.text.Convert; diff --git a/ruoyi-system/src/main/resources/mapper/supplies/NucleicMapper.xml b/ruoyi-system/src/main/resources/mapper/supplies/NucleicMapper.xml index 6d33464..fcc48a2 100644 --- a/ruoyi-system/src/main/resources/mapper/supplies/NucleicMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/supplies/NucleicMapper.xml @@ -2,7 +2,7 @@ - + @@ -23,8 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and nucleic_description = #{nucleicDescription} - - where nucleic_id = #{nucleicId} diff --git a/ruoyi-system/src/main/resources/mapper/supplies/VaccineMapper.xml b/ruoyi-system/src/main/resources/mapper/supplies/VaccineMapper.xml index d9319d0..52f4b0c 100644 --- a/ruoyi-system/src/main/resources/mapper/supplies/VaccineMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/supplies/VaccineMapper.xml @@ -2,7 +2,7 @@ - +