Merge remote-tracking branch 'origin/dev/zzcx20200202_init' into dev/zzcx20200202_init

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

@@ -3,6 +3,8 @@ package com.diagbot.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -16,6 +18,8 @@ import java.util.Date;
  * @since 2020-02-02
  */
 @TableName("zzcx_inquiry_info")
+@Getter
+@Setter
 public class InquiryInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -51,231 +55,19 @@ public class InquiryInfo implements Serializable {
      */
     private String modifier;
 
-    /**
-     * 公众号appid
-     */
-    private String appId;
-
-    /**
-     * 医院名称
-     */
-    private String organName;
-
-    /**
-     * 医生所在科室名称
-     */
-    private String department;
-
-    /**
-     * 医生ID
-     */
-    private String doctorId;
-
-    /**
-     * 医生名称
-     */
-    private String doctorName;
-
-    /**
-     * 用户在纳里的ID
-     */
-    private String mpiId;
-
-    /**
-     * 用户名称
-     */
-    private String patientName;
-
-    /**
-     * 用户年龄
-     */
-    private Integer patientAge;
-
-    /**
-     * 用户性别
-     */
-    private String patientSex;
-
     /**
      * 诊断
      */
     private String diagnosis;
 
     /**
-     * 纳里返回的url
+     * 访问者的IP
      */
-    private String retUrl;
+    private String ip;
 
     /**
      * 备注
      */
     private String remark;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public String getAppId() {
-        return appId;
-    }
-
-    public void setAppId(String appId) {
-        this.appId = appId;
-    }
-
-    public String getOrganName() {
-        return organName;
-    }
-
-    public void setOrganName(String organName) {
-        this.organName = organName;
-    }
-
-    public String getDepartment() {
-        return department;
-    }
-
-    public void setDepartment(String department) {
-        this.department = department;
-    }
-
-    public String getDoctorId() {
-        return doctorId;
-    }
-
-    public void setDoctorId(String doctorId) {
-        this.doctorId = doctorId;
-    }
-
-    public String getDoctorName() {
-        return doctorName;
-    }
-
-    public void setDoctorName(String doctorName) {
-        this.doctorName = doctorName;
-    }
-
-    public String getMpiId() {
-        return mpiId;
-    }
-
-    public void setMpiId(String mpiId) {
-        this.mpiId = mpiId;
-    }
-
-    public String getPatientName() {
-        return patientName;
-    }
-
-    public void setPatientName(String patientName) {
-        this.patientName = patientName;
-    }
-
-    public Integer getPatientAge() {
-        return patientAge;
-    }
-
-    public void setPatientAge(Integer patientAge) {
-        this.patientAge = patientAge;
-    }
-
-    public String getPatientSex() {
-        return patientSex;
-    }
-
-    public void setPatientSex(String patientSex) {
-        this.patientSex = patientSex;
-    }
-
-    public String getDiagnosis() {
-        return diagnosis;
-    }
-
-    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;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @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 +
-                ", retUrl=" + retUrl +
-                ", remark=" + remark +
-                "}";
-    }
 }

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

@@ -13,6 +13,7 @@ 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.HttpUtils;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.SaveInquiryVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,27 +29,25 @@ import java.util.Map;
 
 /**
  * @Description:
- * @author: rengb
+ * @author: zhoutg
  * @time: 2020/2/1 23:33
  */
 @Component
 public class InquiryInfoFacade extends InquiryInfoServiceImpl {
-    //    @Autowired
-    //    private InquiryDetailFacade inquiryDetailFacade;
+
+
     @Autowired
     @Qualifier("inquiryDetailServiceImpl")
     private InquiryDetailServiceImpl inquiryDetailService;
 
-    public SaveInquiryDTO saveInquiry(SaveInquiryVO saveInquiryVO) {
-        SaveInquiryDTO saveInquiryDTO = new SaveInquiryDTO();
-//        String retUrl = getUrl(saveInquiryVO);
+    public void saveInquiry(SaveInquiryVO saveInquiryVO) {
         Date now = DateUtil.now();
 
         InquiryInfo inquiryInfo = new InquiryInfo();
         BeanUtil.copyProperties(saveInquiryVO, inquiryInfo);
         inquiryInfo.setGmtCreate(now);
         inquiryInfo.setGmtModified(now);
-//        inquiryInfo.setRetUrl(retUrl);
+        inquiryInfo.setIp(HttpUtils.getIpAddress());
         save(inquiryInfo);
 
         List<InquiryDetail> inquiryDetailList = BeanUtil.listCopyTo(saveInquiryVO.getDetailList(), InquiryDetail.class);
@@ -58,55 +57,6 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             i.setGmtModified(now);
         });
         inquiryDetailService.saveBatch(inquiryDetailList);
-
-//        saveInquiryDTO.setBody(retUrl);
-        return saveInquiryDTO;
     }
 
