1.修改医院系统配置表结构，增加平潭HIS系统字典解析

src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java

@@ -10,6 +10,7 @@ import com.glxp.mipsdl.req.post.PostThrCorpRequest;
 import com.glxp.mipsdl.req.post.PostThrInvProductsRequest;
 import com.glxp.mipsdl.req.post.PostThrProductsRequest;
 import com.glxp.mipsdl.res.BaseResponse;
+import com.glxp.mipsdl.util.ResultVOUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -65,7 +66,7 @@ public class PtxhyyClient implements BaseHttpClient {
 
     @Override
     public BaseResponse testConnect() {
-        return null;
+        return ResultVOUtils.success();
     }
 
     @Override

src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyFileClient.java

@@ -20,7 +20,7 @@ import java.io.InputStream;
 import java.util.List;
 
 /**
- * 平潭协和医院文件接口
+ * 平潭协和医院物资系统文件接口
  */
 @Slf4j
 @Service(value = "100008FileClient")

src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyHisClient.java

@@ -0,0 +1,114 @@
+package com.glxp.mipsdl.client.ptxhyy;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.glxp.mipsdl.client.BaseHttpClient;
+import com.glxp.mipsdl.config.ThirdSysConfig;
+import com.glxp.mipsdl.http.HttpClient;
+import com.glxp.mipsdl.req.base.*;
+import com.glxp.mipsdl.req.post.PostFileThrOrderRequest;
+import com.glxp.mipsdl.req.post.PostThrCorpRequest;
+import com.glxp.mipsdl.req.post.PostThrInvProductsRequest;
+import com.glxp.mipsdl.req.post.PostThrProductsRequest;
+import com.glxp.mipsdl.res.BaseResponse;
+import com.glxp.mipsdl.util.ResultVOUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+
+/**
+ * 平潭协和医院HIS系统接口
+ */
+@Slf4j
+@Service(value = "100009HttpClient")
+public class PtxhyyHisClient implements BaseHttpClient {
+
+    @Resource
+    private HttpClient httpClient;
+    @Resource
+    private ThirdSysConfig thirdSysConfig;
+
+    @Override
+    public BaseResponse getUnit(UdiwmsUnitRequest udiwmsUnitRequest) {
+        return null;
+    }
+
+    @Override
+    public BaseResponse getProducts(UdiwmsProductRequest udiwmsProductRequest) {
+        return null;
+    }
+
+    @Override
+    public BaseResponse getOrderTypes(UdiwmsBusTypeRequest udiwmsBusTypeRequest) {
+        return null;
+    }
+
+    @Override
+    public BaseResponse getOrders(UdiwmsOrderQueryRequest udiwmsOrderQueryRequest) {
+        return null;
+    }
+
+    @Override
+    public BaseResponse submitOrders(UdiwmsOrderRequest udiwmsOrderRequest) {
+        return null;
+    }
+
+    @Override
+    public BaseResponse getInvProducts(UdiwmsInvProductsRequest udiwmsInvProductsRequest) {
+        return null;
+    }
+
+    @Override
+    public BaseResponse getWarehouse(UdiwmsWarehouseRequest udiwmsWarehouseRequest) {
+        return null;
+    }
+
+    @Override
+    public BaseResponse testConnect() {
+        return ResultVOUtils.success();
+    }
+
+    @Override
+    public BaseResponse queryUdiInvProducts(UdiwmsQueryUdiInvProductsRequest queryUdiInvProductsRequest) {
+        return null;
+    }
+
+    @Override
+    public BaseResponse submitProducts(UdiwmsAddProductsRequest udiwmsAddProductsRequest) {
+        return null;
+    }
+
+    @Override
+    public BaseResponse submitUnit(UdiwmsAddUnitRequest udiwmsAddUnitRequest) {
+        return null;
+    }
+
+    @Override
+    public BaseResponse submitPreInOrders(UdiwmsPreInOrderRequest udiwmsPreInOrderRequest) {
+        return null;
+    }
+
+    @Override
+    public BaseResponse postProducts(PostThrProductsRequest postThrProductsRequest) {
+        postThrProductsRequest.setUploadType("文件导入");
+        String response = httpClient.postUDIWMSJson(thirdSysConfig.getPostPiUrl(), postThrProductsRequest);
+        BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class);
+        return baseResponse;
+    }
+
+    @Override
+    public BaseResponse postCorps(PostThrCorpRequest postThrCorpRequest) {
+        return null;
+    }
+
+    @Override
+    public BaseResponse postOrderDetail(PostFileThrOrderRequest postFileThrOrderRequest) {
+        return null;
+    }
+
+    @Override
+    public BaseResponse postInvProducts(PostThrInvProductsRequest postThrInvProductsRequest) {
+        return null;
+    }
+}

src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyHisFileClient.java

