diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java index 0448bfa..ca93005 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java @@ -10,7 +10,6 @@ import com.lyms.platform.operate.web.request.BasicConfigAddRequest; import com.lyms.platform.operate.web.request.BasicConfigQueryRequest; import com.lyms.platform.operate.web.request.BasicConfigUpdateRequest; import com.lyms.platform.operate.web.result.FrontEndResult; -import com.lyms.platform.operate.web.result.TreeNode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; @@ -21,24 +20,20 @@ import java.util.ArrayList; import java.util.List; /** - * - * * 基础项配置接口 - * + * * @author Administrator */ @Controller public class BasicConfigController extends BaseController { - + @Autowired private BasicConfigFacade basicConfigFacade; - + /** - * * 基础项配置查询 - * - * @param basicConfigQueryRequest 基础项配置查询请求 - * + * + * @param basicConfigQueryRequest 基础项配置查询请求 * @return 返回结果 */ @RequestMapping(method = RequestMethod.GET, value = "/basicConfig") @@ -47,31 +42,26 @@ public class BasicConfigController extends BaseController { BaseListResponse baseListResponse = basicConfigFacade.findBasicConfigList(basicConfigQueryRequest); return FrontEndResult.ini().setData(baseListResponse.getData()).setPageInfo(baseListResponse.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - + /** - * * 修改一条基础项配置 - * - * @param id 基础项id - * + * + * @param id 基础项id * @param basicConfigUpdateRequest 基础项修改请求 - * * @return 返回结果 */ @RequestMapping(method = RequestMethod.PUT, value = "/basicConfig/{id}") @ResponseBody public BaseResponse updateOneBasicConfigById(@PathVariable("id") - String id, @Valid BasicConfigUpdateRequest basicConfigUpdateRequest) { + String id, @Valid BasicConfigUpdateRequest basicConfigUpdateRequest) { basicConfigUpdateRequest.setId(id); return basicConfigFacade.updateOneBasicConfig(basicConfigUpdateRequest); } - + /** - * * 删除一条基础项配置 - * + * * @param id 基础项id - * * @return 返回结果 */ @RequestMapping(method = RequestMethod.DELETE, value = "/basicConfig") @@ -80,34 +70,32 @@ public class BasicConfigController extends BaseController { return basicConfigFacade.deleteOneBasicConfig(id); } - + /** - * * 基础项树形结构数据 - * + * * @return 返回结果 */ @RequestMapping(method = RequestMethod.GET, value = "/basicConfigTree") @ResponseBody public BaseListResponse findAllBasicConfigWithTree(BasicConfigQueryRequest basicConfigQueryRequest) { - if(null == basicConfigQueryRequest.getParentId()) { + if (null == basicConfigQueryRequest.getParentId()) { basicConfigQueryRequest.setParentId("0"); } basicConfigQueryRequest.setLimit(9999); return basicConfigFacade.findBasicConfigList(basicConfigQueryRequest); } - + /** - * 批量增加基础项配置 - * + * 批量增加基础项配置 + * * @param basicConfigRequests 批量增加请求 - * * @return 返回结果 */ - @RequestMapping(method = RequestMethod.POST, value = "/basicConfig", consumes = { MediaType.APPLICATION_JSON_VALUE }) + @RequestMapping(method = RequestMethod.POST, value = "/basicConfig", consumes = {MediaType.APPLICATION_JSON_VALUE}) @ResponseBody public BaseResponse batchAddBasicConfig(@RequestBody - List basicConfigRequests) { + List basicConfigRequests) { return basicConfigFacade.batchAddBasicConfig(basicConfigRequests); } @@ -124,12 +112,11 @@ public class BasicConfigController extends BaseController { list.add(basicConfigAddRequest); basicConfigFacade.batchAddBasicConfig(list); - return 1; + return 1; } /** - * * 查询基础数据根据类型 * * @return 返回结果 @@ -140,4 +127,14 @@ public class BasicConfigController extends BaseController { return basicConfigFacade.getBaseConfigByType(type); } + /** + * 获取高危因素 + * + * @return 返回结果 + */ + @RequestMapping(method = RequestMethod.GET, value = "/getHighRisk") + @ResponseBody + public BaseResponse getHighRisk() { + return basicConfigFacade.getHighRisk(); + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java index d1a33ca..8353d69 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; @Component @@ -52,7 +53,7 @@ public class BasicConfigFacade { } - public List buildResult( List data){ + public List buildResult(List data) { List dataList = new ArrayList<>(); if (CollectionUtils.isNotEmpty(data)) { for (BasicConfig basicConfig : data) { @@ -61,12 +62,10 @@ public class BasicConfigFacade { dataList.add(basicConfigResult); } } - return dataList; + return dataList; } - - /** * 修改一条基础项配置 * @@ -116,7 +115,7 @@ public class BasicConfigFacade { public List findAllBasicConfigWithTree() { List list = new ArrayList(); List l = basicConfigService.queryParentConfig(); - if(CollectionUtils.isNotEmpty(l)){ + if (CollectionUtils.isNotEmpty(l)) { for (BasicConfig b : l) { TreeNode node = TreeHelper.recursiveTree(b, basicConfigService); if (null != node) { @@ -148,22 +147,20 @@ public class BasicConfigFacade { /** * 查询基础数据通过parentId + * * @param parentId * @return */ - public List getBaseicConfigByParentId(String parentId) - { + public List getBaseicConfigByParentId(String parentId) { BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); basicConfigQuery.setNeed("1"); basicConfigQuery.setYn(YnEnums.YES.getId()); basicConfigQuery.setParentId(parentId); List datas = basicConfigService.queryBasicConfig(basicConfigQuery); - List configResults = new ArrayList<>(); - if (datas != null) - { - for(BasicConfig data : datas) - { - BasicConfigResult br = new BasicConfigResult(); + List configResults = new ArrayList<>(); + if (datas != null) { + for (BasicConfig data : datas) { + BasicConfigResult br = new BasicConfigResult(); br.setId(data.getId()); br.setCode(data.getCode()); br.setEnable(data.getEnable()); @@ -178,6 +175,7 @@ public class BasicConfigFacade { /** * 根据类型查询响应的 基础数据 + * * @param type * @return */ @@ -185,12 +183,11 @@ public class BasicConfigFacade { BaseObjectResponse objectResponse = new BaseObjectResponse(); - List results = new ArrayList<>(); + List results = new ArrayList<>(); - String parentId = ConfigTypeEnums.getTypeParentId(type); - - if (!StringUtils.isEmpty(parentId)) - { + String parentId = ConfigTypeEnums.getTypeParentId(type); + + if (!StringUtils.isEmpty(parentId)) { results = getBaseicConfigByParentId(parentId); } objectResponse.setData(results); @@ -199,5 +196,33 @@ public class BasicConfigFacade { return objectResponse; } + public BaseResponse getHighRisk() { + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setYn(YnEnums.YES.getId()); + basicConfigQuery.setParentId(SystemConfig.HIGH_RISK_ID); + List basicConfigs = basicConfigService.queryBasicConfig(basicConfigQuery); + List basicConfigs1 = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(basicConfigs)) { + for (BasicConfig basicConfig : basicConfigs) { + basicConfigQuery.setParentId(basicConfig.getId()); + List basicConfigs2 = basicConfigService.queryBasicConfig(basicConfigQuery); + if (CollectionUtils.isNotEmpty(basicConfigs2)) { + basicConfigs1.addAll(basicConfigs2); + } + } + } + + return new BaseObjectResponse().setData(convertToList(basicConfigs1)).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); + } + private List convertToList(List list) { + List data = new ArrayList<>(); + for (BasicConfig basicConfig : list) { + java.util.Map map = new HashMap<>(); + map.put("id", basicConfig.getId()); + map.put("name", basicConfig.getName()); + data.add(map); + } + return list; + } } \ No newline at end of file