diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedVaccineNameMapper.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedVaccineNameMapper.java new file mode 100644 index 0000000..5ed93aa --- /dev/null +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedVaccineNameMapper.java @@ -0,0 +1,21 @@ +package com.lymsh.yimiao.main.data.dao; + +import com.lymsh.yimiao.main.data.model.MedVaccineName; +import com.lymsh.yimiao.main.data.model.MedVaccineNameQuery; + +import java.util.List; + +public interface MedVaccineNameMapper { + public void addMedVaccineName(MedVaccineName obj); + + public void updateMedVaccineName(MedVaccineName obj); + + public void deleteMedVaccineName(Integer id); + + public MedVaccineName getMedVaccineName(String id); + + public int queryMedVaccineNameCount(MedVaccineNameQuery query); + + public List queryMedVaccineName(MedVaccineNameQuery query); + +} \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineName.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineName.java new file mode 100644 index 0000000..6295e87 --- /dev/null +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineName.java @@ -0,0 +1,87 @@ +package com.lymsh.yimiao.main.data.model; + +import java.util.Date; + +public class MedVaccineName { + private String vnId; + private String vnName; + private String vnPreventDisease; + private String vnMonthAge; + private String vnPosition; + private String vnTaboo; + private String vnDescription; + private String vnIsValid; + private Integer vnVaccineType; + + public Integer getVnVaccineType() { + return vnVaccineType; + } + + public void setVnVaccineType(Integer vnVaccineType) { + this.vnVaccineType = vnVaccineType; + } + + public String getVnId() { + return vnId; + } + + public void setVnId(String vnId) { + this.vnId = vnId; + } + + public String getVnName() { + return vnName; + } + + public void setVnName(String vnName) { + this.vnName = vnName; + } + + public String getVnPreventDisease() { + return vnPreventDisease; + } + + public void setVnPreventDisease(String vnPreventDisease) { + this.vnPreventDisease = vnPreventDisease; + } + + public String getVnMonthAge() { + return vnMonthAge; + } + + public void setVnMonthAge(String vnMonthAge) { + this.vnMonthAge = vnMonthAge; + } + + public String getVnPosition() { + return vnPosition; + } + + public void setVnPosition(String vnPosition) { + this.vnPosition = vnPosition; + } + + public String getVnTaboo() { + return vnTaboo; + } + + public void setVnTaboo(String vnTaboo) { + this.vnTaboo = vnTaboo; + } + + public String getVnDescription() { + return vnDescription; + } + + public void setVnDescription(String vnDescription) { + this.vnDescription = vnDescription; + } + + public String getVnIsValid() { + return vnIsValid; + } + + public void setVnIsValid(String vnIsValid) { + this.vnIsValid = vnIsValid; + } +} \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineNameQuery.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineNameQuery.java new file mode 100644 index 0000000..468b172 --- /dev/null +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineNameQuery.java @@ -0,0 +1,91 @@ +package com.lymsh.yimiao.main.data.model; + + +import java.util.Date; + +import com.lymsh.mommybaby.basecommon.base.BaseQuery; + + +public class MedVaccineNameQuery extends BaseQuery { + private String vnId; + private String vnName; + private String vnPreventDisease; + private String vnMonthAge; + private String vnPosition; + private String vnTaboo; + private String vnDescription; + private String vnIsValid; + private Integer vnVaccineType; + + public Integer getVnVaccineType() { + return vnVaccineType; + } + + public void setVnVaccineType(Integer vnVaccineType) { + this.vnVaccineType = vnVaccineType; + } + + public String getVnId() { + return vnId; + } + + public void setVnId(String vnId) { + this.vnId = vnId; + } + + public String getVnName() { + return vnName; + } + + public void setVnName(String vnName) { + this.vnName = vnName; + } + + public String getVnPreventDisease() { + return vnPreventDisease; + } + + public void setVnPreventDisease(String vnPreventDisease) { + this.vnPreventDisease = vnPreventDisease; + } + + public String getVnMonthAge() { + return vnMonthAge; + } + + public void setVnMonthAge(String vnMonthAge) { + this.vnMonthAge = vnMonthAge; + } + + public String getVnPosition() { + return vnPosition; + } + + public void setVnPosition(String vnPosition) { + this.vnPosition = vnPosition; + } + + public String getVnTaboo() { + return vnTaboo; + } + + public void setVnTaboo(String vnTaboo) { + this.vnTaboo = vnTaboo; + } + + public String getVnDescription() { + return vnDescription; + } + + public void setVnDescription(String vnDescription) { + this.vnDescription = vnDescription; + } + + public String getVnIsValid() { + return vnIsValid; + } + + public void setVnIsValid(String vnIsValid) { + this.vnIsValid = vnIsValid; + } +} \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedVaccineNameService.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedVaccineNameService.java new file mode 100644 index 0000000..adbfd7f --- /dev/null +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedVaccineNameService.java @@ -0,0 +1,21 @@ +package com.lymsh.yimiao.main.data.service; + +import com.lymsh.yimiao.main.data.model.MedVaccineName; +import com.lymsh.yimiao.main.data.model.MedVaccineNameQuery; + +import java.util.List; + +public interface MedVaccineNameService { + public void addMedVaccineName(MedVaccineName obj); + + public void updateMedVaccineName(MedVaccineName obj); + + public void deleteMedVaccineName(Integer id); + + public MedVaccineName getMedVaccineName(String id); + + public int queryMedVaccineNameCount(MedVaccineNameQuery query); + + public List queryMedVaccineName(MedVaccineNameQuery query); + +} \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedVaccinenameServiceImpl.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedVaccinenameServiceImpl.java index 2cd03ed..8cc85fe 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedVaccinenameServiceImpl.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedVaccinenameServiceImpl.java @@ -1,31 +1,31 @@ package com.lymsh.yimiao.main.data.service.impl; -import com.lymsh.yimiao.main.data.dao.MedVaccinenameMapper; -import com.lymsh.yimiao.main.data.model.MedVaccinename; -import com.lymsh.yimiao.main.data.model.MedVaccinenameQuery; -import com.lymsh.yimiao.main.data.service.MedVaccinenameService; +import com.lymsh.yimiao.main.data.dao.MedVaccineNameMapper; +import com.lymsh.yimiao.main.data.model.MedVaccineName; +import com.lymsh.yimiao.main.data.model.MedVaccineNameQuery; +import com.lymsh.yimiao.main.data.service.MedVaccineNameService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @Service -public class MedVaccinenameServiceImpl implements MedVaccinenameService { +public class MedVaccinenameServiceImpl implements MedVaccineNameService { @Autowired -private MedVaccinenameMapper medVaccinenameMapper; +private MedVaccineNameMapper medVaccinenameMapper; @Override -public void addMedVaccinename(MedVaccinename obj){medVaccinenameMapper.addMedVaccinename(obj);} +public void addMedVaccineName(MedVaccineName obj){medVaccinenameMapper.addMedVaccineName(obj);} @Override -public void updateMedVaccinename(MedVaccinename obj){medVaccinenameMapper.updateMedVaccinename(obj);} +public void updateMedVaccineName(MedVaccineName obj){medVaccinenameMapper.updateMedVaccineName(obj);} @Override -public void deleteMedVaccinename (Integer id){medVaccinenameMapper.deleteMedVaccinename(id);} +public void deleteMedVaccineName (Integer id){medVaccinenameMapper.deleteMedVaccineName(id);} @Override -public MedVaccinename getMedVaccinename (String id){return medVaccinenameMapper.getMedVaccinename(id);} +public MedVaccineName getMedVaccineName (String id){return medVaccinenameMapper.getMedVaccineName(id);} @Override -public int queryMedVaccinenameCount (MedVaccinenameQuery query){return medVaccinenameMapper.queryMedVaccinenameCount(query);} +public int queryMedVaccineNameCount (MedVaccineNameQuery query){return medVaccinenameMapper.queryMedVaccineNameCount(query);} @Override -public List queryMedVaccinename (MedVaccinenameQuery query){if (query.getNeed() != null) {query.mysqlBuild(medVaccinenameMapper.queryMedVaccinenameCount(query));}return medVaccinenameMapper.queryMedVaccinename(query);} +public List queryMedVaccineName (MedVaccineNameQuery query){if (query.getNeed() != null) {query.mysqlBuild(medVaccinenameMapper.queryMedVaccineNameCount(query));}return medVaccinenameMapper.queryMedVaccineName(query);} } \ No newline at end of file diff --git a/mainData/src/main/resources/mainOrm/MedVaccinename.xml b/mainData/src/main/resources/mainOrm/MedVaccinename.xml index bd8806e..cbbacd4 100644 --- a/mainData/src/main/resources/mainOrm/MedVaccinename.xml +++ b/mainData/src/main/resources/mainOrm/MedVaccinename.xml @@ -1,8 +1,8 @@ - + - + @@ -14,7 +14,7 @@ - select vn_id,vn_name,vn_preventDisease,vn_monthAge,vn_position,vn_taboo,vn_description,vn_isValid,vn_vaccineType from med_vaccinename WHERE vn_id = #{vnId,jdbcType=VARCHAR} @@ -32,7 +32,7 @@ limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} - + 1 = 1 @@ -67,18 +67,18 @@ and vn_isValid = #{vnIsValid,jdbcType=VARCHAR} - select vn_id,vn_name,vn_preventDisease,vn_monthAge,vn_position,vn_taboo,vn_description,vn_isValid from med_vaccinename - + - select count(1) from med_vaccinename - + diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java index b93a839..93b57d7 100644 --- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java +++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java @@ -217,7 +217,7 @@ public class KidsController extends BaseController{ map.put("ioInoculateTime", medInoculateorder.getIoInoculateTime()); //下次接种疫苗 map.put("vaccineId", medInoculateorder.getIoVaccineId()); - MedVaccineInfo medVaccineinfo = medVaccineinfoService.getMedVaccineinfo(medInoculateorder.getIoVaccineId()); + MedVaccineInfo medVaccineinfo = medVaccineinfoService.getMedVaccineInfo(medInoculateorder.getIoVaccineId()); map.put("vaccineName", medVaccineinfo == null ? "" : medVaccineinfo.getViName()); //接种地点 map.put("organizationId", medInoculateorder.getIoOrganizationId()); diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/VaccineNamesController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/VaccineNamesController.java index a32e27c..2e19da2 100644 --- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/VaccineNamesController.java +++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/VaccineNamesController.java @@ -2,8 +2,8 @@ package com.lyms.yimiao.web.controller.v1; import com.lymsh.mommybaby.basecommon.base.BaseController; import com.lymsh.mommybaby.basecommon.util.ResultUtils; -import com.lymsh.yimiao.main.data.model.MedVaccinename; -import com.lymsh.yimiao.main.data.service.MedVaccinenameService; +import com.lymsh.yimiao.main.data.model.MedVaccineName; +import com.lymsh.yimiao.main.data.service.MedVaccineNameService; import com.lymsh.yimiao.main.data.util.JsonUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -23,7 +23,7 @@ import java.util.Map; public class VaccineNamesController extends BaseController{ @Autowired - private MedVaccinenameService medVaccineNameService; + private MedVaccineNameService medVaccineNameService; /** * @@ -33,7 +33,7 @@ public class VaccineNamesController extends BaseController{ @RequestMapping(value = "/vaccineNames", method = RequestMethod.GET) public void getVaccineNames(HttpServletResponse response, @RequestParam("id") String id){ - MedVaccinename medVaccineName = medVaccineNameService.getMedVaccinename(id); + MedVaccineName medVaccineName = medVaccineNameService.getMedVaccinename(id); if (medVaccineName==null){ ResultUtils.buildParameterErrorResultAndWrite(response,"疫苗名称信息不存在"); return;