From 7e7e41436ebe65cd0ceea3546a0dcfe33411aaab Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 4 Jun 2018 15:08:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E9=99=A2=E9=BB=98=E8=AE=A4=E5=BC=80?= =?UTF-8?q?=E9=80=9A=E9=AB=98=E5=8D=B1=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/common/dao/BaseMongoDAOImpl.java | 5 +- .../ModularFunctionConfigController.java | 21 ++++++++- .../web/facade/ModularFunctionConfigFacde.java | 54 +++++++++++++++++++--- 3 files changed, 68 insertions(+), 12 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/dao/BaseMongoDAOImpl.java b/platform-common/src/main/java/com/lyms/platform/common/dao/BaseMongoDAOImpl.java index e38b863..82f4ddc 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/dao/BaseMongoDAOImpl.java +++ b/platform-common/src/main/java/com/lyms/platform/common/dao/BaseMongoDAOImpl.java @@ -1,8 +1,5 @@ package com.lyms.platform.common.dao; -import com.lyms.platform.common.dao.operator.MongoCondition; -import com.lyms.platform.common.dao.operator.MongoOper; -import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.dao.operator.Page; import com.lyms.platform.common.pojo.SyncDataModel; import com.lyms.platform.common.pojo.UpdateMultiData; @@ -11,7 +8,6 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; -import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Update; import org.springframework.util.Assert; @@ -160,6 +156,7 @@ public class BaseMongoDAOImpl implements BaseMongoDAO { || "SyncDataModel".equals(data.getClass().getSimpleName()) || "SmsConfigModel".equals(data.getClass().getSimpleName()) || "OperateLogModel".equals(data.getClass().getSimpleName()) + || "ModularFunctionConfigModel".equals(data.getClass().getSimpleName()) || "TrackDown".equals(data.getClass().getSimpleName())) { if(!"LisReport".equals(data.getClass().getSimpleName())){ //ExceptionUtils.catchException("NotSerializable for class :"+data.getClass().getSimpleName() ); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ModularFunctionConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ModularFunctionConfigController.java index bbd0942..ca47b48 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ModularFunctionConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ModularFunctionConfigController.java @@ -3,6 +3,7 @@ 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.operate.web.facade.ModularFunctionConfigFacde; import com.lyms.platform.operate.web.request.ModularFunctionConfigRequest; @@ -23,7 +24,22 @@ public class ModularFunctionConfigController extends BaseController { private ModularFunctionConfigFacde modularFunctionConfigFacde; /** + * 初始化开通目前已配置医院高危功能模块 + * + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/initOrgModulFunConfig") + @ResponseBody + public BaseResponse initOrgModulFunConfig(String hosptailId) { + int size = modularFunctionConfigFacde.configAllOrganization(hosptailId); + BaseResponse baseResponse = new BaseResponse("成功", ErrorCodeConstants.SUCCESS); + baseResponse.setObject("处理：" + size + "家医院默认开通高危配置模块"); + return baseResponse; + } + + /** * 配置医院功能模块 + * * @param model * @param request * @return @@ -32,7 +48,7 @@ public class ModularFunctionConfigController extends BaseController { @ResponseBody @TokenRequired public BaseResponse addModularFunConfig(@RequestBody ModularFunctionConfigRequest model, - HttpServletRequest request) { + HttpServletRequest request) { return modularFunctionConfigFacde.addDiagnoseConfig(model, getUserId(request)); } @@ -40,12 +56,13 @@ public class ModularFunctionConfigController extends BaseController { /** * 查询当前医院的功能配置项 + * * @param hospitalId * @return */ @RequestMapping(method = RequestMethod.GET, value = "/queryModularFunConfig") @ResponseBody - public BaseResponse queryDiagnoseConfig(@RequestParam("hospitalId")String hospitalId) { + public BaseResponse queryDiagnoseConfig(@RequestParam("hospitalId") String hospitalId) { return modularFunctionConfigFacde.queryDiagnoseConfig(hospitalId); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ModularFunctionConfigFacde.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ModularFunctionConfigFacde.java index 5b51f9f..eebabe0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ModularFunctionConfigFacde.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ModularFunctionConfigFacde.java @@ -4,18 +4,25 @@ import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.ModularFunctionConfigService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.OptActionEnums; +import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.ModularFunctionConfigRequest; import com.lyms.platform.operate.web.result.ModularFunctionConfigResult; +import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.model.OrganizationQuery; +import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.ModularFunctionConfigModel; import com.lyms.platform.query.ModularFunctionConfigQuery; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * Created by Administrator on 2018-03-29. @@ -31,9 +38,46 @@ public class ModularFunctionConfigFacde { @Autowired private OperateLogFacade operateLogFacade; - @Autowired private BasicConfigService basicConfigService; + @Autowired + private OrganizationService organizationService; + + /** + * 查询当前组里面包含的医院 + * + * @return + */ + public int configAllOrganization(String hosptailId) { + OrganizationQuery organizationQuery = new OrganizationQuery(); + organizationQuery.setYn(YnEnums.YES.getId()); + if (StringUtils.isNotEmpty(hosptailId)) { + organizationQuery.setId(Integer.valueOf(hosptailId)); + } + List list = organizationService.queryOrganization(organizationQuery); + if (CollectionUtils.isNotEmpty(list)) { + for (Organization organization : list) { + ModularFunctionConfigQuery modularFunctionConfigQuery = new ModularFunctionConfigQuery(); + modularFunctionConfigQuery.setHospitalId(String.valueOf(organization.getId())); + List modularFunctionConfigModels = modularFunctionConfigServcie.queryDiagnoseConfigs(modularFunctionConfigQuery); + if (CollectionUtils.isEmpty(modularFunctionConfigModels)) { + ModularFunctionConfigModel modularFunctionConfigModel = new ModularFunctionConfigModel(); + modularFunctionConfigModel.setHospitalId(String.valueOf(organization.getId())); + System.out.println("正在开通医院高危模块功能："+organization.getId()); + List> configs = new ArrayList<>(); + Map conMap = new HashMap(); + conMap.put("type", "1"); + conMap.put("value", "2"); + configs.add(conMap); + modularFunctionConfigModel.setConfigs(configs); + modularFunctionConfigServcie.saveDiagnoseConfig(modularFunctionConfigModel); + }else{ + System.out.println("----跳过开通医院高危模块功能："+organization.getId()); + } + } + } + return list.size(); + } /** * 添加配置基础和项 @@ -49,7 +93,7 @@ public class ModularFunctionConfigFacde { if (StringUtils.isNotEmpty(request.getId())) { ModularFunctionConfigModel operateBeforeContent = modularFunctionConfigServcie.findById(request.getId()); modularFunctionConfigServcie.updateDiagnoseConfig(modularFunctionConfigModel); - operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId),operateBeforeContent, modularFunctionConfigModel, OptActionEnums.UPDATE.getId(), "配置医院功能模块"); + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), operateBeforeContent, modularFunctionConfigModel, OptActionEnums.UPDATE.getId(), "配置医院功能模块"); } else { modularFunctionConfigModel = modularFunctionConfigServcie.saveDiagnoseConfig(modularFunctionConfigModel); operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), modularFunctionConfigModel, OptActionEnums.ADD.getId(), "配置医院功能模块"); @@ -62,14 +106,12 @@ public class ModularFunctionConfigFacde { ModularFunctionConfigQuery diagnoseConfigQuery = new ModularFunctionConfigQuery(); diagnoseConfigQuery.setHospitalId(hospitalId); List configModels = modularFunctionConfigServcie.queryDiagnoseConfigs(diagnoseConfigQuery); - if (CollectionUtils.isEmpty(configModels)) - { + if (CollectionUtils.isEmpty(configModels)) { return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有数据"); } ModularFunctionConfigModel configModel = configModels.get(0); - if (configModel != null) - { + if (configModel != null) { ModularFunctionConfigResult result = new ModularFunctionConfigResult(); result.convertToResult(configModel); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(result); -- 1.8.3.1