@@ -0,0 +1,78 @@
+package com.glxp.mipsdl.client.ptxhyy;
+
+import cn.hutool.core.thread.ThreadUtil;
+import com.glxp.mipsdl.client.BaseFileClient;
+import com.glxp.mipsdl.req.post.PostThrProductsRequest;
+import com.glxp.mipsdl.res.BaseResponse;
+import com.glxp.mipsdl.res.udiwms.UdiwmsProductInfoResponse;
+import com.glxp.mipsdl.service.file.UdiInfoUploadService;
+import com.glxp.mipsdl.util.ExcelUtil;
+import com.glxp.mipsdl.util.ExecutorUtil;
+import com.glxp.mipsdl.util.ResultVOUtils;
+import com.glxp.mipsdl.vo.file.ptxhyy.PtxhyyHisProductEntity;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+/**
+ * 平潭协和医院His文件接口
+ */
+@Slf4j
+@Service(value = "100009FileClient")
+public class PtxhyyHisFileClient implements BaseFileClient {
+
+    @Resource
+    private UdiInfoUploadService udiInfoUploadService;
+    @Resource
+    private ExecutorUtil executorUtil;
+
+    @Override
+    public BaseResponse uploadPi(List<MultipartFile> files, String thirdSys) {
+        for (int i = 0; i < files.size(); i++) {
+            MultipartFile file = files.get(i);
+            if (file.isEmpty()) {
+                return ResultVOUtils.error(500, "上传第" + (i++) + "个文件失败");
+            }
+            try {
+                InputStream inputStream = file.getInputStream();
+                ExcelUtil<PtxhyyHisProductEntity> util = new ExcelUtil(PtxhyyHisProductEntity.class);
+                List<UdiwmsProductInfoResponse> udiwmsProductInfoResponses = util.importPi(inputStream);
+                PostThrProductsRequest postThrProductsRequest = new PostThrProductsRequest();
+                postThrProductsRequest.setDatas(udiwmsProductInfoResponses);
+                postThrProductsRequest.setUploadType("文件导入");
+                postThrProductsRequest.setThirdSys(thirdSys);
+                executorUtil.getUploadExecutor().execute(ThreadUtil.newThread(() -> {
+                    udiInfoUploadService.postProducts(postThrProductsRequest);
+                }, "uploadPi"));
+                log.error("上传完" + System.currentTimeMillis());
+            } catch (IOException e) {
+                log.error("解析上传excel文件IO异常，异常信息：{}", e);
+                return ResultVOUtils.error(500, "数据异常");
+            } catch (Exception e) {
+                log.error("处理产品信息excel文件异常，异常信息：{}", e);
+                return ResultVOUtils.error(500, "数据异常");
+            }
+        }
+        return ResultVOUtils.success("文件解析成功，正在上传，请稍后刷新查看");
+    }
+
+    @Override
+    public BaseResponse uploadCorps(List<MultipartFile> files, String thirdSys) {
+        return null;
+    }
+
+    @Override
+    public BaseResponse uploadInvPi(List<MultipartFile> files, String thirdSys) {
+        return null;
+    }
+
+    @Override
+    public BaseResponse uploadOrders(List<MultipartFile> files, String thirdSys) {
+        return null;
+    }
+}

src/main/java/com/glxp/mipsdl/config/HospConfig.java

@@ -1,6 +1,5 @@
 package com.glxp.mipsdl.config;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,6 +9,7 @@ import com.glxp.mipsdl.entity.auth.AuthLicenseEntity;
 import com.glxp.mipsdl.entity.system.SysHospConfigEntity;
 import com.glxp.mipsdl.util.DictUtl;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
 import javax.annotation.PostConstruct;
