Commit 8b4c2839d234533c737e0dc26a9a02a785af2fc4
1 parent
dc6ea97ac4
Exists in
luanping
and in
1 other branch
#新增孕周字典管理功能
Showing 8 changed files with 306 additions and 3 deletions
- platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/ProjectWeekMapper.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/model/ProjectWeekEntity.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/service/ProjectWeekService.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/ProjectWeekServiceImpl.java
- platform-biz-service/src/main/resources/mainOrm/master/ProjectWeekMapper.xml
- platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FactorProjectController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ProjectWeekController.java
platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/ProjectWeekMapper.java
View file @
8b4c283
| 1 | +package com.lyms.platform.permission.dao.master; | |
| 2 | + | |
| 3 | +import com.lyms.platform.permission.model.ProjectWeekEntity; | |
| 4 | + | |
| 5 | +import java.util.List; | |
| 6 | + | |
| 7 | +public interface ProjectWeekMapper { | |
| 8 | + List<ProjectWeekEntity> getList(Integer hospitalId); | |
| 9 | + void add(ProjectWeekEntity factorProject); | |
| 10 | + void update(ProjectWeekEntity factorProject); | |
| 11 | + void del(Integer id); | |
| 12 | + ProjectWeekEntity selectById(Integer id); | |
| 13 | +} |
platform-biz-service/src/main/java/com/lyms/platform/permission/model/ProjectWeekEntity.java
View file @
8b4c283
| 1 | +package com.lyms.platform.permission.model; | |
| 2 | + | |
| 3 | +public class ProjectWeekEntity { | |
| 4 | + private Integer id; | |
| 5 | + private String name; | |
| 6 | + private String week; | |
| 7 | + private Integer hospitalId; | |
| 8 | + | |
| 9 | + public Integer getId() { | |
| 10 | + return id; | |
| 11 | + } | |
| 12 | + | |
| 13 | + public void setId(Integer id) { | |
| 14 | + this.id = id; | |
| 15 | + } | |
| 16 | + | |
| 17 | + public String getName() { | |
| 18 | + return name; | |
| 19 | + } | |
| 20 | + | |
| 21 | + public void setName(String name) { | |
| 22 | + this.name = name; | |
| 23 | + } | |
| 24 | + | |
| 25 | + public String getWeek() { | |
| 26 | + return week; | |
| 27 | + } | |
| 28 | + | |
| 29 | + public void setWeek(String week) { | |
| 30 | + this.week = week; | |
| 31 | + } | |
| 32 | + | |
| 33 | + public Integer getHospitalId() { | |
| 34 | + return hospitalId; | |
| 35 | + } | |
| 36 | + | |
| 37 | + public void setHospitalId(Integer hospitalId) { | |
| 38 | + this.hospitalId = hospitalId; | |
| 39 | + } | |
| 40 | +} |
platform-biz-service/src/main/java/com/lyms/platform/permission/service/ProjectWeekService.java
View file @
8b4c283
| 1 | +package com.lyms.platform.permission.service; | |
| 2 | + | |
| 3 | +import com.lyms.platform.permission.model.ProjectWeekEntity; | |
| 4 | + | |
| 5 | +import java.util.List; | |
| 6 | + | |
| 7 | +public interface ProjectWeekService { | |
| 8 | + List<ProjectWeekEntity> getList(Integer hospitalId); | |
| 9 | + ProjectWeekEntity selectInfo(Integer id); | |
| 10 | + void add(ProjectWeekEntity projectWay); | |
| 11 | + void update(ProjectWeekEntity projectWay); | |
| 12 | + void del(Integer id); | |
| 13 | +} |
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/ProjectWeekServiceImpl.java
View file @
8b4c283
| 1 | +package com.lyms.platform.permission.service.impl; | |
| 2 | + | |
| 3 | +import com.lyms.platform.permission.dao.master.ProjectWeekMapper; | |
| 4 | +import com.lyms.platform.permission.model.ProjectWeekEntity; | |
| 5 | +import com.lyms.platform.permission.service.ProjectWeekService; | |
| 6 | +import org.springframework.beans.factory.annotation.Autowired; | |
| 7 | +import org.springframework.stereotype.Service; | |
| 8 | + | |
| 9 | +import java.util.List; | |
| 10 | + | |
| 11 | +@Service("projectWeekService") | |
| 12 | +public class ProjectWeekServiceImpl implements ProjectWeekService { | |
| 13 | + @Autowired | |
| 14 | + private ProjectWeekMapper projectWeekMapper; | |
| 15 | + @Override | |
| 16 | + public List<ProjectWeekEntity> getList(Integer hospitalId) { | |
| 17 | + return projectWeekMapper.getList(hospitalId); | |
| 18 | + } | |
| 19 | + | |
| 20 | + @Override | |
| 21 | + public ProjectWeekEntity selectInfo(Integer id) { | |
| 22 | + return projectWeekMapper.selectById(id); | |
| 23 | + } | |
| 24 | + | |
| 25 | + @Override | |
| 26 | + public void add(ProjectWeekEntity projectWay) { | |
| 27 | + projectWeekMapper.add(projectWay); | |
| 28 | + } | |
| 29 | + | |
| 30 | + @Override | |
| 31 | + public void update(ProjectWeekEntity projectWay) { | |
| 32 | + projectWeekMapper.update(projectWay); | |
| 33 | + } | |
| 34 | + | |
| 35 | + @Override | |
| 36 | + public void del(Integer id) { | |
| 37 | + projectWeekMapper.del(id); | |
| 38 | + } | |
| 39 | +} |
platform-biz-service/src/main/resources/mainOrm/master/ProjectWeekMapper.xml
View file @
8b4c283
| 1 | +<?xml version="1.0" encoding="UTF-8" ?> | |
| 2 | +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > | |
| 3 | +<mapper namespace="com.lyms.platform.permission.dao.master.ProjectWeekMapper"> | |
| 4 | + | |
| 5 | + <resultMap id="ProjectWeekMap" type="com.lyms.platform.permission.model.ProjectWeekEntity"> | |
| 6 | + <id column="id" property="id" jdbcType="INTEGER"/> | |
| 7 | + <result column="name" property="name" jdbcType="VARCHAR"/> | |
| 8 | + <result column="week" property="week" jdbcType="VARCHAR"/> | |
| 9 | + <result column="hospital_id" property="hospitalId" jdbcType="INTEGER"/> | |
| 10 | + </resultMap> | |
| 11 | + | |
| 12 | + <select id="getList" resultMap="ProjectWeekMap" parameterType="java.util.List"> | |
| 13 | + SELECT id, | |
| 14 | + name,week, | |
| 15 | + hospital_id | |
| 16 | + FROM project_week | |
| 17 | + where | |
| 18 | + hospital_id=#{hospitalId} | |
| 19 | + </select> | |
| 20 | + | |
| 21 | + <insert id="add" parameterType="com.lyms.platform.permission.model.ProjectWeekEntity"> | |
| 22 | + INSERT INTO project_week(name,week,hospital_id) | |
| 23 | + VALUES (#{name},#{week},#{hospitalId}) | |
| 24 | + </insert> | |
| 25 | + | |
| 26 | + | |
| 27 | + <update id="update" parameterType="com.lyms.platform.permission.model.ProjectWeekEntity" > | |
| 28 | + update project_week | |
| 29 | + <set> | |
| 30 | + <if test="name != null and name != ''"> | |
| 31 | + name = #{name,jdbcType=VARCHAR}, | |
| 32 | + </if> | |
| 33 | + <if test="week != null and week != ''"> | |
| 34 | + week = #{week,jdbcType=VARCHAR}, | |
| 35 | + </if> | |
| 36 | + <if test="hospitalId != null"> | |
| 37 | + hospital_id = #{hospitalId,jdbcType=INTEGER}, | |
| 38 | + </if> | |
| 39 | + | |
| 40 | + </set> | |
| 41 | + where id = #{id,jdbcType=INTEGER} | |
| 42 | + </update> | |
| 43 | + | |
| 44 | + | |
| 45 | + <delete id="del" parameterType="java.lang.Integer"> | |
| 46 | + delete from project_week where id = #{id,jdbcType=INTEGER} | |
| 47 | + </delete> | |
| 48 | + | |
| 49 | + <select id="selectById" resultMap="ProjectWeekMap" parameterType="java.lang.Integer"> | |
| 50 | + SELECT id, | |
| 51 | + name,week, | |
| 52 | + hospital_id | |
| 53 | + FROM project_week | |
| 54 | + where | |
| 55 | + id = #{id,jdbcType=INTEGER} | |
| 56 | + </select> | |
| 57 | + | |
| 58 | +</mapper> |
platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java
View file @
8b4c283
| ... | ... | @@ -84,8 +84,29 @@ |
| 84 | 84 | |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | + /** | |
| 88 | + *比较两个字符串中是否有相同字符 | |
| 89 | + * @param str1 | |
| 90 | + * @param str2 | |
| 91 | + * @return | |
| 92 | + */ | |
| 93 | + public static boolean hasSameCharacters(String str1,String str2){ | |
| 94 | + boolean hasSameCharacters = false; | |
| 95 | + str1=str1.replace(",",""); | |
| 96 | + str2=str2.replace(",",""); | |
| 97 | + for (int i = 0; i < str1.length(); i++) { | |
| 98 | + char c = str1.charAt(i); | |
| 99 | + | |
| 100 | + if (str2.indexOf(c) != -1) { // 若str2包含该字符则说明存在相同的字符 | |
| 101 | + hasSameCharacters = true; | |
| 102 | + break; | |
| 103 | + } | |
| 104 | + } | |
| 105 | + return hasSameCharacters; | |
| 106 | + } | |
| 107 | + | |
| 87 | 108 | public static void main(String[] args) { |
| 88 | - System.out.println("2021122".startsWith("2031")); | |
| 109 | + System.out.println((hasSameCharacters("1","3,4,5,6,7"))); | |
| 89 | 110 | } |
| 90 | 111 | |
| 91 | 112 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FactorProjectController.java
View file @
8b4c283
| ... | ... | @@ -11,6 +11,7 @@ |
| 11 | 11 | import com.lyms.platform.permission.model.*; |
| 12 | 12 | import com.lyms.platform.permission.service.CheckItemService; |
| 13 | 13 | import com.lyms.platform.permission.service.FactorProjectService; |
| 14 | +import com.lyms.platform.permission.service.ProjectWeekService; | |
| 14 | 15 | import org.springframework.beans.factory.annotation.Autowired; |
| 15 | 16 | import org.springframework.beans.factory.annotation.Qualifier; |
| 16 | 17 | import org.springframework.stereotype.Controller; |
| ... | ... | @@ -29,6 +30,9 @@ |
| 29 | 30 | @Autowired |
| 30 | 31 | @Qualifier("cfCheckItemService") |
| 31 | 32 | private CheckItemService checkItemService; |
| 33 | + @Autowired | |
| 34 | + @Qualifier("projectWeekService") | |
| 35 | + private ProjectWeekService projectWeekService; | |
| 32 | 36 | |
| 33 | 37 | @RequestMapping(value = "/getList", method = RequestMethod.GET) |
| 34 | 38 | @ResponseBody |
| ... | ... | @@ -98,8 +102,8 @@ |
| 98 | 102 | |
| 99 | 103 | @RequestMapping(value = "/getWeekList", method = RequestMethod.GET) |
| 100 | 104 | @TokenRequired |
| 101 | - public void getWeekList(HttpServletResponse response){ | |
| 102 | - ResultUtils.buildSuccessResultAndWrite(response, ProjectWeekEnums.getWeekEnums()); | |
| 105 | + public void getWeekList(HttpServletResponse response,Integer hospitalId){ | |
| 106 | + ResultUtils.buildSuccessResultAndWrite(response, projectWeekService.getList(hospitalId)); | |
| 103 | 107 | } |
| 104 | 108 | |
| 105 | 109 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ProjectWeekController.java
View file @
8b4c283
| 1 | +package com.lyms.platform.operate.web.controller; | |
| 2 | + | |
| 3 | +import com.lyms.platform.common.annotation.TokenRequired; | |
| 4 | +import com.lyms.platform.common.base.BaseController; | |
| 5 | +import com.lyms.platform.common.constants.ErrorCodeConstants; | |
| 6 | +import com.lyms.platform.common.result.BaseResponse; | |
| 7 | +import com.lyms.platform.common.utils.ResultUtils; | |
| 8 | +import com.lyms.platform.common.utils.StringUtils; | |
| 9 | +import com.lyms.platform.operate.web.utils.CollectionUtils; | |
| 10 | +import com.lyms.platform.permission.model.ProjectWeekEntity; | |
| 11 | +import com.lyms.platform.permission.service.ProjectWeekService; | |
| 12 | +import org.springframework.beans.factory.annotation.Autowired; | |
| 13 | +import org.springframework.beans.factory.annotation.Qualifier; | |
| 14 | +import org.springframework.stereotype.Controller; | |
| 15 | +import org.springframework.web.bind.annotation.*; | |
| 16 | + | |
| 17 | +import javax.servlet.http.HttpServletResponse; | |
| 18 | +import java.util.List; | |
| 19 | + | |
| 20 | +@Controller | |
| 21 | +@RequestMapping("/projectWeek") | |
| 22 | +public class ProjectWeekController extends BaseController { | |
| 23 | + @Autowired | |
| 24 | + @Qualifier("projectWeekService") | |
| 25 | + private ProjectWeekService projectWeekService; | |
| 26 | + | |
| 27 | + @RequestMapping(value = "/getList", method = RequestMethod.GET) | |
| 28 | + @TokenRequired | |
| 29 | + public void getWeekList(HttpServletResponse response, @RequestParam(value = "hospitalId")Integer hospitalId){ | |
| 30 | + ResultUtils.buildSuccessResultAndWrite(response, projectWeekService.getList(hospitalId)); | |
| 31 | + } | |
| 32 | + | |
| 33 | + @RequestMapping(value = "/selectInfo", method = RequestMethod.GET) | |
| 34 | + @TokenRequired | |
| 35 | + @ResponseBody | |
| 36 | + public BaseResponse selectInfo( @RequestParam(value = "id") Integer id) { | |
| 37 | + BaseResponse baseResponse = new BaseResponse(); | |
| 38 | + if (id == null) { | |
| 39 | + baseResponse.setErrorcode(-1); | |
| 40 | + baseResponse.setErrormsg("医院不能存在"); | |
| 41 | + return baseResponse; | |
| 42 | + } | |
| 43 | + ProjectWeekEntity factorProject= projectWeekService.selectInfo(id); | |
| 44 | + baseResponse.setObject(factorProject); | |
| 45 | + baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); | |
| 46 | + return baseResponse; | |
| 47 | + } | |
| 48 | + | |
| 49 | + @RequestMapping(value = "/add", method = RequestMethod.POST) | |
| 50 | + @TokenRequired | |
| 51 | + @ResponseBody | |
| 52 | + public BaseResponse add( @RequestBody ProjectWeekEntity projectWeekEntity) { | |
| 53 | + BaseResponse baseResponse = new BaseResponse(); | |
| 54 | + Integer hospitalId= projectWeekEntity.getHospitalId(); | |
| 55 | + if (hospitalId == null) { | |
| 56 | + baseResponse.setErrorcode(-1); | |
| 57 | + baseResponse.setErrormsg("医院不能存在"); | |
| 58 | + return baseResponse; | |
| 59 | + } | |
| 60 | + List<ProjectWeekEntity> weekList= projectWeekService.getList(hospitalId); | |
| 61 | + if (CollectionUtils.isNotEmpty(weekList)){ | |
| 62 | + for (int i = 0,j=weekList.size(); i < j; i++) { | |
| 63 | + ProjectWeekEntity projectWeek= weekList.get(i); | |
| 64 | + if (StringUtils.hasSameCharacters(projectWeek.getWeek(),projectWeekEntity.getWeek())){ | |
| 65 | + baseResponse.setErrorcode(-1); | |
| 66 | + baseResponse.setErrormsg("已存在相同孕周,请重新选择"); | |
| 67 | + return baseResponse; | |
| 68 | + } | |
| 69 | + } | |
| 70 | + | |
| 71 | + } | |
| 72 | + projectWeekService.add(projectWeekEntity); | |
| 73 | + return baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); | |
| 74 | + } | |
| 75 | + | |
| 76 | + @RequestMapping(value = "/update", method = RequestMethod.POST) | |
| 77 | + @TokenRequired | |
| 78 | + @ResponseBody | |
| 79 | + public BaseResponse update( @RequestBody ProjectWeekEntity projectWeekEntity) { | |
| 80 | + BaseResponse baseResponse = new BaseResponse(); | |
| 81 | + if (projectWeekEntity.getId() == null) { | |
| 82 | + baseResponse.setErrorcode(-1); | |
| 83 | + baseResponse.setErrormsg("医院不能存在"); | |
| 84 | + return baseResponse; | |
| 85 | + } | |
| 86 | + List<ProjectWeekEntity> weekList= projectWeekService.getList(projectWeekEntity.getHospitalId()); | |
| 87 | + if (CollectionUtils.isNotEmpty(weekList)){ | |
| 88 | + for (int i = 0,j=weekList.size(); i < j; i++) { | |
| 89 | + ProjectWeekEntity projectWeek= weekList.get(i); | |
| 90 | + if (!projectWeek.getId().equals(projectWeekEntity.getId())&&StringUtils.hasSameCharacters(projectWeek.getWeek(),projectWeekEntity.getWeek())){ | |
| 91 | + baseResponse.setErrorcode(-1); | |
| 92 | + baseResponse.setErrormsg("已存在相同孕周,请重新选择"); | |
| 93 | + return baseResponse; | |
| 94 | + } | |
| 95 | + } | |
| 96 | + } | |
| 97 | + projectWeekService.update(projectWeekEntity); | |
| 98 | + return baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); | |
| 99 | + } | |
| 100 | + | |
| 101 | + @RequestMapping(value = "/del", method = RequestMethod.GET) | |
| 102 | + @TokenRequired | |
| 103 | + @ResponseBody | |
| 104 | + public BaseResponse del(@RequestParam(value = "id") Integer id) { | |
| 105 | + BaseResponse baseResponse = new BaseResponse(); | |
| 106 | + if (id == null) { | |
| 107 | + baseResponse.setErrorcode(-1); | |
| 108 | + baseResponse.setErrormsg("医院不能存在"); | |
| 109 | + return baseResponse; | |
| 110 | + } | |
| 111 | + projectWeekService.del(id); | |
| 112 | + return baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); | |
| 113 | + } | |
| 114 | + | |
| 115 | +} |