-//    private String getUrl(SaveInquiryVO saveInquiryVO) {
-//        String retUrl = null;
-//        try {
-//            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;
-//    }
-//
-//    private Request getltcs(SaveInquiryVO saveInquiryVO) {
-//        List bodyList = new ArrayList<>();
-//
-//        List<Map<String, Object>> details = new ArrayList<>();
-//        saveInquiryVO.getDetailList().forEach(i -> {
-//            Map<String, Object> detail = new HashMap<>();
-//            detail.put("question", i.getQuestion());
-//            detail.put("answer", i.getAnswer());
-//            details.add(detail);
-//        });
-//
-//        Map<String, Object> body = new HashMap<>();
-//        body.put("details", details);
-//        body.put("doctorId", Integer.parseInt(saveInquiryVO.getDoctorId()));
-//        body.put("mpiId", saveInquiryVO.getMpiId());
-//        body.put("appId", saveInquiryVO.getAppId());
-//        if (saveInquiryVO.getDepartment().equals("全科")){
-//            body.put("diagnosis", saveInquiryVO.getDiagnosis());
-//        }
-//        bodyList.add(body);
-//
-//        //X-Service-Id对应的值
-//        String serviceId = "consult.questionRecordService";
-//        //X-Service-Method对应的值
-//        String method = "saveQuestionRecord";
-//        return new Request(serviceId, method, bodyList);
-//    }
-
 }

zzcx-service/src/main/java/com/diagbot/vo/SaveInquiryVO.java

