Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -82,6 +82,8 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/tran/operationConfig/getPage").permitAll()
                 .antMatchers("/tran/operationConfig/importExcel").permitAll()
                 .antMatchers("/tran/operationConfig/exportExcel").permitAll()
+                .antMatchers("/tran/hospitalInfo/saveRecord").permitAll()
+                .antMatchers("/tran/hospitalInfo/getHospitalInfo").permitAll()
                 .antMatchers("/sys/versionInfo/getVersionInfoAlls").permitAll()
                 .antMatchers("/sys/disclaimerInfo/getDisclaimerInfo").permitAll()
                 .antMatchers("/sys/mr/createMr").permitAll()

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -125,6 +125,8 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/tran/operationConfig/getPage", request)
                 || matchers("/tran/operationConfig/importExcel", request)
                 || matchers("/tran/operationConfig/exportExcel", request)
+                || matchers("/tran/hospitalInfo/saveRecord", request)
+                || matchers("/tran/hospitalInfo/getHospitalInfo", request)
                 || matchers("/sys/versionInfo/getVersionInfoAlls", request)
                 || matchers("/sys/disclaimerInfo/getDisclaimerInfo", request)
                 || matchers("/sys/mr/createMr", request)

src/main/java/com/diagbot/facade/HospitalInfoFacade.java

@@ -1,16 +1,24 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.entity.HospitalInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.StatusEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.HospitalInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.HospitalCheckVO;
 import com.diagbot.vo.HospitalInfoVO;
+import com.diagbot.vo.HospitalSaveVO;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+
 /**
  * @author wangfeng
  * @Description:
@@ -43,4 +51,36 @@ public class HospitalInfoFacade extends HospitalInfoServiceImpl {
         }
         return false;
     }
+
+    /**
+     * 保存医院信息--医院端只能修改对接状态
+     *
+     * @param hospitalSaveVO
+     * @return
+     */
+    public Boolean saveRecord(HospitalSaveVO hospitalSaveVO) {
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        if (!hospitalSaveVO.getId().equals(Long.valueOf(hospitalId))) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "不允许修改别家医院信息");
+        }
+        String userId = SysUserUtils.getCurrentPrincipleID();
+        Date now = DateUtil.now();
+        UpdateWrapper<HospitalInfo> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("connect", hospitalSaveVO.getConnect())
+                .set("modifier", userId)
+                .set("gmt_modified", now)
+                .eq("id", hospitalSaveVO.getId());
+        return this.update(updateWrapper);
+    }
+
+    /**
+     * 获取医院信息
+     *
+     * @return
+     */
+    public HospitalInfo getHospitalInfo() {
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        HospitalInfo hospitalInfo = this.getById(Long.valueOf(hospitalId));
+        return hospitalInfo;
+    }
 }

src/main/java/com/diagbot/vo/HospitalSaveVO.java

@@ -0,0 +1,20 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2020/8/11 10:53
+ */
+@Getter
+@Setter
+public class HospitalSaveVO {
+    @NotNull(message = "请输入医院id")
+    private Long id;
+    @NotNull(message = "请输入是否对接")
+    private Integer connect;
+}

src/main/java/com/diagbot/web/HospitalInfoController.java

@@ -4,12 +4,15 @@ package com.diagbot.web;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.HospitalInfo;
 import com.diagbot.facade.HospitalInfoFacade;
 import com.diagbot.vo.HospitalCheckVO;
 import com.diagbot.vo.HospitalInfoVO;
+import com.diagbot.vo.HospitalSaveVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,11 +30,9 @@ import javax.validation.Valid;
  * @since 2020-07-29
  */
 @RestController
-@RequestMapping("/sys/hospitalInfo")
+@RequestMapping("/tran/hospitalInfo")
 @Api(value = "医院信息API", tags = { "医院信息API" })
 @SuppressWarnings("unchecked")
-@ApiIgnore
-@Deprecated
 public class HospitalInfoController {
 
     @Autowired
@@ -42,6 +43,7 @@ public class HospitalInfoController {
                     "code：医院编码<br>")
     @PostMapping("/getHospitalInfo")
     @SysLogger("getHospitalInfo")
+    @ApiIgnore
     public RespDTO<HospitalInfoDTO> getHospitalInfo(@RequestBody @Valid HospitalInfoVO hospitalInfoVO) {
         HospitalInfoDTO data = hospitalInfoFacade.getHospitalInfo(hospitalInfoVO);
         return RespDTO.onSuc(data);
@@ -52,7 +54,25 @@ public class HospitalInfoController {
             notes = "hospitalCode：医院编码<br>")
     @PostMapping("/checkHospital")
     @SysLogger("checkHospital")
+    @ApiIgnore
     public RespDTO<Boolean> checkHospital(@RequestBody @Valid HospitalCheckVO hospitalCheckVO) {
         return RespDTO.onSuc(hospitalInfoFacade.checkHospital(hospitalCheckVO));
     }
+
+    @ApiOperation(value = "医院信息——修改医院信息[by:zhaops]",
+            notes = "id：医院id<br>" +
+                    "connect：是否对接（0-不对接，1-对接）<br>")
+    @PostMapping("/saveRecord")
+    @SysLogger("saveRecord")
+    public RespDTO<Boolean> saveRecord(@RequestBody @Valid HospitalSaveVO hospitalSaveVO) {
+        return RespDTO.onSuc(hospitalInfoFacade.saveRecord(hospitalSaveVO));
+    }
+
+    @ApiOperation(value = "医院信息——获取医院信息[by:zhaops]",
+            notes = "")
+    @GetMapping("/getHospitalInfo")
+    @SysLogger("getHospitalInfo")
+    public RespDTO<HospitalInfo> getHospitalInfo() {
+        return RespDTO.onSuc(hospitalInfoFacade.getHospitalInfo());
+    }
 }

src/main/java/com/diagbot/web/PushController.java

@@ -24,7 +24,7 @@ import javax.validation.Valid;
  * @time: 2020/8/6 9:49
  */
 @RestController
-@RequestMapping("sys/push")
+@RequestMapping("/sys/push")
 @Api(value = "推理相关API", tags = { "推理相关API" })
 @SuppressWarnings("unchecked")
 public class PushController {