diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/RiskDefaultTypeEnum.java b/platform-common/src/main/java/com/lyms/platform/common/enums/RiskDefaultTypeEnum.java new file mode 100644 index 0000000..9d65e7c --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/RiskDefaultTypeEnum.java @@ -0,0 +1,36 @@ +package com.lyms.platform.common.enums; + +/** + * Created by Administrator on 2016/6/22 0022. + */ +public enum RiskDefaultTypeEnum { + Orange("橙色","orange"), + Yellow("黄色","yellow"), + Red("红色","red"), + Purple("紫色","purple") + ; + + private RiskDefaultTypeEnum(String title, String color) { + this.color = color; + this.title = title; + } + + private String title; + private String color; + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getColor() { + return color; + } + + public void setColor(String color) { + this.color = color; + } +} diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java b/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java index 6db8090..29bbfc8 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java @@ -59,4 +59,12 @@ public class SystemConfig { public static final String YSFYS = "5769eef90cf22c3157577422"; //本次妊娠 public static final String BCRS = "5769eef90cf22c3157577422"; + + // 高危风险(new) + public static final String GWFX_NEW = "6A09E3B0-8418-47CA-A846-55514EE08A24"; + + // 高危风险类型的类型(typeId) + public static final String GWFX_NEW_COLOR_TYPE_ID = "TYPE-GWFX-NEW"; + + } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java index 505eb8f..8294fe5 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java @@ -33,6 +33,25 @@ public class BasicConfig extends BaseModel { private Long createDate; private Long modifiedDate; + private Integer score; + private String describe; + + public Integer getScore() { + return score; + } + + public void setScore(Integer score) { + this.score = score; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + public static long getSerialVersionUID() { return serialVersionUID; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java index aa6e63c..4bbe68b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java @@ -21,6 +21,8 @@ public class BasicConfigQuery extends BaseQuery implements IConvertToNativeQuery private Integer enable; + private String typeId; + public Integer getEnable() { return enable; } @@ -45,6 +47,9 @@ public class BasicConfigQuery extends BaseQuery implements IConvertToNativeQuery if (null != parentId) { condition = condition.and("parentId", parentId, MongoOper.IS); } + if (null != typeId) { + condition = condition.and("typeId", typeId, MongoOper.IS); + } if(null!=enable){ condition = condition.and("enable", enable, MongoOper.IS); } @@ -57,6 +62,14 @@ public class BasicConfigQuery extends BaseQuery implements IConvertToNativeQuery return condition.toMongoQuery(); } + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + public String getKeyword() { return keyword; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RiskController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RiskController.java new file mode 100644 index 0000000..da2028f --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RiskController.java @@ -0,0 +1,165 @@ +package com.lyms.platform.operate.web.controller; + +import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.result.BaseListResponse; +import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.SystemConfig; +import com.lyms.platform.operate.web.facade.BasicConfigFacade; +import com.lyms.platform.operate.web.request.BasicConfigQueryRequest; +import com.lyms.platform.operate.web.result.FrontEndResult; +import com.lyms.platform.pojo.BasicConfig; +import com.lyms.platform.query.BasicConfigQuery; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.validation.Valid; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by Administrator on 2016/6/22 0022. + */ +@Controller +public class RiskController extends BaseController { + + @Autowired + private BasicConfigService basicConfigService; + + /** + * 高危风险版本查询 + * + * @return 返回结果 + */ + @RequestMapping(method = RequestMethod.GET, value = "/risk/version") + @ResponseBody + public FrontEndResult queryRiskVersion(@RequestParam(value = "versionId", required = false) String versionId) { + BasicConfigQuery query = new BasicConfigQuery(); + query.setId(versionId); + query.setParentId(SystemConfig.GWFX_NEW); + query.setYn(YnEnums.YES.getId()); + List list = basicConfigService.queryBasicConfig(query); + List data = new ArrayList<>(); + query.setTypeId(SystemConfig.GWFX_NEW_COLOR_TYPE_ID); + for (BasicConfig config:list) { + Map map = new HashMap<>(); + map.put("id", config.getId()); + map.put("name", config.getName()); + query.setParentId(config.getId()); + List levelList = basicConfigService.queryBasicConfig(query); + List subList = new ArrayList<>(); + for (BasicConfig b:levelList) { + Map submap = new HashMap<>(); + submap.put("id", b.getId()); + submap.put("name", b.getName()); + submap.put("code", b.getCode()); + subList.add(submap); + } + map.put("levelList", subList); + data.add(map); + } + return FrontEndResult.ini().setData(data).setPageInfo(query.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + /** + * 高危风险查询 + * + * @return 返回结果 + */ + @RequestMapping(method = RequestMethod.GET, value = "/risklist") + @ResponseBody + public BaseResponse queryRisk(@RequestParam("versionId") String versionId, + @RequestParam("page") Integer page, + @RequestParam("limit") Integer limit, + @RequestParam(value = "typeId", required = false) String typeId, + @RequestParam(value = "keyword", required = false) String s) { + if (StringUtils.isNotBlank(versionId)) { + BasicConfigQuery query = new BasicConfigQuery(); + query.setParentId(versionId); + query.setYn(YnEnums.YES.getId()); + query.setNeed("y"); + query.setLimit(limit); + query.setPage(page); + query.setTypeId(typeId); + query.setKeyword(s); + List list = basicConfigService.queryBasicConfig(query); + return FrontEndResult.ini().setData(list).setPageInfo(query.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } else { + return new BaseResponse("versionId is null", ErrorCodeConstants.PARAMETER_ERROR); + } + } + + /** + * 高危风险查询 + * + * @return 返回结果 + */ + @RequestMapping(method = RequestMethod.POST, value = "/riskcopy") + @ResponseBody + public BaseResponse copyRisk(@RequestParam("versionId") String versionId) { + if (StringUtils.isNotBlank(versionId)) { + BasicConfig b = basicConfigService.getOneBasicConfigById(versionId); + if (b != null) { + b.setId(null); + b.setName(b.getName() + " - 副本"); + basicConfigService.addBasicConfig(b); + BasicConfigQuery query = new BasicConfigQuery(); + query.setParentId(versionId); + query.setYn(YnEnums.YES.getId()); + List list = basicConfigService.queryBasicConfig(query); + List configList = new ArrayList<>(); + Map map = new HashMap<>(); + for (BasicConfig config:list) { + String oldId = new String(config.getId()); + config.setId(null); + config.setParentId(b.getId()); + if (SystemConfig.GWFX_NEW_COLOR_TYPE_ID.equals(b.getTypeId())) { + basicConfigService.addBasicConfig(config); + map.put(oldId, config.getId()); + } else { + configList.add(config); + } + } + if (configList.size() > 0) { + for (BasicConfig config : configList) { + config.setTypeId(map.get(config.getTypeId())); + } + basicConfigService.batchSave(configList); + } + return new BaseResponse("成功", ErrorCodeConstants.SUCCESS); + } else { + return new BaseResponse("版本数据不存在", ErrorCodeConstants.BUSINESS_ERROR); + } + + } else { + return new BaseResponse("versionId is null", ErrorCodeConstants.PARAMETER_ERROR); + } + } + + @RequestMapping(method = RequestMethod.POST, value = "/risk/version") + @ResponseBody + public BaseResponse addRiskVersion(@RequestParam("name") String name) { + BasicConfig config = new BasicConfig(); + config.setParentId(SystemConfig.GWFX_NEW); + config.setTypeId("0"); + config.setName(name); + config.setYn(YnEnums.YES.getId()); + config.setCode(name); + config.setEnable(YnEnums.YES.getId()); + config.setCreateDate(System.currentTimeMillis()); + basicConfigService.addBasicConfig(config); + return new BaseObjectResponse().setData(config.getId()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + +} 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 ac00ce9..98ee24e 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 @@ -79,6 +79,9 @@ public class BasicConfigFacade { obj.setName(basicConfigUpdateRequest.getName()); obj.setId(basicConfigUpdateRequest.getId()); obj.setEnable(basicConfigUpdateRequest.getEnable()); + obj.setTypeId(basicConfigUpdateRequest.getTypeId()); + obj.setScore(basicConfigUpdateRequest.getScore()); + obj.setDescribe(basicConfigUpdateRequest.getDescribe()); BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); basicConfigQuery.setId(basicConfigUpdateRequest.getId()); basicConfigQuery.setYn(YnEnums.YES.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java index 52a22d0..5ba44c1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java @@ -18,6 +18,34 @@ public class BasicConfigAddRequest implements IBasicRequestConvert{ @FormParam private String code; + private String typeId; + private Integer score; + private String describe; + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + + public Integer getScore() { + return score; + } + + public void setScore(Integer score) { + this.score = score; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + public String getParentId() { return parentId; } @@ -54,6 +82,9 @@ public class BasicConfigAddRequest implements IBasicRequestConvert{ if(StringUtils.isEmpty(parentId)){ return null; } + basicConfig.setTypeId(typeId); + basicConfig.setDescribe(describe); + basicConfig.setScore(score); basicConfig.setCode(code); basicConfig.setName(name); basicConfig.setParentId(parentId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java index 1880739..8a3f3fa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java @@ -16,6 +16,33 @@ public class BasicConfigUpdateRequest { private String code; @FormParam private int enable; + private String typeId; + private Integer score; + private String describe; + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + + public Integer getScore() { + return score; + } + + public void setScore(Integer score) { + this.score = score; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } public int getEnable() { return enable;