@@ -22,73 +22,15 @@ import java.util.List;
 public class SaveInquiryVO {
 
     /**
-     * 公众号appid
+     * 访问者的IP
      */
-    @ApiModelProperty(value = "公众号appid", required = true)
-    @NotBlank(message = "公众号appid必传")
-    private String appId;
-
-    /**
-     * 医院名称
-     */
-    @ApiModelProperty(value = "医院名称", required = true)
-    @NotBlank(message = "医院名称必传")
-    private String organName;
-
-    /**
-     * 医生所在科室名称
-     */
-    @ApiModelProperty(value = "医生所在科室名称", required = true)
-    @NotBlank(message = "医生所在科室名称必传")
-    private String department;
-
-    /**
-     * 医生ID
-     */
-    @ApiModelProperty(value = "医生ID", required = true)
-    @NotBlank(message = "医生ID必传")
-    private String doctorId;
-
-    /**
-     * 医生名称
-     */
-    @ApiModelProperty(value = "医生名称", required = true)
-    @NotBlank(message = "医生名称必传")
-    private String doctorName;
-
-    /**
-     * 用户ID
-     */
-    @ApiModelProperty(value = "用户ID", required = true)
-    @NotBlank(message = "用户ID必传")
-    private String mpiId;
-
-    /**
-     * 用户名称
-     */
-    @ApiModelProperty(value = "用户名称", required = true)
-    @NotBlank(message = "用户名称必传")
-    private String patientName;
-
-    /**
-     * 用户年龄
-     */
-    @ApiModelProperty(value = "用户年龄", required = true)
-    @NotNull(message = "用户年龄必传")
-    private Integer patientAge;
-
-    /**
-     * 用户性别
-     */
-    @ApiModelProperty(value = "用户性别", required = true)
-    @NotBlank(message = "用户性别必传")
-    private String patientSex;
+    @ApiModelProperty(value = "访问者的IP", hidden = true)
+    private String ip;
 
     /**
      * 诊断
      */
     @ApiModelProperty(value = "诊断", required = true)
-    @NotBlank(message = "诊断必传")
     private String diagnosis;
 
 
@@ -97,8 +39,6 @@ public class SaveInquiryVO {
      */
     @Valid
     @ApiModelProperty(value = "问诊明细", required = true)
-    @NotEmpty(message = "问诊明细不能为空")
     private List<SaveInquiryDetailVO> detailList;
 
-
 }

zzcx-service/src/main/java/com/diagbot/web/InquiryInfoController.java

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SaveInquiryDTO;
 import com.diagbot.facade.InquiryInfoFacade;
@@ -17,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.validation.Valid;
 
 /**
- * @author rengb
+ * @author zhoutg
  * @since 2018-11-23
  */
 @RestController
@@ -29,12 +28,12 @@ public class InquiryInfoController {
     @Autowired
     private InquiryInfoFacade inquiryInfoFacade;
 
-    @ApiOperation(value = "问诊记录保存[by:rengb]")
+    @ApiOperation(value = "问诊记录保存[by:zhoutg]")
     @PostMapping("/saveInquiry")
-    @SysLogger("saveInquiry")
     @Transactional
-    public RespDTO<SaveInquiryDTO> saveInquiry(@Valid @RequestBody SaveInquiryVO saveInquiryVO) {
-        return RespDTO.onSuc(inquiryInfoFacade.saveInquiry(saveInquiryVO));
+    public RespDTO<Boolean> saveInquiry(@Valid @RequestBody SaveInquiryVO saveInquiryVO) {
+        inquiryInfoFacade.saveInquiry(saveInquiryVO);
+        return RespDTO.onSuc(true);
     }
 
 

zzcx-service/src/main/java/com/diagbot/web/QuestionInfoController.java

@@ -1,58 +1,58 @@
-package com.diagbot.web;
-
-
-import com.diagbot.dto.QuestionDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.facade.QuestionFacade;
-import com.diagbot.vo.QuestionIds2VO;
-import com.diagbot.vo.QuestionVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-/**
- * <p>
- * 标签基础表 前端控制器
- * </p>
- *
- * @author zhoutg
- * @since 2018-11-15
- */
-@RequestMapping("/zzcx-questionInfo")
-@RestController
-@Api(value = "标签相关API111", tags = { "自测程序-标签相关API" })
-@SuppressWarnings("unchecked")
-public class QuestionInfoController {
-
-    @Autowired
-    QuestionFacade questionFacade;
-
-    @ApiOperation(value = "自诊程序-根据参数返回标签内容[by:zhoutg]",
-            notes = "id: questionId<br>" +
-                    "sexType：性别，1：男，2：女<br>" +
-                    "age：年龄")
-    @PostMapping("/getById")
-    public RespDTO<QuestionDTO> getById(@RequestBody QuestionVO questionVO) {
-        QuestionDTO data = questionFacade.getById(questionVO);
-        return RespDTO.onSuc(data);
-    }
-
-
-    @ApiOperation(value = "智能程序-查询多个id优化[by:zhoutg]",
-            notes = "ids: 多个questionId<br>" +
-                    "sexType：性别，1：男，2：女<br>" +
-                    "age：年龄")
-    @PostMapping("/getByIds")
-    public RespDTO<Map<Long, Object>> getByIds(@RequestBody QuestionIds2VO questionIds2VO) {
-        Map<Long, Object> data = questionFacade.getByIds(questionIds2VO);
-        return RespDTO.onSuc(data);
-    }
-
-
-}
+//package com.diagbot.web;
+//
+//
+//import com.diagbot.dto.QuestionDTO;
+//import com.diagbot.dto.RespDTO;
+//import com.diagbot.facade.QuestionFacade;
+//import com.diagbot.vo.QuestionIds2VO;
+//import com.diagbot.vo.QuestionVO;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.PostMapping;
+//import org.springframework.web.bind.annotation.RequestBody;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import java.util.Map;
+//
+///**
+// * <p>
+// * 标签基础表 前端控制器
+// * </p>
+// *
+// * @author zhoutg
+// * @since 2018-11-15
+// */
+//@RequestMapping("/zzcx-questionInfo")
+//@RestController
+//@Api(value = "标签相关API", tags = { "自测程序-标签相关API" })
+//@SuppressWarnings("unchecked")
+//public class QuestionInfoController {
+//
+//    @Autowired
+//    QuestionFacade questionFacade;
+//
+//    @ApiOperation(value = "自诊程序-根据参数返回标签内容[by:zhoutg]",
+//            notes = "id: questionId<br>" +
+//                    "sexType：性别，1：男，2：女<br>" +
+//                    "age：年龄")
+//    @PostMapping("/getById")
+//    public RespDTO<QuestionDTO> getById(@RequestBody QuestionVO questionVO) {
+//        QuestionDTO data = questionFacade.getById(questionVO);
+//        return RespDTO.onSuc(data);
+//    }
+//
+//
+//    @ApiOperation(value = "智能程序-查询多个id优化[by:zhoutg]",
+//            notes = "ids: 多个questionId<br>" +
+//                    "sexType：性别，1：男，2：女<br>" +
+//                    "age：年龄")
+//    @PostMapping("/getByIds")
+//    public RespDTO<Map<Long, Object>> getByIds(@RequestBody QuestionIds2VO questionIds2VO) {
+//        Map<Long, Object> data = questionFacade.getByIds(questionIds2VO);
+//        return RespDTO.onSuc(data);
+//    }
+//
+//
+//}