1.对接中转服务数据，修复用户注册bug

api-common/src/main/java/com/glxp/udi/common/converter/LongList2StringConverter.java

@@ -6,12 +6,13 @@ import org.apache.commons.lang3.StringUtils;
 import java.util.*;
 
 /**
- *  Long 类型的 List 转为字符串
+ * Long 类型的 List 转为字符串
  */
 public class LongList2StringConverter {
 
     /**
      * Long 类型的 List 转为字符串
+     *
      * @param longList
      * @param regex
      * @return
@@ -22,7 +23,7 @@ public class LongList2StringConverter {
             return null;
         }
         Set<String> stringSet = new HashSet<>();
-        for (Long value: longList){
+        for (Long value : longList) {
             stringSet.add(value.toString());
         }
         if (stringSet.isEmpty()) {

api-common/src/main/java/com/glxp/udi/common/converter/String2LongListConverter.java

@@ -11,9 +11,8 @@ import java.util.List;
 public class String2LongListConverter {
 
     /**
-     *
      * @param string
-     * @param regex 切割的字符
+     * @param regex  切割的字符
      * @return
      */
     public static List<Long> convert(String string, String regex) {
@@ -31,7 +30,7 @@ public class String2LongListConverter {
                 longList.add(Long.valueOf(str));
             }
             return longList;
-        }catch (Exception e) {
+        } catch (Exception e) {
             return Collections.emptyList();
         }
     }

api-common/src/main/java/com/glxp/udi/common/converter/String2StringListConverter.java

@@ -12,9 +12,8 @@ import java.util.List;
 public class String2StringListConverter {
 
     /**
-     *
      * @param string
-     * @param regex 切割的字符
+     * @param regex  切割的字符
      * @return
      */
     public static List<String> convert(String string, String regex) {
@@ -27,7 +26,7 @@ public class String2StringListConverter {
                 return Collections.emptyList();
             }
             return new ArrayList<>(Arrays.asList(strings));
-        }catch (Exception e) {
+        } catch (Exception e) {
             return Collections.emptyList();
         }
     }

api-common/src/main/java/com/glxp/udi/common/res/BaseResponse.java

