diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiContrastController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiContrastController.java new file mode 100644 index 00000000..058d3f90 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiContrastController.java @@ -0,0 +1,338 @@ +package com.glxp.api.admin.controller.basic; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.constant.ConstantStatus; +import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; +import com.glxp.api.admin.entity.basic.ProductInfoEntity; +import com.glxp.api.admin.entity.basic.UdiInfoEntity; +import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.api.admin.httpclient.UdiDlHttpClient; +import com.glxp.api.admin.req.basic.CombineRequest; +import com.glxp.api.admin.req.basic.RemoveRelRequest; +import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest; +import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.basic.*; +import com.glxp.api.admin.service.thrsys.ThrProductsService; +import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.admin.util.DateUtil; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; +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 java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@RestController +public class UdiContrastController { + + @Resource + UdiDlHttpClient udiDlHttpClient; + @Resource + UdiRelevanceService udiRelevanceService; + @Resource + UdiInfoService udiInfoService; + @Resource + private BasicThirdSysService basicThirdSysService; + + @Resource + UdiContrastService udiContrastService; + @Resource + ThrProductsService thrProductsService; + + + //添加产品 + @AuthRuleAnnotation("") + @PostMapping("/udi/udirel/revleance") + public BaseResponse revleanceUdi(@RequestBody CombineRequest combineRequest) { + List keys = combineRequest.getKeys(); + if (keys != null && keys.size() > 0) { + for (String key : keys) { + //关联添加 + if (StrUtil.isEmpty(combineRequest.getRelId()) || combineRequest.isIdSpliUdi()) { + if (StrUtil.isNotEmpty(combineRequest.getThirdId())) { + if (udiContrastService.isExit(key, combineRequest.getThirdId())) { + return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!"); + } else { + createUnionContrast(combineRequest, key); + + + } + } else { + //只添加DI + if (udiContrastService.isExit(key, null)) { + return ResultVOUtils.error(500, "已存在该DI，且未对照！"); + } else { + createOnlyUuid(combineRequest, key); + } + } + } else {//修改关联DI + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(combineRequest.getRelId()); + if (udiContrastService.isExit(key, udiRelevanceEntity.getMainId())) { + return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!"); + } else { + updateDi(udiRelevanceEntity, key); + } + + } + } + } else if (CollUtil.isNotEmpty(combineRequest.getThirdIds())) { + //只添加产品 + for (String thirdId : combineRequest.getThirdIds()) { + if (udiContrastService.isExit(null, thirdId)) { + return ResultVOUtils.error(500, "产品编码:" + thirdId + "已存在!"); + } else { + createOnlyMainId(combineRequest, thirdId); + } + } + } + return ResultVOUtils.success("添加成功"); + } + + @AuthRuleAnnotation("") + @PostMapping("/udi/udirel/changeVersion") + public BaseResponse changeVersion(@RequestBody CombineRequest combineRequest) { + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(combineRequest.getRelId()); + if (udiContrastService.isExit(combineRequest.getKeys().get(0), udiRelevanceEntity.getMainId())) { + return ResultVOUtils.error(500, "已存在相同的对照关系，无法切换版本"); + } + List udiInfoEntities = udiDlHttpClient.getUdiByUuid(combineRequest.getKeys().get(0)); + udiInfoService.insertUdiInfos(udiInfoEntities); + udiInfoService.deleteByUuid(udiRelevanceEntity.getUuid()); + udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid()); + udiRelevanceEntity.setUpdateTime(DateUtil.formatDateTime(new Date())); + udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + return ResultVOUtils.success("切换成功！"); + } + + + //更换关联ERP产品 + @AuthRuleAnnotation("") + @PostMapping("/udi/udirel/modifyRel") + public BaseResponse modifyRel(@RequestBody CombineRequest combineRequest) { + + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(combineRequest.getRelId()); + udiRelevanceEntity = setThird(combineRequest, udiRelevanceEntity); + udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + udiRelevanceEntity.setManufactory(combineRequest.getManufactory()); + udiRelevanceEntity.setSupName(combineRequest.getSupName()); + UdiRelevanceEntity temp = udiContrastService.findById(udiRelevanceEntity.getId()); + if (udiContrastService.isExit(temp.getOriginUuid(), udiRelevanceEntity.getMainId())) { + return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!"); + } else { + try { + udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + } catch (Exception e) { + return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!"); + } + } + + + return ResultVOUtils.success("更新成功"); + } + + + //解除绑定产品信息ID + @AuthRuleAnnotation("") + @GetMapping("/udiwms/udirl/thirdSys/remove") + public BaseResponse removeThirdId(RemoveRelRequest removeRelRequest) { + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeRelRequest.getRelId()); + List udiRelevanceEntities = udiRelevanceService.selectByUuid(udiRelevanceEntity.getUuid()); + if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 0) { + for (UdiRelevanceEntity udiRelevanceEntity1 : udiRelevanceEntities) { + if (udiRelevanceEntity1.getThirdId() == null && udiRelevanceEntity1.getThirdId1() == null && + udiRelevanceEntity1.getThirdId2() == null && udiRelevanceEntity1.getThirdId3() == null && udiRelevanceEntity1.getThirdId4() == null) { + return ResultVOUtils.error(500, "解除绑定失败！"); + } + } + } + if (removeRelRequest.getThirdSys().equals("thirdId")) { + udiRelevanceEntity.setThirdId(""); + udiRelevanceEntity.setThirdName(""); + UdiRelevanceEntity temp = udiContrastService.findById(udiRelevanceEntity.getId()); + if (udiContrastService.isExit(temp.getOriginUuid(), null)) { + return ResultVOUtils.error(500, "解除绑定失败！"); + } + } 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(""); + } + try { + CombineRequest combineRequest = new CombineRequest(); + combineRequest.setRelId(removeRelRequest.getRelId()); + udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + } catch (Exception e) { + e.printStackTrace(); + return ResultVOUtils.error(500, "解除绑定失败！"); + } + return ResultVOUtils.success("解除绑定成功！"); + } + + + @Resource + ProductInfoService productInfoService; + + //獲取DI版本号 + @AuthRuleAnnotation("") + @GetMapping("/udiwms/syncdi/version") + public BaseResponse getVersion(CombineRequest combineRequest) { + List productInfoEntityList = new ArrayList<>(); + List udiRelevanceEntities = udiContrastService.findByUuid(combineRequest.getUuid()); + if (CollUtil.isNotEmpty(udiRelevanceEntities)) { + String originUuid = udiRelevanceEntities.get(0).getOriginUuid(); + List productInfoEntities = productInfoService.selectByUuid(originUuid); + if (CollUtil.isNotEmpty(productInfoEntities)) { + String deviceRecordKey = productInfoEntities.get(0).getDeviceRecordKey(); + ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); + productInfoFilterRequest.setDeviceRecordKey(deviceRecordKey); + List result = productInfoService.filterProductGroup(productInfoFilterRequest); + if (CollUtil.isNotEmpty(result)) { + productInfoEntityList.addAll(result); + } + } + + } + + PageInfo pageInfo; + pageInfo = new PageInfo<>(productInfoEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(productInfoEntityList); + return ResultVOUtils.success(pageSimpleResponse); + + } + + public void createUnionContrast(CombineRequest combineRequest, String key) { + List udiInfoEntities = udiDlHttpClient.getUdiByUuid(key); + UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); + udiRelevanceEntity.setThirdId(combineRequest.getThirdId()); + udiRelevanceEntity.setThirdName(combineRequest.getErpName()); + udiRelevanceEntity.setMainId(combineRequest.getThirdId()); + udiRelevanceEntity.setMainName(combineRequest.getErpName()); + udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid()); + if (combineRequest.getManufactory() != null) { + udiRelevanceEntity.setManufactory(combineRequest.getManufactory()); + } else + udiRelevanceEntity.setManufactory(udiInfoEntities.get(0).getYlqxzcrbarmc()); + udiRelevanceEntity.setSupName(combineRequest.getSupName()); + udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); + udiInfoService.insertUdiInfos(udiInfoEntities); + } + + public void createOnlyUuid(CombineRequest combineRequest, String key) { + List udiInfoEntities = udiDlHttpClient.getUdiByUuid(key); + UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); + udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid()); + udiRelevanceEntity.setManufactory(udiInfoEntities.get(0).getYlqxzcrbarmc()); + udiRelevanceEntity.setSupName(combineRequest.getSupName()); + udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); + udiInfoService.insertUdiInfos(udiInfoEntities); + } + + public void createOnlyMainId(CombineRequest combineRequest, String mainId) { + FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); + filterThrProductsRequest.setCode(mainId); + List thrProductsEntities = thrProductsService.selectThrProducts(filterThrProductsRequest); + ThrProductsEntity thrProductsEntity = thrProductsEntities.get(0); + UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); + udiRelevanceEntity.setThirdId(thrProductsEntity.getCode()); + udiRelevanceEntity.setThirdName(thrProductsEntity.getName()); + udiRelevanceEntity.setMainId(thrProductsEntity.getCode()); + udiRelevanceEntity.setMainName(thrProductsEntity.getName()); + udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + udiRelevanceEntity.setUuid(CustomUtil.getUUId()); + udiRelevanceEntity.setManufactory(thrProductsEntity.getManufactory()); + udiRelevanceEntity.setSupName(combineRequest.getSupName()); + udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); + UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); + BeanUtils.copyProperties(thrProductsEntity, udiInfoEntity); + udiInfoEntity.setNameCode(thrProductsEntity.getCode()); + udiInfoEntity.setCpmctymc(thrProductsEntity.getName()); + udiInfoEntity.setManufactory(thrProductsEntity.getManufactory()); + udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory()); + udiInfoEntity.setGgxh(thrProductsEntity.getSpec()); + udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo()); + udiInfoEntity.setUuid(udiRelevanceEntity.getUuid()); + udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); + udiInfoEntity.setDiType(1); + udiInfoService.insertUdiInfo(udiInfoEntity); + } + + public void updateDi(UdiRelevanceEntity udiRelevanceEntity, String key) { + List udiInfoEntities = udiDlHttpClient.getUdiByUuid(key); + udiInfoService.deleteByUuid(udiRelevanceEntity.getUuid()); + udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid()); + udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + udiInfoService.insertUdiInfos(udiInfoEntities); + } + + + public UdiRelevanceEntity setThird(CombineRequest combineRequest, UdiRelevanceEntity udiRelevanceEntity) { + if ("thirdId".equals(combineRequest.getThirdSys())) { + udiRelevanceEntity.setThirdId(combineRequest.getThirdId()); + udiRelevanceEntity.setThirdName(combineRequest.getErpName()); + } else if ("thirdId1".equals(combineRequest.getThirdSys())) { + udiRelevanceEntity.setThirdId1(combineRequest.getThirdId()); + udiRelevanceEntity.setThirdName1(combineRequest.getErpName()); + } else if ("thirdId2".equals(combineRequest.getThirdSys())) { + udiRelevanceEntity.setThirdId2(combineRequest.getThirdId()); + udiRelevanceEntity.setThirdName2(combineRequest.getErpName()); + } else if ("thirdId3".equals(combineRequest.getThirdSys())) { + udiRelevanceEntity.setThirdId3(combineRequest.getThirdId()); + udiRelevanceEntity.setThirdName3(combineRequest.getErpName()); + } else if ("thirdId4".equals(combineRequest.getThirdSys())) { + udiRelevanceEntity.setThirdId4(combineRequest.getThirdId()); + udiRelevanceEntity.setThirdName4(combineRequest.getErpName()); + } + + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); + String mainSys = basicThirdSysEntity.getThirdId(); + if (mainSys.equals("thirdId")) { + udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId()); + udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName()); + } else if (mainSys.equals("thirdId1")) { + udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId1()); + udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName1()); + } else if (mainSys.equals("thirdId2")) { + udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId2()); + udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName2()); + } else if (mainSys.equals("thirdId3")) { + udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId3()); + udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName3()); + } else if (mainSys.equals("thirdId4")) { + udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId4()); + udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName4()); + } + + if (combineRequest.getErpProductsResponse() != null) { + udiRelevanceEntity.setMeasname(combineRequest.getErpProductsResponse().getMeasname()); + udiRelevanceEntity.setManufactory(combineRequest.getErpProductsResponse().getManufactory()); + } + + return udiRelevanceEntity; + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java index c95d5bca..44a98205 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java @@ -302,119 +302,10 @@ public class UdiRelevanceController { return ResultVOUtils.error(499, "所选产品DI已经被" + "第三方产品ID" + "绑定，您确定继续对照"); } } - return ResultVOUtils.success("合并成功"); + return ResultVOUtils.success("未选择产品"); } - //新增或修改关联 - @AuthRuleAnnotation("") - @PostMapping("/udi/udirel/revleance") - public BaseResponse revleanceUdi(@RequestBody CombineRequest combineRequest) { - List keys = combineRequest.getKeys(); - if (keys != null && keys.size() > 0) { - for (String key : keys) { -// UdiInfoEntity udiInfoEntity = getUdiInfo(combineRequest); - FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); - filterUdiInfoRequest.setUuid(key); - List udiInfoEntities = udiInfoService.filterAllUdiInfo(filterUdiInfoRequest); - UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); - if (udiInfoEntities == null || udiInfoEntities.isEmpty()) { - udiInfoEntities = udiDlHttpClient.getUdiByUuid(key); - if (udiInfoEntities != null && !udiInfoEntities.isEmpty()) { - udiInfoService.insertUdiInfos(udiInfoEntities); - - } else { - return ResultVOUtils.error(500, "连接UDI数据下载服务出错！"); - } - } - if (combineRequest.getManufactory() != null) { - udiRelevanceEntity.setManufactory(combineRequest.getManufactory()); - } else - udiRelevanceEntity.setManufactory(udiInfoEntities.get(0).getYlqxzcrbarmc()); - - - if (combineRequest.getRelId() != null && !combineRequest.getRelId().equals("")) { - //修改 - //判断DI是否被使用，若使用则新增一条 - UdiRelevanceEntity temp = udiRelevanceService.selectById(combineRequest.getRelId()); - List udiRelevanceEntities = udiRelevanceService.selectByUuid(temp.getUuid()); - if (udiRelevanceEntities != null && !udiRelevanceEntities.isEmpty()) { - for (UdiRelevanceEntity udiRelevanceEntity1 : udiRelevanceEntities) { - List temps = udiInfoService.findByUuids(udiRelevanceEntity1.getUuid()); - if (temps != null && temps.size() > 0) { - for (int i = 0; i < temps.size(); i++) { - List warehouseEntityList = warehouseService.searchCode(temps.get(i).getNameCode()); - if (warehouseEntityList != null && warehouseEntityList.size() > 0) { - - //新增一条记录 - UdiRelevanceEntity newRlEntity = new UdiRelevanceEntity(); - newRlEntity = setThird(combineRequest, newRlEntity); - newRlEntity.setUpdateTime(DateUtil.getDateTime()); - newRlEntity.setUuid(key); - udiRelevanceEntity.setManufactory(temps.get(0).getYlqxzcrbarmc()); - udiRelevanceService.insertUdiRelevance(newRlEntity); - - return ResultVOUtils.success("合并成功"); - } - } - } - } - } - - UdiInfoEntity tempEntity = udiInfoEntities.get(0); - udiRelevanceEntity.setId(combineRequest.getRelId()); - udiRelevanceEntity.setUuid(key); - if (combineRequest.getManufactory() != null) { - udiRelevanceEntity.setManufactory(combineRequest.getManufactory()); - } else - udiRelevanceEntity.setManufactory(tempEntity.getManufactory()); - udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); - try { - udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); - } catch (Exception e) { - return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!"); - } - - removeProducts(combineRequest); - } else { - List udiRelevanceEntities = udiRelevanceService.selectByUuid(key); - if (udiRelevanceEntities != null && !udiRelevanceEntities.isEmpty()) { - for (UdiRelevanceEntity udiRelevanceEntity1 : udiRelevanceEntities) { - if (StrUtil.isEmpty(combineRequest.getThirdId()) && StrUtil.isEmpty(udiRelevanceEntity1.getMainId())) { - return ResultVOUtils.error(500, "已存在该DI，且未关联！"); - } - } - } - udiRelevanceEntity = setThird(combineRequest, udiRelevanceEntity); - UdiRelevanceEntity temp = udiRelevanceService.selectUpteaByAll(key, combineRequest.getThirdId()); - if (temp == null || StrUtil.isEmpty(udiRelevanceEntity.getThirdId())) { - udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); - udiRelevanceEntity.setUuid(key); - udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); - - } else { - return ResultVOUtils.error(500, "重复关联！"); - } - } - - - } - } - return ResultVOUtils.success("合并成功"); - } - - public void removeProducts(CombineRequest combineRequest) { - UdiRelevanceEntity temp = udiRelevanceService.selectById(combineRequest.getRelId()); - FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); - filterUdiInfoRequest.setNameCode(combineRequest.getThirdId()); - filterUdiInfoRequest.setUuid(temp.getUuid()); - List udiInfoEntities = udiInfoService.filterUdiInfo(filterUdiInfoRequest); - if (udiInfoEntities != null && udiInfoEntities.size() > 0) { - UdiInfoEntity udiInfoEntity = udiInfoEntities.get(0); - if (udiInfoEntity.getDeviceRecordKey() == null) - udiInfoService.deleteById(udiInfoEntities.get(0).getId() + ""); - } - } //选入查询结果的所有DI @@ -425,26 +316,6 @@ public class UdiRelevanceController { return ResultVOUtils.success("后台已开始导入，请稍后刷新查看"); } - //更换关联ERP产品 - @AuthRuleAnnotation("") - @PostMapping("/udi/udirel/modifyRel") - public BaseResponse modifyRel(@RequestBody CombineRequest combineRequest) { - - UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); - udiRelevanceEntity.setId(combineRequest.getRelId()); - udiRelevanceEntity = setThird(combineRequest, udiRelevanceEntity); - udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); - removeProducts(combineRequest); - udiRelevanceEntity.setManufactory(combineRequest.getManufactory()); - - try { - udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); - } catch (Exception e) { - return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!"); - } - - return ResultVOUtils.success("更新成功"); - } //更换关联ERP产品 @AuthRuleAnnotation("") @@ -748,59 +619,15 @@ public class UdiRelevanceController { return ResultVOUtils.success(pageSimpleResponse); } - //解除绑定产品信息ID - @AuthRuleAnnotation("") - @GetMapping("/udiwms/udirl/thirdSys/remove") - public BaseResponse removeThirdId(RemoveRelRequest removeRelRequest) { - UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeRelRequest.getRelId()); - List udiRelevanceEntities = udiRelevanceService.selectByUuid(udiRelevanceEntity.getUuid()); - if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 0) { - for (UdiRelevanceEntity udiRelevanceEntity1 : udiRelevanceEntities) { - if (udiRelevanceEntity1.getThirdId() == null && udiRelevanceEntity1.getThirdId1() == null && - udiRelevanceEntity1.getThirdId2() == null && udiRelevanceEntity1.getThirdId3() == null && udiRelevanceEntity1.getThirdId4() == null) { - return ResultVOUtils.error(500, "解除绑定失败！"); - } - } - } - 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(""); - } - try { - CombineRequest combineRequest = new CombineRequest(); - combineRequest.setRelId(removeRelRequest.getRelId()); - removeProducts(combineRequest); - udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); - } catch (Exception e) { - e.printStackTrace(); - return ResultVOUtils.error(500, "解除绑定失败！"); - } - return ResultVOUtils.success("解除绑定成功！"); - } - //解除绑定DI器械信息 @AuthRuleAnnotation("") @GetMapping("/udiwms/udirl/di/remove") public BaseResponse removeDI(RemoveRelRequest removeRelRequest) { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeRelRequest.getRelId()); - if (StrUtil.isEmpty(udiRelevanceEntity.getMainId())) { return ResultVOUtils.error(500, "未关联第三方产品ID，无法解除绑定！"); } - List temps = udiRelevanceService.selectByMainId(udiRelevanceEntity.getMainId()); if (temps.size() > 0) { for (UdiRelevanceResponse temp : temps) { @@ -810,8 +637,6 @@ public class UdiRelevanceController { } } } - - BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getMainId(), basicThirdSysEntity.getThirdId()); UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); @@ -903,14 +728,4 @@ public class UdiRelevanceController { } - 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-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java index c1cb529b..e793aa18 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java @@ -11,7 +11,6 @@ import java.util.List; @Mapper public interface CompanyProductRelevanceDao { - List filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest); List filterCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/ProductInfoDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/ProductInfoDao.java index 111af0e7..e265abbe 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/ProductInfoDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/ProductInfoDao.java @@ -13,6 +13,9 @@ public interface ProductInfoDao { List filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest); + List filterProductGroup(ProductInfoFilterRequest productInfoFilterRequest); + + List filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest); List filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiRelevanceDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiRelevanceDao.java index 493f98ba..acf82d30 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiRelevanceDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiRelevanceDao.java @@ -21,6 +21,10 @@ public interface UdiRelevanceDao { // UdiRelevanceResponse selectUdiByUUid List selectByUuid(@Param("uuid") String uuid); + + List selectByOrigiUuid(FilterUdiInfoRequest filterUdiInfoRequest); + + UdiRelevanceEntity selectById(@Param("id") String id); UdiRelevanceEntity selectByThirdId(FilterUdiInfoRequest filterUdiInfoRequest); @@ -48,6 +52,7 @@ public interface UdiRelevanceDao { */ List batchSelectByUuid(@Param("uuids") List uuids); + List batchSelectByIds(@Param("ids") List ids); /** @@ -57,5 +62,4 @@ public interface UdiRelevanceDao { */ void importUdiRelevance(@Param("udiRelevanceEntities") List udiRelevanceEntities); - } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsDao.java index ab7659e1..c3c2ce4e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsDao.java @@ -10,10 +10,12 @@ import java.util.List; @Mapper public interface ThrProductsDao { - List filterThrProductsRequest(FilterThrProductsRequest filterThrProductsRequest); + List batchSelectByIds(FilterThrProductsRequest filterThrProductsRequest); + ThrProductsEntity selectById(@Param("id") String id); + List selectThrProducts(FilterThrProductsRequest filterThrProductsRequest); boolean insertThrProducts(ThrProductsEntity thrProductsEntity); @@ -25,6 +27,13 @@ public interface ThrProductsDao { boolean deleteAll(); + /** + * 导入第三方产品信息 + * + * @param thrProductsEntities + */ + void importThrProducts(@Param("thrProductsEntities") List thrProductsEntities); + /** * 批量导入第三方产品信息 * diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java index aa115fa9..b61f2c7e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java @@ -4,7 +4,6 @@ import lombok.Data; @Data public class UdiInfoEntity { - private Integer id; private String nameCode; private String packRatio; @@ -42,7 +41,7 @@ public class UdiInfoEntity { private String scbssfbhscrq; private String scbssfbhsxrq; private String cpms; - + private String originUuid; //本地生成信息 private String batchNo; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java index 2defd96c..65246daa 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java @@ -31,10 +31,12 @@ public class UdiRelevanceEntity { private String udplatCode; private Boolean isAdavence; private String supName; + private String originUuid; public Integer getLockStatus() { if (lockStatus == null) return 1; return lockStatus; } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/UdiDlHttpClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/UdiDlHttpClient.java index 54d6d04e..6c0b5a84 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/UdiDlHttpClient.java +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/UdiDlHttpClient.java @@ -1,20 +1,15 @@ package com.glxp.api.admin.httpclient; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; import com.glxp.api.admin.entity.basic.ProductInfoEntity; import com.glxp.api.admin.entity.basic.UdiInfoEntity; import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest; import com.glxp.api.admin.service.basic.ProductInfoService; -import com.glxp.api.admin.util.HttpClient; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.admin.util.UuidUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -27,6 +22,7 @@ public class UdiDlHttpClient { @Resource ProductInfoService productInfoService; + public List getUdiByUuid(String uuid) { ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); productInfoFilterRequest.setPage(1); @@ -35,9 +31,12 @@ public class UdiDlHttpClient { List productInfoEntityList = productInfoService.findAll(productInfoFilterRequest); List udiInfoEntities = new ArrayList<>(); + String myUuid = UuidUtils.getUUId(); for (ProductInfoEntity productInfoEntity : productInfoEntityList) { UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); BeanUtils.copyProperties(productInfoEntity, udiInfoEntity); + udiInfoEntity.setUuid(myUuid); + udiInfoEntity.setOriginUuid(productInfoEntity.getUuid()); udiInfoEntities.add(udiInfoEntity); } return udiInfoEntities; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineRequest.java index aba61462..5d83e19d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineRequest.java @@ -18,11 +18,12 @@ public class CombineRequest { private String thirdSys; private Boolean isRlInv; private FilterErpGoodsRequest query; - - private String erpId; + private Long customerId; private Boolean supEnable; private String manufactory; + private String supName; private boolean idSpliUdi; + private String uuid; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java index 71625a54..c515e305 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java @@ -29,7 +29,7 @@ public class FilterUdiInfoRequest extends ListPageRequest { private String zczbhhzbapzbh; private Integer diType; - private Boolean isDisable; + private String unionCode; private String udiCode; private String thrPiId; @@ -51,11 +51,12 @@ public class FilterUdiInfoRequest extends ListPageRequest { private String sptm; private String unionFilterStr;//产品名称，规格，批文，生产厂家联合查询 - + private Boolean isDisable; List relIds; private String uniqueNameCode; private String supName; private String unitFk; + private String originUuid; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java index 33811d30..1a3db65f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java @@ -65,6 +65,7 @@ public class UdiRelevanceResponse { private String manufactory; private String unitFk; private String companyName; + private String originUuid; public int getBhzxxsbzsl() { diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/info/CompanyProductRelevanceResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/info/CompanyProductRelevanceResponse.java index a80cb979..6c210f47 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/info/CompanyProductRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/info/CompanyProductRelevanceResponse.java @@ -10,6 +10,7 @@ public class CompanyProductRelevanceResponse { private String thirdId; private String thirdName; private String uuid; + private String originUuid; private String nameCode; private String packLevel; private String packRatio; @@ -33,7 +34,7 @@ public class CompanyProductRelevanceResponse { private String sydycpbs; private int versionNumber; private int diType; - private Boolean isDisable; + private String thirdId1; private String thirdId2; private String thirdId3; @@ -47,7 +48,7 @@ public class CompanyProductRelevanceResponse { private String sptm; private String manufactory; private String measname; - + private Boolean isDisable; private long customerId; private String auditStatus; @@ -58,4 +59,10 @@ public class CompanyProductRelevanceResponse { private String mainName; private Boolean isAdavence; + private String scbssfbhph; + private String scbssfbhxlh; + private String scbssfbhscrq; + private String scbssfbhsxrq; + private String cpms; + private String supName; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/ProductInfoService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/ProductInfoService.java index ab99f0b1..3bd61b95 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/ProductInfoService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/ProductInfoService.java @@ -1,7 +1,6 @@ package com.glxp.api.admin.service.basic; - import com.glxp.api.admin.entity.basic.ProductInfoEntity; import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest; @@ -16,6 +15,8 @@ public interface ProductInfoService { List filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest); + List filterProductGroup(ProductInfoFilterRequest productInfoFilterRequest); + List filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest); List filterUdiByCreditNo(ProductInfoFilterRequest productInfoFilterRequest); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiContrastService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiContrastService.java new file mode 100644 index 00000000..0a080504 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiContrastService.java @@ -0,0 +1,98 @@ +package com.glxp.api.admin.service.basic; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.glxp.api.admin.dao.basic.UdiRelevanceDao; +import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class UdiContrastService { + + @Resource + UdiRelevanceDao udiRelevanceDao; + + + public boolean isExit(String originUuid, String mainId) { + + if (StrUtil.isNotEmpty(originUuid) && StrUtil.isNotEmpty(mainId)) { + List udiRelevanceEntities = findByUnion(originUuid, mainId); + if (CollUtil.isNotEmpty(udiRelevanceEntities)) { + return true; + } else + return false; + } else if (StrUtil.isNotEmpty(originUuid) && StrUtil.isEmpty(mainId)) { + List udiRelevanceEntities = findByOriginUuid(originUuid); + if (CollUtil.isNotEmpty(udiRelevanceEntities)) { + for (UdiRelevanceEntity udiRelevanceEntity : udiRelevanceEntities) { + if (StrUtil.isEmpty(udiRelevanceEntity.getMainId()) && StrUtil.isNotEmpty(udiRelevanceEntity.getOriginUuid())) { + return true; + } + } + } + return false; + } else if (StrUtil.isEmpty(originUuid) && StrUtil.isNotEmpty(mainId)) { + List udiRelevanceEntities = findByMainId(mainId); + if (CollUtil.isNotEmpty(udiRelevanceEntities)) { + for (UdiRelevanceEntity udiRelevanceEntity : udiRelevanceEntities) { + if (StrUtil.isEmpty(udiRelevanceEntity.getOriginUuid()) && StrUtil.isNotEmpty(udiRelevanceEntity.getMainId())) { + return true; + } + } + } + return false; + } else return false; + + + } + + public List findByUnion(String originUuid, String mainId) { + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setMainId(mainId); + filterUdiInfoRequest.setOriginUuid(originUuid); + List udiRelevanceEntities = udiRelevanceDao.selectByOrigiUuid(filterUdiInfoRequest); + return udiRelevanceEntities; + } + + public List findByUuid(String uuid) { + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setUuid(uuid); + List udiRelevanceEntities = udiRelevanceDao.selectByOrigiUuid(filterUdiInfoRequest); + return udiRelevanceEntities; + } + + public UdiRelevanceEntity findById(String id) { + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setId(id); + List udiRelevanceEntities = udiRelevanceDao.selectByOrigiUuid(filterUdiInfoRequest); + if (CollUtil.isNotEmpty(udiRelevanceEntities)) + return udiRelevanceEntities.get(0); + return null; + } + + public List findByOriginUuid(String originUuid) { + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setOriginUuid(originUuid); + List udiRelevanceEntities = udiRelevanceDao.selectByOrigiUuid(filterUdiInfoRequest); + return udiRelevanceEntities; + } + + public List findByMainId(String mainId) { + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setMainId(mainId); + List udiRelevanceEntities = udiRelevanceDao.selectByOrigiUuid(filterUdiInfoRequest); + return udiRelevanceEntities; + } + + + public List filterAll(FilterUdiInfoRequest filterUdiInfoRequest) { + List udiRelevanceEntities = udiRelevanceDao.selectByOrigiUuid(filterUdiInfoRequest); + return udiRelevanceEntities; + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java index 9440608c..ff741c8e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java @@ -18,7 +18,7 @@ public interface UdiRelevanceService { UdiRelevanceResponse selectByNameCode(String nameCode); - List selectAllByNameCode(String nameCode,String unitFk); + List selectAllByNameCode(String nameCode, String unitFk); boolean isExit(); @@ -57,6 +57,4 @@ public interface UdiRelevanceService { boolean deleteByIds(List id); boolean deleteByUuid(String uuid); - - } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/ProductInfoServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/ProductInfoServiceImpl.java index 4638e1e9..69021d55 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/ProductInfoServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/ProductInfoServiceImpl.java @@ -42,6 +42,20 @@ public class ProductInfoServiceImpl implements ProductInfoService { return data; } + @Override + public List filterProductGroup(ProductInfoFilterRequest productInfoFilterRequest) { + if (productInfoFilterRequest == null) { + return Collections.emptyList(); + } + if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) { + int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit(); + PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit()); + } + + List data = productInfoDao.filterProductGroup(productInfoFilterRequest); + return data; + } + @Override public List filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java index a0e4f368..e0e7f81a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java @@ -219,17 +219,6 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService { } List data = udiRelevanceDao.filterEntity(filterUdiInfoRequest); -// if ((data == null || data.isEmpty()) && thirdId != null) { -// filterUdiInfoRequest.setUuid(null); -// data = udiRelevanceDao.filterEntity(filterUdiInfoRequest); -// if ((data == null || data.isEmpty()) && uuid != null) { -// filterUdiInfoRequest.setUuid(uuid); -// filterUdiInfoRequest.setThirdId(null); -// data = udiRelevanceDao.filterEntity(filterUdiInfoRequest); -// } -// } - - if (data != null && data.size() > 0) return data.get(0); return null; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java index 88c9ac37..6cc3e912 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java @@ -11,6 +11,8 @@ public interface ThrProductsService { List filterThrProductsRequest(FilterThrProductsRequest filterThrProductsRequest); + List selectThrProducts(FilterThrProductsRequest filterThrProductsRequest); + ThrProductsEntity selectById(String id); boolean insertThrProducts(ThrProductsEntity thrProductsEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java index 37dbea52..304325c4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java @@ -33,6 +33,19 @@ public class ThrProductsServiceImpl implements ThrProductsService { return data; } + @Override + public List selectThrProducts(FilterThrProductsRequest filterThrProductsRequest) { + if (filterThrProductsRequest == null) { + return Collections.emptyList(); + } + if (filterThrProductsRequest.getPage() != null) { + int offset = (filterThrProductsRequest.getPage() - 1) * filterThrProductsRequest.getLimit(); + PageHelper.offsetPage(offset, filterThrProductsRequest.getLimit()); + } + List data = thrProductsDao.selectThrProducts(filterThrProductsRequest); + return data; + } + @Override public ThrProductsEntity selectById(String id) { return thrProductsDao.selectById(id); diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/UuidUtils.java b/api-admin/src/main/java/com/glxp/api/admin/util/UuidUtils.java new file mode 100644 index 00000000..58afce51 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/UuidUtils.java @@ -0,0 +1,42 @@ +package com.glxp.api.admin.util; + +import java.util.UUID; + +public class UuidUtils { + + public static String getUUId() { + UUID uuid = UUID.randomUUID(); + return uuid.toString().replace("-", ""); + } + + public static String[] chars = new String[]{"a", "b", "c", "d", "e", "f", + "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", + "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", + "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "I", + "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", + "W", "X", "Y", "Z"}; + + public static String getShortUuid() { + StringBuffer shortBuffer = new StringBuffer(); + String uuid = UUID.randomUUID().toString().replace("-", ""); + for (int i = 0; i < 8; i++) { + String str = uuid.substring(i * 4, i * 4 + 4); + int x = Integer.parseInt(str, 16); + shortBuffer.append(chars[x % 0x3E]); + } + return shortBuffer.toString(); + } + + public static String getShortUuid(int idLength) { + if (idLength <= 0) idLength = 4; + StringBuffer shortBuffer = new StringBuffer(); + String uuid = UUID.randomUUID().toString().replace("-", ""); + for (int i = 0; i < idLength; i++) { + String str = uuid.substring(i * 4, i * 4 + 4); + int x = Integer.parseInt(str, 16); + shortBuffer.append(chars[x % 0x3E]); + } + return shortBuffer.toString(); + } + +} diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml index e37f5568..a3c34371 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml @@ -45,7 +45,10 @@ basic_products.tyshxydm,basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh, basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid, basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType, - basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence + basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph, + basic_products.scbssfbhxlh, + basic_products.scbssfbhscrq, + basic_products.scbssfbhsxrq,basic_products.cpms,basic_products.originUuid FROM company_product_relevance inner JOIN basic_udirel ON company_product_relevance.udiRlIdFk = basic_udirel.id diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml index fb742f5a..b265bc50 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml @@ -36,7 +36,37 @@ - + @@ -40,7 +43,7 @@ basic_products.scbssfbhph, basic_products.scbssfbhxlh, basic_products.scbssfbhscrq, - basic_products.scbssfbhsxrq,basic_products.cpms + basic_products.scbssfbhsxrq,basic_products.cpms,basic_products.originUuid FROM (company_product_relevance inner JOIN basic_udirel ON company_product_relevance.udiRlIdFk = basic_udirel.id) @@ -80,7 +83,9 @@ AND company_product_relevance.customerId = #{customerId} - + + + AND originUuid = #{originUuid} ORDER BY updateTime DESC @@ -123,7 +128,7 @@ nameCode,packRatio,packLevel,bhxjsl, bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey, cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber - ,diType,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms,manufactory) + ,diType,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms,manufactory,originUuid) values ( #{id}, @@ -154,7 +159,7 @@ #{scbssfbhph}, #{scbssfbhxlh}, #{scbssfbhscrq}, - #{scbssfbhsxrq},#{cpms},#{manufactory} + #{scbssfbhsxrq},#{cpms},#{manufactory},#{originUuid} ) @@ -164,7 +169,7 @@ nameCode,packRatio,packLevel,bhxjsl, bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey, cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber - ,diType,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms,manufactory + ,diType,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms,manufactory,originUuid ) values @@ -196,7 +201,7 @@ #{item.diType},#{item.productType}, #{item.scbssfbhph}, #{item.scbssfbhxlh}, #{item.scbssfbhscrq}, - #{item.scbssfbhsxrq},#{item.cpms},#{item.manufactory} + #{item.scbssfbhsxrq},#{item.cpms},#{item.manufactory},#{item.originUuid} ) @@ -247,6 +252,7 @@ scbssfbhscrq=#{scbssfbhscrq}, scbssfbhsxrq=#{scbssfbhsxrq}, cpms=#{cpms}, + originUuid=#{originUuid}, WHERE nameCode = #{nameCode} @@ -265,7 +271,7 @@ (id, nameCode, packRatio, packLevel, bhxjsl, bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, addType, deviceRecordKey, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, uuid, sjcpbm, versionNumber, diType, ybbm, sptm, manufactory, measname, - productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms) values + productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms,originUuid) values (#{item.id}, #{item.nameCode}, @@ -299,7 +305,7 @@ #{item.productType}, #{item.scbssfbhph}, #{item.scbssfbhxlh}, #{item.scbssfbhscrq}, - #{item.scbssfbhsxrq},#{item.cpms}) + #{item.scbssfbhsxrq},#{item.cpms},#{item.originUuid}) \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 7522b86f..5608bfd1 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -24,7 +24,7 @@ basic_products.diType,basic_products.productType,basic_products.scbssfbhph, basic_products.scbssfbhxlh, basic_products.scbssfbhscrq, - basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName + basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid FROM basic_udirel inner JOIN basic_products ON basic_products.uuid = basic_udirel.uuid @@ -109,7 +109,7 @@ basic_products.diType,basic_products.productType,basic_products.scbssfbhph, basic_products.scbssfbhxlh, basic_products.scbssfbhscrq, - basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,company_product_relevance.unitFk + basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,company_product_relevance.unitFk,basic_products.originUuid FROM basic_udirel inner JOIN basic_products ON basic_products.uuid = basic_udirel.uuid @@ -302,6 +302,28 @@ FROM basic_udirel WHERE id = #{id} + + + + + + + + + + + + + +