常用标签维护——添加（更改）

icssman-service/src/main/java/com/diagbot/enums/UsualEnum.java

@@ -0,0 +1,50 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description: 常用枚举类
+ * @Author: wangyu
+ * @Date: 10:25 2018/12/13
+ */
+public enum UsualEnum implements KeyedNamed {
+    Disable(0, "不常用"),
+    Enable(1, "常用");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    UsualEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static UsualEnum getEnum(Integer key) {
+        for (UsualEnum item : UsualEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        UsualEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}
+

icssman-service/src/main/java/com/diagbot/facade/QuestionUsualFacade.java

@@ -2,21 +2,21 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.dto.DeptInfoDTO;
-import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.QuestionUsual;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.UsualEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.service.QuestionUsualService;
 import com.diagbot.service.impl.QuestionUsualServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
-import com.diagbot.util.ListUtil;
 import com.diagbot.util.UserUtils;
-import com.diagbot.vo.DeptInfoVO;
 import com.diagbot.vo.QuestionUsualVO;
 import com.diagbot.vo.UpdateQuetionUsualVO;
+import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -32,6 +32,9 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
     private QuestionInfoFacade questionInfoFacade ;
     @Autowired
     private DeptInfoFacade deptInfoFacade;
+    @Autowired
+    @Qualifier("questionUsualServiceImpl")
+    private QuestionUsualService questionUsualService;
 
     /**
      * 添加常用标签
@@ -39,29 +42,24 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
      * @return
      */
     public Boolean addQuestionUsual(QuestionUsualVO questionUsualVO) {
-        DeptInfoVO deptInfoVO =new DeptInfoVO();
-        QuestionInfo questionInfo =new QuestionInfo();
-        BeanUtil.copyProperties(questionUsualVO,deptInfoVO);
-        List<DeptInfoDTO> listRespDTO = deptInfoFacade.getDeptInfos(questionUsualVO.getDeptCode(),questionUsualVO.getHospitalCode());
-        if (ListUtil.isEmpty(listRespDTO)) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR,
-                    "获取科室信息失败");
-        }
-        questionInfo.setName(questionUsualVO.getQuestionName());
-        QuestionInfo questionInfoRespDTO = questionInfoFacade.getQuestionInfos(questionInfo);
-        if (questionInfoRespDTO == null) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR,
-                    "获取标签信息失败");
-        }
+        List<QuestionUsual> questionUsualList = Lists.newArrayList();
         QuestionUsual questionUsual = new QuestionUsual();
-        questionUsual.setCreator(UserUtils.getCurrentPrincipleID());
-        questionUsual.setModifier(UserUtils.getCurrentPrincipleID());
-        questionUsual.setGmtCreate(DateUtil.now());
-        questionUsual.setQuestionId(questionInfoRespDTO.getId());
-        questionUsual.setDeptId(listRespDTO.get(0).getId());
-        Boolean flag = this.save(questionUsual);
+        String userId = "1"/*UserUtils.getCurrentPrincipleID()*/;
+        for (int i = 0; i<questionUsualVO.getQuestionId().size(); i++ ) {
+            questionUsual =new QuestionUsual();
+            questionUsual.setCreator(userId);
+            questionUsual.setModifier(userId);
+            questionUsual.setGmtCreate(DateUtil.now());
+            questionUsual.setGmtModified(DateUtil.now());
+            questionUsual.setQuestionId(questionUsualVO.getQuestionId().get(i));
+            questionUsual.setDeptId(questionUsualVO.getDeptId());
+            questionUsual.setOrderNo(Long.parseLong(String.valueOf(i+1)));
+            questionUsual.setUsual(String.valueOf(UsualEnum.Enable.getKey()));
+            questionUsualList.add(questionUsual);
+        }
+        Boolean flag = questionUsualService.saveBatch(questionUsualList);
         if(!flag){
-            throw new CommonException(CommonErrorCode.FAIL,
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED,
                     "常用症状添加失败");
         }
         return flag;

icssman-service/src/main/java/com/diagbot/vo/QuestionUsualVO.java

@@ -4,6 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Description:
@@ -13,10 +14,8 @@ import javax.validation.constraints.NotNull;
 @Getter
 @Setter
 public class QuestionUsualVO {
-    @NotNull(message = "请输入医院编号")
-    private String hospitalCode;
-    @NotNull(message = "请输入科室编号")
-    private String deptCode;
-    @NotNull(message = "请输入症状名称")
-    private String questionName;
+    @NotNull(message = "请输入科室id")
+    private Long deptId;
+    @NotNull(message = "请输入症状id")
+    private List<Long> questionId;
 }