冠状问诊bean添加

znwz-service/src/main/java/com/diagbot/entity/InquiryDetail.java

@@ -1,10 +1,11 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -33,12 +34,12 @@ public class InquiryDetail implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -77,6 +78,7 @@ public class InquiryDetail implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -84,20 +86,23 @@ public class InquiryDetail implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -105,6 +110,7 @@ public class InquiryDetail implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -112,6 +118,7 @@ public class InquiryDetail implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public Long getInquiryId() {
         return inquiryId;
     }
@@ -119,6 +126,7 @@ public class InquiryDetail implements Serializable {
     public void setInquiryId(Long inquiryId) {
         this.inquiryId = inquiryId;
     }
+
     public String getQuestion() {
         return question;
     }
@@ -126,6 +134,7 @@ public class InquiryDetail implements Serializable {
     public void setQuestion(String question) {
         this.question = question;
     }
+
     public String getAnswer() {
         return answer;
     }
@@ -133,6 +142,7 @@ public class InquiryDetail implements Serializable {
     public void setAnswer(String answer) {
         this.answer = answer;
     }
+
     public String getRemark() {
         return remark;
     }
@@ -144,16 +154,16 @@ public class InquiryDetail implements Serializable {
     @Override
     public String toString() {
         return "InquiryDetail{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", inquiryId=" + inquiryId +
-            ", question=" + question +
-            ", answer=" + answer +
-            ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", inquiryId=" + inquiryId +
+                ", question=" + question +
+                ", answer=" + answer +
+                ", remark=" + remark +
+                "}";
     }
 }

znwz-service/src/main/java/com/diagbot/entity/InquiryInfo.java

@@ -1,10 +1,11 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -12,7 +13,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author zhoutg
- * @since 2020-02-01
+ * @since 2020-02-02
  */
 @TableName("znwz_inquiry_info")
 public class InquiryInfo implements Serializable {
@@ -33,12 +34,12 @@ public class InquiryInfo implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -100,6 +101,11 @@ public class InquiryInfo implements Serializable {
      */
     private String diagnosis;
 
+    /**
+     * 纳里返回的url
+     */
+    private String retUrl;
+
     /**
      * 备注
      */
@@ -112,6 +118,7 @@ public class InquiryInfo implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -119,20 +126,23 @@ public class InquiryInfo implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -140,6 +150,7 @@ public class InquiryInfo implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -147,6 +158,7 @@ public class InquiryInfo implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public String getAppId() {
         return appId;
     }
@@ -154,6 +166,7 @@ public class InquiryInfo implements Serializable {
     public void setAppId(String appId) {
         this.appId = appId;
     }
+
     public String getOrganName() {
         return organName;
     }
@@ -161,6 +174,7 @@ public class InquiryInfo implements Serializable {
     public void setOrganName(String organName) {
         this.organName = organName;
     }
+
     public String getDepartment() {
         return department;
     }
@@ -168,6 +182,7 @@ public class InquiryInfo implements Serializable {
     public void setDepartment(String department) {
         this.department = department;
     }
+
     public String getDoctorId() {
         return doctorId;
     }
@@ -175,6 +190,7 @@ public class InquiryInfo implements Serializable {
     public void setDoctorId(String doctorId) {
         this.doctorId = doctorId;
     }
+
     public String getDoctorName() {
         return doctorName;
     }
@@ -182,6 +198,7 @@ public class InquiryInfo implements Serializable {
     public void setDoctorName(String doctorName) {
         this.doctorName = doctorName;
     }
+
     public String getMpiId() {
         return mpiId;
     }
@@ -189,6 +206,7 @@ public class InquiryInfo implements Serializable {
     public void setMpiId(String mpiId) {
         this.mpiId = mpiId;
     }
+
     public String getPatientName() {
         return patientName;
     }
@@ -196,6 +214,7 @@ public class InquiryInfo implements Serializable {
     public void setPatientName(String patientName) {
         this.patientName = patientName;
     }
+
     public Integer getPatientAge() {
         return patientAge;
     }
@@ -203,6 +222,7 @@ public class InquiryInfo implements Serializable {
     public void setPatientAge(Integer patientAge) {
         this.patientAge = patientAge;
     }
+
     public String getPatientSex() {
         return patientSex;
     }
@@ -210,6 +230,7 @@ public class InquiryInfo implements Serializable {
     public void setPatientSex(String patientSex) {
         this.patientSex = patientSex;
     }
+
     public String getDiagnosis() {
         return diagnosis;
     }
@@ -217,6 +238,15 @@ public class InquiryInfo implements Serializable {
     public void setDiagnosis(String diagnosis) {
         this.diagnosis = diagnosis;
     }
+
+    public String getRetUrl() {
+        return retUrl;
+    }
+
+    public void setRetUrl(String retUrl) {
+        this.retUrl = retUrl;
+    }
+
     public String getRemark() {
         return remark;
     }
@@ -228,23 +258,24 @@ public class InquiryInfo implements Serializable {
     @Override
     public String toString() {
         return "InquiryInfo{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", appId=" + appId +
-            ", organName=" + organName +
-            ", department=" + department +
-            ", doctorId=" + doctorId +
-            ", doctorName=" + doctorName +
-            ", mpiId=" + mpiId +
-            ", patientName=" + patientName +
-            ", patientAge=" + patientAge +
-            ", patientSex=" + patientSex +
-            ", diagnosis=" + diagnosis +
-            ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", appId=" + appId +
+                ", organName=" + organName +
+                ", department=" + department +
+                ", doctorId=" + doctorId +
+                ", doctorName=" + doctorName +
+                ", mpiId=" + mpiId +
+                ", patientName=" + patientName +
+                ", patientAge=" + patientAge +
+                ", patientSex=" + patientSex +
+                ", diagnosis=" + diagnosis +
+                ", retUrl=" + retUrl +
+                ", remark=" + remark +
+                "}";
     }
 }

znwz-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -1,13 +1,26 @@
 package com.diagbot.facade;
 
 import com.diagbot.dto.SaveInquiryDTO;
+import com.diagbot.entity.Client;
+import com.diagbot.entity.InquiryDetail;
+import com.diagbot.entity.InquiryInfo;
+import com.diagbot.entity.JSONResponseBean;
 import com.diagbot.entity.Request;
+import com.diagbot.entity.Response;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.InquiryDetailServiceImpl;
 import com.diagbot.service.impl.InquiryInfoServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.SaveInquiryVO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -19,24 +32,62 @@ import java.util.Map;
  */
 @Component
 public class InquiryInfoFacade extends InquiryInfoServiceImpl {
-
+    //    @Autowired
+    //    private InquiryDetailFacade inquiryDetailFacade;
     @Autowired
-    private InquiryDetailFacade inquiryDetailFacade;
-
-
-    public SaveInquiryDTO saveInquiry(SaveInquiryVO saveInquiryVO){
-
-
+    @Qualifier("inquiryDetailServiceImpl")
+    private InquiryDetailServiceImpl inquiryDetailService;
+
+    public SaveInquiryDTO saveInquiry(SaveInquiryVO saveInquiryVO) {
+        SaveInquiryDTO saveInquiryDTO = new SaveInquiryDTO();
+        String retUrl = getUrl(saveInquiryVO);
+        Date now = DateUtil.now();
+
+        InquiryInfo inquiryInfo = new InquiryInfo();
+        BeanUtil.copyProperties(saveInquiryVO, inquiryInfo);
+        inquiryInfo.setGmtCreate(now);
+        inquiryInfo.setGmtModified(now);
+        inquiryInfo.setRetUrl(retUrl);
+        save(inquiryInfo);
+
+        List<InquiryDetail> inquiryDetailList = BeanUtil.listCopyTo(saveInquiryVO.getDetailList(), InquiryDetail.class);
+        inquiryDetailList.forEach(i -> {
+            i.setInquiryId(inquiryInfo.getId());
+            i.setGmtCreate(now);
+            i.setGmtModified(now);
+        });
+        inquiryDetailService.saveBatch(inquiryDetailList);
 
-        return null;
+        saveInquiryDTO.setBody(retUrl);
+        return saveInquiryDTO;
     }
 
+    private String getUrl(SaveInquiryVO saveInquiryVO) {
+        String retUrl = null;
+        try {
+            String apiUrl = "http://116.62.170.131:8096/openapi-devtest/gateway";
+            String appKey = "ngari5e34e52511dc394f";
+            String appSecret = "11dc394fc05518c1";
+            String encodingAesKey = "";
+            Client client = new Client(apiUrl, appKey, appSecret, encodingAesKey);
+            Response response = client.execute(getltcs(saveInquiryVO));
+            if (response.isSuccess()) {
+                JSONResponseBean result = response.getJsonResponseBean();
+                retUrl = result.getBody().toString();
+            }
+        } catch (Exception e) {
+        }
+        if (StringUtil.isBlank(retUrl)) {
+            throw new CommonException(CommonErrorCode.RPC_ERROR, "提交失败");
+        }
+        return retUrl;
+    }
 
-    public static Request getltcs(SaveInquiryVO saveInquiryVO) {
+    private Request getltcs(SaveInquiryVO saveInquiryVO) {
         List bodyList = new ArrayList<>();
 
         List<Map<String, Object>> details = new ArrayList<>();
-        saveInquiryVO.getDetailList().forEach(i->{
+        saveInquiryVO.getDetailList().forEach(i -> {
             Map<String, Object> detail = new HashMap<>();
             detail.put("question", i.getQuestion());
             detail.put("answer", i.getAnswer());
@@ -59,7 +110,4 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         return new Request(serviceId, method, bodyList);
     }
 
-
-
-
-}
+}

znwz-service/src/main/java/com/diagbot/util/Demo.java

@@ -25,11 +25,13 @@ public class Demo {
 
         //调用相应的接口请求
         Response response = client.execute(getltcs());
-        System.out.println(JSONUtils.toString(response));
+//        System.out.println(JSONUtils.toString(response));
         if (response.isSuccess()) {
             //接口返回的结果
             JSONResponseBean result = response.getJsonResponseBean();
-            System.out.println(JSONUtils.toString(result));
+//            System.out.println(JSONUtils.toString(result));
+            System.out.println(result.getBody().toString());
+
         } else {
             System.out.println(response.getCaErrorMsg());
             System.out.println(response.getErrorMessage());

znwz-service/src/main/resources/mapper/InquiryInfoMapper.xml

@@ -20,6 +20,7 @@
         <result column="patient_age" property="patientAge" />
         <result column="patient_sex" property="patientSex" />
         <result column="diagnosis" property="diagnosis" />
+        <result column="ret_url" property="retUrl" />
         <result column="remark" property="remark" />
     </resultMap>