From 8b4c2839d234533c737e0dc26a9a02a785af2fc4 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Thu, 22 Feb 2024 16:24:43 +0800 Subject: [PATCH] =?UTF-8?q?#=E6=96=B0=E5=A2=9E=E5=AD=95=E5=91=A8=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../permission/dao/master/ProjectWeekMapper.java | 13 +++ .../permission/model/ProjectWeekEntity.java | 40 +++++++ .../permission/service/ProjectWeekService.java | 13 +++ .../service/impl/ProjectWeekServiceImpl.java | 39 +++++++ .../resources/mainOrm/master/ProjectWeekMapper.xml | 58 +++++++++++ .../lyms/platform/common/utils/StringUtils.java | 23 ++++- .../web/controller/FactorProjectController.java | 8 +- .../web/controller/ProjectWeekController.java | 115 +++++++++++++++++++++ 8 files changed, 306 insertions(+), 3 deletions(-) create mode 100644 platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/ProjectWeekMapper.java create mode 100644 platform-biz-service/src/main/java/com/lyms/platform/permission/model/ProjectWeekEntity.java create mode 100644 platform-biz-service/src/main/java/com/lyms/platform/permission/service/ProjectWeekService.java create mode 100644 platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/ProjectWeekServiceImpl.java create mode 100644 platform-biz-service/src/main/resources/mainOrm/master/ProjectWeekMapper.xml create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ProjectWeekController.java diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/ProjectWeekMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/ProjectWeekMapper.java new file mode 100644 index 0000000..3858071 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/ProjectWeekMapper.java @@ -0,0 +1,13 @@ +package com.lyms.platform.permission.dao.master; + +import com.lyms.platform.permission.model.ProjectWeekEntity; + +import java.util.List; + +public interface ProjectWeekMapper { + List getList(Integer hospitalId); + void add(ProjectWeekEntity factorProject); + void update(ProjectWeekEntity factorProject); + void del(Integer id); + ProjectWeekEntity selectById(Integer id); +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ProjectWeekEntity.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ProjectWeekEntity.java new file mode 100644 index 0000000..948c4b4 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ProjectWeekEntity.java @@ -0,0 +1,40 @@ +package com.lyms.platform.permission.model; + +public class ProjectWeekEntity { + private Integer id; + private String name; + private String week; + private Integer hospitalId; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getWeek() { + return week; + } + + public void setWeek(String week) { + this.week = week; + } + + public Integer getHospitalId() { + return hospitalId; + } + + public void setHospitalId(Integer hospitalId) { + this.hospitalId = hospitalId; + } +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/ProjectWeekService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/ProjectWeekService.java new file mode 100644 index 0000000..da0ed1d --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/ProjectWeekService.java @@ -0,0 +1,13 @@ +package com.lyms.platform.permission.service; + +import com.lyms.platform.permission.model.ProjectWeekEntity; + +import java.util.List; + +public interface ProjectWeekService { + List getList(Integer hospitalId); + ProjectWeekEntity selectInfo(Integer id); + void add(ProjectWeekEntity projectWay); + void update(ProjectWeekEntity projectWay); + void del(Integer id); +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/ProjectWeekServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/ProjectWeekServiceImpl.java new file mode 100644 index 0000000..398a900 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/ProjectWeekServiceImpl.java @@ -0,0 +1,39 @@ +package com.lyms.platform.permission.service.impl; + +import com.lyms.platform.permission.dao.master.ProjectWeekMapper; +import com.lyms.platform.permission.model.ProjectWeekEntity; +import com.lyms.platform.permission.service.ProjectWeekService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service("projectWeekService") +public class ProjectWeekServiceImpl implements ProjectWeekService { + @Autowired + private ProjectWeekMapper projectWeekMapper; + @Override + public List getList(Integer hospitalId) { + return projectWeekMapper.getList(hospitalId); + } + + @Override + public ProjectWeekEntity selectInfo(Integer id) { + return projectWeekMapper.selectById(id); + } + + @Override + public void add(ProjectWeekEntity projectWay) { + projectWeekMapper.add(projectWay); + } + + @Override + public void update(ProjectWeekEntity projectWay) { + projectWeekMapper.update(projectWay); + } + + @Override + public void del(Integer id) { + projectWeekMapper.del(id); + } +} diff --git a/platform-biz-service/src/main/resources/mainOrm/master/ProjectWeekMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/ProjectWeekMapper.xml new file mode 100644 index 0000000..a816d10 --- /dev/null +++ b/platform-biz-service/src/main/resources/mainOrm/master/ProjectWeekMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + INSERT INTO project_week(name,week,hospital_id) + VALUES (#{name},#{week},#{hospitalId}) + + + + + update project_week + + + name = #{name,jdbcType=VARCHAR}, + + + week = #{week,jdbcType=VARCHAR}, + + + hospital_id = #{hospitalId,jdbcType=INTEGER}, + + + + where id = #{id,jdbcType=INTEGER} + + + + + delete from project_week where id = #{id,jdbcType=INTEGER} + + + + + \ No newline at end of file diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java index b0ae58e..f9ef86f 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java @@ -84,8 +84,29 @@ public final class StringUtils { } + /** + *比较两个字符串中是否有相同字符 + * @param str1 + * @param str2 + * @return + */ + public static boolean hasSameCharacters(String str1,String str2){ + boolean hasSameCharacters = false; + str1=str1.replace(",",""); + str2=str2.replace(",",""); + for (int i = 0; i < str1.length(); i++) { + char c = str1.charAt(i); + + if (str2.indexOf(c) != -1) { // 若str2包含该字符则说明存在相同的字符 + hasSameCharacters = true; + break; + } + } + return hasSameCharacters; + } + public static void main(String[] args) { - System.out.println("2021122".startsWith("2031")); + System.out.println((hasSameCharacters("1","3,4,5,6,7"))); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FactorProjectController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FactorProjectController.java index f42fe21..0dbe50e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FactorProjectController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FactorProjectController.java @@ -11,6 +11,7 @@ import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.CheckItemService; import com.lyms.platform.permission.service.FactorProjectService; +import com.lyms.platform.permission.service.ProjectWeekService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; @@ -29,6 +30,9 @@ public class FactorProjectController extends BaseController { @Autowired @Qualifier("cfCheckItemService") private CheckItemService checkItemService; + @Autowired + @Qualifier("projectWeekService") + private ProjectWeekService projectWeekService; @RequestMapping(value = "/getList", method = RequestMethod.GET) @ResponseBody @@ -98,8 +102,8 @@ public class FactorProjectController extends BaseController { @RequestMapping(value = "/getWeekList", method = RequestMethod.GET) @TokenRequired - public void getWeekList(HttpServletResponse response){ - ResultUtils.buildSuccessResultAndWrite(response, ProjectWeekEnums.getWeekEnums()); + public void getWeekList(HttpServletResponse response,Integer hospitalId){ + ResultUtils.buildSuccessResultAndWrite(response, projectWeekService.getList(hospitalId)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ProjectWeekController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ProjectWeekController.java new file mode 100644 index 0000000..42acefa --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ProjectWeekController.java @@ -0,0 +1,115 @@ +package com.lyms.platform.operate.web.controller; + +import com.lyms.platform.common.annotation.TokenRequired; +import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.ResultUtils; +import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.utils.CollectionUtils; +import com.lyms.platform.permission.model.ProjectWeekEntity; +import com.lyms.platform.permission.service.ProjectWeekService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@Controller +@RequestMapping("/projectWeek") +public class ProjectWeekController extends BaseController { + @Autowired + @Qualifier("projectWeekService") + private ProjectWeekService projectWeekService; + + @RequestMapping(value = "/getList", method = RequestMethod.GET) + @TokenRequired + public void getWeekList(HttpServletResponse response, @RequestParam(value = "hospitalId")Integer hospitalId){ + ResultUtils.buildSuccessResultAndWrite(response, projectWeekService.getList(hospitalId)); + } + + @RequestMapping(value = "/selectInfo", method = RequestMethod.GET) + @TokenRequired + @ResponseBody + public BaseResponse selectInfo( @RequestParam(value = "id") Integer id) { + BaseResponse baseResponse = new BaseResponse(); + if (id == null) { + baseResponse.setErrorcode(-1); + baseResponse.setErrormsg("医院不能存在"); + return baseResponse; + } + ProjectWeekEntity factorProject= projectWeekService.selectInfo(id); + baseResponse.setObject(factorProject); + baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + return baseResponse; + } + + @RequestMapping(value = "/add", method = RequestMethod.POST) + @TokenRequired + @ResponseBody + public BaseResponse add( @RequestBody ProjectWeekEntity projectWeekEntity) { + BaseResponse baseResponse = new BaseResponse(); + Integer hospitalId= projectWeekEntity.getHospitalId(); + if (hospitalId == null) { + baseResponse.setErrorcode(-1); + baseResponse.setErrormsg("医院不能存在"); + return baseResponse; + } + List weekList= projectWeekService.getList(hospitalId); + if (CollectionUtils.isNotEmpty(weekList)){ + for (int i = 0,j=weekList.size(); i < j; i++) { + ProjectWeekEntity projectWeek= weekList.get(i); + if (StringUtils.hasSameCharacters(projectWeek.getWeek(),projectWeekEntity.getWeek())){ + baseResponse.setErrorcode(-1); + baseResponse.setErrormsg("已存在相同孕周，请重新选择"); + return baseResponse; + } + } + + } + projectWeekService.add(projectWeekEntity); + return baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + @RequestMapping(value = "/update", method = RequestMethod.POST) + @TokenRequired + @ResponseBody + public BaseResponse update( @RequestBody ProjectWeekEntity projectWeekEntity) { + BaseResponse baseResponse = new BaseResponse(); + if (projectWeekEntity.getId() == null) { + baseResponse.setErrorcode(-1); + baseResponse.setErrormsg("医院不能存在"); + return baseResponse; + } + List weekList= projectWeekService.getList(projectWeekEntity.getHospitalId()); + if (CollectionUtils.isNotEmpty(weekList)){ + for (int i = 0,j=weekList.size(); i < j; i++) { + ProjectWeekEntity projectWeek= weekList.get(i); + if (!projectWeek.getId().equals(projectWeekEntity.getId())&&StringUtils.hasSameCharacters(projectWeek.getWeek(),projectWeekEntity.getWeek())){ + baseResponse.setErrorcode(-1); + baseResponse.setErrormsg("已存在相同孕周，请重新选择"); + return baseResponse; + } + } + } + projectWeekService.update(projectWeekEntity); + return baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + @RequestMapping(value = "/del", method = RequestMethod.GET) + @TokenRequired + @ResponseBody + public BaseResponse del(@RequestParam(value = "id") Integer id) { + BaseResponse baseResponse = new BaseResponse(); + if (id == null) { + baseResponse.setErrorcode(-1); + baseResponse.setErrormsg("医院不能存在"); + return baseResponse; + } + projectWeekService.del(id); + return baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + +} -- 1.8.3.1