@@ -24,6 +24,8 @@ import java.util.List;
 @Configuration
 public class HospConfig {
 
+    @Value("${THIRD_ID}")
+    private String thirdSys;
     @Resource
     private SysHospConfigDao hospConfigDao;
     @Resource
@@ -39,9 +41,9 @@ public class HospConfig {
     public SysHospConfigEntity getHospConfig() {
         if (null == hospConfig) {
             log.info("系统启动中，获取医院编码");
-            List<SysHospConfigEntity> configList = hospConfigDao.selectList(null);
+            SysHospConfigEntity sysHospConfig = hospConfigDao.selectOne(new QueryWrapper<SysHospConfigEntity>().eq("thirdSys", thirdSys));
-            if (CollUtil.isNotEmpty(configList)) {
+            if (null != sysHospConfig) {
-                hospConfig = configList.get(0);
+                hospConfig = sysHospConfig;
                 DictUtl.CURRENT_HOSP_CODE = hospConfig.getCode();
                 log.info("获取医院编码成功，编码信息：{}", JSONUtil.toJsonStr(hospConfig));
                 return hospConfig;

src/main/java/com/glxp/mipsdl/controller/UdiInfoUploadController.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -25,8 +26,8 @@ public class UdiInfoUploadController {
      * @return
      */
     @PostMapping("/udiwms/erp/pi/upload")
-    public BaseResponse uploadPi(@RequestParam("file") List<MultipartFile> files, @RequestParam("thirdSys") String thirdSys) {
+    public BaseResponse uploadPi(@RequestParam("file") MultipartFile file, @RequestParam("thirdSys") String thirdSys) {
-        return ClientProcessor.getFileClient().uploadPi(files, thirdSys);
+        return ClientProcessor.getFileClient().uploadPi(Collections.singletonList(file), thirdSys);
     }
 
     /**

src/main/java/com/glxp/mipsdl/entity/system/SysHospConfigEntity.java

@@ -23,7 +23,10 @@ public class SysHospConfigEntity {
     @TableField(value = "name")
     private String name;
 
-    public static final String COL_CODE = "code";
+    /**
+     * 第三方系统标识
+     */
+    @TableField(value = "thirdSys")
+    private String thirdSys;
 
-    public static final String COL_NAME = "name";
 }

src/main/java/com/glxp/mipsdl/vo/file/ptxhyy/PtxhyyHisProductEntity.java

@@ -0,0 +1,104 @@
+package com.glxp.mipsdl.vo.file.ptxhyy;
+
+import com.glxp.mipsdl.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 平潭协和医院HIS系统耗材字典excel解析实体类
+ */
+@Data
+public class PtxhyyHisProductEntity {
+
+    @Excel(name = "LASTUPDATETIME")
+    private Date updateTime;
+
+    @Excel(name="CODE")
+    private String code;
+
+    @Excel(name = "NAME")
+    private String name;
+
+    @Excel(name = "MEASNAME")
+    private String measname;
+
+    @Excel(name = "STANDARD")
+    private String standard;
+
+    @Excel(name = "REGISTERNO")
+    private String registerNo;
+
+    @Excel(name = "MANUFACTORYCODE")
+    private String manufactoryCode;
+
+    @Excel(name = "MANUFACTORY")
+    private String manufactory;
+
+    @Excel(name = "SUPCODE")
+    private String supCode;
+
+    @Excel(name = "SUPNAME")
+    private String supName;
+
+    @Excel(name = "CPLB")
+    private String cplb;
+
+    @Excel(name = "FLBM")
+    private String flbm;
+
+    //器械类别
+    @Excel(name = "QXLB")
+    private String qxlb;
+
+    //医保编码
+    @Excel(name = "YBBM")
+    private String ybbm;
+
+    //商品条码
+    @Excel(name = "SPTM")
+    private String sptm;
+
+    //注册人社会信用号
+    @Excel(name = "TYSHXYDM")
+    private String tyshxydm;
+
+    //注册/备案人
+    @Excel(name = "YLQXZCRBARMC")
+    private String ylqxzcrbarmc;
+
+    //注册/备案人英文
+    @Excel(name = "YLQXZCRBARYWMC")
+    private String ylqxzcrbarywmc;
+
+    //商品名称
+    @Excel(name = "SPMC")
+    private String spmc;
+
+    //其他编码
+    @Excel(name = "QTBM")
+    private String qtbm;
+
+    @Excel(name = "CPMS")
+    private String cpms;
+
+    //注册证有效期至
+    @Excel(name = "ZCZYXQZ")
+    private String zczyxqz;
+
+    @Excel(name = "PRICE")
+    private String price;
+
+    @Excel(name = "REMARK")
+    private String remark;
+
+    @Excel(name = "REMARK1")
+    private String remark1;
+
+    @Excel(name = "REMARK2")
+    private String remark2;
+
+    @Excel(name = "REMARK3")
+    private String remark3;
+
+}

src/main/java/com/glxp/mipsdl/vo/file/ptxhyy/PtxhyyProductEntity.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import java.util.Date;
 
 /**
- * 平潭协和医院耗材字典excel解析实体类
+ * 平潭协和医院物资系统耗材字典excel解析实体类
  */
 @Data
 public class PtxhyyProductEntity {

src/main/resources/application.yml

@@ -16,8 +16,8 @@ server:
 #      min-spare: 10
 
 #第三方系统标识
-THIRD_ID: thirdId
+THIRD_ID: thirdId2
-THIRD_NAME: thirdName
+THIRD_NAME: thirdName2
 
 #UDI管理系统地址
 UDIWMS_IP: http://127.0.0.1:9991

src/main/resources/hosp_dict.json

@@ -7,5 +7,6 @@
   {"code":  "100005", "name": "平和县医院"},
   {"code":  "100006", "name": "东山县医院"},
   {"code":  "100007", "name": "云霄中医院"},
-  {"code":  "100008", "name": "平潭协和医院"}
+  {"code":  "100008", "name": "平潭协和医院物资系统"},
+  {"code":  "100009", "name": "平潭协和医院HIS系统"}
 ]