diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/YmFeedBacksMapper.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/YmFeedBacksMapper.java new file mode 100644 index 0000000..873b89d --- /dev/null +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/YmFeedBacksMapper.java @@ -0,0 +1,21 @@ +package com.lymsh.yimiao.main.data.dao; + +import com.lymsh.yimiao.main.data.model.YmFeedBacks; +import com.lymsh.yimiao.main.data.model.YmFeedBacksQuery; + +import java.util.List; + +public interface YmFeedBacksMapper { + public void addYmFeedBacks(YmFeedBacks obj); + + public void updateYmFeedBacks(YmFeedBacks obj); + + public void deleteYmFeedBacks(Integer id); + + public YmFeedBacks getYmFeedBacks(Integer id); + + public int queryYmFeedBacksCount(YmFeedBacksQuery query); + + public List queryYmFeedBacks(YmFeedBacksQuery query); + +} \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/YmFeedBacks.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/YmFeedBacks.java new file mode 100644 index 0000000..8d6f21f --- /dev/null +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/YmFeedBacks.java @@ -0,0 +1,94 @@ +package com.lymsh.yimiao.main.data.model; + +import java.util.Date; + +public class YmFeedBacks { + private Integer id; + private String content; + private Integer type; + private Integer replyId; + private Date created; + private Integer yn; + private Integer publishId; + private String publishName; + + public Integer getId() { + return id; + } + + + public void setId(Integer id) { + this.id = id; + + } + + public String getContent() { + return content; + } + + + public void setContent(String content) { + this.content = content; + + } + + public Integer getType() { + return type; + } + + + public void setType(Integer type) { + this.type = type; + + } + + public Integer getReplyId() { + return replyId; + } + + + public void setReplyId(Integer replyId) { + this.replyId = replyId; + + } + + public Date getCreated() { + return created; + } + + + public void setCreated(Date created) { + this.created = created; + + } + + public Integer getYn() { + return yn; + } + + + public void setYn(Integer yn) { + this.yn = yn; + + } + + public Integer getPublishId() { + return publishId; + } + + + public void setPublishId(Integer publishId) { + this.publishId = publishId; + + } + + public String getPublishName() { + return publishName; + } + + + public void setPublishName(String publishName) { + this.publishName = publishName; + + } +} \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/YmFeedBacksQuery.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/YmFeedBacksQuery.java new file mode 100644 index 0000000..5483d41 --- /dev/null +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/YmFeedBacksQuery.java @@ -0,0 +1,98 @@ +package com.lymsh.yimiao.main.data.model; + + +import java.util.Date; + +import com.lymsh.mommybaby.basecommon.base.BaseQuery; + + +public class YmFeedBacksQuery extends BaseQuery { + private Integer id; + private String content; + private Integer type; + private Integer replyId; + private Date created; + private Integer yn; + private Integer publishId; + private String publishName; + + public Integer getId() { + return id; + } + + + public void setId(Integer id) { + this.id = id; + + } + + public String getContent() { + return content; + } + + + public void setContent(String content) { + this.content = content; + + } + + public Integer getType() { + return type; + } + + + public void setType(Integer type) { + this.type = type; + + } + + public Integer getReplyId() { + return replyId; + } + + + public void setReplyId(Integer replyId) { + this.replyId = replyId; + + } + + public Date getCreated() { + return created; + } + + + public void setCreated(Date created) { + this.created = created; + + } + + public Integer getYn() { + return yn; + } + + + public void setYn(Integer yn) { + this.yn = yn; + + } + + public Integer getPublishId() { + return publishId; + } + + + public void setPublishId(Integer publishId) { + this.publishId = publishId; + + } + + public String getPublishName() { + return publishName; + } + + + public void setPublishName(String publishName) { + this.publishName = publishName; + + } +} \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/YmFeedBacksService.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/YmFeedBacksService.java new file mode 100644 index 0000000..91f5333 --- /dev/null +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/YmFeedBacksService.java @@ -0,0 +1,21 @@ +package com.lymsh.yimiao.main.data.service; + +import com.lymsh.yimiao.main.data.model.YmFeedBacks; +import com.lymsh.yimiao.main.data.model.YmFeedBacksQuery; + +import java.util.List; + +public interface YmFeedBacksService { + public void addYmFeedBacks(YmFeedBacks obj); + + public void updateYmFeedBacks(YmFeedBacks obj); + + public void deleteYmFeedBacks(Integer id); + + public YmFeedBacks getYmFeedBacks(Integer id); + + public int queryYmFeedBacksCount(YmFeedBacksQuery query); + + public List queryYmFeedBacks(YmFeedBacksQuery query); + +} \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/YmFeedBacksServiceImpl.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/YmFeedBacksServiceImpl.java new file mode 100644 index 0000000..a47a8a8 --- /dev/null +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/YmFeedBacksServiceImpl.java @@ -0,0 +1,51 @@ +package com.lymsh.yimiao.main.data.service.impl; + +import com.lymsh.yimiao.main.data.dao.YmFeedBacksMapper; +import com.lymsh.yimiao.main.data.model.YmFeedBacks; +import com.lymsh.yimiao.main.data.model.YmFeedBacksQuery; +import com.lymsh.yimiao.main.data.service.YmFeedBacksService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class YmFeedBacksServiceImpl implements YmFeedBacksService { + + @Autowired + private YmFeedBacksMapper ymFeedbacksMapper; + + @Override + public void addYmFeedBacks(YmFeedBacks obj) { + ymFeedbacksMapper.addYmFeedBacks(obj); + } + + @Override + public void updateYmFeedBacks(YmFeedBacks obj) { + ymFeedbacksMapper.updateYmFeedBacks(obj); + } + + @Override + public void deleteYmFeedBacks(Integer id) { + ymFeedbacksMapper.deleteYmFeedBacks(id); + } + + @Override + public YmFeedBacks getYmFeedBacks(Integer id) { + return ymFeedbacksMapper.getYmFeedBacks(id); + } + + @Override + public int queryYmFeedBacksCount(YmFeedBacksQuery query) { + return ymFeedbacksMapper.queryYmFeedBacksCount(query); + } + + @Override + public List queryYmFeedBacks(YmFeedBacksQuery query) { + if (query.getNeed() != null) { + query.mysqlBuild(ymFeedbacksMapper.queryYmFeedBacksCount(query)); + } + return ymFeedbacksMapper.queryYmFeedBacks(query); + } + +} \ No newline at end of file diff --git a/mainData/src/main/resources/mainOrm/YmFeedbacks.xml b/mainData/src/main/resources/mainOrm/YmFeedbacks.xml index 2bfed97..ebb9a11 100644 --- a/mainData/src/main/resources/mainOrm/YmFeedbacks.xml +++ b/mainData/src/main/resources/mainOrm/YmFeedbacks.xml @@ -1,8 +1,8 @@ - + - + @@ -15,13 +15,13 @@ - + insert into ym_feedbacks (id,content,type,reply_id,created,yn,publish_id,publish_name) values (#{id},#{content},#{type},#{replyId},#{created},#{yn},#{publishId},#{publishName}) - + update ym_feedbacks id = #{id,jdbcType=INTEGER}, @@ -50,12 +50,12 @@ publish_name = #{publishName,jdbcType=VARCHAR}, - + - select id,content,type,reply_id,created,yn,publish_id,publish_name @@ -71,7 +71,7 @@ limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} - + 1 = 1 @@ -103,18 +103,18 @@ and publish_name = #{publishName,jdbcType=VARCHAR} - select id,content,type,reply_id,created,yn,publish_id,publish_name from ym_feedbacks - + - select count(1) from ym_feedbacks - + diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/FeedbackController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/FeedbackController.java index d394745..85f1ccd 100644 --- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/FeedbackController.java +++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/FeedbackController.java @@ -7,9 +7,9 @@ import com.lymsh.mommybaby.basecommon.context.MommyBobyContext; import com.lymsh.mommybaby.basecommon.util.ContextHolder; import com.lymsh.mommybaby.basecommon.util.ResultUtils; import com.lymsh.yimiao.main.data.enumdata.YnEnum; -import com.lymsh.yimiao.main.data.model.YmFeedbacks; +import com.lymsh.yimiao.main.data.model.YmFeedBacks; import com.lymsh.yimiao.main.data.model.YmUsers; -import com.lymsh.yimiao.main.data.service.YmFeedbacksService; +import com.lymsh.yimiao.main.data.service.YmFeedBacksService; import com.lymsh.yimiao.main.data.service.YmUsersService; import com.lymsh.yimiao.main.data.util.JsonUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -36,7 +36,7 @@ public class FeedbackController extends BaseController{ @Autowired private YmUsersService usersService; @Autowired - private YmFeedbacksService feedBacksService; + private YmFeedBacksService feedBacksService; /** * 提交意见反馈 @@ -57,7 +57,7 @@ public class FeedbackController extends BaseController{ Integer userId = mommyBobyContext.getUserId(); if (null != userId) { - YmFeedbacks feedBacks = new YmFeedbacks(); + YmFeedBacks feedBacks = new YmFeedBacks(); feedBacks.setYn(YnEnum.yes.getId()); feedBacks.setCreated(new Date()); feedBacks.setType(1);//默认是反馈 @@ -68,7 +68,7 @@ public class FeedbackController extends BaseController{ if (null != users) { feedBacks.setPublishName(users.getNickname()); } - feedBacksService.addYmFeedbacks(feedBacks); + feedBacksService.addYmFeedBacks(feedBacks); ResultUtils.buildSuccessResultAndWrite(httpServletResponse); } else { Map result = new HashMap<>(); 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 2e19da2..546f938 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 @@ -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;