diff --git a/api-common/src/main/java/com/glxp/udi/common/converter/LongList2StringConverter.java b/api-common/src/main/java/com/glxp/udi/common/converter/LongList2StringConverter.java index 283f44b..cd283e4 100644 --- a/api-common/src/main/java/com/glxp/udi/common/converter/LongList2StringConverter.java +++ b/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 stringSet = new HashSet<>(); - for (Long value: longList){ + for (Long value : longList) { stringSet.add(value.toString()); } if (stringSet.isEmpty()) { diff --git a/api-common/src/main/java/com/glxp/udi/common/converter/String2LongListConverter.java b/api-common/src/main/java/com/glxp/udi/common/converter/String2LongListConverter.java index b444a63..273405b 100644 --- a/api-common/src/main/java/com/glxp/udi/common/converter/String2LongListConverter.java +++ b/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 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(); } } diff --git a/api-common/src/main/java/com/glxp/udi/common/converter/String2StringListConverter.java b/api-common/src/main/java/com/glxp/udi/common/converter/String2StringListConverter.java index c2ed37a..c7dc283 100644 --- a/api-common/src/main/java/com/glxp/udi/common/converter/String2StringListConverter.java +++ b/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 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(); } } diff --git a/api-common/src/main/java/com/glxp/udi/common/res/BaseResponse.java b/api-common/src/main/java/com/glxp/udi/common/res/BaseResponse.java index b40f803..d7133cc 100644 --- a/api-common/src/main/java/com/glxp/udi/common/res/BaseResponse.java +++ b/api-common/src/main/java/com/glxp/udi/common/res/BaseResponse.java @@ -4,11 +4,15 @@ import lombok.Data; /** * 返回结果类 + * * @param */ @Data public class BaseResponse { - public boolean success(){return this.code.equals(20000);} + public boolean success() { + return this.code.equals(20000); + } + private Integer code; private String message; diff --git a/api-common/src/main/java/com/glxp/udi/common/util/ResultVOUtils.java b/api-common/src/main/java/com/glxp/udi/common/util/ResultVOUtils.java index a155541..ccad812 100644 --- a/api-common/src/main/java/com/glxp/udi/common/util/ResultVOUtils.java +++ b/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) { diff --git a/api-udims/pom.xml b/api-udims/pom.xml index 4d7541e..325ca25 100644 --- a/api-udims/pom.xml +++ b/api-udims/pom.xml @@ -118,7 +118,6 @@ fastjson - org.springframework.boot spring-boot-starter-test @@ -280,9 +279,7 @@ 1.4.0 - - diff --git a/api-udims/src/main/java/com/glxp/udi/ApiAdminApplication.java b/api-udims/src/main/java/com/glxp/udi/ApiAdminApplication.java index d5234cb..244fa14 100644 --- a/api-udims/src/main/java/com/glxp/udi/ApiAdminApplication.java +++ b/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); } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/config/RedisConfig.java b/api-udims/src/main/java/com/glxp/udi/admin/config/RedisConfig.java index 336b5de..7241dd7 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/config/RedisConfig.java +++ b/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 */ diff --git a/api-udims/src/main/java/com/glxp/udi/admin/constant/ConstantStatus.java b/api-udims/src/main/java/com/glxp/udi/admin/constant/ConstantStatus.java index 82390e2..affda0b 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/constant/ConstantStatus.java +++ b/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; //单据来源 diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/auth/AuthAdminController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/auth/AuthAdminController.java index 6213730..44ca65e 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/auth/AuthAdminController.java +++ b/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(); - - CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(curUser.getCustomerId()); - int max = customerInfoEntity.getUserMax(); - int count = authAdminService.findCountByCustomerId(authAdminSaveRequest.getCustomerId()); - if (count >= max) { - return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "已超过最大用户数"); + if (curUser.getCustomerId() != 110) { + CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(curUser.getCustomerId()); + int max = customerInfoEntity.getUserMax(); + int count = authAdminService.findCountByCustomerId(authAdminSaveRequest.getCustomerId()); + if (count >= max) { + return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "已超过最大用户数"); + } } + // 检查是否存在相同名称的管理员 AuthAdmin byUserName = authAdminService.findByUserName(authAdminSaveRequest.getUserName()); if (byUserName != null) { diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/auth/CustomerController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/auth/CustomerController.java index b12a3c7..e6a893f 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/auth/CustomerController.java +++ b/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") diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/auth/RegisterController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/auth/RegisterController.java index 69d8757..020e909 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/auth/RegisterController.java +++ b/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()); diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/basic/BasicUnitMaintainController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/basic/BasicUnitMaintainController.java new file mode 100644 index 0000000..6d8c191 --- /dev/null +++ b/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 basicUnitMaintainEntities; + basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK); + basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); + PageInfo pageInfo = new PageInfo<>(basicUnitMaintainEntities); + PageSimpleResponse 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 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 basicUnitMaintainEntities; + basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(basicUnitMaintainEntities); + PageSimpleResponse 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 basicUnitMaintainEntities; + basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); + + List basicUnitMaintainResponses = basicUnitMaintainEntities.stream().map(item -> + { + BasicUnitMaintainResponse basicUnitMaintainResponse = new BasicUnitMaintainResponse(); + BeanUtils.copyProperties(item, basicUnitMaintainResponse); + basicUnitMaintainResponse.setUnitId(item.getErpId()); + return basicUnitMaintainResponse; + }).collect(Collectors.toList()); + PageInfo pageInfo; + pageInfo = new PageInfo<>(basicUnitMaintainResponses); + PageSimpleResponse 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 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> 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 thrCorpEntities + = thrCorpService.filterThrCorps(filterThrCorpRequest); + List 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 pageInfo; + pageInfo = new PageInfo<>(thrCorpEntities); + PageSimpleResponse 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 basicThirdSysEntities = basicThirdSysService.filterBasicThiSys(filterBasicThirdSysRequest); + List 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 pageInfo; + pageInfo = new PageInfo<>(basicProductThirdSysResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicProductThirdSysResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + + public BasicThirdSysEntity filterThirdSys(String thirdId, List basicThirdSysEntities) { + if (basicThirdSysEntities != null && basicThirdSysEntities.size() > 0) { + for (BasicThirdSysEntity basicThirdSysEntity : basicThirdSysEntities) { + if (thirdId.equals(basicThirdSysEntity.getThirdId())) { + return basicThirdSysEntity; + } + } + } + return null; + } +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/info/CompanyController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/info/CompanyController.java index 212a7a5..c6130ac 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/info/CompanyController.java +++ b/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(); - File file=new File(URL); - if(file.exists()&&file.isFile()) { + String URL = filePath + "/register/file/image1/" + companyEntity.getFilePath(); + File file = new File(URL); + 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(); - File file=new File(URL); - if(file.exists()&&file.isFile()) { + String URL = filePath + "/register/file/image1/" + companyEntity.getFilePath2(); + File file = new File(URL); + 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(); - File file=new File(URL); - if(file.exists()&&file.isFile()) { + String URL = filePath + "/register/file/image1/" + companyEntity.getFilePath3(); + File file = new File(URL); + 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(); - File file=new File(URL); - if(file.exists()&&file.isFile()) { + String URL = filePath + "/register/file/image1/" + companyEntity.getFilePath4(); + File file = new File(URL); + if (file.exists() && file.isFile()) { file.delete(); } } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/info/PlatformController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/info/PlatformController.java new file mode 100644 index 0000000..87c7a4f --- /dev/null +++ b/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 params) { + List 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 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 map = new HashMap(); + map.put("username", unitMaintainEntity.getPlatformUsername()); + map.put("password", unitMaintainEntity.getPlatformPassword()); + + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_JSON_UTF8); + + HttpEntity request = new HttpEntity(JSON.toJSONString(map), headers); + RestTemplate restTemplate = new RestTemplate(); + log.error(url); + + String result = restTemplate.postForObject(url, request, String.class, map); + log.error(result); + Map object = JSON.parseObject(result, Map.class); + + if (object != null && object.get("data") != null) { + Map 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("关联成功"); + } + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/param/SystemPDFTemplateController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/param/SystemPDFTemplateController.java index 3c08200..958adcf 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/param/SystemPDFTemplateController.java +++ b/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()); diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/udidl/EnterpriseController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/udidl/EnterpriseController.java new file mode 100644 index 0000000..c3eaad7 --- /dev/null +++ b/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 enterpriseResponses = enterpriseService.filterCandidateCompanyName(enterpriseRequest); + return ResultVOUtils.success(enterpriseResponses); + } + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/udidl/SysRoleController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/udidl/SysRoleController.java new file mode 100644 index 0000000..aaa75c0 --- /dev/null +++ b/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); + } + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/udidl/SysUserController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/udidl/SysUserController.java new file mode 100644 index 0000000..a11d022 --- /dev/null +++ b/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); + } + + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/dao/basic/BasicThirdSysDao.java b/api-udims/src/main/java/com/glxp/udi/admin/dao/basic/BasicThirdSysDao.java new file mode 100644 index 0000000..9c80b1c --- /dev/null +++ b/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 filterBasicThiSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest); + + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/dao/basic/BasicThirdSysDetailDao.java b/api-udims/src/main/java/com/glxp/udi/admin/dao/basic/BasicThirdSysDetailDao.java index fc99c64..18bbacc 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/dao/basic/BasicThirdSysDetailDao.java +++ b/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 filterBasicThirdSysDetail(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest); diff --git a/api-udims/src/main/java/com/glxp/udi/admin/dao/info/PlatformDao.java b/api-udims/src/main/java/com/glxp/udi/admin/dao/info/PlatformDao.java new file mode 100644 index 0000000..7cfebaf --- /dev/null +++ b/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 list); + + int remove(String id); + + int update(PlatformEntity platformEntity); + + List list(Map map); + + int count(Map map); + + PlatformEntity get(String id); +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/dao/info/ScheduledDao.java b/api-udims/src/main/java/com/glxp/udi/admin/dao/info/ScheduledDao.java index 2825fcb..b14d925 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/dao/info/ScheduledDao.java +++ b/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 diff --git a/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/UnitMaintainDao.java b/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/UnitMaintainDao.java new file mode 100644 index 0000000..ea3884f --- /dev/null +++ b/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 filterList(UnitMaintainFilterRequest unitMaintainFilterRequest); + + boolean insertUnitMaintain(UnitMaintainEntity unitMaintainEntity); + + boolean deleteById(@Param("id") String id); + + UnitMaintainEntity selectById(@Param("id") String id); + + boolean updateUnit(UnitMaintainEntity unitMaintainEntity); +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/dao/thrsys/ThrCorpDao.java b/api-udims/src/main/java/com/glxp/udi/admin/dao/thrsys/ThrCorpDao.java new file mode 100644 index 0000000..4ff6dd5 --- /dev/null +++ b/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 filterThrCorps(FilterThrCorpRequest filterThrCorpRequest); + + List batchSelectByIds(FilterThrCorpRequest filterThrProductsRequest); + + boolean insertThrCorps(ThrCorpEntity thrCorpEntity); + + boolean insertThrCorpss(@Param("thrCorpEntitys") List 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 thrCorpEntities); + + void importThrCorp(ThrCorpEntity thrCorpEntity); +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/entity/auth/UserRegisterEntity.java b/api-udims/src/main/java/com/glxp/udi/admin/entity/auth/UserRegisterEntity.java index aa76254..13942e4 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/entity/auth/UserRegisterEntity.java +++ b/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; } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/entity/info/PlatformEntity.java b/api-udims/src/main/java/com/glxp/udi/admin/entity/info/PlatformEntity.java new file mode 100644 index 0000000..6dc63b0 --- /dev/null +++ b/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; + } +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/UnitMaintainEntity.java b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/UnitMaintainEntity.java new file mode 100644 index 0000000..845d8fc --- /dev/null +++ b/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; + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/entity/thrsys/ThrCorpEntity.java b/api-udims/src/main/java/com/glxp/udi/admin/entity/thrsys/ThrCorpEntity.java new file mode 100644 index 0000000..510d23b --- /dev/null +++ b/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; + + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/httpclient/ErpBasicClient.java b/api-udims/src/main/java/com/glxp/udi/admin/httpclient/ErpBasicClient.java new file mode 100644 index 0000000..1906f13 --- /dev/null +++ b/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> getErpCrop(BasicUnitMaintainFilterRequest unitMaintainFilterRequest, String url) { + Map 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> udiDlDeviceResponse = + JSONObject.parseObject(response, new TypeReference>>() { + }); + return udiDlDeviceResponse; + } catch (Exception e) { + log.error("获取往来单位异常", e); + return ResultVOUtils.error(500, "连接ERP服务出错！"); + } + } + + //获取产品信息 + public BaseResponse> getErpProducts(FilterErpGoodsRequest filterErpGoodsRequest, String url) { + Map 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> udiDlDeviceResponse = + JSONObject.parseObject(response, new TypeReference>>() { + }); + return udiDlDeviceResponse; + } catch (Exception e) { + log.error("获取产品信息异常", e); + return ResultVOUtils.error(500, "连接ERP服务出错！"); + } + } + + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/req/basic/BasicUnitMaintainFilterRequest.java b/api-udims/src/main/java/com/glxp/udi/admin/req/basic/BasicUnitMaintainFilterRequest.java index 8fc749c..0bdf501 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/req/basic/BasicUnitMaintainFilterRequest.java +++ b/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 thrCorpEntities; - } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/req/basic/CombineSingleUnitRequest.java b/api-udims/src/main/java/com/glxp/udi/admin/req/basic/CombineSingleUnitRequest.java new file mode 100644 index 0000000..335f535 --- /dev/null +++ b/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; +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/req/basic/CombineUnitRequest.java b/api-udims/src/main/java/com/glxp/udi/admin/req/basic/CombineUnitRequest.java new file mode 100644 index 0000000..8c550be --- /dev/null +++ b/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 keys; + private String thirdSys; + List custmandocResponses; +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/req/basic/FilterErpGoodsRequest.java b/api-udims/src/main/java/com/glxp/udi/admin/req/basic/FilterErpGoodsRequest.java new file mode 100644 index 0000000..f7e6e7c --- /dev/null +++ b/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; +} + diff --git a/api-udims/src/main/java/com/glxp/udi/admin/req/basic/RemoveRelRequest.java b/api-udims/src/main/java/com/glxp/udi/admin/req/basic/RemoveRelRequest.java new file mode 100644 index 0000000..bb46b00 --- /dev/null +++ b/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; +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/req/feign/BaseParam.java b/api-udims/src/main/java/com/glxp/udi/admin/req/feign/BaseParam.java new file mode 100644 index 0000000..bd4c553 --- /dev/null +++ b/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;//名称，支持模糊查询 +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/req/inout/UnitMaintainFilterRequest.java b/api-udims/src/main/java/com/glxp/udi/admin/req/inout/UnitMaintainFilterRequest.java new file mode 100644 index 0000000..571a54b --- /dev/null +++ b/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; + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/req/thrsys/FilterThrCorpRequest.java b/api-udims/src/main/java/com/glxp/udi/admin/req/thrsys/FilterThrCorpRequest.java new file mode 100644 index 0000000..7d13f83 --- /dev/null +++ b/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 codes; + private String name; + private String key; + List thrCorpEntities; +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/req/udidl/EnterpriseRequest.java b/api-udims/src/main/java/com/glxp/udi/admin/req/udidl/EnterpriseRequest.java new file mode 100644 index 0000000..cf32ca7 --- /dev/null +++ b/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：医疗机构 + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/req/udid/ScheduledRequest.java b/api-udims/src/main/java/com/glxp/udi/admin/req/udidl/ScheduledRequest.java similarity index 76% rename from api-udims/src/main/java/com/glxp/udi/admin/req/udid/ScheduledRequest.java rename to api-udims/src/main/java/com/glxp/udi/admin/req/udidl/ScheduledRequest.java index 0fc94f3..152c1df 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/req/udid/ScheduledRequest.java +++ b/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; diff --git a/api-udims/src/main/java/com/glxp/udi/admin/req/udidl/SysRoleParam.java b/api-udims/src/main/java/com/glxp/udi/admin/req/udidl/SysRoleParam.java new file mode 100644 index 0000000..4151ab7 --- /dev/null +++ b/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; +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/req/udidl/SysUserParam.java b/api-udims/src/main/java/com/glxp/udi/admin/req/udidl/SysUserParam.java new file mode 100644 index 0000000..c4a8ceb --- /dev/null +++ b/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; +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/res/basic/BasicProductThirdSysResponse.java b/api-udims/src/main/java/com/glxp/udi/admin/res/basic/BasicProductThirdSysResponse.java new file mode 100644 index 0000000..afd7706 --- /dev/null +++ b/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; +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/res/basic/BasicUnitMaintainResponse.java b/api-udims/src/main/java/com/glxp/udi/admin/res/basic/BasicUnitMaintainResponse.java new file mode 100644 index 0000000..0860754 --- /dev/null +++ b/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; +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/res/basic/ErpProductsResponse.java b/api-udims/src/main/java/com/glxp/udi/admin/res/basic/ErpProductsResponse.java new file mode 100644 index 0000000..7ec90a2 --- /dev/null +++ b/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 + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/res/udidl/EnterpriseResponse.java b/api-udims/src/main/java/com/glxp/udi/admin/res/udidl/EnterpriseResponse.java new file mode 100644 index 0000000..b2aeda5 --- /dev/null +++ b/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; + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/basic/BasicThirdSysDetailService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/basic/BasicThirdSysDetailService.java index 7a9491e..c7b7741 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/basic/BasicThirdSysDetailService.java +++ b/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 filterBasicThirdSysDetail(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest); diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/basic/BasicThirdSysService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/basic/BasicThirdSysService.java new file mode 100644 index 0000000..c70b389 --- /dev/null +++ b/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 filterBasicThiSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest); + + BasicThirdSysEntity selectMainThrSys(); +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/basic/BasicUnitMaintainService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/basic/BasicUnitMaintainService.java index 2c1a460..0352332 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/basic/BasicUnitMaintainService.java +++ b/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(); + } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/basic/impl/BasicThirdSysDetailServiceImpl.java b/api-udims/src/main/java/com/glxp/udi/admin/service/basic/impl/BasicThirdSysDetailServiceImpl.java index 65dc572..833e66e 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/basic/impl/BasicThirdSysDetailServiceImpl.java +++ b/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 diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/basic/impl/BasicThirdSysServiceImpl.java b/api-udims/src/main/java/com/glxp/udi/admin/service/basic/impl/BasicThirdSysServiceImpl.java new file mode 100644 index 0000000..52fb3d7 --- /dev/null +++ b/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 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 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 data = basicThirdSysDao.filterBasicThiSys(filterBasicThirdSysRequest); + if (data != null && data.size() > 0) { + return data.get(0); + } + return null; + } +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java b/api-udims/src/main/java/com/glxp/udi/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java index 7802b27..e06b5b2 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java +++ b/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; } + } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/basic/impl/BussinessTypeServiceImpl.java b/api-udims/src/main/java/com/glxp/udi/admin/service/basic/impl/BussinessTypeServiceImpl.java index 427f2c8..f2579d5 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/basic/impl/BussinessTypeServiceImpl.java +++ b/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()); diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/info/PlatformService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/info/PlatformService.java new file mode 100644 index 0000000..b1f1314 --- /dev/null +++ b/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 list); + + int remove(String id); + + int update(PlatformEntity platformEntity); + + List list(Map map); + + int count(Map map); + + PlatformEntity get(String id); +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/info/impl/PlatformServiceImpl.java b/api-udims/src/main/java/com/glxp/udi/admin/service/info/impl/PlatformServiceImpl.java new file mode 100644 index 0000000..7a89da5 --- /dev/null +++ b/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 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 list(Map map) { + return platformDao.list(map); + } + + @Override + public int count(Map map) { + return platformDao.count(map); + } + + @Override + public PlatformEntity get(String id) { + return platformDao.get(id); + } +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/inout/UnitMaintainService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/UnitMaintainService.java new file mode 100644 index 0000000..21deeaa --- /dev/null +++ b/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 filterList(UnitMaintainFilterRequest unitMaintainFilterRequest); + + boolean insertUnitMaintain(UnitMaintainEntity unitMaintainEntity); + + boolean deleteById(String id); + + UnitMaintainEntity selectById(String id); + + boolean updateUnit(UnitMaintainEntity unitMaintainEntity); +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/UnitMaintainServiceImpl.java b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/UnitMaintainServiceImpl.java new file mode 100644 index 0000000..3eeefbb --- /dev/null +++ b/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 filterList(UnitMaintainFilterRequest unitMaintainFilterRequest) { + if (unitMaintainFilterRequest == null) { + return Collections.emptyList(); + } + int offset = (unitMaintainFilterRequest.getPage() - 1) * unitMaintainFilterRequest.getLimit(); + PageHelper.offsetPage(offset, unitMaintainFilterRequest.getLimit()); + List 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); + } +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/thrsys/ThrCorpService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/thrsys/ThrCorpService.java new file mode 100644 index 0000000..05a8895 --- /dev/null +++ b/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 filterThrCorps(FilterThrCorpRequest filterThrCorpRequest); + + boolean insertThrCorps(ThrCorpEntity thrCorpEntity); + + boolean insertThrCorpss(List thrCorpEntitys); + + boolean updateThrCorps(ThrCorpEntity thrCorpEntity); + + boolean deleteById(String id); + + boolean deleteByUnitId(String id); + + boolean deleteAll(); + + /** + * 导入第三方往来单位数据 + * + * @param thrCorpEntities + */ + void importJsonData(List thrCorpEntities); +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/thrsys/impl/ThrCorpServiceImpl.java b/api-udims/src/main/java/com/glxp/udi/admin/service/thrsys/impl/ThrCorpServiceImpl.java new file mode 100644 index 0000000..3711cd1 --- /dev/null +++ b/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 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 data = thrCorpDao.filterThrCorps(filterThrCorpRequest); + return data; + } + + @Override + public boolean insertThrCorps(ThrCorpEntity thrCorpEntity) { + return thrCorpDao.insertThrCorps(thrCorpEntity); + } + + @Override + public boolean insertThrCorpss(List 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 thrCorpEntities) { + try { + thrCorpDao.importThrCorps(thrCorpEntities); + } catch (Exception e) { + log.error("导入第三方往来单位数据异常", e); + } + } +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/udidl/EnterpriseService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/udidl/EnterpriseService.java new file mode 100644 index 0000000..862732d --- /dev/null +++ b/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 filterCandidateCompanyName(EnterpriseRequest enterpriseRequest); +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/udidl/SysRoleService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/udidl/SysRoleService.java new file mode 100644 index 0000000..bc376f3 --- /dev/null +++ b/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); + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/udidl/SysUserService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/udidl/SysUserService.java new file mode 100644 index 0000000..445176b --- /dev/null +++ b/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); +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/udidl/impl/EnterpriseServiceImpl.java b/api-udims/src/main/java/com/glxp/udi/admin/service/udidl/impl/EnterpriseServiceImpl.java new file mode 100644 index 0000000..7909737 --- /dev/null +++ b/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 filterCandidateCompanyName(EnterpriseRequest enterpriseRequest) { + BaseParam baseParam = new BaseParam(); + baseParam.setPage(1); + baseParam.setLimit(10); + baseParam.setName(enterpriseRequest.getKey()); + + List 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; + } +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/udidl/impl/SysRoleServiceImpl.java b/api-udims/src/main/java/com/glxp/udi/admin/service/udidl/impl/SysRoleServiceImpl.java new file mode 100644 index 0000000..892fd38 --- /dev/null +++ b/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); + } + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/udidl/impl/SysUserServiceImpl.java b/api-udims/src/main/java/com/glxp/udi/admin/service/udidl/impl/SysUserServiceImpl.java new file mode 100644 index 0000000..2ddf957 --- /dev/null +++ b/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); + } +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/thread/BasicUnitImportService.java b/api-udims/src/main/java/com/glxp/udi/admin/thread/BasicUnitImportService.java new file mode 100644 index 0000000..f774253 --- /dev/null +++ b/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 imports = new ArrayList<>(); + if (basicThirdSysDetailEntity.getFromType() == 0) { + int page = 1; + + List erpUnitsResponses = new ArrayList<>(); + while (true) { + unitMaintainFilterRequest.setPage(page); + unitMaintainFilterRequest.setLimit(100); + BaseResponse> baseResponse = + erpBasicClient.getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue()); + List 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 thrCorpEntities = thrCorpService.filterThrCorps(filterThrCorpRequest); + List 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); + } + } + } +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/util/HttpClient.java b/api-udims/src/main/java/com/glxp/udi/admin/util/HttpClient.java new file mode 100644 index 0000000..b12f7cb --- /dev/null +++ b/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 postParameters = new LinkedMultiValueMap<>(); + postParameters.add("params", json); + HttpHeaders headers = new HttpHeaders(); + headers.add("Content-Type", "application/x-www-form-urlencoded"); + HttpEntity> 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 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 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 postParameters = new LinkedMultiValueMap<>(); +// postParameters.add("params", json); + logger.info(url + "\n" + json); + HttpHeaders headers = new HttpHeaders(); + headers.add("Content-Type", "application/json"); + HttpEntity 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 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 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 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 httpEntity = new HttpEntity<>(headers); + String response = restTemplate.getForObject(accessTokenRequestUrl, String.class, httpEntity); + return response; + } +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/util/UdidlClient.java b/api-udims/src/main/java/com/glxp/udi/admin/util/UdidlClient.java new file mode 100644 index 0000000..0941b4f --- /dev/null +++ b/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; + } +} diff --git a/api-udims/src/main/resources/application-pro.properties b/api-udims/src/main/resources/application-pro.properties index 50d6d28..82f656f 100644 --- a/api-udims/src/main/resources/application-pro.properties +++ b/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 \ No newline at end of file +file_path=D:/1s/udims + +#UDI\u6570\u636E\u4E0B\u8F7D +UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df \ No newline at end of file diff --git a/api-udims/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml b/api-udims/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml index 6a10740..7da2e95 100644 --- a/api-udims/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml +++ b/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 - , udplatCompanyName, udplatCompanyId) + checkType, registerTime, checkTime, comments, areaCode, userName, licenseUrl, companyId) values (#{nickName}, #{password}, #{realName}, #{tel}, #{mobile}, #{userId}, #{email}, #{companyName}, #{creditNum}, #{area}, #{detailAddr}, #{bussinessStatus}, #{checkType}, #{registerTime}, #{checkTime}, - #{comments}, #{areaCode}, #{userName}, #{licenseUrl}, #{companyId} - , #{udplatCompanyName}, #{udplatCompanyId}) + #{comments}, #{areaCode}, #{userName}, #{licenseUrl}, #{companyId}) diff --git a/api-udims/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml b/api-udims/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml new file mode 100644 index 0000000..92667b9 --- /dev/null +++ b/api-udims/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml @@ -0,0 +1,57 @@ + + + + + + insert INTO basic_third_sys(thirdId, thirdName, guideUrl, remark, thridUrl, enabled, mainSys, apikey, secretkey) + values (#{thirdId}, + #{thirdName}, + #{guideUrl}, + #{remark}, + #{thridUrl}, + #{enabled}, + #{mainSys}, + #{apikey}, + #{secretkey}) + + + + UPDATE basic_third_sys + + thirdId=#{thirdId}, + thirdName=#{thirdName}, + guideUrl=#{guideUrl}, + remark=#{remark}, + thridUrl=#{thridUrl}, + enabled=#{enabled}, + mainSys=#{mainSys}, + apikey=#{apikey}, + secretkey=#{secretkey} + + WHERE id=#{id} + + + + + \ No newline at end of file diff --git a/api-udims/src/main/resources/mybatis/mapper/info/PlatformDao.xml b/api-udims/src/main/resources/mybatis/mapper/info/PlatformDao.xml new file mode 100644 index 0000000..3c24f02 --- /dev/null +++ b/api-udims/src/main/resources/mybatis/mapper/info/PlatformDao.xml @@ -0,0 +1,76 @@ + + + + + + + + insert into auth_platform + ( id,name,host ) + values + ( + #{id},#{name,jdbcType=VARCHAR},#{host,jdbcType=VARCHAR} + ) + + + + replace into auth_platform + ( id,name,host ) + values + + ( + #{item.id},#{item.name,jdbcType=VARCHAR},#{item.host,jdbcType=VARCHAR} + ) + + + + + delete from auth_platform where id = #{value} + + + + update auth_platform + + name=#{name}, + host=#{host}, + + where id=#{id} + + + + + + diff --git a/api-udims/src/main/resources/mybatis/mapper/info/ScheduleDao.xml b/api-udims/src/main/resources/mybatis/mapper/info/ScheduleDao.xml index e736ab8..9b2b12f 100644 --- a/api-udims/src/main/resources/mybatis/mapper/info/ScheduleDao.xml +++ b/api-udims/src/main/resources/mybatis/mapper/info/ScheduleDao.xml @@ -27,7 +27,7 @@ WHERE cronName=#{cronName} - + SELECT * FROM io_unit_maintain + + + and name like concat('%',#{key},'%') or spell like concat('%',#{key},'%') or unitId like + concat('%',#{key},'%') + + + AND customerId = #{customerId} + + + + + + + replace INTO io_unit_maintain + (thirdId,unitId,name,spell, + addr,status,type,customerId,creditNo) + values + ( + #{thirdId}, + #{unitId}, + #{name}, + #{spell}, + #{addr}, + #{status}, + #{type},#{customerId},#{creditNo} + ) + + + + DELETE FROM io_unit_maintain WHERE id = #{id} + + + + + + + + UPDATE io_unit_maintain + + thirdId=#{thirdId}, + unitId=#{unitId}, + name=#{name}, + spell=#{spell}, + addr=#{addr}, + status=#{status}, + type=#{type}, + creditNo=#{creditNo}, + platform_id=#{platformId}, + appid=#{appid}, + api_key=#{apiKey}, + secret_key=#{secretKey}, + + WHERE id = #{id} + + diff --git a/api-udims/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml b/api-udims/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml new file mode 100644 index 0000000..364f402 --- /dev/null +++ b/api-udims/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml @@ -0,0 +1,144 @@ + + + + + + + + + + replace + INTO thr_corp + ( + unitId,name,spell,addr,creditNo, + contact,mobile,thirdSysFk,updateTime + ) + values + ( + #{unitId}, + #{name}, + #{spell}, + #{addr}, + #{creditNo}, + #{contact}, + #{mobile}, + #{thirdSysFk}, + #{updateTime} + ) + + + + replace INTO thr_corp + ( + unitId,name,spell,addr,creditNo, + contact,mobile,thirdSysFk,updateTime + ) + values + + + ( + #{item.unitId}, + #{item.name}, + #{item.spell}, + #{item.addr}, + #{item.creditNo}, + #{item.contact}, + #{item.mobile}, + #{item.thirdSysFk},#{item.updateTime} + ) + + + + + DELETE + FROM thr_corp + WHERE id = #{id} + + + + DELETE + FROM thr_corp + WHERE unitId = #{unitId} + + + + DELETE + FROM thr_corp + + + UPDATE thr_corp + + unitId=#{unitId}, + name=#{name}, + spell=#{spell}, + addr=#{addr}, + creditNo=#{creditNo}, + contact=#{contact}, + mobile=#{mobile}, + thirdSysFk=#{thirdSysFk}, + updateTime=#{updateTime}, + + + WHERE id = #{id} + + + + replace INTO thr_corp + (id, unitId, name, spell, addr, creditNo, + contact, mobile, thirdSysFk, updateTime) + values + + + (#{item.id}, + #{item.unitId}, + #{item.name}, + #{item.spell}, + #{item.addr}, + #{item.creditNo}, + #{item.contact}, + #{item.mobile}, + #{item.thirdSysFk}, #{item.updateTime}) + + + + + 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} + ) + + \ No newline at end of file