Commit 379547437606ed47c4a16c8b15b62b26abb2ba3a
1 parent
5d9914bcbc
Exists in
master
提交疫苗名称model
Showing 8 changed files with 245 additions and 25 deletions
- mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedVaccineNameMapper.java
- mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineName.java
- mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineNameQuery.java
- mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedVaccineNameService.java
- mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedVaccinenameServiceImpl.java
- mainData/src/main/resources/mainOrm/MedVaccinename.xml
- webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java
- webApi/src/main/java/com/lyms/yimiao/web/controller/v1/VaccineNamesController.java
mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedVaccineNameMapper.java
View file @
3795474
1 | +package com.lymsh.yimiao.main.data.dao; | |
2 | + | |
3 | +import com.lymsh.yimiao.main.data.model.MedVaccineName; | |
4 | +import com.lymsh.yimiao.main.data.model.MedVaccineNameQuery; | |
5 | + | |
6 | +import java.util.List; | |
7 | + | |
8 | +public interface MedVaccineNameMapper { | |
9 | + public void addMedVaccineName(MedVaccineName obj); | |
10 | + | |
11 | + public void updateMedVaccineName(MedVaccineName obj); | |
12 | + | |
13 | + public void deleteMedVaccineName(Integer id); | |
14 | + | |
15 | + public MedVaccineName getMedVaccineName(String id); | |
16 | + | |
17 | + public int queryMedVaccineNameCount(MedVaccineNameQuery query); | |
18 | + | |
19 | + public List<MedVaccineName> queryMedVaccineName(MedVaccineNameQuery query); | |
20 | + | |
21 | +} |
mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineName.java
View file @
3795474
1 | +package com.lymsh.yimiao.main.data.model; | |
2 | + | |
3 | +import java.util.Date; | |
4 | + | |
5 | +public class MedVaccineName { | |
6 | + private String vnId; | |
7 | + private String vnName; | |
8 | + private String vnPreventDisease; | |
9 | + private String vnMonthAge; | |
10 | + private String vnPosition; | |
11 | + private String vnTaboo; | |
12 | + private String vnDescription; | |
13 | + private String vnIsValid; | |
14 | + private Integer vnVaccineType; | |
15 | + | |
16 | + public Integer getVnVaccineType() { | |
17 | + return vnVaccineType; | |
18 | + } | |
19 | + | |
20 | + public void setVnVaccineType(Integer vnVaccineType) { | |
21 | + this.vnVaccineType = vnVaccineType; | |
22 | + } | |
23 | + | |
24 | + public String getVnId() { | |
25 | + return vnId; | |
26 | + } | |
27 | + | |
28 | + public void setVnId(String vnId) { | |
29 | + this.vnId = vnId; | |
30 | + } | |
31 | + | |
32 | + public String getVnName() { | |
33 | + return vnName; | |
34 | + } | |
35 | + | |
36 | + public void setVnName(String vnName) { | |
37 | + this.vnName = vnName; | |
38 | + } | |
39 | + | |
40 | + public String getVnPreventDisease() { | |
41 | + return vnPreventDisease; | |
42 | + } | |
43 | + | |
44 | + public void setVnPreventDisease(String vnPreventDisease) { | |
45 | + this.vnPreventDisease = vnPreventDisease; | |
46 | + } | |
47 | + | |
48 | + public String getVnMonthAge() { | |
49 | + return vnMonthAge; | |
50 | + } | |
51 | + | |
52 | + public void setVnMonthAge(String vnMonthAge) { | |
53 | + this.vnMonthAge = vnMonthAge; | |
54 | + } | |
55 | + | |
56 | + public String getVnPosition() { | |
57 | + return vnPosition; | |
58 | + } | |
59 | + | |
60 | + public void setVnPosition(String vnPosition) { | |
61 | + this.vnPosition = vnPosition; | |
62 | + } | |
63 | + | |
64 | + public String getVnTaboo() { | |
65 | + return vnTaboo; | |
66 | + } | |
67 | + | |
68 | + public void setVnTaboo(String vnTaboo) { | |
69 | + this.vnTaboo = vnTaboo; | |
70 | + } | |
71 | + | |
72 | + public String getVnDescription() { | |
73 | + return vnDescription; | |
74 | + } | |
75 | + | |
76 | + public void setVnDescription(String vnDescription) { | |
77 | + this.vnDescription = vnDescription; | |
78 | + } | |
79 | + | |
80 | + public String getVnIsValid() { | |
81 | + return vnIsValid; | |
82 | + } | |
83 | + | |
84 | + public void setVnIsValid(String vnIsValid) { | |
85 | + this.vnIsValid = vnIsValid; | |
86 | + } | |
87 | +} |
mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineNameQuery.java
View file @
3795474
1 | +package com.lymsh.yimiao.main.data.model; | |
2 | + | |
3 | + | |
4 | +import java.util.Date; | |
5 | + | |
6 | +import com.lymsh.mommybaby.basecommon.base.BaseQuery; | |
7 | + | |
8 | + | |
9 | +public class MedVaccineNameQuery extends BaseQuery { | |
10 | + private String vnId; | |
11 | + private String vnName; | |
12 | + private String vnPreventDisease; | |
13 | + private String vnMonthAge; | |
14 | + private String vnPosition; | |
15 | + private String vnTaboo; | |
16 | + private String vnDescription; | |
17 | + private String vnIsValid; | |
18 | + private Integer vnVaccineType; | |
19 | + | |
20 | + public Integer getVnVaccineType() { | |
21 | + return vnVaccineType; | |
22 | + } | |
23 | + | |
24 | + public void setVnVaccineType(Integer vnVaccineType) { | |
25 | + this.vnVaccineType = vnVaccineType; | |
26 | + } | |
27 | + | |
28 | + public String getVnId() { | |
29 | + return vnId; | |
30 | + } | |
31 | + | |
32 | + public void setVnId(String vnId) { | |
33 | + this.vnId = vnId; | |
34 | + } | |
35 | + | |
36 | + public String getVnName() { | |
37 | + return vnName; | |
38 | + } | |
39 | + | |
40 | + public void setVnName(String vnName) { | |
41 | + this.vnName = vnName; | |
42 | + } | |
43 | + | |
44 | + public String getVnPreventDisease() { | |
45 | + return vnPreventDisease; | |
46 | + } | |
47 | + | |
48 | + public void setVnPreventDisease(String vnPreventDisease) { | |
49 | + this.vnPreventDisease = vnPreventDisease; | |
50 | + } | |
51 | + | |
52 | + public String getVnMonthAge() { | |
53 | + return vnMonthAge; | |
54 | + } | |
55 | + | |
56 | + public void setVnMonthAge(String vnMonthAge) { | |
57 | + this.vnMonthAge = vnMonthAge; | |
58 | + } | |
59 | + | |
60 | + public String getVnPosition() { | |
61 | + return vnPosition; | |
62 | + } | |
63 | + | |
64 | + public void setVnPosition(String vnPosition) { | |
65 | + this.vnPosition = vnPosition; | |
66 | + } | |
67 | + | |
68 | + public String getVnTaboo() { | |
69 | + return vnTaboo; | |
70 | + } | |
71 | + | |
72 | + public void setVnTaboo(String vnTaboo) { | |
73 | + this.vnTaboo = vnTaboo; | |
74 | + } | |
75 | + | |
76 | + public String getVnDescription() { | |
77 | + return vnDescription; | |
78 | + } | |
79 | + | |
80 | + public void setVnDescription(String vnDescription) { | |
81 | + this.vnDescription = vnDescription; | |
82 | + } | |
83 | + | |
84 | + public String getVnIsValid() { | |
85 | + return vnIsValid; | |
86 | + } | |
87 | + | |
88 | + public void setVnIsValid(String vnIsValid) { | |
89 | + this.vnIsValid = vnIsValid; | |
90 | + } | |
91 | +} |
mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedVaccineNameService.java
View file @
3795474
1 | +package com.lymsh.yimiao.main.data.service; | |
2 | + | |
3 | +import com.lymsh.yimiao.main.data.model.MedVaccineName; | |
4 | +import com.lymsh.yimiao.main.data.model.MedVaccineNameQuery; | |
5 | + | |
6 | +import java.util.List; | |
7 | + | |
8 | +public interface MedVaccineNameService { | |
9 | + public void addMedVaccineName(MedVaccineName obj); | |
10 | + | |
11 | + public void updateMedVaccineName(MedVaccineName obj); | |
12 | + | |
13 | + public void deleteMedVaccineName(Integer id); | |
14 | + | |
15 | + public MedVaccineName getMedVaccineName(String id); | |
16 | + | |
17 | + public int queryMedVaccineNameCount(MedVaccineNameQuery query); | |
18 | + | |
19 | + public List<MedVaccineName> queryMedVaccineName(MedVaccineNameQuery query); | |
20 | + | |
21 | +} |
mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedVaccinenameServiceImpl.java
View file @
3795474
1 | 1 | package com.lymsh.yimiao.main.data.service.impl; |
2 | 2 | |
3 | -import com.lymsh.yimiao.main.data.dao.MedVaccinenameMapper; | |
4 | -import com.lymsh.yimiao.main.data.model.MedVaccinename; | |
5 | -import com.lymsh.yimiao.main.data.model.MedVaccinenameQuery; | |
6 | -import com.lymsh.yimiao.main.data.service.MedVaccinenameService; | |
3 | +import com.lymsh.yimiao.main.data.dao.MedVaccineNameMapper; | |
4 | +import com.lymsh.yimiao.main.data.model.MedVaccineName; | |
5 | +import com.lymsh.yimiao.main.data.model.MedVaccineNameQuery; | |
6 | +import com.lymsh.yimiao.main.data.service.MedVaccineNameService; | |
7 | 7 | import org.springframework.beans.factory.annotation.Autowired; |
8 | 8 | import org.springframework.stereotype.Service; |
9 | 9 | |
10 | 10 | import java.util.List; |
11 | 11 | |
12 | 12 | @Service |
13 | -public class MedVaccinenameServiceImpl implements MedVaccinenameService { | |
13 | +public class MedVaccinenameServiceImpl implements MedVaccineNameService { | |
14 | 14 | |
15 | 15 | @Autowired |
16 | -private MedVaccinenameMapper medVaccinenameMapper; | |
16 | +private MedVaccineNameMapper medVaccinenameMapper; | |
17 | 17 | |
18 | 18 | @Override |
19 | -public void addMedVaccinename(MedVaccinename obj){medVaccinenameMapper.addMedVaccinename(obj);} | |
19 | +public void addMedVaccineName(MedVaccineName obj){medVaccinenameMapper.addMedVaccineName(obj);} | |
20 | 20 | @Override |
21 | -public void updateMedVaccinename(MedVaccinename obj){medVaccinenameMapper.updateMedVaccinename(obj);} | |
21 | +public void updateMedVaccineName(MedVaccineName obj){medVaccinenameMapper.updateMedVaccineName(obj);} | |
22 | 22 | @Override |
23 | -public void deleteMedVaccinename (Integer id){medVaccinenameMapper.deleteMedVaccinename(id);} | |
23 | +public void deleteMedVaccineName (Integer id){medVaccinenameMapper.deleteMedVaccineName(id);} | |
24 | 24 | @Override |
25 | -public MedVaccinename getMedVaccinename (String id){return medVaccinenameMapper.getMedVaccinename(id);} | |
25 | +public MedVaccineName getMedVaccineName (String id){return medVaccinenameMapper.getMedVaccineName(id);} | |
26 | 26 | @Override |
27 | -public int queryMedVaccinenameCount (MedVaccinenameQuery query){return medVaccinenameMapper.queryMedVaccinenameCount(query);} | |
27 | +public int queryMedVaccineNameCount (MedVaccineNameQuery query){return medVaccinenameMapper.queryMedVaccineNameCount(query);} | |
28 | 28 | @Override |
29 | -public List<MedVaccinename> queryMedVaccinename (MedVaccinenameQuery query){if (query.getNeed() != null) {query.mysqlBuild(medVaccinenameMapper.queryMedVaccinenameCount(query));}return medVaccinenameMapper.queryMedVaccinename(query);} | |
29 | +public List<MedVaccineName> queryMedVaccineName (MedVaccineNameQuery query){if (query.getNeed() != null) {query.mysqlBuild(medVaccinenameMapper.queryMedVaccineNameCount(query));}return medVaccinenameMapper.queryMedVaccineName(query);} | |
30 | 30 | |
31 | 31 | } |
mainData/src/main/resources/mainOrm/MedVaccinename.xml
View file @
3795474
1 | 1 | <?xml version="1.0" encoding="UTF-8" ?> |
2 | 2 | <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > |
3 | -<mapper namespace="com.lymsh.yimiao.main.data.dao.MedVaccinenameMapper"> | |
3 | +<mapper namespace="com.lymsh.yimiao.main.data.dao.MedVaccineNameMapper"> | |
4 | 4 | |
5 | -<resultMap id="MedVaccinenameResultMap" type="com.lymsh.yimiao.main.data.model.MedVaccinename"> | |
5 | +<resultMap id="MedVaccineNameResultMap" type="com.lymsh.yimiao.main.data.model.MedVaccineName"> | |
6 | 6 | <result column="vn_id" property="vnId" jdbcType="VARCHAR" /> |
7 | 7 | <result column="vn_name" property="vnName" jdbcType="VARCHAR" /> |
8 | 8 | <result column="vn_preventDisease" property="vnPreventDisease" jdbcType="VARCHAR" /> |
... | ... | @@ -14,7 +14,7 @@ |
14 | 14 | <result column="vn_vaccineType" property="vnVaccineType" jdbcType="INTEGER" /> |
15 | 15 | </resultMap> |
16 | 16 | |
17 | -<select id="getMedVaccinename" resultMap="MedVaccinenameResultMap" parameterType="java.lang.String"> | |
17 | +<select id="getMedVaccineName" resultMap="MedVaccineNameResultMap" parameterType="java.lang.String"> | |
18 | 18 | select vn_id,vn_name,vn_preventDisease,vn_monthAge,vn_position,vn_taboo,vn_description,vn_isValid,vn_vaccineType |
19 | 19 | from med_vaccinename |
20 | 20 | WHERE vn_id = #{vnId,jdbcType=VARCHAR} |
... | ... | @@ -32,7 +32,7 @@ |
32 | 32 | |
33 | 33 | |
34 | 34 | |
35 | -<sql id="MedVaccinenameCondition"> | |
35 | +<sql id="MedVaccineNameCondition"> | |
36 | 36 | <where> |
37 | 37 | 1 = 1 |
38 | 38 | <if test="vnId != null and vnId != ''"> |
39 | 39 | |
40 | 40 | |
41 | 41 | |
... | ... | @@ -67,18 +67,18 @@ |
67 | 67 | |
68 | 68 | |
69 | 69 | |
70 | -<select id="queryMedVaccinename" resultMap="MedVaccinenameResultMap" parameterType="com.lymsh.yimiao.main.data.model.MedVaccinenameQuery"> | |
70 | +<select id="queryMedVaccineName" resultMap="MedVaccineNameResultMap" parameterType="com.lymsh.yimiao.main.data.model.MedVaccineNameQuery"> | |
71 | 71 | select vn_id,vn_name,vn_preventDisease,vn_monthAge,vn_position,vn_taboo,vn_description,vn_isValid |
72 | 72 | from med_vaccinename |
73 | -<include refid="MedVaccinenameCondition" /> | |
73 | +<include refid="MedVaccineNameCondition" /> | |
74 | 74 | <include refid="orderAndLimit" /> |
75 | 75 | </select> |
76 | 76 | |
77 | 77 | |
78 | 78 | |
79 | -<select id="queryMedVaccinenameCount" resultType="int" parameterType="com.lymsh.yimiao.main.data.model.MedVaccinenameQuery"> | |
79 | +<select id="queryMedVaccineNameCount" resultType="int" parameterType="com.lymsh.yimiao.main.data.model.MedVaccineNameQuery"> | |
80 | 80 | select count(1) from med_vaccinename |
81 | -<include refid="MedVaccinenameCondition" /> | |
81 | +<include refid="MedVaccineNameCondition" /> | |
82 | 82 | </select> |
83 | 83 | |
84 | 84 |
webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java
View file @
3795474
... | ... | @@ -217,7 +217,7 @@ |
217 | 217 | map.put("ioInoculateTime", medInoculateorder.getIoInoculateTime()); |
218 | 218 | //下次接种疫苗 |
219 | 219 | map.put("vaccineId", medInoculateorder.getIoVaccineId()); |
220 | - MedVaccineInfo medVaccineinfo = medVaccineinfoService.getMedVaccineinfo(medInoculateorder.getIoVaccineId()); | |
220 | + MedVaccineInfo medVaccineinfo = medVaccineinfoService.getMedVaccineInfo(medInoculateorder.getIoVaccineId()); | |
221 | 221 | map.put("vaccineName", medVaccineinfo == null ? "" : medVaccineinfo.getViName()); |
222 | 222 | //接种地点 |
223 | 223 | map.put("organizationId", medInoculateorder.getIoOrganizationId()); |
webApi/src/main/java/com/lyms/yimiao/web/controller/v1/VaccineNamesController.java
View file @
3795474
... | ... | @@ -2,8 +2,8 @@ |
2 | 2 | |
3 | 3 | import com.lymsh.mommybaby.basecommon.base.BaseController; |
4 | 4 | import com.lymsh.mommybaby.basecommon.util.ResultUtils; |
5 | -import com.lymsh.yimiao.main.data.model.MedVaccinename; | |
6 | -import com.lymsh.yimiao.main.data.service.MedVaccinenameService; | |
5 | +import com.lymsh.yimiao.main.data.model.MedVaccineName; | |
6 | +import com.lymsh.yimiao.main.data.service.MedVaccineNameService; | |
7 | 7 | import com.lymsh.yimiao.main.data.util.JsonUtil; |
8 | 8 | import org.springframework.beans.factory.annotation.Autowired; |
9 | 9 | import org.springframework.stereotype.Controller; |
... | ... | @@ -23,7 +23,7 @@ |
23 | 23 | public class VaccineNamesController extends BaseController{ |
24 | 24 | |
25 | 25 | @Autowired |
26 | - private MedVaccinenameService medVaccineNameService; | |
26 | + private MedVaccineNameService medVaccineNameService; | |
27 | 27 | |
28 | 28 | /** |
29 | 29 | * |
... | ... | @@ -33,7 +33,7 @@ |
33 | 33 | @RequestMapping(value = "/vaccineNames", method = RequestMethod.GET) |
34 | 34 | public void getVaccineNames(HttpServletResponse response, |
35 | 35 | @RequestParam("id") String id){ |
36 | - MedVaccinename medVaccineName = medVaccineNameService.getMedVaccinename(id); | |
36 | + MedVaccineName medVaccineName = medVaccineNameService.getMedVaccinename(id); | |
37 | 37 | if (medVaccineName==null){ |
38 | 38 | ResultUtils.buildParameterErrorResultAndWrite(response,"疫苗名称信息不存在"); |
39 | 39 | return; |