@@ -4,11 +4,15 @@ import lombok.Data;
 
 /**
  * 返回结果类
+ *
  * @param <T>
  */
 @Data
 public class BaseResponse<T> {
-    public boolean success(){return this.code.equals(20000);}
+    public boolean success() {
+        return this.code.equals(20000);
+    }
+
     private Integer code;
 
     private String message;

api-common/src/main/java/com/glxp/udi/common/util/ResultVOUtils.java

@@ -13,6 +13,7 @@ public class ResultVOUtils {
 
     /**
      * 成功时返回
+     *
      * @param data 返回的data对象
      * @return {@link BaseResponse}
      */
@@ -26,6 +27,7 @@ public class ResultVOUtils {
 
     /**
      * 成功时返回
+     *
      * @return {@link BaseResponse}
      */
     public static BaseResponse success() {
@@ -35,7 +37,8 @@ public class ResultVOUtils {
 
     /**
      * 错误时返回
-     * @param code 错误码
+     *
+     * @param code    错误码
      * @param message 错误信息
      * @return {@link BaseResponse}
      */
@@ -50,6 +53,7 @@ public class ResultVOUtils {
 
     /**
      * 错误时返回
+     *
      * @param resultEnum 错误枚举类
      * @return {@link BaseResponse}
      */
@@ -59,8 +63,9 @@ public class ResultVOUtils {
 
     /**
      * 错误时返回
+     *
      * @param resultEnum 错误枚举类
-     * @param message 错误的信息
+     * @param message    错误的信息
      * @return {@link BaseResponse}
      */
     public static BaseResponse error(ResultEnum resultEnum, String message) {

api-udims/pom.xml

@@ -118,7 +118,6 @@
             <artifactId>fastjson</artifactId>
         </dependency>
 
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -280,9 +279,7 @@
                         <version>1.4.0</version>
                     </dependency>
                 </dependencies>
-
             </plugin>
-
         </plugins>
     </build>
 

api-udims/src/main/java/com/glxp/udi/ApiAdminApplication.java

@@ -11,14 +11,12 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
 @ServletComponentScan
 public class ApiAdminApplication extends SpringBootServletInitializer {
 
-
     public static void main(String[] args) {
         SpringApplication.run(ApiAdminApplication.class, args);
     }
 
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
-
         return builder.sources(ApiAdminApplication.class);
     }
 

api-udims/src/main/java/com/glxp/udi/admin/config/RedisConfig.java

@@ -14,6 +14,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
 
 /**
  * redis配置类
+ *
  * @program: springbootdemo
  * @Date: 2019/2/22 15:20
  * @Author: zjjlive
@@ -25,6 +26,7 @@ public class RedisConfig extends CachingConfigurerSupport {
 
     /**
      * retemplate相关配置
+     *
      * @param factory
      * @return
      */

api-udims/src/main/java/com/glxp/udi/admin/constant/ConstantStatus.java

@@ -82,7 +82,7 @@ public class ConstantStatus {
     public static final int CORP_TYPE_SPECIAL = 3;
 
 
-    public static final int CORP_SICK_SICK=1;
+    public static final int CORP_SICK_SICK = 1;
     public static final int CORP_SICK_CUS = 2;
 
     //单据来源

api-udims/src/main/java/com/glxp/udi/admin/controller/auth/AuthAdminController.java

@@ -227,13 +227,15 @@ public class AuthAdminController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         AuthAdmin curUser = getCustomerId();
-
+        if (curUser.getCustomerId() != 110) {
-        CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(curUser.getCustomerId());
+            CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(curUser.getCustomerId());
-        int max = customerInfoEntity.getUserMax();
+            int max = customerInfoEntity.getUserMax();
-        int count = authAdminService.findCountByCustomerId(authAdminSaveRequest.getCustomerId());
+            int count = authAdminService.findCountByCustomerId(authAdminSaveRequest.getCustomerId());
-        if (count >= max) {
+            if (count >= max) {
-            return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "已超过最大用户数");
+                return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "已超过最大用户数");
+            }
         }
+
         // 检查是否存在相同名称的管理员
         AuthAdmin byUserName = authAdminService.findByUserName(authAdminSaveRequest.getUserName());
         if (byUserName != null) {

api-udims/src/main/java/com/glxp/udi/admin/controller/auth/CustomerController.java

@@ -11,13 +11,10 @@ import com.glxp.udi.admin.req.auth.CustomerInfoFilterRequest;
 import com.glxp.udi.admin.req.info.DeleteRequest;
 import com.glxp.udi.admin.res.PageSimpleResponse;
 import com.glxp.udi.admin.service.auth.AuthAdminService;
-import com.glxp.udi.admin.service.auth.AuthRoleAdminService;
 import com.glxp.udi.admin.service.auth.CustomerInfoService;
 import com.glxp.udi.admin.service.auth.UserRegisterService;
 import com.glxp.udi.admin.service.auth.impl.CustomerContactService;
 import com.glxp.udi.admin.service.info.CompanyService;
-import com.glxp.udi.admin.service.param.SystemPDFTemplateRelevanceService;
-import com.glxp.udi.admin.service.param.SystemPDFTemplateService;
 import com.glxp.udi.common.enums.ResultEnum;
 import com.glxp.udi.common.res.BaseResponse;
 import com.glxp.udi.common.util.ResultVOUtils;
@@ -47,12 +44,6 @@ public class CustomerController {
     private UserRegisterService userRegisterService;
     @Resource
     private AuthAdminService authAdminService;
-    @Resource
-    private AuthRoleAdminService authRoleAdminService;
-    @Resource
-    private SystemPDFTemplateService systemPDFTemplateService;
-    @Resource
-    private SystemPDFTemplateRelevanceService systemPDFTemplateRelevanceService;
 
     @AuthRuleAnnotation("")
     @GetMapping("/spms/customer/list")

api-udims/src/main/java/com/glxp/udi/admin/controller/auth/RegisterController.java

@@ -7,7 +7,6 @@ import com.glxp.udi.admin.entity.auth.AuthAdmin;
 import com.glxp.udi.admin.entity.auth.CustomerContactEntity;
 import com.glxp.udi.admin.entity.auth.CustomerInfoEntity;
 import com.glxp.udi.admin.entity.auth.UserRegisterEntity;
-import com.glxp.udi.admin.entity.basic.BasicUnitMaintainEntity;
 import com.glxp.udi.admin.entity.info.CompanyEntity;
 import com.glxp.udi.admin.entity.info.SetupEntity;
 import com.glxp.udi.admin.entity.param.SystemParamConfigEntity;
@@ -364,14 +363,6 @@ public class RegisterController {
         companyEntity.setBussinessStatus(userRegisterEntity.getBussinessStatus());
         companyEntity.setCreditNum(userRegisterEntity.getCreditNum());
 
-        BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(userRegisterEntity.getCompanyId());
-        if (basicUnitMaintainEntity != null) {
-            basicUnitMaintainEntity.setThirdId1(userRegisterEntity.getUdplatCompanyId());
-            basicUnitMaintainEntity.setThirdName1(userRegisterEntity.getUdplatCompanyName());
-            basicUnitMaintainService.updateById(basicUnitMaintainEntity);
-        }
-
-
         FilterAliCertRequest filterAliCertRequest = new FilterAliCertRequest();
         filterAliCertRequest.setId(registerCheckRequest.getAliCertId());
 

api-udims/src/main/java/com/glxp/udi/admin/controller/basic/BasicUnitMaintainController.java

@@ -0,0 +1,475 @@
+package com.glxp.udi.admin.controller.basic;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
+import com.glxp.udi.admin.constant.ConstantStatus;
+import com.glxp.udi.admin.entity.basic.BasicThirdSysDetailEntity;
+import com.glxp.udi.admin.entity.basic.BasicThirdSysEntity;
+import com.glxp.udi.admin.entity.basic.BasicUnitMaintainEntity;
+import com.glxp.udi.admin.entity.info.CompanyEntity;
+import com.glxp.udi.admin.entity.inout.OrderEntity;
+import com.glxp.udi.admin.entity.param.SystemParamConfigEntity;
+import com.glxp.udi.admin.entity.thrsys.ThrCorpEntity;
+import com.glxp.udi.admin.httpclient.ErpBasicClient;
+import com.glxp.udi.admin.req.basic.*;
+import com.glxp.udi.admin.req.info.DeleteRequest;
+import com.glxp.udi.admin.req.inout.OrderFilterRequest;
+import com.glxp.udi.admin.req.thrsys.FilterThrCorpRequest;
+import com.glxp.udi.admin.res.PageSimpleResponse;
+import com.glxp.udi.admin.res.basic.BasicProductThirdSysResponse;
+import com.glxp.udi.admin.res.basic.BasicUnitMaintainResponse;
+import com.glxp.udi.admin.res.basic.ErpUnitsResponse;
+import com.glxp.udi.admin.service.basic.BasicThirdSysDetailService;
+import com.glxp.udi.admin.service.basic.BasicThirdSysService;
+import com.glxp.udi.admin.service.basic.BasicUnitMaintainService;
+import com.glxp.udi.admin.service.info.CompanyService;
+import com.glxp.udi.admin.service.inout.OrderService;
+import com.glxp.udi.admin.service.param.SystemParamConfigService;
+import com.glxp.udi.admin.service.thrsys.ThrCorpService;
+import com.glxp.udi.admin.thread.BasicUnitImportService;
+import com.glxp.udi.admin.util.CustomUtil;
+import com.glxp.udi.common.enums.ResultEnum;
+import com.glxp.udi.common.res.BaseResponse;
+import com.glxp.udi.common.util.ResultVOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.validation.BindingResult;
+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.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 往来单位信息维护
+ */
+@RestController
+public class BasicUnitMaintainController {
+
+    @Resource
+    private BasicUnitMaintainService basicUnitMaintainService;
+    @Resource
+    BasicThirdSysDetailService basicThirdSysDetailService;
+    @Resource
+    private SystemParamConfigService systemParamConfigService;
+    @Resource
+    private BasicThirdSysService basicThirdSysService;
+    @Resource
+    BasicUnitImportService basicUnitImportService;
+    @Resource
+    private ThrCorpService thrCorpService;
+    @Resource
+    private CompanyService companyService;
+    @Resource
+    private OrderService orderService;
+    @Resource
+    private ErpBasicClient erpBasicClient;
+
+    @GetMapping("/udiwms/basic/unit/maintain/filter")
+    public BaseResponse filterBasicUnitMaintain(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
+                                                BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BasicUnitMaintainEntity> basicUnitMaintainEntities;
+        basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK);
+        basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
+        PageInfo<BasicUnitMaintainEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
+        PageSimpleResponse<BasicUnitMaintainEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(basicUnitMaintainEntities);
+
+        SystemParamConfigEntity systemParamConfigEntityBUMErpId = systemParamConfigService.selectByParamKey("basic_unit_maintain_erp_id");
+        SystemParamConfigEntity systemParamConfigEntityBUMThirdId = systemParamConfigService.selectByParamKey("basic_cops_thirdSys");
+        Map<String, Object> rMap = new HashMap<>();
+        rMap.put("BUMErpIdValue",
+                systemParamConfigEntityBUMErpId != null && StringUtils.isNotBlank(systemParamConfigEntityBUMErpId.getParamValue()) ?
+                        systemParamConfigEntityBUMErpId.getParamValue() : "0");
+        rMap.put("BUMThirdIdValue",
+                systemParamConfigEntityBUMThirdId != null && StringUtils.isNotBlank(systemParamConfigEntityBUMThirdId.getParamValue()) ?
+                        systemParamConfigEntityBUMThirdId.getParamValue() : "0");
+        rMap.put("page", pageSimpleResponse);
+        return ResultVOUtils.success(rMap);
+    }
+
+    @GetMapping("/udiwms/basic/unit/maintain/filter2")
+    public BaseResponse filterBasicUnitMaintain2(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
+                                                 BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BasicUnitMaintainEntity> basicUnitMaintainEntities;
+        basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
+        PageInfo<BasicUnitMaintainEntity> pageInfo;
+        pageInfo = new PageInfo<>(basicUnitMaintainEntities);
+        PageSimpleResponse<BasicUnitMaintainEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(basicUnitMaintainEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/basic/unit/maintain/save")
+    public BaseResponse save(@RequestBody @Valid BasicUnitMaintainEntity basicUnitMaintainSaveRequest,
+                             BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity();
+        BeanUtils.copyProperties(basicUnitMaintainSaveRequest, basicUnitMaintainEntity);
+        basicUnitMaintainEntity.setErpId(CustomUtil.getId());
+        basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS);
+        boolean b = basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity);
+        if (!b) {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        }
+
+        return ResultVOUtils.success();
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/basic/unit/maintain/update")
+    public BaseResponse update(@RequestBody BasicUnitMaintainEntity basicUnitMaintainSaveRequest) {
+        basicUnitMaintainService.updateById(basicUnitMaintainSaveRequest);
+        return ResultVOUtils.success("修改成功");
+    }
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/unit/download")
+    public BaseResponse downloadBasicUnit(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
+                                          BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BasicUnitMaintainEntity> basicUnitMaintainEntities;
+        basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
+
+        List<BasicUnitMaintainResponse> basicUnitMaintainResponses = basicUnitMaintainEntities.stream().map(item ->
+        {
+            BasicUnitMaintainResponse basicUnitMaintainResponse = new BasicUnitMaintainResponse();
+            BeanUtils.copyProperties(item, basicUnitMaintainResponse);
+            basicUnitMaintainResponse.setUnitId(item.getErpId());
+            return basicUnitMaintainResponse;
+        }).collect(Collectors.toList());
+        PageInfo<BasicUnitMaintainResponse> pageInfo;
+        pageInfo = new PageInfo<>(basicUnitMaintainResponses);
+        PageSimpleResponse<BasicUnitMaintainResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(basicUnitMaintainResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/basic/unit/maintain/combine")
+    public BaseResponse combine(@RequestBody CombineUnitRequest combineRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<ErpUnitsResponse> erpUnitsResponses = combineRequest.getCustmandocResponses();
+        if (erpUnitsResponses != null && erpUnitsResponses.size() > 0) {
+            for (ErpUnitsResponse erpUnitsResponse : erpUnitsResponses) {
+                BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity();
+                if (combineRequest.getThirdSys() != null) {
+                    if ("thirdId".equals(combineRequest.getThirdSys())) {
+                        basicUnitMaintainEntity.setThirdId(erpUnitsResponse.getId());
+                        basicUnitMaintainEntity.setThirdName(erpUnitsResponse.getName());
+                    } else if ("thirdId1".equals(combineRequest.getThirdSys())) {
+                        basicUnitMaintainEntity.setThirdId1(erpUnitsResponse.getId());
+                        basicUnitMaintainEntity.setThirdName1(erpUnitsResponse.getName());
+                    } else if ("thirdId2".equals(combineRequest.getThirdSys())) {
+                        basicUnitMaintainEntity.setThirdId2(erpUnitsResponse.getId());
+                        basicUnitMaintainEntity.setThirdName2(erpUnitsResponse.getName());
+                    } else if ("thirdId3".equals(combineRequest.getThirdSys())) {
+                        basicUnitMaintainEntity.setThirdId3(erpUnitsResponse.getId());
+                        basicUnitMaintainEntity.setThirdName3(erpUnitsResponse.getName());
+                    } else if ("thirdId4".equals(combineRequest.getThirdSys())) {
+                        basicUnitMaintainEntity.setThirdId4(erpUnitsResponse.getId());
+                        basicUnitMaintainEntity.setThirdName4(erpUnitsResponse.getName());
+                    }
+                }
+                basicUnitMaintainEntity.setErpId(CustomUtil.getId());
+                basicUnitMaintainEntity.setName(erpUnitsResponse.getName());
+                basicUnitMaintainEntity.setSpell(erpUnitsResponse.getSpell());
+                basicUnitMaintainEntity.setAddr(erpUnitsResponse.getAddr());
+                basicUnitMaintainEntity.setCreditNo(erpUnitsResponse.getCreditNo());
+                basicUnitMaintainEntity.setContact(erpUnitsResponse.getContact());
+                basicUnitMaintainEntity.setMobile(erpUnitsResponse.getMobile());
+                basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SP);
+                basicUnitMaintainEntity.setUpdateTime(new Date());
+                basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity);
+            }
+        }
+        return ResultVOUtils.success("选入成功");
+    }
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/basic/unit/maintain/combineAll")
+    public BaseResponse combineAll(BasicUnitMaintainFilterRequest unitMaintainFilterRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("corpUrl", unitMaintainFilterRequest.getThirdSys());
+        if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
+            return ResultVOUtils.error(500, "往来单位接口地址未定义");
+        if (basicThirdSysDetailEntity.getEnabled()) {
+            basicUnitImportService.selectAllUnit(basicThirdSysDetailEntity, unitMaintainFilterRequest);
+
+        } else {
+            return ResultVOUtils.error(500, "第三方往来单位服务未启用");
+        }
+
+
+        return ResultVOUtils.success("后台正在添加，请稍后刷新查看！");
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/basic/unit/maintain/combineSingle")
+    public BaseResponse combineSingle(@RequestBody CombineSingleUnitRequest combineRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        ErpUnitsResponse erpUnitsResponse = combineRequest.getErpUnitsResponse();
+        BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity();
+        basicUnitMaintainEntity.setId(Integer.parseInt(combineRequest.getKey()));
+        if (combineRequest.getThirdSys() != null) {
+            if ("thirdId".equals(combineRequest.getThirdSys())) {
+                basicUnitMaintainEntity.setThirdId(erpUnitsResponse.getId());
+                basicUnitMaintainEntity.setThirdName(erpUnitsResponse.getName());
+            } else if ("thirdId1".equals(combineRequest.getThirdSys())) {
+                basicUnitMaintainEntity.setThirdId1(erpUnitsResponse.getId());
+                basicUnitMaintainEntity.setThirdName1(erpUnitsResponse.getName());
+            } else if ("thirdId2".equals(combineRequest.getThirdSys())) {
+                basicUnitMaintainEntity.setThirdId2(erpUnitsResponse.getId());
+                basicUnitMaintainEntity.setThirdName2(erpUnitsResponse.getName());
+            } else if ("thirdId3".equals(combineRequest.getThirdSys())) {
+                basicUnitMaintainEntity.setThirdId3(erpUnitsResponse.getId());
+                basicUnitMaintainEntity.setThirdName3(erpUnitsResponse.getName());
+            } else if ("thirdId4".equals(combineRequest.getThirdSys())) {
+                basicUnitMaintainEntity.setThirdId4(erpUnitsResponse.getId());
+                basicUnitMaintainEntity.setThirdName4(erpUnitsResponse.getName());
+            }
+        }
+//        basicUnitMaintainEntity.setThirdName(erpUnitsResponse.getName());
+//        basicUnitMaintainEntity.setSpell(erpUnitsResponse.getSpell());
+//        basicUnitMaintainEntity.setAddr(erpUnitsResponse.getAddr());
+//        basicUnitMaintainEntity.setCreditNo(erpUnitsResponse.getCreditNo());
+//        basicUnitMaintainEntity.setContact(erpUnitsResponse.getContact());
+//        basicUnitMaintainEntity.setMobile(erpUnitsResponse.getMobile());
+        basicUnitMaintainService.updateById(basicUnitMaintainEntity);
+        return ResultVOUtils.success("关联成功");
+    }
+
+    //解除绑定
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/unit/thirdSys/removeRl")
+    public BaseResponse uploadThirdServcie(RemoveRelRequest removeRelRequest) {
+        BasicUnitMaintainEntity udiRelevanceEntity = basicUnitMaintainService.selectById(removeRelRequest.getRelId());
+        if (removeRelRequest.getThirdSys().equals("thirdId")) {
+            udiRelevanceEntity.setThirdId("");
+            udiRelevanceEntity.setThirdName("");
+        } else if (removeRelRequest.getThirdSys().equals("thirdId1")) {
+            udiRelevanceEntity.setThirdId1("");
+            udiRelevanceEntity.setThirdName1("");
+        } else if (removeRelRequest.getThirdSys().equals("thirdId2")) {
+            udiRelevanceEntity.setThirdId2("");
+            udiRelevanceEntity.setThirdName2("");
+        } else if (removeRelRequest.getThirdSys().equals("thirdId3")) {
+            udiRelevanceEntity.setThirdId3("");
+            udiRelevanceEntity.setThirdName3("");
+        } else if (removeRelRequest.getThirdSys().equals("thirdId4")) {
+            udiRelevanceEntity.setThirdId4("");
+            udiRelevanceEntity.setThirdName4("");
+        }
+        basicUnitMaintainService.updateById(udiRelevanceEntity);
+
+        return ResultVOUtils.success("解除绑定成功！");
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/basic/unit/maintain/delete")
+    public BaseResponse deleteBasicUnitMaintain(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        String id = deleteRequest.getId();
+        BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectById(id);
+
+        //判断是否被单据绑定
+        OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
+        orderFilterRequest.setFromCorpId(basicUnitMaintainEntity.getErpId());
+        OrderEntity orderEntity = orderService.findOne(orderFilterRequest);
+        if (orderEntity != null) {
+            return ResultVOUtils.error(500, "已存在该供应商单据，无法删除!");
+        }
+        //判断供应商是否已存在
+        CompanyEntity companyEntity = companyService.findCompanyByUnitFk(basicUnitMaintainEntity.getErpId());
+        if (companyEntity != null) {
+            return ResultVOUtils.error(500, "供应商已注册，无法删除!");
+        }
+
+        basicUnitMaintainService.deleteById(id);
+        return ResultVOUtils.success("删除成功");
+    }
+
+    //查询ERP往来单位
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/unitMaintain/filterErp")
+    public BaseResponse filterErp(BasicUnitMaintainFilterRequest unitMaintainFilterRequest,
+                                  BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("corpUrl", unitMaintainFilterRequest.getThirdSys());
+        if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
+            return ResultVOUtils.error(500, "往来单位接口地址未定义");
+        if (basicThirdSysDetailEntity.getEnabled()) {
+            if (basicThirdSysDetailEntity.getFromType() == 0 || (unitMaintainFilterRequest.getIsDownThrSys() != null && unitMaintainFilterRequest.getIsDownThrSys())) {
+                BaseResponse<PageSimpleResponse<ErpUnitsResponse>> udiDlDeviceResponse =
+                        erpBasicClient.getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue());
+
+                if (udiDlDeviceResponse.getCode() == 20000) {
+                    for (ErpUnitsResponse erpUnitsResponse : udiDlDeviceResponse.getData().getList()) {
+                        BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByThirdId(erpUnitsResponse.getId(), unitMaintainFilterRequest.getThirdSys());
+                        if (basicUnitMaintainEntity != null) {
+                            erpUnitsResponse.setChecked(true);
+                        } else {
+                            erpUnitsResponse.setChecked(false);
+                        }
+                    }
+
+                    return udiDlDeviceResponse;
+                } else {
+                    return udiDlDeviceResponse;
+                }
+
+            } else {
+                FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest();
+                BeanUtils.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest);
+                filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys());
+                List<ThrCorpEntity> thrCorpEntities
+                        = thrCorpService.filterThrCorps(filterThrCorpRequest);
+                List<ThrCorpEntity> thrCorpEntityList = thrCorpEntities.stream().map(item ->
+                {
+                    ThrCorpEntity thrCorpEntity = new ThrCorpEntity();
+                    BeanUtils.copyProperties(item, thrCorpEntity);
+                    BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByThirdId(item.getUnitId(), unitMaintainFilterRequest.getThirdSys());
+                    if (basicUnitMaintainEntity != null) {
+                        thrCorpEntity.setChecked(true);
+                    } else {
+                        thrCorpEntity.setChecked(false);
+                    }
+                    thrCorpEntity.setId(item.getUnitId());
+                    return thrCorpEntity;
+                }).collect(Collectors.toList());
+                PageInfo<ThrCorpEntity> pageInfo;
+                pageInfo = new PageInfo<>(thrCorpEntities);
+                PageSimpleResponse<ThrCorpEntity> pageSimpleResponse = new PageSimpleResponse<>();
+                pageSimpleResponse.setTotal(pageInfo.getTotal());
+                pageSimpleResponse.setList(thrCorpEntityList);
+                return ResultVOUtils.success(pageSimpleResponse);
+            }
+        } else {
+            return ResultVOUtils.error(500, "第三方往来单位服务未启用");
+        }
+
+
+    }
+
+    //获取产品信息详情（多平台）
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/unitMaintain/thirdSys/detail")
+    public BaseResponse getThirdSysDetail(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
+                                          BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectById(basicUnitMaintainFilterRequest.getId() + "");
+
+        FilterBasicThirdSysRequest filterBasicThirdSysRequest = new FilterBasicThirdSysRequest();
+        filterBasicThirdSysRequest.setEnabled(true);
+        List<BasicThirdSysEntity> basicThirdSysEntities = basicThirdSysService.filterBasicThiSys(filterBasicThirdSysRequest);
+        List<BasicProductThirdSysResponse> basicProductThirdSysResponses = new ArrayList<>();
+
+        for (BasicThirdSysEntity basicThirdSysEntity : basicThirdSysEntities) {
+            if (basicThirdSysEntity.getThirdId().equals("thirdId")) {
+                BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse();
+                basicProductThirdSysResponse.setSysId(basicThirdSysEntity.getThirdId());
+                basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName());
+                if (basicUnitMaintainEntity != null) {
+                    basicProductThirdSysResponse.setThirdId(basicUnitMaintainEntity.getThirdId());
+                    basicProductThirdSysResponse.setThirdName(basicUnitMaintainEntity.getThirdName());
+                }
+
+                basicProductThirdSysResponses.add(basicProductThirdSysResponse);
+            } else if (basicThirdSysEntity.getThirdId().equals("thirdId1")) {
+                BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse();
+                basicProductThirdSysResponse.setSysId(basicThirdSysEntity.getThirdId());
+                basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName());
+                if (basicUnitMaintainEntity != null) {
+                    basicProductThirdSysResponse.setThirdId(basicUnitMaintainEntity.getThirdId1());
+                    basicProductThirdSysResponse.setThirdName(basicUnitMaintainEntity.getThirdName1());
+                }
+                basicProductThirdSysResponses.add(basicProductThirdSysResponse);
+            } else if (basicThirdSysEntity.getThirdId().equals("thirdId2")) {
+                BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse();
+                basicProductThirdSysResponse.setSysId(basicThirdSysEntity.getThirdId());
+                basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName());
+                if (basicUnitMaintainEntity != null) {
+                    basicProductThirdSysResponse.setThirdId(basicUnitMaintainEntity.getThirdId2());
+                    basicProductThirdSysResponse.setThirdName(basicUnitMaintainEntity.getThirdName2());
+                }
+                basicProductThirdSysResponses.add(basicProductThirdSysResponse);
+            } else if (basicThirdSysEntity.getThirdId().equals("thirdId3")) {
+                BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse();
+                basicProductThirdSysResponse.setSysId(basicThirdSysEntity.getThirdId());
+                basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName());
+                if (basicUnitMaintainEntity != null) {
+                    basicProductThirdSysResponse.setThirdId(basicUnitMaintainEntity.getThirdId3());
+                    basicProductThirdSysResponse.setThirdName(basicUnitMaintainEntity.getThirdName3());
+                }
+                basicProductThirdSysResponses.add(basicProductThirdSysResponse);
+            } else if (basicThirdSysEntity.getThirdId().equals("thirdId4")) {
+                BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse();
+                basicProductThirdSysResponse.setSysId(basicThirdSysEntity.getThirdId());
+                basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName());
+                if (basicUnitMaintainEntity != null) {
+                    basicProductThirdSysResponse.setThirdId(basicUnitMaintainEntity.getThirdId4());
+                    basicProductThirdSysResponse.setThirdName(basicUnitMaintainEntity.getThirdName4());
+                }
+                basicProductThirdSysResponses.add(basicProductThirdSysResponse);
+            }
+        }
+        PageInfo<BasicProductThirdSysResponse> pageInfo;
+        pageInfo = new PageInfo<>(basicProductThirdSysResponses);
+        PageSimpleResponse<BasicProductThirdSysResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(basicProductThirdSysResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    public BasicThirdSysEntity filterThirdSys(String thirdId, List<BasicThirdSysEntity> basicThirdSysEntities) {
+        if (basicThirdSysEntities != null && basicThirdSysEntities.size() > 0) {
+            for (BasicThirdSysEntity basicThirdSysEntity : basicThirdSysEntities) {
+                if (thirdId.equals(basicThirdSysEntity.getThirdId())) {
+                    return basicThirdSysEntity;
+                }
+            }
+        }
+        return null;
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/controller/info/CompanyController.java

@@ -92,9 +92,9 @@ public class CompanyController {
 //        }
         if (StringUtils.isNotBlank(companyEntity.getNewFilePath())) {
             if (StringUtils.isNotBlank(companyEntity.getFilePath())) {
-                String URL=filePath+"/register/file/image1/" + companyEntity.getFilePath();
+                String URL = filePath + "/register/file/image1/" + companyEntity.getFilePath();
-                File file=new File(URL);
+                File file = new File(URL);
-                if(file.exists()&&file.isFile()) {
+                if (file.exists() && file.isFile()) {
                     file.delete();
                 }
             }
@@ -102,9 +102,9 @@ public class CompanyController {
         }
         if (StringUtils.isNotBlank(companyEntity.getNewFilePath2())) {
             if (StringUtils.isNotBlank(companyEntity.getFilePath2())) {
-                String URL=filePath+"/register/file/image1/" + companyEntity.getFilePath2();
+                String URL = filePath + "/register/file/image1/" + companyEntity.getFilePath2();
-                File file=new File(URL);
+                File file = new File(URL);
-                if(file.exists()&&file.isFile()) {
+                if (file.exists() && file.isFile()) {
                     file.delete();
                 }
             }
@@ -112,9 +112,9 @@ public class CompanyController {
         }
         if (StringUtils.isNotBlank(companyEntity.getNewFilePath3())) {
             if (StringUtils.isNotBlank(companyEntity.getFilePath3())) {
-                String URL=filePath+"/register/file/image1/" + companyEntity.getFilePath3();
+                String URL = filePath + "/register/file/image1/" + companyEntity.getFilePath3();
-                File file=new File(URL);
+                File file = new File(URL);
-                if(file.exists()&&file.isFile()) {
+                if (file.exists() && file.isFile()) {
                     file.delete();
                 }
             }
@@ -122,9 +122,9 @@ public class CompanyController {
         }
         if (StringUtils.isNotBlank(companyEntity.getNewFilePath4())) {
             if (StringUtils.isNotBlank(companyEntity.getFilePath4())) {
-                String URL=filePath+"/register/file/image1/" + companyEntity.getFilePath4();
+                String URL = filePath + "/register/file/image1/" + companyEntity.getFilePath4();
-                File file=new File(URL);
+                File file = new File(URL);
-                if(file.exists()&&file.isFile()) {
+                if (file.exists() && file.isFile()) {
                     file.delete();
                 }
             }

api-udims/src/main/java/com/glxp/udi/admin/controller/info/PlatformController.java

@@ -0,0 +1,113 @@
+package com.glxp.udi.admin.controller.info;
+
+import com.alibaba.fastjson.JSON;
+import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
+import com.glxp.udi.admin.entity.info.PlatformEntity;
+import com.glxp.udi.admin.entity.inout.UnitMaintainEntity;
+import com.glxp.udi.admin.res.PageSimpleResponse;
+import com.glxp.udi.admin.service.info.PlatformService;
+import com.glxp.udi.admin.service.inout.UnitMaintainService;
+import com.glxp.udi.common.res.BaseResponse;
+import com.glxp.udi.common.util.ResultVOUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@Slf4j
+public class PlatformController {
+
+    @Resource
+    private PlatformService platformService;
+    @Resource
+    private UnitMaintainService unitMaintainService;
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udims/platform/remove")
+    public BaseResponse remove(@RequestBody PlatformEntity platformEntity) {
+        if (platformService.remove(platformEntity.getId()) > 0)
+            ResultVOUtils.success("删除成功");
+        return ResultVOUtils.error(500, "删除失败");
+    }
+
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udims/platform/update")
+    public BaseResponse update(@RequestBody PlatformEntity platformEntity) {
+        if (platformService.update(platformEntity) > 0)
+            ResultVOUtils.success("修改成功");
+
+        return ResultVOUtils.success("修改失败");
+    }
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/udims/platform/list")
+    public BaseResponse list(@RequestParam Map<String, Object> params) {
+        List<PlatformEntity> list = platformService.list(params);
+        if (params.get("page") != null && params.get("limit") != null) {
+            params.put("offset", (Integer.valueOf(params.get("page").toString()) - 1) * (Integer.valueOf(params.get("limit").toString())));
+        }
+        int total = platformService.count(params);
+        PageSimpleResponse<PlatformEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(Long.valueOf(String.valueOf(total)));
+        pageSimpleResponse.setList(list);
+
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udims/platform/link")
+    public BaseResponse update(@RequestBody UnitMaintainEntity unitMaintainEntity) {
+        PlatformEntity platformEntity = platformService.get(unitMaintainEntity.getPlatformId());
+        if (platformEntity != null) {
+            String url = platformEntity.getHost() + "/verify";
+
+            Map<String, Object> map = new HashMap<String, Object>();
+            map.put("username", unitMaintainEntity.getPlatformUsername());
+            map.put("password", unitMaintainEntity.getPlatformPassword());
+
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
+
+            HttpEntity<String> request = new HttpEntity<String>(JSON.toJSONString(map), headers);
+            RestTemplate restTemplate = new RestTemplate();
+            log.error(url);
+
+            String result = restTemplate.postForObject(url, request, String.class, map);
+            log.error(result);
+            Map<String, Object> object = JSON.parseObject(result, Map.class);
+
+            if (object != null && object.get("data") != null) {
+                Map<String, Object> data = JSON.parseObject(JSON.toJSONString(object.get("data")), Map.class);
+                log.error(JSON.toJSONString(object.get("data")));
+                if (data.get("appid") != null) {
+                    unitMaintainEntity.setAppid(data.get("appid").toString());
+                    if (data.get("apiKey") != null)
+                        unitMaintainEntity.setApiKey(data.get("apiKey").toString());
+                    if (data.get("secretKey") != null)
+                        unitMaintainEntity.setSecretKey(data.get("secretKey").toString());
+                } else {
+                    return ResultVOUtils.error(500, "关联验证失败,请联系管理人员");
+                }
+            } else if (object != null && object.get("message") != null) {
+                return ResultVOUtils.error(500, object.get("message").toString());
+            } else {
+                return ResultVOUtils.error(500, "关联失败,请联系管理人员");
+            }
+
+        } else {
+            return ResultVOUtils.error(500, "未查询到平台信息");
+        }
+        unitMaintainService.updateUnit(unitMaintainEntity);
+        return ResultVOUtils.success("关联成功");
+    }
+
+}

api-udims/src/main/java/com/glxp/udi/admin/controller/param/SystemPDFTemplateController.java

@@ -33,7 +33,7 @@ public class SystemPDFTemplateController {
     @AuthRuleAnnotation("system/pdf/template/list")
     @GetMapping("/system/pdf/template/list")
     public BaseResponse list(@Valid SystemPDFTemplateRequest systemPDFTemplateRequest,
-                              BindingResult bindingResult) {
+                             BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());

api-udims/src/main/java/com/glxp/udi/admin/controller/udidl/EnterpriseController.java

@@ -0,0 +1,41 @@
+package com.glxp.udi.admin.controller.udidl;
+
+import com.glxp.udi.admin.req.udidl.EnterpriseRequest;
+import com.glxp.udi.admin.res.udidl.EnterpriseResponse;
+import com.glxp.udi.admin.service.udidl.EnterpriseService;
+import com.glxp.udi.common.enums.ResultEnum;
+import com.glxp.udi.common.res.BaseResponse;
+import com.glxp.udi.common.util.ResultVOUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 企业信息控制器
+ */
+@RestController
+public class EnterpriseController {
+
+    @Autowired
+    private EnterpriseService enterpriseService;
+
+    /**
+     * 用户注册页面，根据企业类型，从阳光采购平台查询企业名称
+     *
+     * @param enterpriseRequest
+     * @param bindingResult
+     * @return
+     */
+    @GetMapping("/udiwms/enterprise/filterCandidateCompanyName")
+    public BaseResponse filterCandidateCompanyName(EnterpriseRequest enterpriseRequest, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<EnterpriseResponse> enterpriseResponses = enterpriseService.filterCandidateCompanyName(enterpriseRequest);
+        return ResultVOUtils.success(enterpriseResponses);
+    }
+
+}

api-udims/src/main/java/com/glxp/udi/admin/controller/udidl/SysRoleController.java

@@ -0,0 +1,36 @@
+package com.glxp.udi.admin.controller.udidl;
+
+import com.glxp.udi.admin.req.udidl.SysRoleParam;
+import com.glxp.udi.admin.service.udidl.SysRoleService;
+import com.glxp.udi.common.enums.ResultEnum;
+import com.glxp.udi.common.res.BaseResponse;
+import com.glxp.udi.common.util.ResultVOUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+public class SysRoleController {
+
+    @Autowired
+    private SysRoleService sysRoleService;
+
+    /**
+     * 查询角色列表
+     *
+     * @param sysRoleParam
+     * @param bindingResult
+     * @return
+     */
+    @PostMapping("/sys/role/list")
+    public BaseResponse list(@RequestBody SysRoleParam sysRoleParam, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        return sysRoleService.getList(sysRoleParam);
+    }
+
+}

api-udims/src/main/java/com/glxp/udi/admin/controller/udidl/SysUserController.java

@@ -0,0 +1,40 @@
+package com.glxp.udi.admin.controller.udidl;
+
+import com.glxp.udi.admin.req.udidl.SysUserParam;
+import com.glxp.udi.admin.service.udidl.SysUserService;
+import com.glxp.udi.common.enums.ResultEnum;
+import com.glxp.udi.common.res.BaseResponse;
+import com.glxp.udi.common.util.ResultVOUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 系统管理 - 用户管理功能接口
+ */
+@Slf4j
+@RestController
+public class SysUserController {
+
+    @Autowired
+    private SysUserService sysUserService;
+
+    /**
+     * 查询用户列表
+     *
+     * @param sysUserParam
+     * @return
+     */
+    @PostMapping("/sys/user/list")
+    public BaseResponse list(@RequestBody SysUserParam sysUserParam, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        return sysUserService.getList(sysUserParam);
+    }
+
+
+}

api-udims/src/main/java/com/glxp/udi/admin/dao/basic/BasicThirdSysDao.java

@@ -0,0 +1,22 @@
+package com.glxp.udi.admin.dao.basic;
+
+import com.glxp.udi.admin.entity.basic.BasicThirdSysEntity;
+import com.glxp.udi.admin.req.basic.FilterBasicThirdSysRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface BasicThirdSysDao {
+
+    boolean insert(BasicThirdSysEntity basicThirdSysEntity);
+
+    boolean updateBasicThiSys(BasicThirdSysEntity basicThirdSysEntity);
+
+    BasicThirdSysEntity selectByThirdId(@Param("thirdId") String thirdId);
+
+    List<BasicThirdSysEntity> filterBasicThiSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest);
+
+
+}

api-udims/src/main/java/com/glxp/udi/admin/dao/basic/BasicThirdSysDetailDao.java

@@ -13,7 +13,7 @@ public interface BasicThirdSysDetailDao {
 
     boolean updateBasicThirdSysDetail(BasicThirdSysDetailEntity basicThirdSysEntity);
 
-    BasicThirdSysDetailEntity selectByKey(@Param("key") String key,@Param("thirdSys") String thirdSys);
+    BasicThirdSysDetailEntity selectByKey(@Param("key") String key, @Param("thirdSys") String thirdSys);
 
     List<BasicThirdSysDetailEntity> filterBasicThirdSysDetail(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest);
 

api-udims/src/main/java/com/glxp/udi/admin/dao/info/PlatformDao.java

@@ -0,0 +1,25 @@
+package com.glxp.udi.admin.dao.info;
+
+import com.glxp.udi.admin.entity.info.PlatformEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface PlatformDao {
+
+    int save(PlatformEntity platformEntity);
+
+    int batchSave(List<PlatformEntity> list);
+
+    int remove(String id);
+
+    int update(PlatformEntity platformEntity);
+
+    List<PlatformEntity> list(Map<String, Object> map);
+
+    int count(Map<String, Object> map);
+
+    PlatformEntity get(String id);
+}

api-udims/src/main/java/com/glxp/udi/admin/dao/info/ScheduledDao.java

@@ -1,7 +1,7 @@
 package com.glxp.udi.admin.dao.info;
 
 import com.glxp.udi.admin.entity.info.ScheduledEntity;
-import com.glxp.udi.admin.req.udid.ScheduledRequest;
+import com.glxp.udi.admin.req.udidl.ScheduledRequest;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

api-udims/src/main/java/com/glxp/udi/admin/dao/inout/UnitMaintainDao.java

@@ -0,0 +1,21 @@
+package com.glxp.udi.admin.dao.inout;
+
+import com.glxp.udi.admin.entity.inout.UnitMaintainEntity;
+import com.glxp.udi.admin.req.inout.UnitMaintainFilterRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface UnitMaintainDao {
+    List<UnitMaintainEntity> filterList(UnitMaintainFilterRequest unitMaintainFilterRequest);
+
+    boolean insertUnitMaintain(UnitMaintainEntity unitMaintainEntity);
+
+    boolean deleteById(@Param("id") String id);
+
+    UnitMaintainEntity selectById(@Param("id") String id);
+
+    boolean updateUnit(UnitMaintainEntity unitMaintainEntity);
+}

api-udims/src/main/java/com/glxp/udi/admin/dao/thrsys/ThrCorpDao.java

@@ -0,0 +1,37 @@
+package com.glxp.udi.admin.dao.thrsys;
+
+import com.glxp.udi.admin.entity.thrsys.ThrCorpEntity;
+import com.glxp.udi.admin.req.thrsys.FilterThrCorpRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ThrCorpDao {
+
+    List<ThrCorpEntity> filterThrCorps(FilterThrCorpRequest filterThrCorpRequest);
+
+    List<ThrCorpEntity> batchSelectByIds(FilterThrCorpRequest filterThrProductsRequest);
+
+    boolean insertThrCorps(ThrCorpEntity thrCorpEntity);
+
+    boolean insertThrCorpss(@Param("thrCorpEntitys") List<ThrCorpEntity> thrCorpEntitys);
+
+    boolean updateThrCorps(ThrCorpEntity thrCorpEntity);
+
+    boolean deleteById(@Param("id") String id);
+
+    boolean deleteByUnitId(@Param("unitId") String unitId);
+
+    boolean deleteAll();
+
+    /**
+     * 导入第三方往来单位数据
+     *
+     * @param thrCorpEntities
+     */
+    void importThrCorps(@Param("thrCorpEntities") List<ThrCorpEntity> thrCorpEntities);
+
+    void importThrCorp(ThrCorpEntity thrCorpEntity);
+}

api-udims/src/main/java/com/glxp/udi/admin/entity/auth/UserRegisterEntity.java

@@ -27,6 +27,4 @@ public class UserRegisterEntity {
     private String areaCode;
     private String userName;
     private String licenseUrl;
-    private String udplatCompanyName;
-    private String udplatCompanyId;
 }

api-udims/src/main/java/com/glxp/udi/admin/entity/info/PlatformEntity.java

@@ -0,0 +1,32 @@
+package com.glxp.udi.admin.entity.info;
+
+public class PlatformEntity {
+
+    private String id;
+    private String name;  //平台名称
+    private String host;     //平台地址
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getHost() {
+        return host;
+    }
+
+    public void setHost(String host) {
+        this.host = host;
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/entity/inout/UnitMaintainEntity.java

@@ -0,0 +1,26 @@
+package com.glxp.udi.admin.entity.inout;
+
+import lombok.Data;
+
+@Data
+public class UnitMaintainEntity {
+
+    private Integer id;
+    private String thirdId;
+    private String unitId;
+    private String name;
+    private String spell;
+    private String addr;
+    private String status;
+    private String type;
+    private String customerId;
+    private String creditNo;
+    private String erpId;
+    private String platformId;
+    private String platformUsername;
+    private String platformPassword;
+    private String appid;
+    private String apiKey;
+    private String secretKey;
+
+}

api-udims/src/main/java/com/glxp/udi/admin/entity/thrsys/ThrCorpEntity.java

@@ -0,0 +1,23 @@
+package com.glxp.udi.admin.entity.thrsys;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ThrCorpEntity {
+
+    private String id;
+    private String unitId;
+    private String name;
+    private String spell;
+    private String addr;
+    private String creditNo;
+    private String contact;
+    private String mobile;
+    private String thirdSysFk;
+    private Boolean checked;
+    private Date updateTime;
+
+
+}

api-udims/src/main/java/com/glxp/udi/admin/httpclient/ErpBasicClient.java

@@ -0,0 +1,78 @@
+package com.glxp.udi.admin.httpclient;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.glxp.udi.admin.entity.basic.BasicThirdSysEntity;
+import com.glxp.udi.admin.req.basic.BasicUnitMaintainFilterRequest;
+import com.glxp.udi.admin.req.basic.FilterErpGoodsRequest;
+import com.glxp.udi.admin.res.PageSimpleResponse;
+import com.glxp.udi.admin.res.basic.ErpProductsResponse;
+import com.glxp.udi.admin.res.basic.ErpUnitsResponse;
+import com.glxp.udi.admin.service.basic.BasicThirdSysService;
+import com.glxp.udi.admin.util.HttpClient;
+import com.glxp.udi.common.res.BaseResponse;
+import com.glxp.udi.common.util.ResultVOUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 获取ERP基础数据
+ */
+@Slf4j
+@Service
+public class ErpBasicClient {
+
+    @Autowired
+    private BasicThirdSysService basicThirdSysService;
+
+    //获取往来单位
+    public BaseResponse<PageSimpleResponse<ErpUnitsResponse>> getErpCrop(BasicUnitMaintainFilterRequest unitMaintainFilterRequest, String url) {
+        Map<String, Object> paramMap = new HashMap<>(16);
+        paramMap.put("name", unitMaintainFilterRequest.getName());
+        paramMap.put("unitId", unitMaintainFilterRequest.getUnitId());
+        paramMap.put("key", unitMaintainFilterRequest.getKey());
+        paramMap.put("page", unitMaintainFilterRequest.getPage());
+        paramMap.put("limit", unitMaintainFilterRequest.getLimit());
+
+        //查询第三方系统接口授权参数
+        BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(unitMaintainFilterRequest.getThirdSys());
+        String response = HttpClient.uCloudPost(url, unitMaintainFilterRequest, basicThirdSysEntity);
+        try {
+            BaseResponse<PageSimpleResponse<ErpUnitsResponse>> udiDlDeviceResponse =
+                    JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<ErpUnitsResponse>>>() {
+                    });
+            return udiDlDeviceResponse;
+        } catch (Exception e) {
+            log.error("获取往来单位异常", e);
+            return ResultVOUtils.error(500, "连接ERP服务出错！");
+        }
+    }
+
+    //获取产品信息
+    public BaseResponse<PageSimpleResponse<ErpProductsResponse>> getErpProducts(FilterErpGoodsRequest filterErpGoodsRequest, String url) {
+        Map<String, Object> paramMap = new HashMap<>(16);
+        paramMap.put("code", filterErpGoodsRequest.getCode());
+        paramMap.put("name", filterErpGoodsRequest.getName());
+        paramMap.put("limit", filterErpGoodsRequest.getLimit());
+        paramMap.put("page", filterErpGoodsRequest.getPage());
+
+        //查询第三方系统接口授权参数
+        BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(filterErpGoodsRequest.getThirdSys());
+        String response = HttpClient.uCloudPost(url, filterErpGoodsRequest, basicThirdSysEntity);
+        try {
+            BaseResponse<PageSimpleResponse<ErpProductsResponse>> udiDlDeviceResponse =
+                    JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<ErpProductsResponse>>>() {
+                    });
+            return udiDlDeviceResponse;
+        } catch (Exception e) {
+            log.error("获取产品信息异常", e);
+            return ResultVOUtils.error(500, "连接ERP服务出错！");
+        }
+    }
+
+
+}

api-udims/src/main/java/com/glxp/udi/admin/req/basic/BasicUnitMaintainFilterRequest.java

@@ -27,5 +27,4 @@ public class BasicUnitMaintainFilterRequest extends ListPageRequest {
     private Boolean isDownThrSys;
     List<ErpUnitsResponse> thrCorpEntities;
 
-
 }

api-udims/src/main/java/com/glxp/udi/admin/req/basic/CombineSingleUnitRequest.java

@@ -0,0 +1,11 @@
+package com.glxp.udi.admin.req.basic;
+
+import com.glxp.udi.admin.res.basic.ErpUnitsResponse;
+import lombok.Data;
+
+@Data
+public class CombineSingleUnitRequest {
+    private String key;
+    private String thirdSys;
+    private ErpUnitsResponse erpUnitsResponse;
+}

api-udims/src/main/java/com/glxp/udi/admin/req/basic/CombineUnitRequest.java

@@ -0,0 +1,14 @@
+package com.glxp.udi.admin.req.basic;
+
+import com.glxp.udi.admin.res.basic.ErpUnitsResponse;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CombineUnitRequest {
+
+    List<String> keys;
+    private String thirdSys;
+    List<ErpUnitsResponse> custmandocResponses;
+}

api-udims/src/main/java/com/glxp/udi/admin/req/basic/FilterErpGoodsRequest.java

@@ -0,0 +1,17 @@
+package com.glxp.udi.admin.req.basic;
+
+import com.glxp.udi.admin.req.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class FilterErpGoodsRequest extends ListPageRequest {
+
+    private String name;
+    private String code;
+    private String spec;        //规格型号
+    private String registerNo;  //注册证号
+    private String manufactory; //生产厂家
+    private String thirdSys;
+    private Boolean isDownThrSys;
+}
+

api-udims/src/main/java/com/glxp/udi/admin/req/basic/RemoveRelRequest.java

@@ -0,0 +1,10 @@
+package com.glxp.udi.admin.req.basic;
+
+import lombok.Data;
+
+@Data
+public class RemoveRelRequest {
+
+    private String relId;
+    private String thirdSys;
+}

api-udims/src/main/java/com/glxp/udi/admin/req/feign/BaseParam.java

@@ -0,0 +1,12 @@
+package com.glxp.udi.admin.req.feign;
+
+import com.glxp.udi.admin.req.ListPageRequest;
+import lombok.Data;
+
+
+@Data
+public class BaseParam extends ListPageRequest {
+    private String startDate;//开始日期
+    private String endDate;//结束日期
+    private String name;//名称，支持模糊查询
+}

api-udims/src/main/java/com/glxp/udi/admin/req/inout/UnitMaintainFilterRequest.java

@@ -0,0 +1,12 @@
+package com.glxp.udi.admin.req.inout;
+
+import com.glxp.udi.admin.req.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class UnitMaintainFilterRequest extends ListPageRequest {
+
+    private String key;
+    private String customerId;
+
+}

api-udims/src/main/java/com/glxp/udi/admin/req/thrsys/FilterThrCorpRequest.java

@@ -0,0 +1,18 @@
+package com.glxp.udi.admin.req.thrsys;
+
+import com.glxp.udi.admin.req.ListPageRequest;
+import com.glxp.udi.admin.res.basic.ErpUnitsResponse;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FilterThrCorpRequest extends ListPageRequest {
+    private String thirdSysFk;
+    private String thirdSys;
+    private String unitId;
+    private List<String> codes;
+    private String name;
+    private String key;
+    List<ErpUnitsResponse> thrCorpEntities;
+}

api-udims/src/main/java/com/glxp/udi/admin/req/udidl/EnterpriseRequest.java

@@ -0,0 +1,13 @@
+package com.glxp.udi.admin.req.udidl;
+
+import com.glxp.udi.admin.req.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class EnterpriseRequest extends ListPageRequest {
+
+    private String key;
+    private String name;
+    private String bussinessStatus; //企业类型 1：生产企业 2：流通企业 3：医疗机构
+
+}

api-udims/src/main/java/com/glxp/udi/admin/req/udidl/ScheduledRequest.java

@@ -1,4 +1,4 @@
-package com.glxp.udi.admin.req.udid;
+package com.glxp.udi.admin.req.udidl;
 
 import lombok.Data;
 

api-udims/src/main/java/com/glxp/udi/admin/req/udidl/SysRoleParam.java

@@ -0,0 +1,10 @@
+package com.glxp.udi.admin.req.udidl;
+
+import com.glxp.udi.admin.req.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class SysRoleParam extends ListPageRequest {
+    private String status;
+    private String  name;
+}

api-udims/src/main/java/com/glxp/udi/admin/req/udidl/SysUserParam.java

@@ -0,0 +1,11 @@
+package com.glxp.udi.admin.req.udidl;
+
+import com.glxp.udi.admin.req.ListPageRequest;
+import lombok.Data;
+
+
+@Data
+public class SysUserParam extends ListPageRequest {
+    private String status;
+    private String  name;
+}

api-udims/src/main/java/com/glxp/udi/admin/res/basic/BasicProductThirdSysResponse.java

@@ -0,0 +1,14 @@
+package com.glxp.udi.admin.res.basic;
+
+import lombok.Data;
+
+@Data
+public class BasicProductThirdSysResponse {
+    private String sysId;
+    private String sysName;
+    private String thirdName;
+    private String thirdId;
+    private String spec;
+    private String registerNo;
+    private String manufactory;
+}

api-udims/src/main/java/com/glxp/udi/admin/res/basic/BasicUnitMaintainResponse.java

@@ -0,0 +1,21 @@
+package com.glxp.udi.admin.res.basic;
+
+import lombok.Data;
+
+@Data
+public class BasicUnitMaintainResponse {
+
+    private Integer id;
+    private String thirdId;
+    private String erpId;
+    private String name;
+    private String spell;
+    private String addr;
+    private String status;
+    private String type;
+    private String creditNo;
+    private String contact;
+    private String mobile;
+    private String thirdName;
+    private String unitId;
+}

api-udims/src/main/java/com/glxp/udi/admin/res/basic/ErpProductsResponse.java

@@ -0,0 +1,41 @@
+package com.glxp.udi.admin.res.basic;
+
+import lombok.Data;
+
+@Data
+public class ErpProductsResponse {
+
+    private String code;    //产品编码
+    private String name;
+    private String measname;    //计量单位
+    private String spec;        //规格型号
+    private String registerNo;  //注册证号
+    private String manufactory; //生产厂家
+    private String cplb;
+    private String flbm;
+    private String qxlb;
+    private String ybbm;
+    private String sptm;
+    private String tyshxydm;
+    private String zczbhhzbapzbh;
+    private String ylqxzcrbarmc;
+    private String ylqxzcrbarywmc;
+    private String cpms;
+    private String supName;
+
+
+    //辅助字段
+    private boolean isChecked;
+    private String thirdSys;
+
+    //添加字段
+    private String model; //型号
+    private String standard; //规格型号，二合一字段
+    private String qtbm; //其他编码
+    private String zczyxqz; //注册有效期截止时间
+    private String remark; //备注
+    private String remark1; //备注1
+    private String remark2; //备注2
+    private String remark3; //备注3
+
+}

api-udims/src/main/java/com/glxp/udi/admin/res/udidl/EnterpriseResponse.java

@@ -0,0 +1,13 @@
+package com.glxp.udi.admin.res.udidl;
+
+import lombok.Data;
+
+/**
+ * 企业信息相应实体类
+ */
+@Data
+public class EnterpriseResponse {
+
+    private String name;
+
+}

api-udims/src/main/java/com/glxp/udi/admin/service/basic/BasicThirdSysDetailService.java

@@ -9,7 +9,7 @@ public interface BasicThirdSysDetailService {
 
     boolean updateBasicThirdSysDetail(BasicThirdSysDetailEntity basicThirdSysEntity);
 
-    BasicThirdSysDetailEntity selectByKey(String key,String thirdSys);
+    BasicThirdSysDetailEntity selectByKey(String key, String thirdSys);
 
     List<BasicThirdSysDetailEntity> filterBasicThirdSysDetail(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest);
 

api-udims/src/main/java/com/glxp/udi/admin/service/basic/BasicThirdSysService.java

@@ -0,0 +1,19 @@
+package com.glxp.udi.admin.service.basic;
+
+import com.glxp.udi.admin.entity.basic.BasicThirdSysEntity;
+import com.glxp.udi.admin.req.basic.FilterBasicThirdSysRequest;
+
+import java.util.List;
+
+public interface BasicThirdSysService {
+
+    boolean insert(BasicThirdSysEntity basicThirdSysEntity);
+
+    boolean updateBasicThiSys(BasicThirdSysEntity basicThirdSysEntity);
+
+    BasicThirdSysEntity selectByThirdId(String thirdId);
+
+    List<BasicThirdSysEntity> filterBasicThiSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest);
+
+    BasicThirdSysEntity selectMainThrSys();
+}

api-udims/src/main/java/com/glxp/udi/admin/service/basic/BasicUnitMaintainService.java

@@ -35,4 +35,5 @@ public interface BasicUnitMaintainService {
     BasicUnitMaintainEntity selectByName(String name);
 
     boolean isExit();
+
 }

api-udims/src/main/java/com/glxp/udi/admin/service/basic/impl/BasicThirdSysDetailServiceImpl.java

@@ -24,7 +24,7 @@ public class BasicThirdSysDetailServiceImpl implements BasicThirdSysDetailServic
 
     @Override
     public BasicThirdSysDetailEntity selectByKey(String key, String thirdSys) {
-        return  basicThirdSysDetailDao.selectByKey(key,thirdSys);
+        return basicThirdSysDetailDao.selectByKey(key, thirdSys);
     }
 
     @Override

api-udims/src/main/java/com/glxp/udi/admin/service/basic/impl/BasicThirdSysServiceImpl.java

@@ -0,0 +1,83 @@
+package com.glxp.udi.admin.service.basic.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.github.pagehelper.PageHelper;
+import com.glxp.udi.admin.dao.auth.AuthLicenseDao;
+import com.glxp.udi.admin.dao.basic.BasicThirdSysDao;
+import com.glxp.udi.admin.entity.auth.AuthLicense;
+import com.glxp.udi.admin.entity.basic.BasicThirdSysEntity;
+import com.glxp.udi.admin.req.basic.FilterBasicThirdSysRequest;
+import com.glxp.udi.admin.service.basic.BasicThirdSysService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+@Slf4j
+@Service
+public class BasicThirdSysServiceImpl implements BasicThirdSysService {
+
+    @Resource
+    BasicThirdSysDao basicThirdSysDao;
+    @Resource
+    private AuthLicenseDao authLicenseDao;
+
+    @Override
+    public boolean insert(BasicThirdSysEntity basicThirdSysEntity) {
+        return basicThirdSysDao.insert(basicThirdSysEntity);
+    }
+
+    @Override
+    public boolean updateBasicThiSys(BasicThirdSysEntity basicThirdSysEntity) {
+        try {
+            //同步更新本系统的授权码和秘钥
+            if (StrUtil.isNotBlank(basicThirdSysEntity.getLicenseApikey()) || StrUtil.isNotBlank(basicThirdSysEntity.getLicenseSecretkey())) {
+                authLicenseDao.updateLicenseByName(basicThirdSysEntity.getLicenseApikey(), basicThirdSysEntity.getLicenseSecretkey(), "UDI自助管理平台");
+            }
+            basicThirdSysDao.updateBasicThiSys(basicThirdSysEntity);
+        } catch (Exception e) {
+            log.error("更新第三方系统信息异常", e);
+        }
+        return true;
+    }
+
+    @Override
+    public BasicThirdSysEntity selectByThirdId(String thirdId) {
+        return basicThirdSysDao.selectByThirdId(thirdId);
+    }
+
+    @Override
+    public List<BasicThirdSysEntity> filterBasicThiSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest) {
+        if (filterBasicThirdSysRequest == null) {
+            return Collections.emptyList();
+        }
+
+        if (filterBasicThirdSysRequest.getPage() != null) {
+            int offset = (filterBasicThirdSysRequest.getPage() - 1) * filterBasicThirdSysRequest.getLimit();
+            PageHelper.offsetPage(offset, filterBasicThirdSysRequest.getLimit());
+        }
+        List<BasicThirdSysEntity> data = basicThirdSysDao.filterBasicThiSys(filterBasicThirdSysRequest);
+        //查询本系统的授权码
+        AuthLicense license = authLicenseDao.selectLicenseByName("UDI自助管理平台");
+        if (null != license) {
+            data.forEach(basicThirdSysEntity -> {
+                basicThirdSysEntity.setLicenseApikey(license.getApiKey());
+                basicThirdSysEntity.setLicenseSecretkey(license.getSecretKey());
+            });
+        }
+        return data;
+    }
+
+    @Override
+    public BasicThirdSysEntity selectMainThrSys() {
+        FilterBasicThirdSysRequest filterBasicThirdSysRequest = new FilterBasicThirdSysRequest();
+        filterBasicThirdSysRequest.setMainSys(true);
+        List<BasicThirdSysEntity> data = basicThirdSysDao.filterBasicThiSys(filterBasicThirdSysRequest);
+        if (data != null && data.size() > 0) {
+            return data.get(0);
+        }
+        return null;
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java

@@ -5,12 +5,14 @@ import com.glxp.udi.admin.dao.basic.BasicUnitMaintainDao;
 import com.glxp.udi.admin.entity.basic.BasicUnitMaintainEntity;
 import com.glxp.udi.admin.req.basic.BasicUnitMaintainFilterRequest;
 import com.glxp.udi.admin.service.basic.BasicUnitMaintainService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.Collections;
 import java.util.List;
 
+@Slf4j
 @Service
 public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService {
 
@@ -117,4 +119,5 @@ public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService {
         }
         return false;
     }
+
 }

api-udims/src/main/java/com/glxp/udi/admin/service/basic/impl/BussinessTypeServiceImpl.java

@@ -116,7 +116,7 @@ public class BussinessTypeServiceImpl implements BussinessTypeService {
 
     @Override
     public boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity) {
-        if (!StrUtil.isEmpty(bussinessTypeEntity.getSupplementOrderType())){
+        if (!StrUtil.isEmpty(bussinessTypeEntity.getSupplementOrderType())) {
             BussinessTypeEntity correspondType = bussinessTypeDao.selectByAction(bussinessTypeEntity.getSupplementOrderType());
             if (correspondType != null && correspondType.getCorpType() == 1) {
                 bussinessTypeDao.updateSupplementOrderType(bussinessTypeEntity.getSupplementOrderType(), bussinessTypeEntity.getAction());

api-udims/src/main/java/com/glxp/udi/admin/service/info/PlatformService.java

@@ -0,0 +1,23 @@
+package com.glxp.udi.admin.service.info;
+
+import com.glxp.udi.admin.entity.info.PlatformEntity;
+
+import java.util.List;
+import java.util.Map;
+
+public interface PlatformService {
+
+    int save(PlatformEntity platformEntity);
+
+    int batchSave(List<PlatformEntity> list);
+
+    int remove(String id);
+
+    int update(PlatformEntity platformEntity);
+
+    List<PlatformEntity> list(Map<String, Object> map);
+
+    int count(Map<String, Object> map);
+
+    PlatformEntity get(String id);
+}

api-udims/src/main/java/com/glxp/udi/admin/service/info/impl/PlatformServiceImpl.java

@@ -0,0 +1,60 @@
+package com.glxp.udi.admin.service.info.impl;
+
+import com.glxp.udi.admin.dao.info.PlatformDao;
+import com.glxp.udi.admin.entity.info.PlatformEntity;
+import com.glxp.udi.admin.service.info.PlatformService;
+import com.glxp.udi.admin.util.UuidUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@Slf4j
+public class PlatformServiceImpl implements PlatformService {
+
+    @Resource
+    PlatformDao platformDao;
+
+    @Override
+    public int save(PlatformEntity platformEntity) {
+        if (StringUtils.isEmpty(platformEntity.getId()))
+            platformEntity.setId(UuidUtils.getUUId());
+        return platformDao.save(platformEntity);
+    }
+
+    @Override
+    public int batchSave(List<PlatformEntity> list) {
+        return platformDao.batchSave(list);
+    }
+
+    @Override
+    public int remove(String id) {
+        return platformDao.remove(id);
+    }
+
+    @Override
+    public int update(PlatformEntity platformEntity) {
+        if (StringUtils.isEmpty(platformEntity.getId()))
+            return save(platformEntity);
+        return platformDao.update(platformEntity);
+    }
+
+    @Override
+    public List<PlatformEntity> list(Map<String, Object> map) {
+        return platformDao.list(map);
+    }
+
+    @Override
+    public int count(Map<String, Object> map) {
+        return platformDao.count(map);
+    }
+
+    @Override
+    public PlatformEntity get(String id) {
+        return platformDao.get(id);
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/service/inout/UnitMaintainService.java

@@ -0,0 +1,20 @@
+package com.glxp.udi.admin.service.inout;
+
+
+import com.glxp.udi.admin.entity.inout.UnitMaintainEntity;
+import com.glxp.udi.admin.req.inout.UnitMaintainFilterRequest;
+
+import java.util.List;
+
+public interface UnitMaintainService {
+
+    List<UnitMaintainEntity> filterList(UnitMaintainFilterRequest unitMaintainFilterRequest);
+
+    boolean insertUnitMaintain(UnitMaintainEntity unitMaintainEntity);
+
+    boolean deleteById(String id);
+
+    UnitMaintainEntity selectById(String id);
+
+    boolean updateUnit(UnitMaintainEntity unitMaintainEntity);
+}

api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/UnitMaintainServiceImpl.java

@@ -0,0 +1,50 @@
+package com.glxp.udi.admin.service.inout.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.glxp.udi.admin.dao.inout.UnitMaintainDao;
+import com.glxp.udi.admin.entity.inout.UnitMaintainEntity;
+import com.glxp.udi.admin.req.inout.UnitMaintainFilterRequest;
+import com.glxp.udi.admin.service.inout.UnitMaintainService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class UnitMaintainServiceImpl implements UnitMaintainService {
+
+    @Resource
+    UnitMaintainDao unitMaintainDao;
+
+    @Override
+    public List<UnitMaintainEntity> filterList(UnitMaintainFilterRequest unitMaintainFilterRequest) {
+        if (unitMaintainFilterRequest == null) {
+            return Collections.emptyList();
+        }
+        int offset = (unitMaintainFilterRequest.getPage() - 1) * unitMaintainFilterRequest.getLimit();
+        PageHelper.offsetPage(offset, unitMaintainFilterRequest.getLimit());
+        List<UnitMaintainEntity> data = unitMaintainDao.filterList(unitMaintainFilterRequest);
+        return data;
+    }
+
+    @Override
+    public boolean insertUnitMaintain(UnitMaintainEntity unitMaintainEntity) {
+        return unitMaintainDao.insertUnitMaintain(unitMaintainEntity);
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        return unitMaintainDao.deleteById(id);
+    }
+
+    @Override
+    public UnitMaintainEntity selectById(String id) {
+        return unitMaintainDao.selectById(id);
+    }
+
+    @Override
+    public boolean updateUnit(UnitMaintainEntity unitMaintainEntity) {
+        return unitMaintainDao.updateUnit(unitMaintainEntity);
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/service/thrsys/ThrCorpService.java

@@ -0,0 +1,31 @@
+package com.glxp.udi.admin.service.thrsys;
+
+
+import com.glxp.udi.admin.entity.thrsys.ThrCorpEntity;
+import com.glxp.udi.admin.req.thrsys.FilterThrCorpRequest;
+
+import java.util.List;
+
+public interface ThrCorpService {
+
+    List<ThrCorpEntity> filterThrCorps(FilterThrCorpRequest filterThrCorpRequest);
+
+    boolean insertThrCorps(ThrCorpEntity thrCorpEntity);
+
+    boolean insertThrCorpss(List<ThrCorpEntity> thrCorpEntitys);
+
+    boolean updateThrCorps(ThrCorpEntity thrCorpEntity);
+
+    boolean deleteById(String id);
+
+    boolean deleteByUnitId(String id);
+
+    boolean deleteAll();
+
+    /**
+     * 导入第三方往来单位数据
+     *
+     * @param thrCorpEntities
+     */
+    void importJsonData(List<ThrCorpEntity> thrCorpEntities);
+}

api-udims/src/main/java/com/glxp/udi/admin/service/thrsys/impl/ThrCorpServiceImpl.java

@@ -0,0 +1,75 @@
+package com.glxp.udi.admin.service.thrsys.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.glxp.udi.admin.dao.thrsys.ThrCorpDao;
+import com.glxp.udi.admin.entity.thrsys.ThrCorpEntity;
+import com.glxp.udi.admin.req.thrsys.FilterThrCorpRequest;
+import com.glxp.udi.admin.service.thrsys.ThrCorpService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+@Slf4j
+@Service
+public class ThrCorpServiceImpl implements ThrCorpService {
+
+    @Resource
+    private ThrCorpDao thrCorpDao;
+
+    @Override
+    public List<ThrCorpEntity> filterThrCorps(FilterThrCorpRequest filterThrCorpRequest) {
+        if (filterThrCorpRequest == null) {
+            return Collections.emptyList();
+        }
+        if (filterThrCorpRequest.getPage() != null) {
+            int offset = (filterThrCorpRequest.getPage() - 1) * filterThrCorpRequest.getLimit();
+            PageHelper.offsetPage(offset, filterThrCorpRequest.getLimit());
+        }
+        List<ThrCorpEntity> data = thrCorpDao.filterThrCorps(filterThrCorpRequest);
+        return data;
+    }
+
+    @Override
+    public boolean insertThrCorps(ThrCorpEntity thrCorpEntity) {
+        return thrCorpDao.insertThrCorps(thrCorpEntity);
+    }
+
+    @Override
+    public boolean insertThrCorpss(List<ThrCorpEntity> thrCorpEntitys) {
+        return thrCorpDao.insertThrCorpss(thrCorpEntitys);
+    }
+
+    @Override
+    public boolean updateThrCorps(ThrCorpEntity thrCorpEntity) {
+        return thrCorpDao.updateThrCorps(thrCorpEntity);
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        return thrCorpDao.deleteById(id);
+    }
+
+    @Override
+    public boolean deleteByUnitId(String id) {
+        return thrCorpDao.deleteByUnitId(id);
+    }
+
+    @Override
+    public boolean deleteAll() {
+        return thrCorpDao.deleteAll();
+    }
+
+    @Override
+    @Async
+    public void importJsonData(List<ThrCorpEntity> thrCorpEntities) {
+        try {
+            thrCorpDao.importThrCorps(thrCorpEntities);
+        } catch (Exception e) {
+            log.error("导入第三方往来单位数据异常", e);
+        }
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/service/udidl/EnterpriseService.java

@@ -0,0 +1,17 @@
+package com.glxp.udi.admin.service.udidl;
+
+import com.glxp.udi.admin.req.udidl.EnterpriseRequest;
+import com.glxp.udi.admin.res.udidl.EnterpriseResponse;
+
+import java.util.List;
+
+public interface EnterpriseService {
+
+    /**
+     * 根据企业类型查询企业名称信息
+     *
+     * @param enterpriseRequest
+     * @return
+     */
+    List<EnterpriseResponse> filterCandidateCompanyName(EnterpriseRequest enterpriseRequest);
+}

api-udims/src/main/java/com/glxp/udi/admin/service/udidl/SysRoleService.java

@@ -0,0 +1,13 @@
+package com.glxp.udi.admin.service.udidl;
+
+import com.glxp.udi.admin.req.udidl.SysRoleParam;
+import com.glxp.udi.common.res.BaseResponse;
+
+/**
+ * 用户管理
+ */
+public interface SysRoleService {
+
+    BaseResponse getList(SysRoleParam sysRoleParam);
+
+}

api-udims/src/main/java/com/glxp/udi/admin/service/udidl/SysUserService.java

@@ -0,0 +1,18 @@
+package com.glxp.udi.admin.service.udidl;
+
+import com.glxp.udi.admin.req.udidl.SysUserParam;
+import com.glxp.udi.common.res.BaseResponse;
+
+/**
+ * 系统管理 - 用户管理 接口
+ */
+public interface SysUserService {
+
+    /**
+     * 查询用户列表
+     *
+     * @param sysUserParam
+     * @return
+     */
+    BaseResponse getList(SysUserParam sysUserParam);
+}

api-udims/src/main/java/com/glxp/udi/admin/service/udidl/impl/EnterpriseServiceImpl.java

@@ -0,0 +1,74 @@
+package com.glxp.udi.admin.service.udidl.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.glxp.udi.admin.req.feign.BaseParam;
+import com.glxp.udi.admin.req.udidl.EnterpriseRequest;
+import com.glxp.udi.admin.res.udidl.EnterpriseResponse;
+import com.glxp.udi.admin.service.udidl.EnterpriseService;
+import com.glxp.udi.admin.util.UdidlClient;
+import com.glxp.udi.common.res.BaseResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@Service
+public class EnterpriseServiceImpl implements EnterpriseService {
+
+    @Autowired
+    private UdidlClient udidlClient;
+
+
+    @Override
+    public List<EnterpriseResponse> filterCandidateCompanyName(EnterpriseRequest enterpriseRequest) {
+        BaseParam baseParam = new BaseParam();
+        baseParam.setPage(1);
+        baseParam.setLimit(10);
+        baseParam.setName(enterpriseRequest.getKey());
+
+        List<EnterpriseResponse> data = new ArrayList<>(10);
+        if (enterpriseRequest.getBussinessStatus().equals("1")) {
+            //生产企业
+            BaseResponse manufactureList = udidlClient.getManufactureList(baseParam);
+            if (null != manufactureList.getData()) {
+                JSONArray list = JSON.parseObject(JSON.toJSONString(manufactureList.getData())).getJSONArray("list");
+                for (Object o : list) {
+                    JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(o));
+                    EnterpriseResponse response = new EnterpriseResponse();
+                    response.setName(jsonObject.getString("manufactureName"));
+                    data.add(response);
+                }
+            }
+        } else if (enterpriseRequest.getBussinessStatus().equals("2")) {
+            //配送企业
+            BaseResponse distributorList = udidlClient.getDistributorList(baseParam);
+            if (null != distributorList.getData()) {
+                JSONArray list = JSON.parseObject(JSON.toJSONString(distributorList.getData())).getJSONArray("list");
+                for (Object o : list) {
+                    JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(o));
+                    EnterpriseResponse response = new EnterpriseResponse();
+                    response.setName(jsonObject.getString("distributorName"));
+                    data.add(response);
+                }
+            }
+        } else if (enterpriseRequest.getBussinessStatus().equals("3")) {
+            //生产企业
+            BaseResponse hospitalList = udidlClient.getHospitalList(baseParam);
+            if (null != hospitalList.getData()) {
+                JSONArray list = JSON.parseObject(JSON.toJSONString(hospitalList.getData())).getJSONArray("list");
+                for (Object o : list) {
+                    JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(o));
+                    EnterpriseResponse response = new EnterpriseResponse();
+                    response.setName(jsonObject.getString("purchaseName"));
+                    data.add(response);
+                }
+            }
+        }
+        return data;
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/service/udidl/impl/SysRoleServiceImpl.java

@@ -0,0 +1,23 @@
+package com.glxp.udi.admin.service.udidl.impl;
+
+import com.glxp.udi.admin.req.udidl.SysRoleParam;
+import com.glxp.udi.admin.service.udidl.SysRoleService;
+import com.glxp.udi.admin.util.UdidlClient;
+import com.glxp.udi.common.res.BaseResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class SysRoleServiceImpl implements SysRoleService {
+
+    @Autowired
+    private UdidlClient udidlClient;
+
+    @Override
+    public BaseResponse getList(SysRoleParam sysRoleParam) {
+        return udidlClient.getSysRoleList(sysRoleParam);
+    }
+
+}

api-udims/src/main/java/com/glxp/udi/admin/service/udidl/impl/SysUserServiceImpl.java

@@ -0,0 +1,22 @@
+package com.glxp.udi.admin.service.udidl.impl;
+
+import com.glxp.udi.admin.req.udidl.SysUserParam;
+import com.glxp.udi.admin.service.udidl.SysUserService;
+import com.glxp.udi.admin.util.UdidlClient;
+import com.glxp.udi.common.res.BaseResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class SysUserServiceImpl implements SysUserService {
+
+    @Autowired
+    private UdidlClient udidlClient;
+
+    @Override
+    public BaseResponse getList(SysUserParam sysUserParam) {
+        return udidlClient.getSysUserList(sysUserParam);
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/thread/BasicUnitImportService.java

@@ -0,0 +1,107 @@
+package com.glxp.udi.admin.thread;
+
+import com.glxp.udi.admin.constant.ConstantStatus;
+import com.glxp.udi.admin.entity.basic.BasicThirdSysDetailEntity;
+import com.glxp.udi.admin.entity.basic.BasicUnitMaintainEntity;
+import com.glxp.udi.admin.entity.thrsys.ThrCorpEntity;
+import com.glxp.udi.admin.httpclient.ErpBasicClient;
+import com.glxp.udi.admin.req.basic.BasicUnitMaintainFilterRequest;
+import com.glxp.udi.admin.req.thrsys.FilterThrCorpRequest;
+import com.glxp.udi.admin.res.PageSimpleResponse;
+import com.glxp.udi.admin.res.basic.ErpUnitsResponse;
+import com.glxp.udi.admin.service.basic.BasicUnitMaintainService;
+import com.glxp.udi.admin.service.thrsys.ThrCorpService;
+import com.glxp.udi.admin.util.CustomUtil;
+import com.glxp.udi.common.res.BaseResponse;
+import org.springframework.beans.BeanUtils;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class BasicUnitImportService {
+    @Resource
+    private BasicUnitMaintainService basicUnitMaintainService;
+    @Resource
+    private ThrCorpService thrCorpService;
+    @Resource
+    private ErpBasicClient erpBasicClient;
+
+    @Async
+    public void selectAllUnit(BasicThirdSysDetailEntity basicThirdSysDetailEntity, BasicUnitMaintainFilterRequest unitMaintainFilterRequest) {
+        List<ErpUnitsResponse> imports = new ArrayList<>();
+        if (basicThirdSysDetailEntity.getFromType() == 0) {
+            int page = 1;
+
+            List<ErpUnitsResponse> erpUnitsResponses = new ArrayList<>();
+            while (true) {
+                unitMaintainFilterRequest.setPage(page);
+                unitMaintainFilterRequest.setLimit(100);
+                BaseResponse<PageSimpleResponse<ErpUnitsResponse>> baseResponse =
+                        erpBasicClient.getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue());
+                List<ErpUnitsResponse> temps = baseResponse.getData().getList();
+                if (temps.size() < 100) {
+                    erpUnitsResponses.addAll(temps);
+                    break;
+                } else {
+                    page++;
+                    erpUnitsResponses.addAll(temps);
+                }
+            }
+
+            imports.addAll(erpUnitsResponses);
+
+        } else {
+            FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest();
+            BeanUtils.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest);
+            filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys());
+            filterThrCorpRequest.setPage(null);
+            List<ThrCorpEntity> thrCorpEntities = thrCorpService.filterThrCorps(filterThrCorpRequest);
+            List<ErpUnitsResponse> lists = thrCorpEntities.stream().map(
+                    item -> {
+                        ErpUnitsResponse thrProductsEntity = new ErpUnitsResponse();
+                        BeanUtils.copyProperties(item, thrProductsEntity);
+                        thrProductsEntity.setId(item.getUnitId());
+                        return thrProductsEntity;
+                    }
+            ).collect(Collectors.toList());
+            imports.addAll(lists);
+        }
+        if (imports != null && imports.size() > 0) {
+            for (ErpUnitsResponse erpUnitsResponse : imports) {
+                BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity();
+                if (unitMaintainFilterRequest.getThirdSys() != null) {
+                    if ("thirdId".equals(unitMaintainFilterRequest.getThirdSys())) {
+                        basicUnitMaintainEntity.setThirdId(erpUnitsResponse.getId());
+                        basicUnitMaintainEntity.setThirdName(erpUnitsResponse.getName());
+                    } else if ("thirdId1".equals(unitMaintainFilterRequest.getThirdSys())) {
+                        basicUnitMaintainEntity.setThirdId1(erpUnitsResponse.getId());
+                        basicUnitMaintainEntity.setThirdName1(erpUnitsResponse.getName());
+                    } else if ("thirdId2".equals(unitMaintainFilterRequest.getThirdSys())) {
+                        basicUnitMaintainEntity.setThirdId2(erpUnitsResponse.getId());
+                        basicUnitMaintainEntity.setThirdName2(erpUnitsResponse.getName());
+                    } else if ("thirdId3".equals(unitMaintainFilterRequest.getThirdSys())) {
+                        basicUnitMaintainEntity.setThirdId3(erpUnitsResponse.getId());
+                        basicUnitMaintainEntity.setThirdName3(erpUnitsResponse.getName());
+                    } else if ("thirdId4".equals(unitMaintainFilterRequest.getThirdSys())) {
+                        basicUnitMaintainEntity.setThirdId4(erpUnitsResponse.getId());
+                        basicUnitMaintainEntity.setThirdName4(erpUnitsResponse.getName());
+                    }
+                }
+                basicUnitMaintainEntity.setErpId(CustomUtil.getId());
+                basicUnitMaintainEntity.setName(erpUnitsResponse.getName());
+                basicUnitMaintainEntity.setSpell(erpUnitsResponse.getSpell());
+                basicUnitMaintainEntity.setAddr(erpUnitsResponse.getAddr());
+                basicUnitMaintainEntity.setCreditNo(erpUnitsResponse.getCreditNo());
+                basicUnitMaintainEntity.setContact(erpUnitsResponse.getContact());
+                basicUnitMaintainEntity.setMobile(erpUnitsResponse.getMobile());
+                basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SP);
+                basicUnitMaintainService.insertBasicUnitMaintainignore(basicUnitMaintainEntity);
+            }
+        }
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/util/HttpClient.java

@@ -0,0 +1,154 @@
+package com.glxp.udi.admin.util;
+
+import com.alibaba.fastjson.JSONObject;
+import com.glxp.udi.admin.entity.basic.BasicThirdSysEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Iterator;
+import java.util.Map;
+
+@Service
+public class HttpClient {
+
+    @Value("${UDI_KEY}")
+    private String udiKey;
+
+    private static final Logger logger = LoggerFactory.getLogger(HttpClient.class);
+
+    public static String post(String url, Object object) {
+        RestTemplate restTemplate = new RestTemplate();
+        String json = JSONObject.toJSON(object).toString();
+        logger.info(url + "\n" + json);
+        MultiValueMap<String, Object> postParameters = new LinkedMultiValueMap<>();
+        postParameters.add("params", json);
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/x-www-form-urlencoded");
+        HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity<>(postParameters, headers);
+        String response = restTemplate.postForObject(UdidConfig.apiUrl + url, httpEntity, String.class);
+        System.out.println(response);
+
+        return response;
+    }
+
+    public static String postU8(String url, Object object) {
+        RestTemplate restTemplate = new RestTemplate();
+        String json = JSONObject.toJSON(object).toString();
+//        MultiValueMap<String, Object> postParameters = new LinkedMultiValueMap<>();
+//        postParameters.add("params", json);
+        logger.info(url + "\n" + json);
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json");
+        headers.add("system", "1");
+        headers.add("apicode", "1b723931cca84aee8ced6b607fc7dabb");
+        HttpEntity<String> httpEntity = new HttpEntity<>(json, headers);
+        String response = restTemplate.postForObject(url, httpEntity, String.class);
+        System.out.println(response);
+        return response;
+    }
+
+    public static String uCloudPost(String url, Object object) {
+        RestTemplate restTemplate = new RestTemplate();
+        String json = JSONObject.toJSON(object).toString();
+//        MultiValueMap<String, Object> postParameters = new LinkedMultiValueMap<>();
+//        postParameters.add("params", json);
+        logger.info(url + "\n" + json);
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json");
+        HttpEntity<String> httpEntity = new HttpEntity<>(json, headers);
+        logger.info(httpEntity.toString());
+        String response = restTemplate.postForObject(url, httpEntity, String.class);
+        System.out.println(response);
+        return response;
+    }
+
+    public static String uCloudPost(String url, Object object, BasicThirdSysEntity basicThirdSysEntity) {
+        RestTemplate restTemplate = new RestTemplate();
+        String json = JSONObject.toJSON(object).toString();
+        logger.info(url + "\n" + json);
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json");
+        if (null != basicThirdSysEntity) {
+            headers.add("api_key", basicThirdSysEntity.getApikey());
+            headers.add("secret_key", basicThirdSysEntity.getSecretkey());
+        }
+        HttpEntity<String> httpEntity = new HttpEntity<>(json, headers);
+        logger.info(httpEntity.toString());
+        String response = restTemplate.postForObject(url, httpEntity, String.class);
+        return response;
+    }
+
+
+    public static String mipsGet(String url) {
+        RestTemplate restTemplate = new RestTemplate();
+        String accessTokenRequestUrl = url;//"http://127.0.0.1:9997/mips/druginfo/list";
+        String response = restTemplate.getForObject(accessTokenRequestUrl, String.class);
+        return response;
+    }
+
+
+    public static String mipsGet(String url, Map params) {
+        StringBuffer stringBuffer = new StringBuffer(url);
+        if (params instanceof Map) {
+            Iterator iterator = ((Map) params).entrySet().iterator();
+            if (iterator.hasNext()) {
+                stringBuffer.append("?");
+                Object element;
+                while (iterator.hasNext()) {
+                    element = iterator.next();
+                    Map.Entry<String, Object> entry = (Map.Entry) element;
+                    //过滤value为null，value为null时进行拼接字符串会变成 "null"字符串
+                    if (entry.getValue() != null) {
+                        stringBuffer.append(element).append("&");
+                    }
+                    url = stringBuffer.substring(0, stringBuffer.length() - 1);
+                }
+            }
+        } else {
+            throw new RuntimeException("url请求:" + url + "请求参数有误不是map类型");
+        }
+        RestTemplate restTemplate = new RestTemplate();
+        String accessTokenRequestUrl = url;//"http://127.0.0.1:9997/mips/druginfo/list";
+        logger.info(accessTokenRequestUrl);
+        String response = restTemplate.getForObject(accessTokenRequestUrl, String.class);
+        return response;
+    }
+
+    public String mipsGetHead(String url, Map params) {
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json");
+        headers.add("key", udiKey);
+        StringBuffer stringBuffer = new StringBuffer(url);
+        if (params instanceof Map) {
+            Iterator iterator = ((Map) params).entrySet().iterator();
+            if (iterator.hasNext()) {
+                stringBuffer.append("?");
+                Object element;
+                while (iterator.hasNext()) {
+                    element = iterator.next();
+                    Map.Entry<String, Object> entry = (Map.Entry) element;
+                    if (entry.getValue() != null) {
+                        stringBuffer.append(element).append("&");
+                    }
+                    url = stringBuffer.substring(0, stringBuffer.length() - 1);
+                }
+            }
+        } else {
+            throw new RuntimeException("url请求:" + url + "请求参数有误不是map类型");
+        }
+        RestTemplate restTemplate = new RestTemplate();
+        String accessTokenRequestUrl = url;//"http://127.0.0.1:9997/mips/druginfo/list";
+        logger.info(accessTokenRequestUrl);
+        HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
+        String response = restTemplate.getForObject(accessTokenRequestUrl, String.class, httpEntity);
+        return response;
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/util/UdidlClient.java

@@ -0,0 +1,134 @@
+package com.glxp.udi.admin.util;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
+import com.glxp.udi.admin.req.feign.BaseParam;
+import com.glxp.udi.admin.req.udidl.SysRoleParam;
+import com.glxp.udi.admin.req.udidl.SysUserParam;
+import com.glxp.udi.common.res.BaseResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class UdidlClient {
+
+    @Value("${UDI_SERVER.url}")
+    private String url;
+
+    @Value("${UDI_SERVER.connectTimeout}")
+    private String connectTimeout;
+
+    @Value("${UDI_SERVER.readTimeout}")
+    private String readTimeout;
+
+    @Value("${UDI_SERVER.followRedirects}")
+    private String followRedirects;
+
+    @Value("${UDI_SERVER.key}")
+    private String key;
+
+    /**
+     * 获取生产企业列表
+     *
+     * @param baseParam
+     * @return
+     */
+    public BaseResponse getManufactureList(BaseParam baseParam) {
+        String response = HttpRequest.post(url + "/udplat/manufacture/list")
+                .body(JSONUtil.toJsonStr(baseParam))
+                .header("key", key)
+                .header("connectTimeout", connectTimeout)
+                .header("readTimeout", readTimeout)
+                .header("followRedirects", followRedirects)
+                .execute()
+                .body();
+        if (StrUtil.isNotBlank(response)) {
+            return JSONUtil.toBean(response, BaseResponse.class);
+        }
+        return null;
+    }
+
+    /**
+     * 获取配送企业列表
+     *
+     * @param baseParam
+     * @return
+     */
+    public BaseResponse getDistributorList(BaseParam baseParam) {
+        String response = HttpRequest.post(url + "/udplat/distributor/list")
+                .body(JSONUtil.toJsonStr(baseParam))
+                .header("key", key)
+                .header("connectTimeout", connectTimeout)
+                .header("readTimeout", readTimeout)
+                .header("followRedirects", followRedirects)
+                .execute()
+                .body();
+        if (StrUtil.isNotBlank(response)) {
+            return JSONUtil.toBean(response, BaseResponse.class);
+        }
+        return null;
+    }
+
+    /**
+     * 获取医疗机构列表
+     *
+     * @param baseParam
+     * @return
+     */
+    public BaseResponse getHospitalList(BaseParam baseParam) {
+        String response = HttpRequest.post(url + "/udplat/hospital/list")
+                .body(JSONUtil.toJsonStr(baseParam))
+                .header("key", key)
+                .header("connectTimeout", connectTimeout)
+                .header("readTimeout", readTimeout)
+                .header("followRedirects", followRedirects)
+                .execute()
+                .body();
+        if (StrUtil.isNotBlank(response)) {
+            return JSONUtil.toBean(response, BaseResponse.class);
+        }
+        return null;
+    }
+
+    /**
+     * 查询用户列表
+     *
+     * @param sysUserParam
+     * @return
+     */
+    public BaseResponse getSysUserList(SysUserParam sysUserParam) {
+        String response = HttpRequest.post(url + "/sys/user/list")
+                .body(JSONUtil.toJsonStr(sysUserParam))
+                .header("key", key)
+                .header("connectTimeout", connectTimeout)
+                .header("readTimeout", readTimeout)
+                .header("followRedirects", followRedirects)
+                .execute()
+                .body();
+        BaseResponse baseResponse = JSON.parseObject(response, BaseResponse.class);
+        return baseResponse;
+    }
+
+    /**
+     * 查询角色列表
+     *
+     * @param sysRoleParam
+     * @return
+     */
+    public BaseResponse getSysRoleList(SysRoleParam sysRoleParam) {
+        String response = HttpRequest.post(url + "/sys/role/list")
+                .body(JSONUtil.toJsonStr(sysRoleParam))
+                .header("key", key)
+                .header("connectTimeout", connectTimeout)
+                .header("readTimeout", readTimeout)
+                .header("followRedirects", followRedirects)
+                .execute()
+                .body();
+        BaseResponse baseResponse = JSON.parseObject(response, BaseResponse.class);
+        return baseResponse;
+    }
+}

api-udims/src/main/resources/application-pro.properties

@@ -39,4 +39,7 @@ spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.max-idle=8 
 spring.redis.jedis.pool.min-idle=0 
 
-file_path=D:/1s/udims
+file_path=D:/1s/udims
+
+#UDI\u6570\u636E\u4E0B\u8F7D
+UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df

api-udims/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml

@@ -26,15 +26,13 @@
         tel, mobile, userId,
         email, companyName, creditNum,
         area, detailAddr, bussinessStatus,
-        checkType, registerTime, checkTime, comments, areaCode, userName, licenseUrl, companyId
+        checkType, registerTime, checkTime, comments, areaCode, userName, licenseUrl, companyId)
-        , udplatCompanyName, udplatCompanyId)
         values (#{nickName}, #{password}, #{realName},
         #{tel}, #{mobile}, #{userId},
         #{email}, #{companyName}, #{creditNum},
         #{area}, #{detailAddr}, #{bussinessStatus},
         #{checkType}, #{registerTime}, #{checkTime},
-        #{comments}, #{areaCode}, #{userName}, #{licenseUrl}, #{companyId}
+        #{comments}, #{areaCode}, #{userName}, #{licenseUrl}, #{companyId})
-        , #{udplatCompanyName}, #{udplatCompanyId})
     </insert>
 
     <update id="updateUserRegister" parameterType="com.glxp.udi.admin.entity.auth.UserRegisterEntity">

api-udims/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.glxp.udi.admin.dao.basic.BasicThirdSysDao">
+    <insert id="insert" parameterType="com.glxp.udi.admin.entity.basic.BasicThirdSysEntity">
+        insert INTO basic_third_sys(thirdId, thirdName, guideUrl, remark, thridUrl, enabled, mainSys, apikey, secretkey)
+        values (#{thirdId},
+                #{thirdName},
+                #{guideUrl},
+                #{remark},
+                #{thridUrl},
+                #{enabled},
+                #{mainSys},
+                #{apikey},
+                #{secretkey})
+    </insert>
+
+    <update id="updateBasicThiSys" parameterType="com.glxp.udi.admin.entity.basic.BasicThirdSysEntity">
+        UPDATE basic_third_sys
+        <trim prefix="set" suffixOverrides=",">
+            <if test="thirdId != null">thirdId=#{thirdId},</if>
+            <if test="thirdName != null">thirdName=#{thirdName},</if>
+            <if test="guideUrl != null">guideUrl=#{guideUrl},</if>
+            <if test="remark != null">remark=#{remark},</if>
+            <if test="thridUrl != null">thridUrl=#{thridUrl},</if>
+            <if test="enabled != null">enabled=#{enabled},</if>
+            <if test="mainSys != null">mainSys=#{mainSys},</if>
+            <if test="apikey != null">apikey=#{apikey},</if>
+            <if test="secretkey != null">secretkey=#{secretkey}</if>
+        </trim>
+        WHERE id=#{id}
+    </update>
+
+    <select id="filterBasicThiSys" parameterType="com.glxp.udi.admin.req.basic.FilterBasicThirdSysRequest"
+            resultType="com.glxp.udi.admin.entity.basic.BasicThirdSysEntity">
+        SELECT * FROM basic_third_sys
+        <where>
+            <if test="thirdId != '' and thirdId != null">
+                AND thirdId = #{thirdId}
+            </if>
+            <if test="thirdName != '' and thirdName != null">
+                AND thirdName = #{thirdName}
+            </if>
+            <if test=" enabled != null">
+                AND enabled = #{enabled}
+            </if>
+            <if test="mainSys != '' and mainSys != null">
+                AND mainSys = #{mainSys}
+            </if>
+        </where>
+    </select>
+    <select id="selectByThirdId" parameterType="Map" resultType="com.glxp.udi.admin.entity.basic.BasicThirdSysEntity">
+        select *
+        FROM basic_third_sys
+        WHERE thirdId = #{thirdId}
+    </select>
+</mapper>

api-udims/src/main/resources/mybatis/mapper/info/PlatformDao.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.glxp.udi.admin.dao.info.PlatformDao">
+
+
+    <insert id="save"  parameterType="com.glxp.udi.admin.entity.info.PlatformEntity"
+      >
+        insert into auth_platform
+          ( id,name,host )
+        values
+          (
+          #{id},#{name,jdbcType=VARCHAR},#{host,jdbcType=VARCHAR}
+          )
+    </insert>
+
+    <insert id="batchSave" parameterType="java.util.List">
+        replace into auth_platform
+         ( id,name,host )
+        values
+        <foreach item="item" index="index" collection="list"
+			separator=",">
+         (
+         #{item.id},#{item.name,jdbcType=VARCHAR},#{item.host,jdbcType=VARCHAR}
+         )
+        </foreach>
+    </insert>
+
+    <delete id="remove" >
+        delete from auth_platform where id = #{value}
+    </delete>
+
+    <update id="update" parameterType="com.glxp.udi.admin.entity.info.PlatformEntity">
+        update auth_platform
+        <set>
+            <if test="name != null">name=#{name},</if>
+            <if test="host != null">host=#{host},</if>
+        </set>
+        where id=#{id}
+    </update>
+
+    <select id="get" resultType="com.glxp.udi.admin.entity.info.PlatformEntity">
+        select * from auth_platform  where id =  #{value}
+    </select>
+    <select id="list" resultType="com.glxp.udi.admin.entity.info.PlatformEntity">
+        select * from auth_platform
+        <where>
+           <if test="id != null and id != ''">
+              and id = #{id}
+           </if>
+           <if test="name != null and name != ''">
+              and instr(name,#{name})
+           </if>
+           <if test="host != null and host != ''">
+              and instr(host,#{host})
+           </if>
+        </where>
+        <if test="offset != null and limit != null">
+				limit #{offset}, #{limit}
+		</if>
+    </select>
+    <select id="count" resultType="int">
+        select count(*) from auth_platform
+        <where>
+           <if test="id != null and id != ''">
+              and id = #{id}
+           </if>
+           <if test="name != null and name != ''">
+              and instr(name,#{name})
+           </if>
+           <if test="host != null and host != ''">
+              and instr(host,#{host})
+           </if>
+        </where>
+    </select>
+</mapper>

api-udims/src/main/resources/mybatis/mapper/info/ScheduleDao.xml

@@ -27,7 +27,7 @@
         WHERE cronName=#{cronName}
     </update>
 
-    <select id="findScheduled" parameterType="com.glxp.udi.admin.req.udid.ScheduledRequest"
+    <select id="findScheduled" parameterType="com.glxp.udi.admin.req.udidl.ScheduledRequest"
             resultType="com.glxp.udi.admin.entity.info.ScheduledEntity">
         select * from scheduled
         <where>

api-udims/src/main/resources/mybatis/mapper/inout/UnitMaintainDao.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.glxp.udi.admin.dao.inout.UnitMaintainDao">
+
+    <select id="filterList" parameterType="com.glxp.udi.admin.req.inout.UnitMaintainFilterRequest"
+            resultType="com.glxp.udi.admin.entity.inout.UnitMaintainEntity">
+        SELECT * FROM io_unit_maintain
+        <where>
+            <if test="key != '' and key!=null">
+                and name like concat('%',#{key},'%') or spell like concat('%',#{key},'%') or unitId like
+                concat('%',#{key},'%')
+            </if>
+            <if test="customerId != '' and customerId != null">
+                AND customerId = #{customerId}
+            </if>
+        </where>
+    </select>
+
+
+    <insert id="insertUnitMaintain" keyProperty="id"
+            parameterType="com.glxp.udi.admin.entity.inout.UnitMaintainEntity">
+        replace INTO io_unit_maintain
+        (thirdId,unitId,name,spell,
+        addr,status,type,customerId,creditNo)
+        values
+            (
+            #{thirdId},
+            #{unitId},
+            #{name},
+            #{spell},
+            #{addr},
+            #{status},
+            #{type},#{customerId},#{creditNo}
+            )
+    </insert>
+
+    <delete id="deleteById" parameterType="Map">
+        DELETE FROM io_unit_maintain  WHERE id =  #{id}
+    </delete>
+
+
+    <select id="selectById" parameterType="Map" resultType="com.glxp.udi.admin.entity.inout.UnitMaintainEntity">
+         select * FROM io_unit_maintain  WHERE id =  #{id}
+    </select>
+
+
+    <update id="updateUnit" parameterType="com.glxp.udi.admin.entity.inout.UnitMaintainEntity">
+        UPDATE io_unit_maintain
+        <set>
+            <if test="thirdId != null">thirdId=#{thirdId},</if>
+            <if test="unitId != null">unitId=#{unitId},</if>
+            <if test="name != null">name=#{name},</if>
+            <if test="spell != null">spell=#{spell},</if>
+            <if test="addr != null">addr=#{addr},</if>
+            <if test="status != null">status=#{status},</if>
+            <if test="type != null">type=#{type},</if>
+            <if test="creditNo != null">creditNo=#{creditNo},</if>
+            <if test="platformId != null">platform_id=#{platformId},</if>
+            <if test="appid != null">appid=#{appid},</if>
+            <if test="apiKey != null">api_key=#{apiKey},</if>
+            <if test="secretKey != null">secret_key=#{secretKey},</if>
+        </set>
+        WHERE id = #{id}
+    </update>
+</mapper>

api-udims/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml

@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.glxp.udi.admin.dao.thrsys.ThrCorpDao">
+
+    <select id="filterThrCorps" parameterType="com.glxp.udi.admin.req.thrsys.FilterThrCorpRequest"
+            resultType="com.glxp.udi.admin.entity.thrsys.ThrCorpEntity">
+        SELECT * FROM thr_corp
+        <where>
+            <if test="unitId != '' and unitId != null">
+                AND unitId = #{unitId}
+            </if>
+            <if test="name != '' and name != null">
+                AND ( name LIKE concat('%',#{name},'%') or spell LIKE concat('%',#{name},'%') )
+            </if>
+            <if test="thirdSysFk != '' and thirdSysFk != null">
+                AND thirdSysFk = #{thirdSysFk}
+            </if>
+        </where>
+        ORDER BY updateTime DESC
+    </select>
+    <select id="batchSelectByIds" resultType="com.glxp.udi.admin.entity.thrsys.ThrCorpEntity">
+        select *
+        from thr_corp where unitId in
+        <foreach collection="codes" item="item" index="index" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        and thirdSysFk = #{thirdSysFk}
+    </select>
+
+    <insert id="insertThrCorps" keyProperty="id" parameterType="com.glxp.udi.admin.entity.thrsys.ThrCorpEntity">
+        replace
+        INTO thr_corp
+        (
+        unitId,name,spell,addr,creditNo,
+        contact,mobile,thirdSysFk,updateTime
+        )
+        values
+            (
+        #{unitId},
+        #{name},
+        #{spell},
+        #{addr},
+        #{creditNo},
+        #{contact},
+        #{mobile},
+        #{thirdSysFk},
+        #{updateTime}
+        )
+    </insert>
+
+    <insert id="insertThrCorpss" keyProperty="id" parameterType="java.util.List">
+        replace INTO thr_corp
+        (
+        unitId,name,spell,addr,creditNo,
+        contact,mobile,thirdSysFk,updateTime
+        )
+        values
+
+        <foreach collection="thrCorpEntitys" item="item" index="index"
+                 separator=",">
+            (
+            #{item.unitId},
+            #{item.name},
+            #{item.spell},
+            #{item.addr},
+            #{item.creditNo},
+            #{item.contact},
+            #{item.mobile},
+            #{item.thirdSysFk},#{item.updateTime}
+            )
+        </foreach>
+    </insert>
+
+    <delete id="deleteById" parameterType="Map">
+        DELETE
+        FROM thr_corp
+        WHERE id = #{id}
+    </delete>
+
+    <delete id="deleteByUnitId" parameterType="Map">
+        DELETE
+        FROM thr_corp
+        WHERE unitId = #{unitId}
+    </delete>
+
+    <delete id="deleteAll">
+        DELETE
+        FROM thr_corp
+    </delete>
+    <update id="updateThrCorps" parameterType="com.glxp.udi.admin.entity.thrsys.ThrCorpEntity">
+        UPDATE thr_corp
+        <trim prefix="set" suffixOverrides=",">
+            <if test="unitId != null">unitId=#{unitId},</if>
+            <if test="name != null">name=#{name},</if>
+            <if test="spell != null">spell=#{spell},</if>
+            <if test="addr != null">addr=#{addr},</if>
+            <if test="creditNo != null">creditNo=#{creditNo},</if>
+            <if test="contact != null">contact=#{contact},</if>
+            <if test="mobile != null">mobile=#{mobile},</if>
+            <if test="thirdSysFk != null">thirdSysFk=#{thirdSysFk},</if>
+            <if test="updateTime != null">updateTime=#{updateTime},</if>
+
+        </trim>
+        WHERE id = #{id}
+    </update>
+
+    <insert id="importThrCorps" parameterType="java.util.List">
+        replace INTO thr_corp
+        (id, unitId, name, spell, addr, creditNo,
+        contact, mobile, thirdSysFk, updateTime)
+        values
+
+        <foreach collection="thrCorpEntities" item="item" index="index"
+                 separator=",">
+            (#{item.id},
+            #{item.unitId},
+            #{item.name},
+            #{item.spell},
+            #{item.addr},
+            #{item.creditNo},
+            #{item.contact},
+            #{item.mobile},
+            #{item.thirdSysFk}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <insert id="importThrCorp" parameterType="com.glxp.udi.admin.entity.thrsys.ThrCorpEntity">
+        replace
+        into thr_corp (id, unitId, spell, addr, creditNo, contact, mobile, thirdSysFk, name, updateTime)
+        values (
+        #{id},
+        #{unitId},
+        #{spell},
+        #{addr},
+        #{creditNo},
+        #{contact},
+        #{mobile},
+        #{thirdSysFk},
+        #{name},
+        #{updateTime}
+        )
+    </insert>
+</mapper>