From 986be3be7e672ad2d7fa55b2584f9e157c8971fe Mon Sep 17 00:00:00 2001 From: maliang Date: Wed, 29 Mar 2017 17:52:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=86=99=E9=AB=98=E5=8D=B1=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parent/base.common/pom.xml | 1 + .../base/common/dao/conf/HighriskConfMapper.java | 11 ++ .../base/common/dao/conf/HighriskConfMapper.xml | 9 +- .../base/common/dao/conf/HighriskVersionMapper.xml | 2 +- .../lyms/base/common/entity/conf/HighriskConf.java | 18 +-- .../base/common/entity/conf/HighriskSource.java | 3 +- .../common/service/conf/HighriskConfService.java | 15 ++- .../service/conf/HighriskVersionService.java | 3 +- .../service/conf/impl/HighriskConfServiceImpl.java | 14 ++- .../conf/impl/HighriskSourceServiceImpl.java | 36 +++++- .../conf/impl/HighriskVersionServiceImpl.java | 35 +++--- .../controller/conf/HighriskVersionController.java | 4 +- .../src/main/resources/app-context.xml | 3 +- .../src/main/resources/xml/app-datasource.xml | 6 +- .../test/java/test/hospital/BaseServiceTest.java | 13 ++ .../src/test/java/test/hospital/BaseTest.java | 13 +- .../test/hospital/service/HighriskVersionTest.java | 139 +++++++++++++++++++++ .../java/test/hospital/service/package-info.java | 15 +++ 18 files changed, 288 insertions(+), 52 deletions(-) create mode 100644 parent/hospital.web/src/test/java/test/hospital/BaseServiceTest.java create mode 100644 parent/hospital.web/src/test/java/test/hospital/service/HighriskVersionTest.java create mode 100644 parent/hospital.web/src/test/java/test/hospital/service/package-info.java diff --git a/parent/base.common/pom.xml b/parent/base.common/pom.xml index 165413b..c79735a 100644 --- a/parent/base.common/pom.xml +++ b/parent/base.common/pom.xml @@ -37,4 +37,5 @@ 1.0 + com.lyms \ No newline at end of file diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskConfMapper.java b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskConfMapper.java index 766a273..5b9078a 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskConfMapper.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskConfMapper.java @@ -32,4 +32,15 @@ public interface HighriskConfMapper extends BaseMapper { */ public List selectByVersion(String versionId); + /** + *
  • @Description:根据资源ID获取对应的配置信息 + *
  • @param sourceId + *
  • @return + *
  • 创建人：maliang + *
  • 创建时间：2017年3月29日 + *
  • 修改人： + *
  • 修改时间： + */ + public List selectBySource(String sourceId); + } \ No newline at end of file diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskConfMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskConfMapper.xml index e462ba5..d6004c6 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskConfMapper.xml +++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskConfMapper.xml @@ -21,8 +21,15 @@ ID AS id, SOURCE_ID AS sourceId, VERSION_ID AS versionId, NAME AS name, COLORCODE AS colorcode, COLORTEXT AS colortext, GROUPORDER AS grouporder, ITEMORDER AS itemorder, GRADE AS grade, ENABLE AS enable + + + + + diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskVersionMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskVersionMapper.xml index b23c031..5ff144d 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskVersionMapper.xml +++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskVersionMapper.xml @@ -20,7 +20,7 @@ - select from id=#{id} and enable=#{status} diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskConf.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskConf.java index 11a62c8..7e51b84 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskConf.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskConf.java @@ -55,17 +55,17 @@ public class HighriskConf implements Serializable { * 高危组排序 */ @TableField(value = "GROUPORDER") - private String grouporder; + private Integer grouporder; /** * 高危项排序 */ @TableField(value = "ITEMORDER") - private String itemorder; + private Integer itemorder; /** * 自定义评分 */ @TableField(value = "GRADE") - private String grade; + private Double grade; /** * 是否启用，默认1启用 */ @@ -120,27 +120,27 @@ public class HighriskConf implements Serializable { this.colortext = colortext; } - public String getGrouporder() { + public Integer getGrouporder() { return grouporder; } - public void setGrouporder(String grouporder) { + public void setGrouporder(Integer grouporder) { this.grouporder = grouporder; } - public String getItemorder() { + public Integer getItemorder() { return itemorder; } - public void setItemorder(String itemorder) { + public void setItemorder(Integer itemorder) { this.itemorder = itemorder; } - public String getGrade() { + public Double getGrade() { return grade; } - public void setGrade(String grade) { + public void setGrade(Double grade) { this.grade = grade; } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskSource.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskSource.java index 1fbc784..2311b19 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskSource.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskSource.java @@ -4,6 +4,7 @@ import java.io.Serializable; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; +import com.lyms.base.common.enums.StatusEnum; /** *

    @@ -37,7 +38,7 @@ public class HighriskSource implements Serializable { * 是否启用，默认1启用 */ @TableField(value = "ENABLE") - private Integer enable; + private Integer enable = StatusEnum.ENABLED.getStatus(); public String getId() { return id; diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskConfService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskConfService.java index 4a0e978..025f70b 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskConfService.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskConfService.java @@ -48,13 +48,24 @@ public interface HighriskConfService extends BaseService { public boolean updateHighriskConf(HighriskConf highriskConf) throws SystemException; /** - *

  • @Description:根据版本号获取高危配置信息 + *
  • @Description:根据版本号获取区域高危配置信息 *
  • @return *
  • 创建人：maliang *
  • 创建时间：2017年3月28日 *
  • 修改人： *
  • 修改时间： */ - public List getHighriskConf(String versionId); + public List getHighriskConfByVersionId(String versionId); + + /** + *
  • @Description:根据资源ID 获取区域版本配置信息 + *
  • @param sourceId + *
  • @return + *
  • 创建人：maliang + *
  • 创建时间：2017年3月29日 + *
  • 修改人： + *
  • 修改时间： + */ + public List getHighriskConfBySourceId(String sourceId); } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskVersionService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskVersionService.java index 10c8bb9..971624d 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskVersionService.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskVersionService.java @@ -1,6 +1,7 @@ package com.lyms.base.common.service.conf; import java.io.Serializable; +import java.util.List; import com.lyms.base.common.entity.conf.HighriskVersion; import com.lyms.exception.SystemException; @@ -44,7 +45,7 @@ public interface HighriskVersionService extends BaseService { *
  • 修改人： *
  • 修改时间： */ - public HighriskVersion getEnableHighriskVersionBy(Serializable id) throws SystemException; + public List getEnableHighriskVersionBy(Serializable id) throws SystemException; /** *
  • @Description:添加版本号 diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskConfServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskConfServiceImpl.java index 46699eb..8e371be 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskConfServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskConfServiceImpl.java @@ -5,6 +5,7 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.service.impl.ServiceImpl; @@ -23,6 +24,7 @@ import com.lyms.util.StrUtils; * @author maliang * @since 2017-03-28 */ +@Service public class HighriskConfServiceImpl extends ServiceImpl implements HighriskConfService { @@ -54,7 +56,8 @@ public class HighriskConfServiceImpl extends ServiceImpl= 1 ? id : null; } @Override @@ -73,10 +76,17 @@ public class HighriskConfServiceImpl extends ServiceImpl getHighriskConf(String versionId) { + public List getHighriskConfByVersionId(String versionId) { if (StringUtils.isBlank(versionId)) return null; return confMapper.selectByVersion(versionId); } + @Override + public List getHighriskConfBySourceId(String sourceId) { + if (StringUtils.isBlank(sourceId)) + return null; + return confMapper.selectBySource(sourceId); + } + } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskSourceServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskSourceServiceImpl.java index 9d3ea8d..d8da29a 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskSourceServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskSourceServiceImpl.java @@ -3,9 +3,14 @@ package com.lyms.base.common.service.conf.impl; import java.io.Serializable; import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.lyms.base.common.dao.conf.HighriskSourceMapper; import com.lyms.base.common.entity.conf.HighriskSource; +import com.lyms.base.common.enums.StatusEnum; import com.lyms.base.common.service.conf.HighriskSourceService; import com.lyms.exception.SystemException; import com.lyms.util.StrUtils; @@ -18,9 +23,13 @@ import com.lyms.util.StrUtils; * @author maliang * @since 2017-03-28 */ +@Service public class HighriskSourceServiceImpl extends ServiceImpl implements HighriskSourceService { + @Autowired + private HighriskSourceMapper sourceMapper; + @Override public Integer deleteLogicById(Serializable id) { return null; @@ -36,21 +45,40 @@ public class HighriskSourceServiceImpl extends ServiceImpl= 1 ? id : null; - return null; } @Override public boolean enable(Serializable id) throws SystemException { - return false; + + if (id == null) + return false; + + HighriskSource highriskSource = sourceMapper.selectById(id); + if (highriskSource == null) + return false; + + Integer status = highriskSource.getEnable(); + + if (status == null || StatusEnum.isDisEnabled(status)) { + highriskSource.setEnable(StatusEnum.ENABLED.getStatus()); + } else { + highriskSource.setEnable(StatusEnum.DISENABLED.getStatus()); + } + Integer tag = sourceMapper.updateById(highriskSource); + + return tag != null && tag >= 1; } @Override public List getHighriskSource() throws SystemException { - return null; + EntityWrapper wrapper = new EntityWrapper(); + wrapper.where("enable={0}", StatusEnum.ENABLED.getStatus()); + return sourceMapper.selectList(wrapper); } } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskVersionServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskVersionServiceImpl.java index 8909c24..b1dad6d 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskVersionServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskVersionServiceImpl.java @@ -1,10 +1,13 @@ package com.lyms.base.common.service.conf.impl; import java.io.Serializable; +import java.util.List; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.lyms.base.common.dao.conf.HighriskVersionMapper; import com.lyms.base.common.entity.conf.HighriskVersion; @@ -21,6 +24,7 @@ import com.lyms.util.StrUtils; * @author maliang * @since 2017-03-28 */ +@Service public class HighriskVersionServiceImpl extends ServiceImpl implements HighriskVersionService { @@ -53,27 +57,22 @@ public class HighriskVersionServiceImpl extends ServiceImpl getEnableHighriskVersionBy(Serializable id) throws SystemException { + + /* + * boolean tag = false; HighriskVersion version = null; if (id == null) + * { tag = true; } else { version = versionMapper.selectBy(id, + * StatusEnum.ENABLED.getStatus()); if (version == null) { tag = true; } + * } // 获取默认版本信息 if (tag) { // version = versionMapper.selectById(id); + * // TODO 获取默认版本 } + */ + EntityWrapper wrapper = new EntityWrapper(); + wrapper.where("enable={0}", StatusEnum.ENABLED.getStatus()); + return versionMapper.selectList(wrapper); } @Override + @Transactional public String createVersion(HighriskVersion version) throws SystemException { if (version == null) { diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/conf/HighriskVersionController.java b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/conf/HighriskVersionController.java index 2c0d072..5c0dedc 100644 --- a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/conf/HighriskVersionController.java +++ b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/conf/HighriskVersionController.java @@ -17,7 +17,7 @@ import com.lyms.web.controller.BaseController; @RequestMapping(value = "/highrisk/version") public class HighriskVersionController extends BaseController { - @Autowired - private HighriskVersionService highriskVersionService; + //@Autowired + //private HighriskVersionService highriskVersionService; } diff --git a/parent/hospital.web/src/main/resources/app-context.xml b/parent/hospital.web/src/main/resources/app-context.xml index 43624fa..3065608 100644 --- a/parent/hospital.web/src/main/resources/app-context.xml +++ b/parent/hospital.web/src/main/resources/app-context.xml @@ -22,8 +22,7 @@ - - + diff --git a/parent/hospital.web/src/main/resources/xml/app-datasource.xml b/parent/hospital.web/src/main/resources/xml/app-datasource.xml index 99acde4..3f54e88 100644 --- a/parent/hospital.web/src/main/resources/xml/app-datasource.xml +++ b/parent/hospital.web/src/main/resources/xml/app-datasource.xml @@ -78,9 +78,11 @@ classpath*:com/lyms/hospital/dao/*Mapper.xml classpath*:com/lyms/hospital/dao/*/*Mapper.xml + classpath*:com/lyms/base/common/dao/*/*Mapper.xml - + + @@ -100,7 +102,7 @@ - + \ No newline at end of file diff --git a/parent/hospital.web/src/test/java/test/hospital/BaseServiceTest.java b/parent/hospital.web/src/test/java/test/hospital/BaseServiceTest.java new file mode 100644 index 0000000..1589687 --- /dev/null +++ b/parent/hospital.web/src/test/java/test/hospital/BaseServiceTest.java @@ -0,0 +1,13 @@ +package test.hospital; + +import org.junit.runner.RunWith; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.web.WebAppConfiguration; + +@RunWith(SpringJUnit4ClassRunner.class) +@WebAppConfiguration +@ContextConfiguration(locations = { "classpath:app-context.xml" }) +public class BaseServiceTest { + +} diff --git a/parent/hospital.web/src/test/java/test/hospital/BaseTest.java b/parent/hospital.web/src/test/java/test/hospital/BaseTest.java index 0a1d780..64a86b4 100644 --- a/parent/hospital.web/src/test/java/test/hospital/BaseTest.java +++ b/parent/hospital.web/src/test/java/test/hospital/BaseTest.java @@ -18,7 +18,7 @@ import com.alibaba.fastjson.JSONObject; @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration -@ContextConfiguration(locations = { "classpath:app-context.xml", "classpath:xml/app-*.xml" +@ContextConfiguration(locations = { "classpath:app-context.xml", "classpath:dev/xml/app-*.xml" // , // "classpath:app-datasource.xml", @@ -41,14 +41,13 @@ public class BaseTest extends AbstractTransactionalJUnit4SpringContextTests { session = new MockHttpSession(); mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build(); } - - protected void outPrint(Object obj){ + + protected void outPrint(Object obj) { System.err.println(obj); } - - protected void outJson(Object obj){ + + protected void outJson(Object obj) { System.err.println(JSONObject.toJSONString(obj)); } - - + } diff --git a/parent/hospital.web/src/test/java/test/hospital/service/HighriskVersionTest.java b/parent/hospital.web/src/test/java/test/hospital/service/HighriskVersionTest.java new file mode 100644 index 0000000..bac08f1 --- /dev/null +++ b/parent/hospital.web/src/test/java/test/hospital/service/HighriskVersionTest.java @@ -0,0 +1,139 @@ +package test.hospital.service; + +import java.util.List; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import com.lyms.base.common.entity.conf.HighriskConf; +import com.lyms.base.common.entity.conf.HighriskSource; +import com.lyms.base.common.entity.conf.HighriskVersion; +import com.lyms.base.common.service.conf.HighriskConfService; +import com.lyms.base.common.service.conf.HighriskSourceService; +import com.lyms.base.common.service.conf.HighriskVersionService; + +import test.hospital.BaseServiceTest; + +public class HighriskVersionTest extends BaseServiceTest { + + @Autowired + private HighriskVersionService highriskVersionService; + + @Autowired + private HighriskSourceService highriskSourceService; + + @Autowired + private HighriskConfService highriskConfService; + + private HighriskVersion version = null; + + @Before + public void init() { + version = new HighriskVersion(); + version.setName("center-1.0"); + } + + /** + *
  • @Description: 启用 / 禁用版本号 + *
  • + *
  • 创建人：maliang + *
  • 创建时间：2017年3月29日 + *
  • 修改人： + *
  • 修改时间： + */ + @Test + public void enable() { + String id = "0EDDB06729CE48FF84CC6188231A6ECE"; + boolean tag = highriskVersionService.enable(id); + Assert.assertTrue(tag); + } + + /** + * + *
  • @Description:创建资源 + *
  • @return + *
  • 创建人：maliang + *
  • 创建时间：2017年3月29日 + *
  • 修改人： + *
  • 修改时间： + */ + public String createSource() { + HighriskSource source = new HighriskSource(); + source.setName("高危资源"); + source.setType("1"); + return highriskSourceService.createHighriskSource(source); + } + + /** + *
  • @Description:创建版本测试 + *
  • + *
  • 创建人：maliang + *
  • 创建时间：2017年3月29日 + *
  • 修改人： + *
  • 修改时间： + */ + public String createVersion() { + String id = highriskVersionService.createVersion(version); + return id; + } + + // @Transactional + @Test + public void createConfig() { + HighriskConf highriskConf = new HighriskConf(); + highriskConf.setSourceId(createSource()); + highriskConf.setVersionId(createVersion()); + highriskConf.setColorcode("ys001"); + highriskConf.setColortext("颜色编码1"); + highriskConf.setGrade(5D); + highriskConf.setGrouporder(1); + highriskConf.setName("颜色"); + highriskConf.setItemorder(1); + + highriskConfService.createHighriskConf(highriskConf); + } + + /** + *
  • @Description:根据source ID获取高危信息 + *
  • + *
  • 创建人：maliang + *
  • 创建时间：2017年3月29日 + *
  • 修改人： + *
  • 修改时间： + */ + @Test + public void getConfigBySourceId() { + String id = "0CFB58C5748247008D5C3421DDB753ED"; + List configs = highriskConfService.getHighriskConfBySourceId(id); + System.out.println(ToStringBuilder.reflectionToString(configs)); + this.print(configs); + } + + /** + *
  • @Description:根据version ID获取高危信息 + *
  • + *
  • 创建人：maliang + *
  • 创建时间：2017年3月29日 + *
  • 修改人： + *
  • 修改时间： + */ + @Test + public void getConfigByVersionId() { + String id = "71839AE8C94B4ACA9A694DD93338CD00"; + List configs = highriskConfService.getHighriskConfByVersionId(id); + this.print(configs); + } + + private void print(List configs) { + if (CollectionUtils.isEmpty(configs)) + return; + for (HighriskConf conf : configs) { + System.out.println(conf.getName()); + } + } + +} diff --git a/parent/hospital.web/src/test/java/test/hospital/service/package-info.java b/parent/hospital.web/src/test/java/test/hospital/service/package-info.java new file mode 100644 index 0000000..04f89de --- /dev/null +++ b/parent/hospital.web/src/test/java/test/hospital/service/package-info.java @@ -0,0 +1,15 @@ +/** + *
  • @Title: package-info.java + *
  • @Package test.hospital.service + *
  • @Description: TODO(文件描述) + *
  • @author maliang + *
  • @date 2017年3月29日 + */ +/** + *
  • @ClassName: package-info + *
  • @Description: TODO(类描述) + *
  • @author maliang + *
  • @date 2017年3月29日 + *
  • + */ +package test.hospital.service; \ No newline at end of file -- 1.8.3.1