From 54dc7cd0eb76efbb9c214264bad8151aca9aabcb Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 25 Apr 2023 23:15:55 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=9B=AA=E8=8A=B1ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/InvWarehouseController.java | 2 +- .../basic/BasicBusTypePreController.java | 2 + .../basic/BasicBussinessTypeController.java | 2 + .../controller/basic/BasicCorpController.java | 22 +++--- .../inout/IoCodeLostController.java | 2 + .../inout/IoCodeTempController.java | 4 +- .../controller/inout/ioCodeRelController.java | 72 ++++++++++--------- .../purchase/SupCertController.java | 19 ++--- .../purchase/SupCertSetController.java | 18 ++--- .../purchase/SupManufacturerController.java | 3 +- .../purchase/SupProductController.java | 38 +++++----- .../controller/thrsys/ThrDeptController.java | 2 +- .../com/glxp/api/dao/auth/AuthAdminDao.java | 2 +- .../glxp/api/dao/auth/WarehouseUserDao.java | 6 +- .../com/glxp/api/dao/basic/BasicCorpDao.java | 1 - .../com/glxp/api/entity/auth/DeptEntity.java | 2 +- .../api/entity/auth/InvBusUserEntity.java | 4 +- .../com/glxp/api/entity/auth/InvSpace.java | 4 +- .../api/entity/auth/InvWarehouseEntity.java | 4 +- .../auth/WarehouseBussinessTypeEntity.java | 4 +- .../api/entity/auth/WarehouseUserEntity.java | 4 +- .../basic/BasicBusTypeChangeEntity.java | 4 +- .../entity/basic/BasicBusTypePreEntity.java | 2 +- .../basic/BasicBussinessTypeEntity.java | 4 +- .../api/entity/basic/BasicCorpEntity.java | 4 +- .../api/entity/basic/BasicHospTypeEntity.java | 6 +- .../api/entity/basic/BasicProductsEntity.java | 2 +- .../basic/CompanyProductRelevanceEntity.java | 4 +- .../api/entity/basic/EntrustReceEntity.java | 4 +- .../api/entity/basic/UdiProductEntity.java | 2 +- .../api/entity/inout/IoCodeLostEntity.java | 4 +- .../api/entity/inout/IoCodeRelEntity.java | 4 +- .../api/entity/purchase/SupCertEntity.java | 6 +- .../api/entity/purchase/SupCertSetEntity.java | 4 +- .../purchase/SupManufacturerEntity.java | 4 +- .../api/entity/purchase/SupProductEntity.java | 6 +- .../entity/thrsys/ThrBusTypeOriginEntity.java | 2 +- .../glxp/api/entity/thrsys/ThrCorpEntity.java | 7 +- .../glxp/api/entity/thrsys/ThrDeptEntity.java | 4 +- .../api/entity/thrsys/ThrProductsEntity.java | 8 +-- .../req/auth/FilterNoSelectUserRequest.java | 2 +- .../api/req/basic/BasicHospTypeRequest.java | 2 +- .../req/purchase/FilterCertSetsRequest.java | 2 +- .../service/auth/WarehouseUserService.java | 3 +- .../auth/impl/WarehouseUserServiceImpl.java | 2 +- .../impl/BasicBussinessTypeServiceImpl.java | 2 +- .../basic/impl/BasicHospTypeServiceImpl.java | 4 +- .../api/service/inout/IoAddInoutService.java | 2 + .../purchase/impl/SupCertServiceImpl.java | 2 +- .../purchase/impl/SupCertSetServiceImpl.java | 2 +- .../impl/SupManufacturerServiceImpl.java | 2 +- .../purchase/impl/SupProductServiceImpl.java | 2 +- .../mybatis/mapper/basic/BasicCorpDao.xml | 22 ------ src/main/resources/schemas/schema_v2.1.sql | 35 +++++++++ 54 files changed, 208 insertions(+), 174 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index c4980feac..0b452d79c 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -246,7 +246,7 @@ public class InvWarehouseController extends BaseController { updateEntity.setId(pEntity.getId()); updateEntity.setUpdateTime(new Date()); deptService.updateInvWarehouse(updateEntity); - invWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId() + ""); + invWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId()); invWarehouseEntity.setUpdateTime(new Date()); boolean b = invWarehouseService.insertInvSubWarehouse(invWarehouseEntity); if (!b) { diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java index b9165de93..3391c2feb 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java @@ -1,6 +1,7 @@ package com.glxp.api.controller.basic; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; @@ -208,6 +209,7 @@ public class BasicBusTypePreController { InvWarehouseEntity invWarehouse = invWarehouseService.findByInvSubByCode(basicBusTypePreEntity.getInvCode()); basicBusTypePreEntity.setDeptCode(invWarehouse.getParentId()); } + basicBusTypePreEntity.setId(IdUtil.getSnowflakeNextId()); basicBusTypePreService.insertBusChangeType(basicBusTypePreEntity); } else { ResultVOUtils.error(999, "参数错误"); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index 92268c540..e524628f7 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -2,6 +2,7 @@ package com.glxp.api.controller.basic; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -135,6 +136,7 @@ public class BasicBussinessTypeController extends BaseController { bussinessTypeSaveRequest.setAction("SC" + CustomUtil.getId()); BasicBussinessTypeEntity basicBussinessTypeEntity = new BasicBussinessTypeEntity(); BeanUtil.copyProperties(bussinessTypeSaveRequest, basicBussinessTypeEntity); + basicBussinessTypeEntity.setId(IdUtil.getSnowflakeNextId()); basicBussinessTypeService.insertBussinessType(basicBussinessTypeEntity); } else { ResultVOUtils.error(999, "参数错误"); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java index c9dd8147e..fdad7138e 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.basic; +import cn.hutool.core.util.IdUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; @@ -64,7 +65,7 @@ public class BasicCorpController { private ThrCorpService thrCorpService; @Resource private CompanyService companyService; -// @Resource + // @Resource // private OrderService orderService; @Resource private ErpBasicClient erpBasicClient; @@ -123,7 +124,8 @@ public class BasicCorpController { basicUnitMaintainEntity.setErpId(CustomUtil.getId()); basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS); basicUnitMaintainEntity.setUpdateTime(new Date()); - boolean b = basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity); + basicUnitMaintainEntity.setId(IdUtil.getSnowflakeNextId()); + boolean b = basicUnitMaintainService.insert(basicUnitMaintainEntity); if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } @@ -133,7 +135,7 @@ public class BasicCorpController { @AuthRuleAnnotation("") @PostMapping("/udiwms/basic/unit/maintain/update") - public BaseResponse update(@RequestBody @Valid BasicCorpEntity basicUnitMaintainSaveRequest,BindingResult bindingResult) { + public BaseResponse update(@RequestBody @Valid BasicCorpEntity basicUnitMaintainSaveRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } @@ -239,7 +241,8 @@ public class BasicCorpController { basicUnitMaintainEntity.setMobile(erpUnitsResponse.getMobile()); basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SP); basicUnitMaintainEntity.setUpdateTime(new Date()); - basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity); + basicUnitMaintainEntity.setId(IdUtil.getSnowflakeNextId()); + basicUnitMaintainService.insert(basicUnitMaintainEntity); } } return ResultVOUtils.success("选入成功"); @@ -275,7 +278,7 @@ public class BasicCorpController { } BasicErpUnitsResponse basicErpUnitsResponse = combineRequest.getBasicErpUnitsResponse(); BasicCorpEntity basicCorpEntity = new BasicCorpEntity(); - basicCorpEntity.setId(Integer.parseInt(combineRequest.getKey())); + basicCorpEntity.setId(Long.parseLong(combineRequest.getKey())); if (combineRequest.getThirdSys() != null) { if ("thirdId".equals(combineRequest.getThirdSys())) { basicCorpEntity.setThirdId(basicErpUnitsResponse.getId()); @@ -346,7 +349,8 @@ public class BasicCorpController { basicUnitMaintainService.deleteById(id); return ResultVOUtils.success("删除成功"); } -// + + // // //查询ERP往来单位 // @AuthRuleAnnotation("") // @GetMapping("/udiwms/unitMaintain/filterErp") @@ -507,15 +511,15 @@ public class BasicCorpController { rMap.put("BUMThirdIdValue", systemParamConfigEntityBUMThirdId != null && StringUtils.isNotBlank(systemParamConfigEntityBUMThirdId.getParamValue()) ? systemParamConfigEntityBUMThirdId.getParamValue() : "0"); - return ResultVOUtils.success(rMap); + return ResultVOUtils.success(rMap); } @AuthRuleAnnotation("") @PostMapping("/udiwms/basic/unit/maintain/getCorpList") public BaseResponse getCorpList() { - List getCorpList=basicUnitMaintainService.getCorpList(); - return ResultVOUtils.success(getCorpList); + List getCorpList = basicUnitMaintainService.getCorpList(); + return ResultVOUtils.success(getCorpList); } diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java index 5f3c7682f..fd2e55dd6 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.inout; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; @@ -101,6 +102,7 @@ public class IoCodeLostController extends BaseController { if (codeLostEntity != null) { codeLostService.update(insertEntity); } else { + insertEntity.setId(IdUtil.getSnowflakeNextId()); codeLostService.insert(insertEntity); } return ResultVOUtils.success("修改成功！"); diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 4ef41b507..4996e3916 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -3,6 +3,7 @@ package com.glxp.api.controller.inout; import cn.hutool.Hutool; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.UUID; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; @@ -593,7 +594,8 @@ public class IoCodeTempController extends BaseController { basicCorpEntity.setOutType(ConstantStatus.CORP_SICK_SICK); basicCorpEntity.setName(addOrderRequest.getFromCorp()); addOrderRequest.setFromCorp(basicCorpEntity.getName()); - basicUnitMaintainService.insertBasicUnitMaintain(basicCorpEntity); + basicCorpEntity.setId(IdUtil.getSnowflakeNextId()); + basicUnitMaintainService.insert(basicCorpEntity); } } diff --git a/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java b/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java index a2af6fefc..2bf1ba6c5 100644 --- a/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java +++ b/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java @@ -1,6 +1,7 @@ package com.glxp.api.controller.inout; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; @@ -49,53 +50,53 @@ public class ioCodeRelController { //判断码有没有重复 - List list=ioCodeRelServicec.selectIoCodeRelByCode("",code); - if(list.size()>0){ - return ResultVOUtils.error(999,"此码已做关联！"); + List list = ioCodeRelServicec.selectIoCodeRelByCode("", code); + if (list.size() > 0) { + return ResultVOUtils.error(999, "此码已做关联！"); } - if(StrUtil.isNotEmpty(code)){ - UdiEntity udiEntity=FilterUdiUtils.getGS1Udi(code); - UdiProductEntity udiProductEntity=udiProductService.findByNameCode(udiEntity.getUdi()); - if(udiProductEntity.getPackLevel()!=null){ - if(Integer.valueOf(udiProductEntity.getPackLevel())>1){ + if (StrUtil.isNotEmpty(code)) { + UdiEntity udiEntity = FilterUdiUtils.getGS1Udi(code); + UdiProductEntity udiProductEntity = udiProductService.findByNameCode(udiEntity.getUdi()); + if (udiProductEntity.getPackLevel() != null) { + if (Integer.valueOf(udiProductEntity.getPackLevel()) > 1) { return ResultVOUtils.success(udiProductEntity.getBhxjcpbm()); } } } - return ResultVOUtils.error(999,"扫码错误！"); + return ResultVOUtils.error(999, "扫码错误！"); } @GetMapping("/udi/ioCode/Rel/checkLowProduct") @Log(title = "单据管理", businessType = BusinessType.INSERT) - public BaseResponse checkLowProduct(String upCode,String lowCode) { + public BaseResponse checkLowProduct(String upCode, String lowCode) { - UdiProductEntity udiProductEntity=new UdiProductEntity(); + UdiProductEntity udiProductEntity = new UdiProductEntity(); //查询上级产品信息 - if(StrUtil.isNotEmpty(upCode)){ - UdiEntity udiEntity=FilterUdiUtils.getGS1Udi(upCode); - udiProductEntity=udiProductService.findByNameCode(udiEntity.getUdi()); + if (StrUtil.isNotEmpty(upCode)) { + UdiEntity udiEntity = FilterUdiUtils.getGS1Udi(upCode); + udiProductEntity = udiProductService.findByNameCode(udiEntity.getUdi()); } //判断码有没有重复 - List list=ioCodeRelServicec.selectIoCodeRelByCode(lowCode,upCode); - if(list.size()>0){ - return ResultVOUtils.error(999,"此码已做关联！"); + List list = ioCodeRelServicec.selectIoCodeRelByCode(lowCode, upCode); + if (list.size() > 0) { + return ResultVOUtils.error(999, "此码已做关联！"); } //判断条数是否超出 - Long count=ioCodeRelServicec.selectIoCodeRelCount(upCode); - if(count>=udiProductEntity.getBhxjsl()){ - return ResultVOUtils.error(999,"数量超出！"); + Long count = ioCodeRelServicec.selectIoCodeRelCount(upCode); + if (count >= udiProductEntity.getBhxjsl()) { + return ResultVOUtils.error(999, "数量超出！"); } //查询下级产品信息 - if(StrUtil.isNotEmpty(lowCode)){ - UdiEntity udiEntity=FilterUdiUtils.getGS1Udi(lowCode); - UdiProductEntity udiProductEntity1=udiProductService.findByNameCode(udiEntity.getUdi()); - if(udiProductEntity!=null){ - if(udiProductEntity1.getNameCode().equals(udiProductEntity.getBhxjcpbm())){ - IoCodeRelEntity ioCodeRelEntity=new IoCodeRelEntity(); + if (StrUtil.isNotEmpty(lowCode)) { + UdiEntity udiEntity = FilterUdiUtils.getGS1Udi(lowCode); + UdiProductEntity udiProductEntity1 = udiProductService.findByNameCode(udiEntity.getUdi()); + if (udiProductEntity != null) { + if (udiProductEntity1.getNameCode().equals(udiProductEntity.getBhxjcpbm())) { + IoCodeRelEntity ioCodeRelEntity = new IoCodeRelEntity(); ioCodeRelEntity.setCode(lowCode); ioCodeRelEntity.setParentCode(upCode); ioCodeRelEntity.setNameCode(udiProductEntity1.getNameCode()); @@ -106,14 +107,15 @@ public class ioCodeRelController { ioCodeRelEntity.setSerialNo(udiProductEntity1.getSerialNo()); ioCodeRelEntity.setCreateTime(new Date()); ioCodeRelEntity.setUpdateTime(new Date()); + ioCodeRelEntity.setId(IdUtil.getSnowflakeNextId()); ioCodeRelServicec.insert(ioCodeRelEntity); - return ResultVOUtils.success(); - }else{ - return ResultVOUtils.error(999,"该条码不属于下级产品！"); + return ResultVOUtils.success(); + } else { + return ResultVOUtils.error(999, "该条码不属于下级产品！"); } } } - return ResultVOUtils.error(999,""); + return ResultVOUtils.error(999, ""); } @GetMapping("/udi/ioCode/Rel/delectList") @@ -131,13 +133,13 @@ public class ioCodeRelController { @GetMapping("/udi/ioCode/Rel/del") @Log(title = "单据管理", businessType = BusinessType.DELETE) - public BaseResponse del(String code,String parentCode) { + public BaseResponse del(String code, String parentCode) { - int count=ioCodeRelServicec.delIoCodeRel(code,parentCode); - if(count>0){ + int count = ioCodeRelServicec.delIoCodeRel(code, parentCode); + if (count > 0) { return ResultVOUtils.success("删除成功"); - }else{ - return ResultVOUtils.error(999,"删除失败"); + } else { + return ResultVOUtils.error(999, "删除失败"); } } diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index c146736bb..0b963156e 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -1,6 +1,7 @@ package com.glxp.api.controller.purchase; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; @@ -117,8 +118,8 @@ public class SupCertController { } } } - }else{ - if(postSelCertRequest.getProductIdFk()==null) { + } else { + if (postSelCertRequest.getProductIdFk() == null) { String errMsg = ""; ArrayList list = new ArrayList<>(); int i = postSelCertRequest.getSupCertSetEntities().size(); @@ -140,7 +141,7 @@ public class SupCertController { } } } - }else{ + } else { String errMsg = ""; ArrayList list = new ArrayList<>(); int i = postSelCertRequest.getSupCertSetEntities().size(); @@ -178,6 +179,7 @@ public class SupCertController { supCertEntity.setStatus(0); supCertEntity.setAuditStatus(ConstantStatus.AUDIT_DRAFT); supCertEntity.setUpdateTime(new Date()); + supCertEntity.setId(IdUtil.getSnowflakeNextId()); boolean b = supCertService.insertCompanyCert(supCertEntity); } return ResultVOUtils.success("成功"); @@ -203,6 +205,7 @@ public class SupCertController { supCertEntity.setCreateTime(new Date()); supCertEntity.setUpdateTime(new Date()); supCertEntity.setStatus(0); + supCertEntity.setId(IdUtil.getSnowflakeNextId()); boolean b = supCertService.insertCompanyCert(supCertEntity); return ResultVOUtils.success("成功"); } @@ -265,15 +268,13 @@ public class SupCertController { BeanUtils.copyProperties(postSupCertRequest, supCertEntity); - if(postSupCertRequest.getVailDate() !=null && postSupCertRequest.getExpireDate() != null){ - if(postSupCertRequest.getVailDate().getTime()>postSupCertRequest.getExpireDate().getTime()){ - return ResultVOUtils.error(999,"生效期不能小于失效期！"); + if (postSupCertRequest.getVailDate() != null && postSupCertRequest.getExpireDate() != null) { + if (postSupCertRequest.getVailDate().getTime() > postSupCertRequest.getExpireDate().getTime()) { + return ResultVOUtils.error(999, "生效期不能小于失效期！"); } } - - if (postSupCertRequest.getRepeatUpload() == 1) { //已审核的重新提交 //1.修改对应的资质信息进入变更审核状态， @@ -419,7 +420,7 @@ public class SupCertController { if (StrUtil.isNotEmpty(filterSupCertRequest.getCustomerId()) && filterSupCertRequest.getType() != null) { List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); - List idsList = supCertEntityList.stream().map(SupCertEntity::getId).distinct().collect(Collectors.toList()); + List idsList = supCertEntityList.stream().map(SupCertEntity::getId).distinct().collect(Collectors.toList()); return ResultVOUtils.success(idsList); } return ResultVOUtils.error(999, "参数错误"); diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java index 677d958a6..4a0c383aa 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java @@ -1,6 +1,7 @@ package com.glxp.api.controller.purchase; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; @@ -58,20 +59,21 @@ public class SupCertSetController { supCertSetEntity = new SupCertSetEntity(); } //判断名字存在就返回 - FilterCertSetsRequest filterCertSetsRequest=new FilterCertSetsRequest(); + FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); filterCertSetsRequest.setType(supCertSetEntity.getType()); filterCertSetsRequest.setName(supCertSetEntity.getName()); List supCertEntityList = supCertSetService.filterCertSets(filterCertSetsRequest); - if(supCertEntityList.size()>0){ - return ResultVOUtils.error(999,"该证书名称已存在！"); + if (supCertEntityList.size() > 0) { + return ResultVOUtils.error(999, "该证书名称已存在！"); } supCertSetEntity.setUpdateTime(new Date()); - if(supCertSetEntity.getType()==3){ - if(supCertSetEntity.getFlbmList().size()>0){ + if (supCertSetEntity.getType() == 3) { + if (supCertSetEntity.getFlbmList().size() > 0) { String flbm = String.join(",", supCertSetEntity.getFlbmList()); supCertSetEntity.setFlbm(flbm); } } + supCertSetEntity.setId(IdUtil.getSnowflakeNextId()); boolean b = supCertSetService.insertCertSet(supCertSetEntity); return ResultVOUtils.success("添加成功！"); } @@ -86,14 +88,14 @@ public class SupCertSetController { supCertSetEntity.setFlbm(flbm); } //判断名字存在就返回 - FilterCertSetsRequest filterCertSetsRequest=new FilterCertSetsRequest(); + FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); filterCertSetsRequest.setType(supCertSetEntity.getType()); filterCertSetsRequest.setName(supCertSetEntity.getName()); filterCertSetsRequest.setId(supCertSetEntity.getId()); filterCertSetsRequest.setUpdateType(1); List supCertEntityList = supCertSetService.filterCertSets(filterCertSetsRequest); - if(supCertEntityList.size()!=0){ - return ResultVOUtils.error(999,"证书已存在!"); + if (supCertEntityList.size() != 0) { + return ResultVOUtils.error(999, "证书已存在!"); } boolean b = supCertSetService.updateCertSet(supCertSetEntity); return ResultVOUtils.success("修改成功"); diff --git a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java index 20127a48e..24c9851ab 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java @@ -1,6 +1,7 @@ package com.glxp.api.controller.purchase; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; @@ -178,7 +179,7 @@ public class SupManufacturerController { supManufacturerEntity.setCreateTime(new Date()); supManufacturerEntity.setUpdateTime(new Date()); - + supManufacturerEntity.setId(IdUtil.getSnowflakeNextId()); boolean b = supManufacturerService.insertCompany(supManufacturerEntity); if (b) { return ResultVOUtils.success("添加成功"); diff --git a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java index be7e3525d..acd248ad6 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java @@ -1,6 +1,7 @@ package com.glxp.api.controller.purchase; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; @@ -136,6 +137,7 @@ public class SupProductController { } supProductEntity.setCreateTime(new Date()); supProductEntity.setUpdateTime(new Date()); + supProductEntity.setId(IdUtil.getSnowflakeNextId()); boolean b = supProductService.insertRegistration(supProductEntity); if (b) { return ResultVOUtils.success("添加成功"); @@ -150,27 +152,27 @@ public class SupProductController { public BaseResponse selectBind(@RequestBody SelectProductBindRequest selectProductBindRequest) { UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectUdiId(Long.valueOf(selectProductBindRequest.getRelIdFk())); - SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(),selectProductBindRequest.getManufacturerId()); + SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), selectProductBindRequest.getManufacturerId()); if (supProductEntity != null) { return ResultVOUtils.error(500, "该产品资质已存在，请勿重复添加！"); - }else{ - supProductEntity = new SupProductEntity(); - BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity); - supProductEntity.setProductId(selectProductBindRequest.getProductId()); - supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh()); - supProductEntity.setRelIdFk(udiRelevanceResponse.getId() + ""); - supProductEntity.setRecordProductName(udiRelevanceResponse.getCpmctymc()); - supProductEntity.setProductType(udiRelevanceResponse.getQxlb()); - supProductEntity.setProductDirectoryCode(udiRelevanceResponse.getFlbm()); - supProductEntity.setRecordPeopleName(udiRelevanceResponse.getYlqxzcrbarmc()); - supProductEntity.setSpecification(udiRelevanceResponse.getGgxh()); - supProductEntity.setCreateTime(new Date()); - supProductEntity.setUpdateTime(new Date()); - supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId()); - supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId()); - supProductEntity.setHchzsb(udiRelevanceResponse.getCplb()); + } else { + supProductEntity = new SupProductEntity(); + BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity); + supProductEntity.setProductId(selectProductBindRequest.getProductId()); + supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh()); + supProductEntity.setRelIdFk(udiRelevanceResponse.getId() + ""); + supProductEntity.setRecordProductName(udiRelevanceResponse.getCpmctymc()); + supProductEntity.setProductType(udiRelevanceResponse.getQxlb()); + supProductEntity.setProductDirectoryCode(udiRelevanceResponse.getFlbm()); + supProductEntity.setRecordPeopleName(udiRelevanceResponse.getYlqxzcrbarmc()); + supProductEntity.setSpecification(udiRelevanceResponse.getGgxh()); + supProductEntity.setCreateTime(new Date()); + supProductEntity.setUpdateTime(new Date()); + supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId()); + supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId()); + supProductEntity.setHchzsb(udiRelevanceResponse.getCplb()); // supProductEntity.setCompanyName(selectProductBindRequest.getCompanyName()); - supProductEntity.setAuditStatus(selectProductBindRequest.getAuditStatus()); + supProductEntity.setAuditStatus(selectProductBindRequest.getAuditStatus()); } diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java index 097c711ce..9994c5cf9 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java @@ -96,7 +96,7 @@ public class ThrDeptController { if (thrDeptEntity.getId() == null) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } - String id = Integer.toString(thrDeptEntity.getId()); + String id = Long.toString(thrDeptEntity.getId()); ThrDeptEntity thrDeptEntity1 = thrDeptService.selectById(id); //查询该部门下的仓库 filterThrSubInvWarehouseRequest.setParentId(thrDeptEntity1.getCode()); diff --git a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java index 4f2ca48f3..e496b2901 100644 --- a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java @@ -75,7 +75,7 @@ public interface AuthAdminDao extends BaseMapperPlus selectHospitalUser(); - List selectNotSelectUser(@Param("userIds") List userIds, @Param("deptId") Integer deptId); + List selectNotSelectUser(@Param("userIds") List userIds, @Param("deptId") Long deptId); List selectAllocatedList(FilterAuthUserRequest filterAuthUserRequest); diff --git a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java index e6fe3084f..43cefff33 100644 --- a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java @@ -25,7 +25,7 @@ public interface WarehouseUserDao extends BaseMapperPlus - * + * *

* * @author 作者 @@ -21,8 +21,8 @@ import java.util.Date; @Data public class SupCertEntity { - @TableId(value = "id", type = IdType.AUTO) - private Integer id; + @TableId(value = "id", type = IdType.INPUT) + private Long id; /** * 配送企业ID外键 diff --git a/src/main/java/com/glxp/api/entity/purchase/SupCertSetEntity.java b/src/main/java/com/glxp/api/entity/purchase/SupCertSetEntity.java index dfc28ed93..df5c0b8c0 100644 --- a/src/main/java/com/glxp/api/entity/purchase/SupCertSetEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/SupCertSetEntity.java @@ -23,8 +23,8 @@ import java.util.List; @Data public class SupCertSetEntity { - @TableId(value = "id", type = IdType.AUTO) - private Integer id; + @TableId(value = "id", type = IdType.INPUT) + private Long id; /** * 证书名称 diff --git a/src/main/java/com/glxp/api/entity/purchase/SupManufacturerEntity.java b/src/main/java/com/glxp/api/entity/purchase/SupManufacturerEntity.java index 176efe79e..5d0d41a8e 100644 --- a/src/main/java/com/glxp/api/entity/purchase/SupManufacturerEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/SupManufacturerEntity.java @@ -11,7 +11,7 @@ import java.util.Date; /** *

- * + * *

* * @author 作者 @@ -21,7 +21,7 @@ import java.util.Date; @Data public class SupManufacturerEntity{ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id", type = IdType.INPUT) private Long id; /** diff --git a/src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java b/src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java index 16fa287bd..d37b53453 100644 --- a/src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java @@ -10,7 +10,7 @@ import java.util.Date; /** *

- * + * *

* * @author 作者 @@ -18,9 +18,9 @@ import java.util.Date; */ @TableName("sup_product") @Data -public class SupProductEntity{ +public class SupProductEntity { - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id", type = IdType.INPUT) private Long id; /** diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java index 54664fc0b..8a65fae2a 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java @@ -21,7 +21,7 @@ public class ThrBusTypeOriginEntity { * id */ @TableId(value = "id", type = IdType.AUTO) - private Integer id; + private Long id; /** * 单据类型名称 diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrCorpEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrCorpEntity.java index 2f3d673b5..57984c6f0 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrCorpEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrCorpEntity.java @@ -10,16 +10,17 @@ import java.util.Date; /** *

- * + * *

+ * * @since 2023-01-12 */ @Data @TableName("thr_corp") -public class ThrCorpEntity{ +public class ThrCorpEntity { @TableId(value = "id", type = IdType.AUTO) - private Integer id; + private Long id; @TableField("unitId") private String unitId; diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrDeptEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrDeptEntity.java index 7b72e4321..a3940207d 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrDeptEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrDeptEntity.java @@ -12,7 +12,7 @@ import java.util.Date; @TableName("thr_dept") public class ThrDeptEntity { - private Integer id; + private Long id; private Integer pid; private String code; private String name; @@ -36,4 +36,4 @@ public class ThrDeptEntity { * 第三方系统标识 */ private String thirdSysFk; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java index c462d63b3..4157848a5 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java @@ -10,7 +10,7 @@ import java.util.Date; /** *

- * + * *

* * @author ${author} @@ -18,10 +18,10 @@ import java.util.Date; */ @Data @TableName("thr_products") -public class ThrProductsEntity{ +public class ThrProductsEntity { @TableId(value = "id", type = IdType.AUTO) - private Integer id; + private Long id; /** * 产品编码 @@ -180,6 +180,4 @@ public class ThrProductsEntity{ private String updateUser; - - } diff --git a/src/main/java/com/glxp/api/req/auth/FilterNoSelectUserRequest.java b/src/main/java/com/glxp/api/req/auth/FilterNoSelectUserRequest.java index 403d4040e..eadab4da5 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterNoSelectUserRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterNoSelectUserRequest.java @@ -10,5 +10,5 @@ public class FilterNoSelectUserRequest extends ListPageRequest { List userIds; - private Integer deptId; + private Long deptId; } diff --git a/src/main/java/com/glxp/api/req/basic/BasicHospTypeRequest.java b/src/main/java/com/glxp/api/req/basic/BasicHospTypeRequest.java index 18da850ec..fd4fc10fe 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicHospTypeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicHospTypeRequest.java @@ -9,7 +9,7 @@ import java.util.List; @Data public class BasicHospTypeRequest{ - private Integer id; + private Long id; private String code; private String parentCode; private String name; diff --git a/src/main/java/com/glxp/api/req/purchase/FilterCertSetsRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterCertSetsRequest.java index bb8c32f31..9c8dcdd50 100644 --- a/src/main/java/com/glxp/api/req/purchase/FilterCertSetsRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/FilterCertSetsRequest.java @@ -7,7 +7,7 @@ import lombok.Data; @Data public class FilterCertSetsRequest extends ListPageRequest { - private Integer id; + private Long id; private String name; private Integer type; private Integer need; diff --git a/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java b/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java index 9b77eeeda..476f5a36b 100644 --- a/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java +++ b/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java @@ -15,7 +15,6 @@ public interface WarehouseUserService extends IService { /** * 查询仓库信息关联的用户数据 * - * @param code 仓位码 * @return */ @@ -40,7 +39,7 @@ public interface WarehouseUserService extends IService { * * @param id */ - void updateDirector(Integer id); + void updateDirector(Long id); void updateDirector(WarehouseUserEntity warehouseUserEntity); diff --git a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java index 1e6eb018d..ab5966e5f 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java @@ -82,7 +82,7 @@ public class WarehouseUserServiceImpl extends ServiceImpl implements IBasicBussinessTypeService { +public class BasicBussinessTypeServiceImpl extends ServiceImpl implements IBasicBussinessTypeService { @Resource private CustomerService customerService; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java index 140f9f7a9..7ba10f5f0 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic.impl; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -65,7 +66,7 @@ public class BasicHospTypeServiceImpl extends ServiceImpl basicHospTypeEntityList = basicHospTypeDao.selectLowTypeAll(basicHospTypeFilterRequest.getCode()); - List ids = basicHospTypeEntityList.stream().map(BasicHospTypeEntity::getId).collect(Collectors.toList()); + List ids = basicHospTypeEntityList.stream().map(BasicHospTypeEntity::getId).collect(Collectors.toList()); ew.notIn("id", ids); } List data = basicHospTypeDao.selectList(ew); @@ -105,6 +106,7 @@ public class BasicHospTypeServiceImpl extends ServiceImpl i @Override public boolean insertCompanyCert(SupCertEntity supCertEntity) { - return supCertDao.insertCompanyCert(supCertEntity); + return supCertDao.insert(supCertEntity) > 0 ? true : false; } @Override diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java index ce8be5769..e74b0c772 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java @@ -41,7 +41,7 @@ public class SupCertSetServiceImpl extends ServiceImpl 0 ? true : false; } @Override diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java index d75d7b3c9..e770a6d63 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java @@ -68,7 +68,7 @@ public class SupManufacturerServiceImpl extends ServiceImpl 0 ? true : false; } @Override diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java index 8188e72d3..c1fac32a5 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java @@ -140,7 +140,7 @@ public class SupProductServiceImpl extends ServiceImpl 0 ? true : false; } @Override diff --git a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml index 8d3efa011..e382616d4 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml @@ -145,28 +145,6 @@ #{remark}) - - insert INTO basic_corp(thirdId, erpId, name, spell, addr, - status, type, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4, - thirdName, thirdName1, thirdName2, thirdName3, thirdName4, updateTime, corpType, outType, - createUser, createTime, updateUser, remark) - values (#{thirdId}, - #{erpId}, - #{name}, - #{spell}, - #{addr}, - #{status}, - #{type}, - #{creditNo}, - #{contact}, - #{mobile}, - #{thirdId1}, #{thirdId2}, #{thirdId3}, #{thirdId4}, - #{thirdName}, #{thirdName1}, #{thirdName2}, #{thirdName3}, #{thirdName4}, #{updateTime}, #{corpType}, - #{outType}, #{createUser}, - #{createTime}, - #{updateUser}, - #{remark}) - diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index ecc5871b6..71208f2ee 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -306,6 +306,41 @@ CREATE TABLE IF NOT EXISTS `sync_data_change_bustypes` COLLATE = utf8mb4_0900_ai_ci COMMENT = '单据同步 - 业务单据类型' ROW_FORMAT = DYNAMIC; +# 修改主键为LONG +CALL Pro_Temp_ColumnWork('basic_hosp_type', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('basic_udirel', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('basic_products', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('company_product_relevance', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('basic_corp', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('sup_cert', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('sup_cert_set', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('sup_company', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('sup_manufacturer', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('sup_product', 'id', 'bigint', 2); + + +CALL Pro_Temp_ColumnWork('io_code_lost', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('io_code_rel', 'id', 'bigint', 2); + +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('basic_bustype_change', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('thr_bustype_origin', 'id', 'bigint', 2); + + +CALL Pro_Temp_ColumnWork('auth_user', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('auth_user_bustype', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('auth_dept', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('auth_warehouse', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('auth_warehouse_bustype', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('auth_warehouse_user', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('auth_space', 'id', 'bigint', 2); + + + +CALL Pro_Temp_ColumnWork('thr_dept', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('thr_products', 'id', 'bigint', 2); +CALL Pro_Temp_ColumnWork('thr_corp', 'id', 'bigint', 2); From 56fcc52b2b3cf4cbef6245f75f95253f970965c7 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Wed, 26 Apr 2023 10:37:34 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 07b6f3e9b004baba8656366a76f1324d496f1a42) --- src/main/java/com/glxp/api/service/sync/HeartService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 3205845c5..f1a03cedc 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -1229,7 +1229,7 @@ public class HeartService { basicDownloadStatusEntity.setUpdateTime(new Date()); basicDownloadStatusEntity.setEndTime(new Date()); basicDownloadStatusEntity.setIdDatas(exportType.getKey()); - basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); //下载完成 + basicDownloadStatusEntity.setStatus(BasicExportStatusEnum.SUCCESS.getCode()); //下载完成 basicDownloadStatusEntity.setType(BasicProcessStatus.BASIC_DATA); basicDownloadStatusEntity.setScheduleType(1); basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); From 6ba113593b509f8351707fff7d1fe4a3dc3e198f Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 26 Apr 2023 15:15:14 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sync/SyncDataSetController.java | 9 +++++++-- .../com/glxp/api/entity/auth/DeptEntity.java | 2 ++ .../api/entity/auth/WarehouseUserEntity.java | 2 +- .../api/entity/system/SyncDataSetEntity.java | 6 +++--- .../com/glxp/api/http/sync/SpGetHttpClient.java | 4 ++-- .../api/res/basic/BasicHospTypeResponse.java | 4 ++-- .../com/glxp/api/service/sync/HeartService.java | 17 ++++++++--------- .../java/com/glxp/api/task/SyncHeartTask.java | 2 +- 8 files changed, 26 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java index 2e565b770..99d832116 100644 --- a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java +++ b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java @@ -92,7 +92,12 @@ public class SyncDataSetController { //todo 请立即同步至UDI管理系统 - spGetHttpClient.updateSynsSet(syncDataSetResponse); - return ResultVOUtils.success("设置成功"); + BaseResponse baseResponse = spGetHttpClient.updateSynsSet(syncDataSetResponse); + if (baseResponse.getCode() == 20000) { + return baseResponse; + } else { + return ResultVOUtils.error(500, "UDI管理系统设置成功，自助平台修改失败"); + } + } } diff --git a/src/main/java/com/glxp/api/entity/auth/DeptEntity.java b/src/main/java/com/glxp/api/entity/auth/DeptEntity.java index 135a1f5a6..f313bbe33 100644 --- a/src/main/java/com/glxp/api/entity/auth/DeptEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/DeptEntity.java @@ -1,5 +1,6 @@ package com.glxp.api.entity.auth; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -19,6 +20,7 @@ public class DeptEntity { private String remark; private Integer level; private String pcode; + @TableField(exist = false) private String pName; /** diff --git a/src/main/java/com/glxp/api/entity/auth/WarehouseUserEntity.java b/src/main/java/com/glxp/api/entity/auth/WarehouseUserEntity.java index fa5573b19..8a96fac45 100644 --- a/src/main/java/com/glxp/api/entity/auth/WarehouseUserEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/WarehouseUserEntity.java @@ -38,7 +38,7 @@ public class WarehouseUserEntity { @TableField("isDirector") private boolean isDirector; - @TableField("employeeName") + @TableField(exist = false) private String employeeName; @TableField("updateTime") diff --git a/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java b/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java index e32b04574..fe45690c7 100644 --- a/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java @@ -23,9 +23,9 @@ public class SyncDataSetEntity { private int dbDiProducts; //DI产品信息 private int dbDiCompany; //DI企业信息 - private int department; //部门信息 - private int warehouseDict; //仓库字典 - private int userData; //用户信息 +// private int department; //部门信息 +// private int warehouseDict; //仓库字典 +// private int userData; //用户信息 private int udiCodeLost; // UDI码补齐 private int udiCodeRel; //UDI码关联关系 diff --git a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java index e678b5b39..d76edda4b 100644 --- a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java +++ b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java @@ -211,7 +211,7 @@ public class SpGetHttpClient { public BaseResponse> getBasicStatus(String type) { Map paramMap = new HashMap<>(16); paramMap.put("type", type); - paramMap.put("status", "3"); + paramMap.put("status", "1"); String response = okHttpCli.doGet(getIpUrl() + "/spssync/basic/udiinfo/getStatus", paramMap, buildHeader()); try { BaseResponse> data = @@ -323,7 +323,7 @@ public class SpGetHttpClient { public void finishTask(String id) { BasicExportStatusRequest basicExportStatusRequest = new BasicExportStatusRequest(); basicExportStatusRequest.setId(id); - String result = okHttpCli.doPostJson(getIpUrl() + "/spssync/basic/udiinfo/finishTask" + String result = okHttpCli.doPostJson(getIpUrl() + "/spssync/udiinfo/finishTask" , JSONUtil.toJsonStr(basicExportStatusRequest), buildHeader()); } diff --git a/src/main/java/com/glxp/api/res/basic/BasicHospTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicHospTypeResponse.java index d11b90151..24a4646cc 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicHospTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicHospTypeResponse.java @@ -11,7 +11,7 @@ import java.util.Date; @Data public class BasicHospTypeResponse { - private Integer id; + private Long id; private String code; private String parentCode; private String name; @@ -23,4 +23,4 @@ public class BasicHospTypeResponse { private String label; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index f1a03cedc..7af006ff4 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -232,7 +232,7 @@ public class HeartService { } break; case USER_DATA: - if (needExec(info.getDepartment(), info.getWarehouseDict(), info.getUserData())) { + if (needExec(info.getBasicDept(), info.getBasicInv(), info.getSysUser())) { uploadData(exportType, taskId, x -> x.getUserData(info, taskId, now, syncTime)); } break; @@ -572,7 +572,7 @@ public class HeartService { syncTimeMap.put("oldDate", syncTime); //确认有开启部门信息同步 - if (needExec(info.getDepartment())) { + if (needExec(info.getBasicDept())) { Map map; if (syncTime == null) { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.DEPT_DATA); @@ -602,7 +602,7 @@ public class HeartService { } //确认有开启仓库字典同步 - if (needExec(info.getWarehouseDict())) { + if (needExec(info.getBasicInv())) { Map map; if (syncTime == null) { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.WAREHOUSE_DICT); @@ -656,7 +656,7 @@ public class HeartService { } //确认有开启用户信息同步 - if (needExec(info.getUserData())) { + if (needExec(info.getSysUser())) { Map map; if (syncTime == null) { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.USER_DATA); @@ -1098,7 +1098,7 @@ public class HeartService { basicDownloadStatusEntity.setUpdateTime(new Date()); basicDownloadStatusEntity.setEndTime(new Date()); basicDownloadStatusEntity.setRemark(remark.toString()); - basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); + basicDownloadStatusEntity.setStatus(BasicExportStatusEnum.SUCCESS.getCode()); basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity); @@ -1111,7 +1111,7 @@ public class HeartService { // 下载最近更新国家库数据-上级服务 @Transactional(propagation = Propagation.NESTED) public void dlAllDiProducts() { - BaseResponse> baseResponse = spGetHttp.getBasicStatus(BasicProcessStatus.NEW_ALL_DI + ""); + BaseResponse> baseResponse = spGetHttp.getBasicStatus(BasicExportTypeEnum.COUNTRY_DI_DATA.getRemark() + ""); List pageSimpleResponse = baseResponse.getData(); if (pageSimpleResponse != null) { List basicExportStatusEntities = pageSimpleResponse; @@ -1165,7 +1165,7 @@ public class HeartService { basicDownloadStatusEntity.setUpdateTime(new Date()); basicDownloadStatusEntity.setEndTime(new Date()); basicDownloadStatusEntity.setRemark(remark.toString()); - basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); + basicDownloadStatusEntity.setStatus(BasicExportStatusEnum.SUCCESS.getCode()); basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity); } } @@ -1272,8 +1272,7 @@ public class HeartService { relevanceDao.insertOrUpdateBatch(relevanceList); } if (CollectionUtil.isNotEmpty(corpList)) { - for (BasicCorpEntity basicCorpEntity : corpList) - corpDao.importBasicUnitMaintain(basicCorpEntity); + corpDao.insertOrUpdateBatch(corpList); } if (CollectionUtil.isNotEmpty(supCertList)) { supCertDao.insertOrUpdateBatch(supCertList); diff --git a/src/main/java/com/glxp/api/task/SyncHeartTask.java b/src/main/java/com/glxp/api/task/SyncHeartTask.java index 8b0a41c82..cee16ce1a 100644 --- a/src/main/java/com/glxp/api/task/SyncHeartTask.java +++ b/src/main/java/com/glxp/api/task/SyncHeartTask.java @@ -105,7 +105,7 @@ public class SyncHeartTask implements SchedulingConfigurer { //定时下载上游最近更新数据轮询时间 - long timeInterval = syncDataSetEntity.getSyncDownloadTime() * 60 * 1000; + long timeInterval = syncDataSetEntity.getSyncDownloadTime() * 6 * 1000; long curTime = System.currentTimeMillis(); Long lastTime = (Long) redisUtil.get("SPS_SYNC_DOWNLOAD_DATA"); if (lastTime == null) { From 2f826221e47f1e5207c3a3fc017a9683fb56bc27 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 26 Apr 2023 15:17:16 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E9=9B=AA=E8=8A=B1=E7=AE=97=E6=B3=95?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B6=85=E5=87=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/config/DataTypeConvertConfig.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/main/java/com/glxp/api/config/DataTypeConvertConfig.java diff --git a/src/main/java/com/glxp/api/config/DataTypeConvertConfig.java b/src/main/java/com/glxp/api/config/DataTypeConvertConfig.java new file mode 100644 index 000000000..2ea30d9ed --- /dev/null +++ b/src/main/java/com/glxp/api/config/DataTypeConvertConfig.java @@ -0,0 +1,21 @@ +package com.glxp.api.config; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; + +@Configuration +public class DataTypeConvertConfig { + @Bean + public ObjectMapper objectMapper(Jackson2ObjectMapperBuilder builder) { + ObjectMapper objectMapper = builder.createXmlMapper(false).build(); + SimpleModule simpleModule = new SimpleModule(); + // 直接将所有的Long类型转换为String + simpleModule.addSerializer(Long.class, ToStringSerializer.instance); + objectMapper.registerModule(simpleModule); + return objectMapper; + } +} From 4ea1efaa921ff4814d44476800af2e328049c1d3 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 26 Apr 2023 18:13:13 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AEbug?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/constant/BasicProcessStatus.java | 2 +- .../com/glxp/api/constant/ConstantStatus.java | 4 +- .../sync/SpsSyncExportStatusController.java | 61 +++++++++++++++++++ .../com/glxp/api/dao/auth/InvSpaceDao.java | 4 +- .../com/glxp/api/dao/sync/BasicExportDao.java | 9 ++- .../com/glxp/api/entity/auth/InvSpace.java | 6 -- .../entity/sync/BasicExportStatusEntity.java | 22 +++++-- .../auth/impl/InvWarehouseServiceImpl.java | 1 - .../api/service/sync/BasicExportService.java | 3 +- .../glxp/api/service/sync/HeartService.java | 33 +++++++++- .../sync/impl/BasicExportServiceImpl.java | 11 ++-- .../mybatis/mapper/auth/InvSpaceDao.xml | 4 +- .../mapper/sync/BasicExportTimeDao.xml | 2 +- 13 files changed, 127 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/glxp/api/constant/BasicProcessStatus.java b/src/main/java/com/glxp/api/constant/BasicProcessStatus.java index 95bd9208b..e49e64115 100644 --- a/src/main/java/com/glxp/api/constant/BasicProcessStatus.java +++ b/src/main/java/com/glxp/api/constant/BasicProcessStatus.java @@ -27,7 +27,7 @@ public class BasicProcessStatus { public static final int BASIC_THIRD_ORDER = 6; //往来单位 public static final String NEW_ALL_DATA = "7"; //所有最新数据 public static final String NEW_ALL_BUS = "8"; - public static final String NEW_ALL_ORDER = "9"; + public static final String NEW_ALL_ORDER = "出入库扫码单据"; /** * 基础数据 */ diff --git a/src/main/java/com/glxp/api/constant/ConstantStatus.java b/src/main/java/com/glxp/api/constant/ConstantStatus.java index 7e96e7e28..e63753a92 100644 --- a/src/main/java/com/glxp/api/constant/ConstantStatus.java +++ b/src/main/java/com/glxp/api/constant/ConstantStatus.java @@ -251,8 +251,8 @@ public class ConstantStatus { //自动下载其他数据 public static final String SYNC_DOWNLOAD_OTHER_DATA = "AutoDownloadOtherData"; - public static final int SYNC_STATUS_SUCCESS = 1; //处理成功 - public static final int SYNC_STATUS_FAIL = 2; //处理失败 + public static final int SYNC_STATUS_SUCCESS = 2; //处理成功 + public static final int SYNC_STATUS_FAIL = 1; //处理失败 public static final int SYNC_STATUS_WAIT = 0; //等待处理 public static final int THIRD_ORDER_UPLOAD = 1; //业务单据上传至第三方 diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java index a15eccff2..4202e677b 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java @@ -3,6 +3,7 @@ package com.glxp.api.controller.sync; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.sync.BasicExportStatusEntity; @@ -22,6 +23,13 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.util.Date; import java.util.List; @@ -111,4 +119,57 @@ public class SpsSyncExportStatusController { } + @AuthRuleAnnotation("") + @PostMapping("/spssync/basic/udiinfo/infoByStatus") + public void infoByStatus(HttpServletResponse response, @RequestBody DeleteRequest deleteRequest) throws IOException { + if (StrUtil.isBlank(deleteRequest.getId())) { + throw new RuntimeException("缺少唯一标识"); + } + BasicExportStatusEntity info = basicExportService.getById(deleteRequest.getId()); + if (info == null) { + throw new RuntimeException("数据不存在"); + } + if (StrUtil.isBlank(info.getCacheFilePath())) { + throw new RuntimeException("文件未生成"); + } + File file = new File(info.getCacheFilePath()); + if (!file.exists()) { + throw new RuntimeException("文件丢失"); + } + String[] split = info.getCacheFilePath().split("/"); + String enFileName = URLEncoder.encode(split[split.length - 1], StandardCharsets.UTF_8); + // 设值返回文件属性，浏览器会根据属性调用下载文件方法 + response.addHeader("Content-Disposition", "attachment;filename=" + enFileName); + // 前端获取文件名，需要解码 + response.addHeader("downLoadName", enFileName); + // 定义输出流 + ServletOutputStream outputStream = null; + FileInputStream fileInputStream = null; + try { + outputStream = response.getOutputStream(); + // 定义输出类型为二进制流输出 + response.setContentType("application/octet-stream"); + fileInputStream = new FileInputStream(file); + byte[] bytes = new byte[fileInputStream.available()]; + fileInputStream.read(bytes); + // 把流写入response + outputStream.write(bytes); + // flush落盘 + outputStream.flush(); + // 关闭输出流 + outputStream.close(); + } catch (IOException e) { + throw new RuntimeException(e); + } finally { + if (outputStream != null) { + outputStream.close(); + } + if (fileInputStream != null) { + fileInputStream.close(); + } + } + + } + + } diff --git a/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java b/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java index 15c473646..fdb5931f0 100644 --- a/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java +++ b/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java @@ -42,7 +42,7 @@ public interface InvSpaceDao extends BaseMapperPlus selectList(InvSpace invSpace); + List selectAllList(InvSpace invSpace); /** * 查询货位编码和名称 @@ -103,4 +103,4 @@ public interface InvSpaceDao extends BaseMapperPlus { List filterExportStatus(BasicExportStatusRequest basicExportStatusRequest); @@ -17,10 +17,9 @@ public interface BasicExportDao { boolean deleteById(@Param("id") String id); - boolean updateExportStatus(BasicExportStatusEntity warehouseEntity); - - boolean deleteByTime(); + boolean updateExportStatus(BasicExportStatusEntity warehouseEntity); + void deleteByDate(@Param("date") String date); } diff --git a/src/main/java/com/glxp/api/entity/auth/InvSpace.java b/src/main/java/com/glxp/api/entity/auth/InvSpace.java index 5172c4215..80884f4ee 100644 --- a/src/main/java/com/glxp/api/entity/auth/InvSpace.java +++ b/src/main/java/com/glxp/api/entity/auth/InvSpace.java @@ -33,13 +33,11 @@ public class InvSpace { /** * 所属仓库 */ - @TableField("invStorageCode") private String invStorageCode; /** * 所属分库 */ - @TableField("invWarehouseCode") private String invWarehouseCode; /** @@ -50,25 +48,21 @@ public class InvSpace { /** * 创建时间 */ - @TableField("createTime") private Date createTime; /** * 更新时间 */ - @TableField("updateTime") private Date updateTime; /** * 创建人 */ - @TableField("createUser") private String createUser; /** * 更新人 */ - @TableField("updateUser") private String updateUser; /** diff --git a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java index 96eefbe77..867f13a0d 100644 --- a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java +++ b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java @@ -2,6 +2,10 @@ package com.glxp.api.entity.sync; import java.util.Date; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.glxp.api.constant.BasicExportStatusEnum; import lombok.AllArgsConstructor; import lombok.Builder; @@ -9,25 +13,31 @@ import lombok.Data; import lombok.NoArgsConstructor; @Data +@TableName("basic_export_status") +@Builder @AllArgsConstructor @NoArgsConstructor -@Builder + public class BasicExportStatusEntity { + @TableId(type = IdType.INPUT) private String id; + @TableField(value = "idDatas") private String idDatas; private Integer status; private String type; + @TableField(value = "updateTime") private Date updateTime; + @TableField(value = "scheduleType") private Integer scheduleType; + @TableField(value = "startTime") private Date startTime; + @TableField(value = "endTime") private Date endTime; private String remark; - private String cacheFilePath; - - /** - * 接收状态 1：接收失败 2：接收成功 - */ + @TableField(value = "receiveStatus") private Integer receiveStatus; + @TableField(value = "cacheFilePath") + private String cacheFilePath; } diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java index c2b616865..91bff5a72 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java @@ -203,7 +203,6 @@ public class InvWarehouseServiceImpl extends ServiceImpl { BasicExportStatusEntity findByData(String idDatas, Integer status); diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 7af006ff4..c5e3f3bb7 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -3,6 +3,7 @@ package com.glxp.api.service.sync; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; @@ -36,6 +37,7 @@ import com.glxp.api.service.inout.*; import com.glxp.api.service.thrsys.*; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.DateUtil; +import com.glxp.api.util.JsonUtils; import com.glxp.api.util.RedisUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -50,6 +52,9 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; import java.util.*; import java.util.function.Function; @@ -129,9 +134,9 @@ public class HeartService { spsSyncOrderResponse.setTaskId(basicExportStatusEntity1.getId()); BaseResponse baseResponse1 = spGetHttp.postAllOrder(spsSyncOrderResponse); if (baseResponse1.getCode() == 20000) { - basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); + basicExportStatusEntity1.setStatus(2); } else { - basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_FAIL); + basicExportStatusEntity1.setStatus(1); } basicExportStatusEntity1.setEndTime(new Date()); basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity); @@ -422,7 +427,7 @@ public class HeartService { if (needExec(info.getUdiCodeLost())) { Map map; if (syncTime == null) { - map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_PRODUCTS); + map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.IO_CODE_LOST); } else { map = syncTimeMap; } @@ -463,6 +468,28 @@ public class HeartService { return dataResponse; } + + private String writeFile(String filePath, String fileDesc, String content) throws IOException { + filePath = String.format("%s/%s", filePath, DateUtil.getDate()); + String fileFullPath = String.format("%s/%s-%s.udi", filePath, fileDesc, IdUtil.fastSimpleUUID()); + File file = new File(filePath); + if (!file.exists()) { + file.mkdirs(); + } + file = new File(fileFullPath); + while (!file.createNewFile()) { + fileFullPath = String.format("%s/%s/%s-%s.udi", filePath, DateUtil.getDate(), fileDesc, IdUtil.fastSimpleUUID()); + file = new File(fileFullPath); + } + + FileWriter fileWriter = new FileWriter(file); + fileWriter.write(content); + fileWriter.flush(); + fileWriter.close(); + return fileFullPath; + } + + private final IBasicBussinessTypeService bussinessTypeService; private final IBasicBusTypeChangeService busTypeChangeService; private final IThrBusTypeOriginService thrBusTypeOriginService; diff --git a/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java index 5cfd22f23..74f0f2525 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.sync.impl; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.sync.BasicExportDao; import com.glxp.api.entity.sync.BasicExportStatusEntity; @@ -15,7 +16,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class BasicExportServiceImpl implements BasicExportService { +public class BasicExportServiceImpl extends ServiceImpl implements BasicExportService { @Resource BasicExportDao basicExportDao; @@ -55,12 +56,12 @@ public class BasicExportServiceImpl implements BasicExportService { } @Override - public boolean updateExportStatus(BasicExportStatusEntity basicExportStatusEntity) { - return basicExportDao.updateExportStatus(basicExportStatusEntity); + public boolean deleteByTime() { + return basicExportDao.deleteByTime(); } @Override - public boolean deleteByTime() { - return basicExportDao.deleteByTime(); + public boolean updateExportStatus(BasicExportStatusEntity basicExportStatusEntity) { + return basicExportDao.updateExportStatus(basicExportStatusEntity); } } diff --git a/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml b/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml index 951a85e72..7847c6588 100644 --- a/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml @@ -293,7 +293,7 @@ - select * from auth_space @@ -408,4 +408,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/sync/BasicExportTimeDao.xml b/src/main/resources/mybatis/mapper/sync/BasicExportTimeDao.xml index 794dde2b0..b798a1865 100644 --- a/src/main/resources/mybatis/mapper/sync/BasicExportTimeDao.xml +++ b/src/main/resources/mybatis/mapper/sync/BasicExportTimeDao.xml @@ -17,7 +17,7 @@ - replace INTO basic_export_status_time(`key`, lastUpdateTime, remark) From 04996178225a26d7688170da4cc5af64f75f1825 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Wed, 26 Apr 2023 18:17:06 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/BasicExportStatusTimeEnum.java | 25 +++ .../api/constant/BasicExportTypeEnum.java | 5 + .../com/glxp/api/dao/auth/InvSpaceDao.java | 2 +- .../api/dao/basic/BasicBusTypePreDao.java | 2 +- .../dao/schedule/SystemParamConfigDao.java | 5 +- .../system/SysPdfTemplateRelevanceBizDao.java | 3 +- .../SysPdfTemplateRelevanceCodeDao.java | 4 +- .../SysPdfTemplateRelevanceLabelDao.java | 3 +- .../SysPdfTemplateRelevanceStatemenDao.java | 3 +- .../api/dao/system/SystemPDFModuleDao.java | 5 +- .../api/dao/system/SystemPDFTemplateDao.java | 5 +- .../basic/BasicBusTypeChangeEntity.java | 12 ++ .../entity/basic/BasicBusTypePreEntity.java | 18 ++ .../api/entity/basic/EntrustReceEntity.java | 13 ++ .../entity/sync/BasicExportStatusEntity.java | 5 + .../entity/system/SystemPDFModuleEntity.java | 5 + .../system/SystemPDFTemplateEntity.java | 4 + .../system/SystemParamConfigEntity.java | 5 + .../api/service/basic/EntrustReceService.java | 3 +- .../basic/IBasicBusTypePreService.java | 4 +- .../impl/BasicBusTypePreServiceImpl.java | 4 +- .../basic/impl/EntrustReceServiceImpl.java | 3 +- .../glxp/api/service/sync/HeartService.java | 197 +++++++++++++++++- .../system/SystemPDFModuleService.java | 3 +- .../SystemPDFTemplateRelevanceBizService.java | 3 +- ...SystemPDFTemplateRelevanceCodeService.java | 3 +- ...ystemPDFTemplateRelevanceLabelService.java | 3 +- ...emPDFTemplateRelevanceStatemenService.java | 3 +- .../system/SystemPDFTemplateService.java | 3 +- .../system/SystemParamConfigService.java | 3 +- .../impl/SystemPDFModuleServiceImpl.java | 5 +- ...temPDFTemplateRelevanceBizServiceImpl.java | 3 +- ...emPDFTemplateRelevanceCodeServiceImpl.java | 3 +- ...mPDFTemplateRelevanceLabelServiceImpl.java | 3 +- ...FTemplateRelevanceStatemenServiceImpl.java | 3 +- .../impl/SystemPDFTemplateServiceImpl.java | 5 +- .../impl/SystemParamConfigServiceImpl.java | 5 +- .../java/com/glxp/api/task/SyncHeartTask.java | 2 +- .../mybatis/mapper/auth/InvSpaceDao.xml | 2 +- .../mapper/basic/BasicBusTypePreDao.xml | 2 +- .../mapper/schedule/SystemParamConfigDao.xml | 2 +- .../mapper/system/SystemPDFModuleDao.xml | 2 +- .../mapper/system/SystemPDFTemplateDao.xml | 2 +- src/main/resources/schemas/schema_v2.1.sql | 8 +- 44 files changed, 355 insertions(+), 48 deletions(-) diff --git a/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java b/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java index 95a9a2694..6e5b2ac0f 100644 --- a/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java +++ b/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java @@ -87,6 +87,31 @@ public enum BasicExportStatusTimeEnum { * 第三方往来单位信息 */ THR_CORP("thr_corp","第三方往来单位信息"), + + /** + * 系统运行参数 + */ + SYSTEM_PARAM_CONFIG("system_param_config","系统运行参数"), + + /** + * 委托验收 + * */ + ENTRUST_ACCEPT("entrust_accept","委托验收"), + + /** + * 打印设置 + */ + PRINT_CONFIG("print_config","打印设置"), + + /** + * 自动建出入库单设置 + */ + SCAN_CHANGE("scan_change","自动建出入库单设置"), + + /** + * 自动建业务单设置 + */ + BUS_TYPE_CHANGE("bus_type_change","自动建业务单设置"), ; @EnumValue private String key; diff --git a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java index 03fc55503..e7d94370e 100644 --- a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java +++ b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java @@ -36,6 +36,11 @@ public enum BasicExportTypeEnum { * 第三方数据 */ THIRD_DATA("third_data", "第三方数据"), + + /** + * 系统设置数据 + */ + SYS_SET_DATA("sys_set_data", "系统设置数据"), ; private String key; diff --git a/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java b/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java index 15c473646..53cc52f4e 100644 --- a/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java +++ b/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java @@ -42,7 +42,7 @@ public interface InvSpaceDao extends BaseMapperPlus selectList(InvSpace invSpace); + List selectEntityList(InvSpace invSpace); /** * 查询货位编码和名称 diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java index 72ff84fb9..002e478b5 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java @@ -42,6 +42,6 @@ public interface BasicBusTypePreDao extends BaseMapperPlus selectBusTypePreResList(FilterBusTypePreRequest filterBusTypePreRequest); - boolean insertOrUpdate(BasicBusTypePreEntity record); + boolean insertOrUpdateEntity(BasicBusTypePreEntity record); } diff --git a/src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java b/src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java index e8e75a5cf..db2b71e11 100644 --- a/src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java +++ b/src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.schedule; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.req.system.FilterParamConfigRequest; import com.glxp.api.req.system.SysParamConfigSaveRequest; @@ -10,7 +11,7 @@ import java.util.Date; import java.util.List; @Mapper -public interface SystemParamConfigDao { +public interface SystemParamConfigDao extends BaseMapperPlus { List queryPage(FilterParamConfigRequest filterParamConfigRequest); @@ -28,7 +29,7 @@ public interface SystemParamConfigDao { boolean updateParentId(SysParamConfigSaveRequest sysParamConfigSaveRequest); - boolean insert(SystemParamConfigEntity systemParamConfigEntity); + boolean insertEntity(SystemParamConfigEntity systemParamConfigEntity); List selectByLastTime(@Param("lastUpdateTime") Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceBizDao.java b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceBizDao.java index 5a6f19ec2..35748d3e4 100644 --- a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceBizDao.java +++ b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceBizDao.java @@ -1,13 +1,14 @@ package com.glxp.api.dao.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import java.util.List; -public interface SysPdfTemplateRelevanceBizDao extends BaseMapper { +public interface SysPdfTemplateRelevanceBizDao extends BaseMapperPlus { List filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest); diff --git a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java index e75ef55ed..b338707a5 100644 --- a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java +++ b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java @@ -1,6 +1,7 @@ package com.glxp.api.dao.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; @@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; -public interface SysPdfTemplateRelevanceCodeDao extends BaseMapper { +public interface SysPdfTemplateRelevanceCodeDao extends BaseMapperPlus { List filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest); @@ -17,5 +18,4 @@ public interface SysPdfTemplateRelevanceCodeDao extends BaseMapper { +public interface SysPdfTemplateRelevanceLabelDao extends BaseMapperPlus { List filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest); } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceStatemenDao.java b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceStatemenDao.java index 02fbc79b9..7730caa58 100644 --- a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceStatemenDao.java +++ b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceStatemenDao.java @@ -1,13 +1,14 @@ package com.glxp.api.dao.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import java.util.List; -public interface SysPdfTemplateRelevanceStatemenDao extends BaseMapper { +public interface SysPdfTemplateRelevanceStatemenDao extends BaseMapperPlus { List filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest); diff --git a/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java b/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java index 07254727c..49bd5c68c 100644 --- a/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java +++ b/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.system; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.req.system.FilterPdfModuleRequest; import com.glxp.api.req.system.SysPdfModuleSaveRequest; @@ -10,7 +11,7 @@ import java.util.Date; import java.util.List; @Mapper -public interface SystemPDFModuleDao { +public interface SystemPDFModuleDao extends BaseMapperPlus { List queryPage(FilterPdfModuleRequest filterPDFModuleRequest); @@ -24,7 +25,7 @@ public interface SystemPDFModuleDao { boolean updateById(SysPdfModuleSaveRequest sysPdfModuleSaveRequest); - boolean insert(SystemPDFModuleEntity systemPDFModuleEntity); + boolean insertEntity(SystemPDFModuleEntity systemPDFModuleEntity); boolean deleteById(Integer id); diff --git a/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java b/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java index bc9e8fa2f..bc84ed813 100644 --- a/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java +++ b/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.system; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.req.system.FilterPdfTemplateRequest; import com.glxp.api.req.system.SysPdfTemplateSaveRequest; @@ -10,7 +11,7 @@ import java.util.Date; import java.util.List; @Mapper -public interface SystemPDFTemplateDao { +public interface SystemPDFTemplateDao extends BaseMapperPlus { List queryPage(FilterPdfTemplateRequest filterPdfTemplateRequest); @@ -22,7 +23,7 @@ public interface SystemPDFTemplateDao { boolean updateById(SysPdfTemplateSaveRequest sysPdfTemplateSaveRequest); - boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity); + boolean insertEntity(SystemPDFTemplateEntity systemPDFTemplateEntity); boolean deleteById(Integer id); diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java index 72bb1a9ea..ee888bc06 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java @@ -94,27 +94,39 @@ public class BasicBusTypeChangeEntity { private Integer busBeforeTime; + @TableField(exist = false) public static final String COL_ID = "id"; + @TableField(exist = false) public static final String COL_ORIGINACTION = "originAction"; + @TableField(exist = false) public static final String COL_ORIGINNAME = "originName"; + @TableField(exist = false) public static final String COL_TARGETACTION = "targetAction"; + @TableField(exist = false) public static final String COL_TYPE = "type"; + @TableField(exist = false) public static final String COL_ENABLE = "enable"; + @TableField(exist = false) public static final String COL_SYSTEMDEFAULT = "systemDefault"; + @TableField(exist = false) public static final String COL_CREATEUSER = "createUser"; + @TableField(exist = false) public static final String COL_UPDATEUSER = "updateUser"; + @TableField(exist = false) public static final String COL_CREATETIME = "createTime"; + @TableField(exist = false) public static final String COL_UPDATETIME = "updateTime"; + @TableField(exist = false) public static final String COL_REMARK = "remark"; } diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java index 508ba1b91..b7d407464 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java @@ -141,39 +141,57 @@ public class BasicBusTypePreEntity { @TableField(value = "busAuditStatus") private Integer busAuditStatus; + @TableField(exist = false) public static final String COL_ID = "id"; + @TableField(exist = false) public static final String COL_INTRO = "intro"; + @TableField(exist = false) public static final String COL_ACTION = "action"; + @TableField(exist = false) public static final String COL_INDEX = "index"; + @TableField(exist = false) public static final String COL_BEFORETIME = "beforeTime"; + @TableField(exist = false) public static final String COL_CHANGETYPE = "changeType"; + @TableField(exist = false) public static final String COL_DEFAULTDEPTCODE = "defaultDeptCode"; + @TableField(exist = false) public static final String COL_DEFAULTINVCODE = "defaultInvCode"; + @TableField(exist = false) public static final String COL_DEPTCODE = "deptCode"; + @TableField(exist = false) public static final String COL_INVCODE = "invCode"; + @TableField(exist = false) public static final String COL_ORIGINACTION = "originAction"; + @TableField(exist = false) public static final String COL_CHANGEENABLE = "changeEnable"; + @TableField(exist = false) public static final String COL_SUPPLEMENTALL = "supplementAll"; + @TableField(exist = false) public static final String COL_CREATEUSER = "createUser"; + @TableField(exist = false) public static final String COL_UPDATEUSER = "updateUser"; + @TableField(exist = false) public static final String COL_CREATETIME = "createTime"; + @TableField(exist = false) public static final String COL_UPDATETIME = "updateTime"; + @TableField(exist = false) public static final String COL_REMARK = "remark"; } diff --git a/src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java b/src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java index 91e67d3f4..b04b2be4a 100644 --- a/src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java @@ -88,29 +88,42 @@ public class EntrustReceEntity { @TableField(value = "entrustEnd") private Integer entrustEnd; + @TableField(exist = false) public static final String COL_ID = "id"; + @TableField(exist = false) public static final String COL_ACTION = "action"; + @TableField(exist = false) public static final String COL_CURDEPT = "curDept"; + @TableField(exist = false) public static final String COL_CURINV = "curInv"; + @TableField(exist = false) public static final String COL_USERID = "userId"; + @TableField(exist = false) public static final String COL_ENTRUSTDEPT = "entrustDept"; + @TableField(exist = false) public static final String COL_ENTRUSTINV = "entrustInv"; + @TableField(exist = false) public static final String COL_ENTRUSTACTION = "entrustAction"; + @TableField(exist = false) public static final String COL_ENTRUSTUSER = "entrustUser"; + @TableField(exist = false) public static final String COL_FINISHRECE = "finishRece"; + @TableField(exist = false) public static final String COL_UPDATETIME = "updateTime"; + @TableField(exist = false) public static final String COL_REMARK = "remark"; + @TableField(exist = false) public static final String COL_ENTRUSTEND = "entrustEnd"; } diff --git a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java index 96eefbe77..cbfac3841 100644 --- a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java +++ b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java @@ -2,6 +2,9 @@ package com.glxp.api.entity.sync; import java.util.Date; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.glxp.api.constant.BasicExportStatusEnum; import lombok.AllArgsConstructor; import lombok.Builder; @@ -12,8 +15,10 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @Builder +@TableName("basic_export_status") public class BasicExportStatusEntity { + @TableId(type = IdType.INPUT) private String id; private String idDatas; private Integer status; diff --git a/src/main/java/com/glxp/api/entity/system/SystemPDFModuleEntity.java b/src/main/java/com/glxp/api/entity/system/SystemPDFModuleEntity.java index 5c2d8471b..105b652b8 100644 --- a/src/main/java/com/glxp/api/entity/system/SystemPDFModuleEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SystemPDFModuleEntity.java @@ -1,10 +1,15 @@ package com.glxp.api.entity.system; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; +/** + * 打印模块 + */ @Data +@TableName("sys_pdf_module") public class SystemPDFModuleEntity { private Integer id; diff --git a/src/main/java/com/glxp/api/entity/system/SystemPDFTemplateEntity.java b/src/main/java/com/glxp/api/entity/system/SystemPDFTemplateEntity.java index da7656a26..9865b41b5 100644 --- a/src/main/java/com/glxp/api/entity/system/SystemPDFTemplateEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SystemPDFTemplateEntity.java @@ -1,10 +1,12 @@ package com.glxp.api.entity.system; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; @Data +@TableName("sys_pdf_template") public class SystemPDFTemplateEntity { private Integer id; @@ -19,4 +21,6 @@ public class SystemPDFTemplateEntity { private Date create_time; private Date update_time; private String jrxmlPath; + private String bussinessType; + private String bussinessStatus; } diff --git a/src/main/java/com/glxp/api/entity/system/SystemParamConfigEntity.java b/src/main/java/com/glxp/api/entity/system/SystemParamConfigEntity.java index 03c43d551..ef7633d26 100644 --- a/src/main/java/com/glxp/api/entity/system/SystemParamConfigEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SystemParamConfigEntity.java @@ -1,12 +1,17 @@ package com.glxp.api.entity.system; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; @Data +@TableName("sys_param_config") public class SystemParamConfigEntity { + @TableId(value = "id", type = IdType.AUTO) private int id; private int parentId; private String paramName; diff --git a/src/main/java/com/glxp/api/service/basic/EntrustReceService.java b/src/main/java/com/glxp/api/service/basic/EntrustReceService.java index abf42527a..dd153d664 100644 --- a/src/main/java/com/glxp/api/service/basic/EntrustReceService.java +++ b/src/main/java/com/glxp/api/service/basic/EntrustReceService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.basic.DlEntrustReceEntity; import com.glxp.api.entity.basic.EntrustReceEntity; import com.glxp.api.req.basic.BasicEntrustRecRequest; @@ -8,7 +9,7 @@ import com.glxp.api.res.basic.EntrustReceResponse; import java.util.Date; import java.util.List; -public interface EntrustReceService { +public interface EntrustReceService extends IService { EntrustReceEntity findById(Integer id); diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java index 3822a371d..5a3094e6a 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.basic.BasicBusTypePreEntity; import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.req.basic.FilterBusTypePreRequest; @@ -11,7 +12,7 @@ import java.util.List; /** * 补单单据类型Service */ -public interface IBasicBusTypePreService { +public interface IBasicBusTypePreService extends IService { /** * 查询补单单据类型数据列表 @@ -20,6 +21,7 @@ public interface IBasicBusTypePreService { * @return */ List filterAll(FilterBusTypeChangeRequest busTypeChangeFilterRequest); + /** * 根据ID删除补单单据类型 * diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java index 856aad5a2..e549a1122 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicBusTypePreDao; import com.glxp.api.entity.basic.BasicBusTypePreEntity; @@ -22,7 +23,7 @@ import java.util.List; @Slf4j @Service @Transactional(rollbackFor = Exception.class) -public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { +public class BasicBusTypePreServiceImpl extends ServiceImpl implements IBasicBusTypePreService { @Resource private BasicBusTypePreDao basicBusTypePreDao; @@ -109,6 +110,7 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { public List findByLastTime(Date lastUpdateTime) { return basicBusTypePreDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); } + /** * 设置创建/更新信息 * diff --git a/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java index 8baa6c206..541d8a52a 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.InvWarehouseDao; import com.glxp.api.dao.basic.EntrustReceDao; @@ -20,7 +21,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class EntrustReceServiceImpl implements EntrustReceService { +public class EntrustReceServiceImpl extends ServiceImpl implements EntrustReceService { @Resource EntrustReceDao entrustReceDao; diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 7af006ff4..63b1ebc64 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -24,15 +24,18 @@ import com.glxp.api.entity.purchase.*; import com.glxp.api.entity.sync.BasicDownloadStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; -import com.glxp.api.entity.system.SyncDataSetEntity; +import com.glxp.api.entity.system.*; import com.glxp.api.entity.thrsys.*; import com.glxp.api.http.sync.SpGetHttpClient; import com.glxp.api.req.sync.SpsSyncDataRequest; import com.glxp.api.res.sync.*; import com.glxp.api.service.auth.*; +import com.glxp.api.service.basic.EntrustReceService; import com.glxp.api.service.basic.IBasicBusTypeChangeService; +import com.glxp.api.service.basic.IBasicBusTypePreService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inout.*; +import com.glxp.api.service.system.*; import com.glxp.api.service.thrsys.*; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.DateUtil; @@ -232,7 +235,7 @@ public class HeartService { } break; case USER_DATA: - if (needExec(info.getBasicDept(), info.getBasicInv(), info.getSysUser())) { + if (!needExec(info.getBasicDept(), info.getBasicInv(), info.getSysUser())) { uploadData(exportType, taskId, x -> x.getUserData(info, taskId, now, syncTime)); } break; @@ -241,11 +244,15 @@ public class HeartService { uploadData(exportType, taskId, x -> x.getThirdData(info, taskId, now, syncTime)); } break; + case SYS_SET_DATA: + if (needExec(info.getSystemConfig(), info.getEntrustAction(), info.getPrintConfig(), info.getScanChangeConfig(), info.getBusChangeConfig())) { + uploadData(exportType, taskId, x -> x.getSysSettingData(info, taskId, now, syncTime)); + } + break; case COUNTRY_DI_DATA: } } - /** * 获取基础数据模块数据 * @@ -800,6 +807,188 @@ public class HeartService { return dataResponse; } + + private final SystemParamConfigService systemParamConfigService; + private final EntrustReceService entrustReceService; + private final SystemPDFModuleService systemPDFModuleService; + private final SystemPDFTemplateService systemPDFTemplateService; + private final SystemPDFTemplateRelevanceCodeService systemPDFTemplateRelevanceCodeService; + private final SystemPDFTemplateRelevanceBizService systemPDFTemplateRelevanceBizService; + private final SystemPDFTemplateRelevanceLabelService systemPDFTemplateRelevanceLabelService; + private final SystemPDFTemplateRelevanceStatemenService systemPDFTemplateRelevanceStatemenService; + private final IBasicBusTypePreService iBasicBusTypePreService; + private final IBasicBusTypeChangeService iBasicBusTypeChangeService; + + /** + * 获取系统设置模块数据 + * + * @param info 同步设置 + * @param now 当前时间 + * @param syncTime 同步时间 -- 传入时不操作exportTime表 + * @return + */ + private SpsSyncSysSettingResponse getSysSettingData(SyncDataSetEntity info, String taskId, Date now, Date syncTime) { + SpsSyncSysSettingResponse dataResponse = null; + Map syncTimeMap = new WeakHashMap<>(3); + syncTimeMap.put("isNew", true); + syncTimeMap.put("oldDate", syncTime); + if (needExec(info.getSystemConfig())) { + Map map; + if (syncTime == null) { + map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SYSTEM_PARAM_CONFIG); + } else { + map = syncTimeMap; + } + List systemParamConfigEntities = systemParamConfigService.list(Wrappers.lambdaQuery(SystemParamConfigEntity.class) + .le((boolean) map.get("isNew"), SystemParamConfigEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), SystemParamConfigEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(systemParamConfigEntities)) { + dataResponse = new SpsSyncSysSettingResponse(); + dataResponse.setSystemParamConfigEntities(systemParamConfigEntities); + } + } + if (needExec(info.getEntrustAction())) { + Map map; + if (syncTime == null) { + map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.ENTRUST_ACCEPT); + } else { + map = syncTimeMap; + } + List entrustReceEntities = entrustReceService.list(Wrappers.lambdaQuery(EntrustReceEntity.class) + .le((boolean) map.get("isNew"), EntrustReceEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), EntrustReceEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(entrustReceEntities)) { + if (dataResponse == null) { + dataResponse = new SpsSyncSysSettingResponse(); + } + dataResponse.setEntrustReceEntities(entrustReceEntities); + } + } + if (needExec(info.getPrintConfig())) { + Map map; + if (syncTime == null) { + map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.PRINT_CONFIG); + } else { + map = syncTimeMap; + } + List systemPDFModuleEntities = systemPDFModuleService.list(Wrappers.lambdaQuery(SystemPDFModuleEntity.class) + .le((boolean) map.get("isNew"), SystemPDFModuleEntity::getUpdate_time, now) + .between(!(boolean) map.get("isNew"), SystemPDFModuleEntity::getUpdate_time + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(systemPDFModuleEntities)) { + if (dataResponse == null) { + dataResponse = new SpsSyncSysSettingResponse(); + } + dataResponse.setSystemPDFModuleEntities(systemPDFModuleEntities); + } + + List systemPDFTemplateEntities = systemPDFTemplateService.list(Wrappers.lambdaQuery(SystemPDFTemplateEntity.class) + .le((boolean) map.get("isNew"), SystemPDFTemplateEntity::getUpdate_time, now) + .between(!(boolean) map.get("isNew"), SystemPDFTemplateEntity::getUpdate_time + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(systemPDFTemplateEntities)) { + if (dataResponse == null) { + dataResponse = new SpsSyncSysSettingResponse(); + } + dataResponse.setSystemPDFTemplateEntities(systemPDFTemplateEntities); + } + + List sysPdfTemplateRelevanceCodeEntities = systemPDFTemplateRelevanceCodeService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceCodeEntity.class) + .le((boolean) map.get("isNew"), SysPdfTemplateRelevanceCodeEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), SysPdfTemplateRelevanceCodeEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(sysPdfTemplateRelevanceCodeEntities)) { + if (dataResponse == null) { + dataResponse = new SpsSyncSysSettingResponse(); + } + dataResponse.setSysPdfTemplateRelevanceCodeEntities(sysPdfTemplateRelevanceCodeEntities); + } + + List sysPdfTemplateRelevanceBizEntities = systemPDFTemplateRelevanceBizService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceBizEntity.class) + .le((boolean) map.get("isNew"), SysPdfTemplateRelevanceBizEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), SysPdfTemplateRelevanceBizEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(sysPdfTemplateRelevanceBizEntities)) { + if (dataResponse == null) { + dataResponse = new SpsSyncSysSettingResponse(); + } + dataResponse.setSysPdfTemplateRelevanceBizEntities(sysPdfTemplateRelevanceBizEntities); + } + + List sysPdfTemplateRelevanceLabelEntities = systemPDFTemplateRelevanceLabelService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceLabelEntity.class) + .le((boolean) map.get("isNew"), SysPdfTemplateRelevanceLabelEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), SysPdfTemplateRelevanceLabelEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(sysPdfTemplateRelevanceLabelEntities)) { + if (dataResponse == null) { + dataResponse = new SpsSyncSysSettingResponse(); + } + dataResponse.setSysPdfTemplateRelevanceLabelEntities(sysPdfTemplateRelevanceLabelEntities); + } + + List sysPdfTemplateRelevanceStatemenEntities = systemPDFTemplateRelevanceStatemenService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceStatemenEntity.class) + .le((boolean) map.get("isNew"), SysPdfTemplateRelevanceStatemenEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), SysPdfTemplateRelevanceStatemenEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(sysPdfTemplateRelevanceStatemenEntities)) { + if (dataResponse == null) { + dataResponse = new SpsSyncSysSettingResponse(); + } + dataResponse.setSysPdfTemplateRelevanceStatemenEntities(sysPdfTemplateRelevanceStatemenEntities); + } + } + + if (needExec(info.getScanChangeConfig())) { + Map map; + if (syncTime == null) { + map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SCAN_CHANGE); + } else { + map = syncTimeMap; + } + List basicBusTypePreEntities = iBasicBusTypePreService.list(Wrappers.lambdaQuery(BasicBusTypePreEntity.class) + .le((boolean) map.get("isNew"), BasicBusTypePreEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), BasicBusTypePreEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(basicBusTypePreEntities)) { + dataResponse = new SpsSyncSysSettingResponse(); + dataResponse.setBasicBusTypePreEntities(basicBusTypePreEntities); + } + } + if (needExec(info.getBusChangeConfig())) { + Map map; + if (syncTime == null) { + map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BUS_TYPE_CHANGE); + } else { + map = syncTimeMap; + } + List basicBusTypeChangeEntities = iBasicBusTypeChangeService.list(Wrappers.lambdaQuery(BasicBusTypeChangeEntity.class) + .le((boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime, now) + .between(!(boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime + , map.get("oldDate"), now) + ); + if (CollectionUtil.isNotEmpty(basicBusTypeChangeEntities)) { + dataResponse = new SpsSyncSysSettingResponse(); + dataResponse.setBasicBusTypeChangeEntities(basicBusTypeChangeEntities); + } + } + + if (dataResponse != null) { + dataResponse.setTaskId(taskId); + } + return dataResponse; + } + /** * 判断是否需要执行 由内向外 * @@ -1230,7 +1419,7 @@ public class HeartService { basicDownloadStatusEntity.setEndTime(new Date()); basicDownloadStatusEntity.setIdDatas(exportType.getKey()); basicDownloadStatusEntity.setStatus(BasicExportStatusEnum.SUCCESS.getCode()); //下载完成 - basicDownloadStatusEntity.setType(BasicProcessStatus.BASIC_DATA); + basicDownloadStatusEntity.setType(exportType.getRemark()); basicDownloadStatusEntity.setScheduleType(1); basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); //通知自助平台任务已完成 diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java b/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java index b7d6d73a6..1881d71fc 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.entity.system.SystemPDFModuleEntity; @@ -11,7 +12,7 @@ import java.util.Date; import java.util.List; -public interface SystemPDFModuleService { +public interface SystemPDFModuleService extends IService { List queryPage(FilterPdfModuleRequest filterPDFModuleRequest); diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java index 2cb617907..456fb82e7 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; @@ -8,7 +9,7 @@ import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import java.util.Date; import java.util.List; -public interface SystemPDFTemplateRelevanceBizService { +public interface SystemPDFTemplateRelevanceBizService extends IService { List getListByModelId(Integer modelId); diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java index 221c69ca0..2588e3d47 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; @@ -8,7 +9,7 @@ import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import java.util.Date; import java.util.List; -public interface SystemPDFTemplateRelevanceCodeService { +public interface SystemPDFTemplateRelevanceCodeService extends IService { List getListByModelId(Integer modelId); diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceLabelService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceLabelService.java index 68dc43569..ff58768f2 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceLabelService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceLabelService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; @@ -8,7 +9,7 @@ import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import java.util.Date; import java.util.List; -public interface SystemPDFTemplateRelevanceLabelService { +public interface SystemPDFTemplateRelevanceLabelService extends IService { List getListByModelId(Integer modelId); diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java index bb6afb255..0a430a57e 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; @@ -8,7 +9,7 @@ import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import java.util.Date; import java.util.List; -public interface SystemPDFTemplateRelevanceStatemenService { +public interface SystemPDFTemplateRelevanceStatemenService extends IService { List getListByModelId(Integer modelId); diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java index d01a20417..2b7a24b52 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.req.system.FilterPdfTemplateRequest; import com.glxp.api.req.system.SysPdfTemplateSaveRequest; @@ -9,7 +10,7 @@ import java.util.Date; import java.util.List; -public interface SystemPDFTemplateService { +public interface SystemPDFTemplateService extends IService { List queryPage(FilterPdfTemplateRequest filterPdfTemplateRequest); diff --git a/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java b/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java index 8265bc4df..d0623305c 100644 --- a/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java +++ b/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.req.system.FilterParamConfigRequest; import com.glxp.api.req.system.SysParamConfigSaveRequest; @@ -10,7 +11,7 @@ import java.util.List; import java.util.Map; -public interface SystemParamConfigService { +public interface SystemParamConfigService extends IService { List queryPage(FilterParamConfigRequest FilterParamConfigRequest); diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java index 185847696..d421f8165 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.system.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.system.SystemPDFModuleDao; import com.glxp.api.dao.system.SystemPDFTemplateRelevanceDao; @@ -18,7 +19,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class SystemPDFModuleServiceImpl implements SystemPDFModuleService { +public class SystemPDFModuleServiceImpl extends ServiceImpl implements SystemPDFModuleService { @Resource SystemPDFModuleDao systemPDFModuleDao; @@ -66,7 +67,7 @@ public class SystemPDFModuleServiceImpl implements SystemPDFModuleService { @Override public boolean insert(SystemPDFModuleEntity systemPDFModuleEntity) { - return systemPDFModuleDao.insert(systemPDFModuleEntity); + return systemPDFModuleDao.insertEntity(systemPDFModuleEntity); } @Override diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java index d9221cac7..8e8e2b2e1 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.system.SysPdfTemplateRelevanceBizDao; import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; @@ -13,7 +14,7 @@ import java.util.Date; import java.util.List; @Service -public class SystemPDFTemplateRelevanceBizServiceImpl implements SystemPDFTemplateRelevanceBizService { +public class SystemPDFTemplateRelevanceBizServiceImpl extends ServiceImpl implements SystemPDFTemplateRelevanceBizService { @Resource SysPdfTemplateRelevanceBizDao sysPdfTemplateRelevanceBizDao; diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java index 737078eeb..aaf3b556a 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.system.SysPdfTemplateRelevanceCodeDao; import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; @@ -13,7 +14,7 @@ import java.util.Date; import java.util.List; @Service -public class SystemPDFTemplateRelevanceCodeServiceImpl implements SystemPDFTemplateRelevanceCodeService { +public class SystemPDFTemplateRelevanceCodeServiceImpl extends ServiceImpl implements SystemPDFTemplateRelevanceCodeService { @Resource SysPdfTemplateRelevanceCodeDao sysPdfTemplateRelevanceCodeDao; diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java index 2f2b23fb2..1370129b3 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.system.SysPdfTemplateRelevanceLabelDao; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; @@ -13,7 +14,7 @@ import java.util.Date; import java.util.List; @Service -public class SystemPDFTemplateRelevanceLabelServiceImpl implements SystemPDFTemplateRelevanceLabelService { +public class SystemPDFTemplateRelevanceLabelServiceImpl extends ServiceImpl implements SystemPDFTemplateRelevanceLabelService { @Resource SysPdfTemplateRelevanceLabelDao sysPdfTemplateRelevanceLabelDao; diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java index e9fd4a65b..28c58c266 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.system.SysPdfTemplateRelevanceStatemenDao; import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; @@ -13,7 +14,7 @@ import java.util.Date; import java.util.List; @Service -public class SystemPDFTemplateRelevanceStatemenServiceImpl implements SystemPDFTemplateRelevanceStatemenService { +public class SystemPDFTemplateRelevanceStatemenServiceImpl extends ServiceImpl implements SystemPDFTemplateRelevanceStatemenService { @Resource SysPdfTemplateRelevanceStatemenDao sysPdfTemplateRelevanceStatemenDao; diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java index eb0ea7533..321a8d6bf 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.system.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.system.SystemPDFTemplateDao; import com.glxp.api.entity.system.SystemPDFTemplateEntity; @@ -15,7 +16,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class SystemPDFTemplateServiceImpl implements SystemPDFTemplateService { +public class SystemPDFTemplateServiceImpl extends ServiceImpl implements SystemPDFTemplateService { @Resource SystemPDFTemplateDao systemPDFTemplateDao; @@ -55,7 +56,7 @@ public class SystemPDFTemplateServiceImpl implements SystemPDFTemplateService { @Override public boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity) { - return systemPDFTemplateDao.insert(systemPDFTemplateEntity); + return systemPDFTemplateDao.insertEntity(systemPDFTemplateEntity); } @Override diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java index a130793da..5df052bdc 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system.impl; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.schedule.SystemParamConfigDao; import com.glxp.api.entity.system.SystemParamConfigEntity; @@ -18,7 +19,7 @@ import java.util.Map; @Service @Transactional(rollbackFor = Exception.class) -public class SystemParamConfigServiceImpl implements SystemParamConfigService { +public class SystemParamConfigServiceImpl extends ServiceImpl implements SystemParamConfigService { @Resource SystemParamConfigDao systemParamConfigDao; @@ -83,7 +84,7 @@ public class SystemParamConfigServiceImpl implements SystemParamConfigService { @Override public boolean insert(SystemParamConfigEntity systemParamConfigEntity) { systemParamConfigEntity.setUpdateTime(new Date()); - return systemParamConfigDao.insert(systemParamConfigEntity); + return systemParamConfigDao.insertEntity(systemParamConfigEntity); } diff --git a/src/main/java/com/glxp/api/task/SyncHeartTask.java b/src/main/java/com/glxp/api/task/SyncHeartTask.java index cee16ce1a..932e4b435 100644 --- a/src/main/java/com/glxp/api/task/SyncHeartTask.java +++ b/src/main/java/com/glxp/api/task/SyncHeartTask.java @@ -74,7 +74,7 @@ public class SyncHeartTask implements SchedulingConfigurer { // heartService.uploadScheduleList(); // heartService.uploadThrData(null); // heartService.uploadThrProducts(null); - heartService.uploadSysSetting(null); +// heartService.uploadSysSetting(null); Arrays.stream(BasicExportTypeEnum.values()).forEach(i -> { heartService.pushData(syncDataSetEntity, null, i); }); diff --git a/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml b/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml index 951a85e72..5d1b0a219 100644 --- a/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml @@ -293,7 +293,7 @@ - select * from auth_space diff --git a/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml index ef64d7378..9981005ce 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml @@ -62,7 +62,7 @@ - + insert into basic_bustype_pre diff --git a/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml b/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml index 6646aafae..49ee881cd 100644 --- a/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml +++ b/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml @@ -65,7 +65,7 @@ WHERE parentId=#{parentId} - + insert INTO sys_param_config(paramName, paramKey, paramValue, paramStatus, paramType, paramExplain, updateTime) values (#{paramName}, diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml index c4cec8f5a..6534290f9 100644 --- a/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml +++ b/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml @@ -68,7 +68,7 @@ WHERE id=#{id} - + insert INTO sys_pdf_module( name, param, fieldExplain, remark, templateId, create_time, update_time , templateDlUrl, templateType , remark1, remark2, remark3) diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml index 1d5299913..85b0eff30 100644 --- a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml +++ b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml @@ -51,7 +51,7 @@ WHERE id=#{id} - + insert INTO sys_pdf_template(name, type, module, param, path, rowCount, qrcodeCount, remark, create_time, update_time, jrxmlPath) diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 71208f2ee..3b7ec505d 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -1,13 +1,13 @@ # 字段新增 （表名，字段名，字段类型，修改方式（1：新增，2：修改，3：删除） CALL Pro_Temp_ColumnWork('auth_user_bustype', 'updateTime', - 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 1); + 'datetime ', 1); CALL Pro_Temp_ColumnWork('auth_warehouse_bustype', 'updateTime', - 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 1); + 'datetime ', 1); CALL Pro_Temp_ColumnWork('auth_warehouse_user', 'updateTime', - 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 1); + 'datetime ', 1); CALL Pro_Temp_ColumnWork('auth_dept_user', 'updateTime', - 'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 1); + 'datetime ', 1); CALL Pro_Temp_ColumnWork('sync_data_set', 'department', 'tinyint ', 1); CALL Pro_Temp_ColumnWork('sync_data_set', 'warehouseDict', 'tinyint ', 1); From 4318495bacd0a553937fd530d1ffded99ae03fe6 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 26 Apr 2023 19:09:05 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AEbug?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/constant/BasicProcessStatus.java | 2 +- .../com/glxp/api/res/sync/SpsSyncOrderResponse.java | 2 +- .../java/com/glxp/api/service/sync/HeartService.java | 10 +++++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/constant/BasicProcessStatus.java b/src/main/java/com/glxp/api/constant/BasicProcessStatus.java index e49e64115..382b2e7bb 100644 --- a/src/main/java/com/glxp/api/constant/BasicProcessStatus.java +++ b/src/main/java/com/glxp/api/constant/BasicProcessStatus.java @@ -36,7 +36,7 @@ public class BasicProcessStatus { * 基础数据 */ public static final String OTHER_DATA = "22"; - public static final String ALL_BUS_ORDER = "11"; + public static final String ALL_BUS_ORDER = "业务单据"; public static final String NEW_ALL_DI = "10"; public static final String NEW_ALL_THR_DATA = "12"; //所有第三方基础数据 public static final String NEW_ALL_THR_PRODUCTS = "13"; //所有第三方产品数据 diff --git a/src/main/java/com/glxp/api/res/sync/SpsSyncOrderResponse.java b/src/main/java/com/glxp/api/res/sync/SpsSyncOrderResponse.java index 4af1e7aa7..1222f4e90 100644 --- a/src/main/java/com/glxp/api/res/sync/SpsSyncOrderResponse.java +++ b/src/main/java/com/glxp/api/res/sync/SpsSyncOrderResponse.java @@ -4,6 +4,7 @@ import com.glxp.api.entity.inout.*; import lombok.Data; import java.util.List; + //同步扫码单据相关 @Data public class SpsSyncOrderResponse extends BaseSyncResponse { @@ -14,5 +15,4 @@ public class SpsSyncOrderResponse extends BaseSyncResponse { List orderDetailCodeEntities; List orderDetailResultEntities; List orderInvoiceEntities; - } diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 9213c1ed6..957de3239 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -135,6 +135,7 @@ public class HeartService { basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss")); basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_SCAN_ORDER); spsSyncOrderResponse.setTaskId(basicExportStatusEntity1.getId()); + spsSyncOrderResponse.setType(BasicProcessStatus.NEW_ALL_ORDER); BaseResponse baseResponse1 = spGetHttp.postAllOrder(spsSyncOrderResponse); if (baseResponse1.getCode() == 20000) { basicExportStatusEntity1.setStatus(2); @@ -194,6 +195,7 @@ public class HeartService { basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss")); basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_BUS_ORDER); spsSyncOrderResponse.setTaskId(basicExportStatusEntity1.getId()); + spsSyncOrderResponse.setType(BasicProcessStatus.ALL_BUS_ORDER); BaseResponse baseResponse1 = spGetHttp.postAllBusOrder(spsSyncOrderResponse); if (baseResponse1.getCode() == 20000) { basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); @@ -254,7 +256,6 @@ public class HeartService { uploadData(exportType, taskId, x -> x.getSysSettingData(info, taskId, now, syncTime)); } break; - case COUNTRY_DI_DATA: } } @@ -410,6 +411,7 @@ public class HeartService { } if (dataResponse != null) { dataResponse.setTaskId(taskId); + dataResponse.setType(BasicExportTypeEnum.BASIC_DATA.getRemark()); } return dataResponse; @@ -470,6 +472,7 @@ public class HeartService { } if (dataResponse != null) { dataResponse.setTaskId(taskId); + dataResponse.setType(BasicExportTypeEnum.OTHER_DATA.getRemark()); } return dataResponse; @@ -578,6 +581,8 @@ public class HeartService { if (dataResponse != null) { dataResponse.setTaskId(taskId); + dataResponse.setType(BasicExportTypeEnum.DOCUMENT_TYPE_DATA.getRemark()); + } return dataResponse; } @@ -723,6 +728,7 @@ public class HeartService { if (dataResponse != null) { dataResponse.setTaskId(taskId); + dataResponse.setType(BasicExportTypeEnum.USER_DATA.getRemark()); } return dataResponse; } @@ -830,6 +836,7 @@ public class HeartService { if (dataResponse != null) { dataResponse.setTaskId(taskId); + dataResponse.setType(BasicExportTypeEnum.THIRD_DATA.getRemark()); } return dataResponse; } @@ -1012,6 +1019,7 @@ public class HeartService { if (dataResponse != null) { dataResponse.setTaskId(taskId); + dataResponse.setType(BasicExportTypeEnum.SYS_SET_DATA.getRemark()); } return dataResponse; } From 655ecb508cd6e961ab46d9166eb92a325f031ba5 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 26 Apr 2023 21:53:55 +0800 Subject: [PATCH 08/12] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/constant/BasicExportTypeEnum.java | 5 +++++ .../com/glxp/api/http/sync/SpGetHttpClient.java | 4 ++-- .../com/glxp/api/req/sync/SyncUpLoadRequest.java | 1 + .../com/glxp/api/service/sync/HeartService.java | 16 +++++++++------- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java index e7d94370e..ed46d9ed9 100644 --- a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java +++ b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java @@ -41,6 +41,11 @@ public enum BasicExportTypeEnum { * 系统设置数据 */ SYS_SET_DATA("sys_set_data", "系统设置数据"), + +// +// NEW_ALL_ORDER("all_order", "出入库扫码单据"), +// ALL_BUS_ORDER("all_bus_order", "业务单据"), + ; private String key; diff --git a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java index d76edda4b..6a010dec7 100644 --- a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java +++ b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java @@ -58,8 +58,8 @@ public class SpGetHttpClient { return headers; } - public BaseResponse postData(BasicExportTypeEnum exportType, Object data) { - SyncUpLoadRequest build = SyncUpLoadRequest.builder().exportType(exportType).data(data).build(); + public BaseResponse postData(String taskId, BasicExportTypeEnum exportType, Object data) { + SyncUpLoadRequest build = SyncUpLoadRequest.builder().taskId(taskId).exportType(exportType).data(data).build(); String result = okHttpCli.doPostJson(getIpUrl() + "/sps/sync/upload/data", JSONUtil.toJsonStr(build), buildHeader()); return JSONObject.parseObject(result, new TypeReference>() { }); diff --git a/src/main/java/com/glxp/api/req/sync/SyncUpLoadRequest.java b/src/main/java/com/glxp/api/req/sync/SyncUpLoadRequest.java index 37baf9281..be40aa7c9 100644 --- a/src/main/java/com/glxp/api/req/sync/SyncUpLoadRequest.java +++ b/src/main/java/com/glxp/api/req/sync/SyncUpLoadRequest.java @@ -12,6 +12,7 @@ import lombok.NoArgsConstructor; @Builder public class SyncUpLoadRequest { + private String taskId; private BasicExportTypeEnum exportType; private Object data; diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 957de3239..e2f6c2255 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -61,6 +61,8 @@ import java.io.IOException; import java.util.*; import java.util.function.Function; +import static com.glxp.api.constant.BasicProcessStatus.NEW_ALL_ORDER; + @Slf4j @Service @RequiredArgsConstructor @@ -123,7 +125,7 @@ public class HeartService { BasicExportStatusEntity orderStatusEntity = new BasicExportStatusEntity(); orderStatusEntity.setId(CustomUtil.getId()); orderStatusEntity.setIdDatas(ConstantStatus.SYNC_SCAN_ORDER); - orderStatusEntity.setType(BasicProcessStatus.NEW_ALL_ORDER); + orderStatusEntity.setType(NEW_ALL_ORDER); orderStatusEntity.setUpdateTime(new Date()); orderStatusEntity.setStartTime(new Date()); orderStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_WAIT); @@ -135,7 +137,7 @@ public class HeartService { basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss")); basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_SCAN_ORDER); spsSyncOrderResponse.setTaskId(basicExportStatusEntity1.getId()); - spsSyncOrderResponse.setType(BasicProcessStatus.NEW_ALL_ORDER); + spsSyncOrderResponse.setType(NEW_ALL_ORDER); BaseResponse baseResponse1 = spGetHttp.postAllOrder(spsSyncOrderResponse); if (baseResponse1.getCode() == 20000) { basicExportStatusEntity1.setStatus(2); @@ -862,7 +864,7 @@ public class HeartService { * @return */ private SpsSyncSysSettingResponse getSysSettingData(SyncDataSetEntity info, String taskId, Date now, Date syncTime) { - SpsSyncSysSettingResponse dataResponse = null; + SpsSyncSysSettingResponse dataResponse = null; Map syncTimeMap = new WeakHashMap<>(3); syncTimeMap.put("isNew", true); syncTimeMap.put("oldDate", syncTime); @@ -1041,7 +1043,7 @@ public class HeartService { if (data == null) { return; } - BaseResponse baseResponse = spGetHttp.postData(exportType, data); + BaseResponse baseResponse = spGetHttp.postData(taskId, exportType, data); if (baseResponse.getCode() != 20000) { status = BasicExportStatusEnum.FAILED.getCode(); } @@ -1254,13 +1256,13 @@ public class HeartService { //下载最近更新扫码单据--上级服务 @Transactional(propagation = Propagation.NESTED) public void dlAllOrder() { - BaseResponse> baseResponse = spGetHttp.getBasicStatus(BasicProcessStatus.NEW_ALL_ORDER + ""); + BaseResponse> baseResponse = spGetHttp.getBasicStatus(NEW_ALL_ORDER + ""); List pageSimpleResponse = baseResponse != null ? baseResponse.getData() : new ArrayList<>(); if (pageSimpleResponse != null) { List basicExportStatusEntities = pageSimpleResponse; if (basicExportStatusEntities != null && basicExportStatusEntities.size() > 0) { for (BasicExportStatusEntity basicExportStatusEntity : basicExportStatusEntities) { - String datas = spGetHttp.getBasicData(basicExportStatusEntity.getId(), BasicProcessStatus.NEW_ALL_ORDER); + String datas = spGetHttp.getBasicData(basicExportStatusEntity.getId(), NEW_ALL_ORDER); BaseResponse response = JSONObject.parseObject(datas, new TypeReference>() { }); if (response.getCode() == 20000 && response.getData() != null) { @@ -1273,7 +1275,7 @@ public class HeartService { basicDownloadStatusEntity.setStartTime(new Date()); basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_SCAN_ORDER); basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_WAIT); //下载中 - basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_ORDER); + basicDownloadStatusEntity.setType(NEW_ALL_ORDER); basicDownloadStatusEntity.setScheduleType(1); basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); StringBuffer remark = new StringBuffer(); From c85d0f445d44d31ea0be35d28c2f3c1b51cd2175 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Thu, 27 Apr 2023 10:10:52 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=8F=8A=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E5=86=99=E5=85=A5=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sync/BasicDownloadStatusEntity.java | 6 ++++++ .../entity/sync/BasicExportStatusEntity.java | 1 - .../glxp/api/service/sync/HeartService.java | 20 +++++++++++++++++-- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java b/src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java index d91f106fa..420da974f 100644 --- a/src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java +++ b/src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java @@ -1,10 +1,14 @@ package com.glxp.api.entity.sync; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; @Data +@TableName("basic_download_status") public class BasicDownloadStatusEntity { /** @@ -24,4 +28,6 @@ public class BasicDownloadStatusEntity { private Date startTime; private Date endTime; private String remark; + @TableField(value = "cacheFilePath") + private String cacheFilePath; } diff --git a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java index 867f13a0d..73886ef0f 100644 --- a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java +++ b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java @@ -17,7 +17,6 @@ import lombok.NoArgsConstructor; @Builder @AllArgsConstructor @NoArgsConstructor - public class BasicExportStatusEntity { @TableId(type = IdType.INPUT) diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index e2f6c2255..410bcb3fa 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -49,6 +49,7 @@ import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.session.TransactionIsolationLevel; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -864,7 +865,7 @@ public class HeartService { * @return */ private SpsSyncSysSettingResponse getSysSettingData(SyncDataSetEntity info, String taskId, Date now, Date syncTime) { - SpsSyncSysSettingResponse dataResponse = null; + SpsSyncSysSettingResponse dataResponse = null; Map syncTimeMap = new WeakHashMap<>(3); syncTimeMap.put("isNew", true); syncTimeMap.put("oldDate", syncTime); @@ -1059,7 +1060,14 @@ public class HeartService { .scheduleType(BasicProcessStatus.SCHEDULE_NORMAL) .remark(baseResponse.getMessage()) .build(); - applicationContext.getBean(this.getClass()).insertExportStatus(exportStatus); + try { + String fileFullPath = writeFile(filePrefix, exportType.getRemark(), JsonUtils.toJsonString(data)); + exportStatus.setCacheFilePath(fileFullPath); + } catch (IOException e) { + throw new RuntimeException(e); + }finally { + applicationContext.getBean(this.getClass()).insertExportStatus(exportStatus); + } if (baseResponse.getCode() != 20000) { throw new RuntimeException(baseResponse.getMessage()); } @@ -1412,6 +1420,8 @@ public class HeartService { private final SupManufacturerDao supManufacturerDao; private final SupProductDao supProductDao; + @Value("${file_path}") + private String filePrefix; /** * 从UDI自助平台拉取 统一方法 @@ -1458,6 +1468,12 @@ public class HeartService { basicDownloadStatusEntity.setStatus(BasicExportStatusEnum.SUCCESS.getCode()); //下载完成 basicDownloadStatusEntity.setType(exportType.getRemark()); basicDownloadStatusEntity.setScheduleType(1); + try { + String fileFullPath = writeFile(filePrefix, exportType.getRemark(), bean.getFileContent()); + basicDownloadStatusEntity.setCacheFilePath(fileFullPath); + } catch (IOException e) { + throw new RuntimeException(e); + } basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); //通知自助平台任务已完成 spGetHttp.finishTask(taskId); From 4f7b490d884ce39babc8bcd04505246bc44daa1d Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Thu, 27 Apr 2023 10:13:30 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=8F=8A=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E5=86=99=E5=85=A5=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/schemas/schema_v2.1.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 3b7ec505d..2b3f74783 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -1,5 +1,8 @@ # 字段新增 （表名，字段名，字段类型，修改方式（1：新增，2：修改，3：删除） +CALL Pro_Temp_ColumnWork('basic_download_status', 'cacheFilePath', + 'varchar(255) ', 1); + CALL Pro_Temp_ColumnWork('auth_user_bustype', 'updateTime', 'datetime ', 1); CALL Pro_Temp_ColumnWork('auth_warehouse_bustype', 'updateTime', From 164c76858c09d83979358dcc8c079ae4c82e1a59 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 27 Apr 2023 10:30:43 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/idc/controller/FileController.java | 21 +- .../api/idc/service/impl/FileServiceImpl.java | 183 +++++++++--------- .../glxp/api/service/sync/HeartService.java | 20 ++ 3 files changed, 121 insertions(+), 103 deletions(-) diff --git a/src/main/java/com/glxp/api/idc/controller/FileController.java b/src/main/java/com/glxp/api/idc/controller/FileController.java index 92c9e2ebe..69c4fd6b6 100644 --- a/src/main/java/com/glxp/api/idc/controller/FileController.java +++ b/src/main/java/com/glxp/api/idc/controller/FileController.java @@ -16,9 +16,6 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.idc.service.FileService; - - - /** * 中继服务接口 */ @@ -31,30 +28,28 @@ public class FileController { @RequestMapping(value = "/spssync/file/upload") @ResponseBody public BaseResponse upload(HttpServletRequest request, @RequestBody Map params) { - return fileService.fileUpload(request,params); + return fileService.fileUpload(request, params); } - + @RequestMapping(value = "/spssync/file/download") @ResponseBody public BaseResponse download(HttpServletRequest request, @RequestBody Map params) { - return fileService.fileDownload(request,params); + return fileService.fileDownload(request, params); } - + @RequestMapping(value = "/spssync/file/downloadFile") @ResponseBody public BaseResponse downloadFile(HttpServletRequest request, @RequestBody Map params) { - return fileService.downloadFile(request,params); + return fileService.downloadFile(request, params); } - + @RequestMapping(value = "/spssync/file/uploadFile") public BaseResponse uploadFile(HttpServletRequest request, - @RequestParam(value = "content" , required = false) String content, - @RequestParam(value = "files", required = false) MultipartFile[] files) { + @RequestParam(value = "content", required = false) String content, + @RequestParam(value = "files", required = false) MultipartFile[] files) { // return fileService.receiveFile(request, content, files); } - - } diff --git a/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java index 66a801ddf..fdb4e299d 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java @@ -38,7 +38,7 @@ import okhttp3.RequestBody; import okhttp3.Response; -/*文件服务*/ +/*文件服务*/ @Service public class FileServiceImpl implements FileService { private static final Logger logger = LoggerFactory.getLogger(FileServiceImpl.class); @@ -48,152 +48,155 @@ public class FileServiceImpl implements FileService { private String apiKey; @Value("${API_SECRET}") private String apiSecret; - + @Resource private DbDao dbDao; @Resource private IdcService idcService; private String imagePath = "register/file/image2/"; - + String pdfPath = "pdf/template/"; + @Override public BaseResponse upload(List list) { return fileToUpload(list); } + @Override public BaseResponse download(List list) { - return fileToDownload(list); + return fileToDownload(list); } - + @Override - public BaseResponse fileUpload(HttpServletRequest request,Map params) { + public BaseResponse fileUpload(HttpServletRequest request, Map params) { List list = new ArrayList<>(); String[] strs = params.get("fileName").toString().split(","); - for(String str:strs) { + for (String str : strs) { list.add(str); } return fileToUpload(list); } - + private BaseResponse fileToUpload(List list) { - String host=""; + String host = ""; try { Map map = dbDao.get("select * from sync_data_set limit 1"); - if(map!=null&&map.get("syncIp")!=null) + if (map != null && map.get("syncIp") != null) host = map.get("syncIp").toString(); } catch (Exception ex) { - + } - if(StringUtils.isEmpty(host)) { + if (StringUtils.isEmpty(host)) { try { - Map config =dbDao.get("select paramValue from system_param_config where paramKey='upper_server_ip'"); - if(config!=null&&config.get("paramValue")!=null) + Map config = dbDao.get("select paramValue from system_param_config where paramKey='upper_server_ip'"); + if (config != null && config.get("paramValue") != null) host = config.get("paramValue").toString(); } catch (Exception ex) { - + } } - if(StringUtils.isEmpty(host)) - return ResultVOUtils.error(9999,"上传地址未配置，请至同步设置中进行设置"); - if(list!=null) { - - - String filePathSlash = filePath.substring(filePath.length() - 1).equals("/") ? "" : "/"; + if (StringUtils.isEmpty(host)) + return ResultVOUtils.error(9999, "上传地址未配置，请至同步设置中进行设置"); + if (list != null) { ArrayList files = new ArrayList<>(); boolean isExists = true; List noExitsList = new ArrayList<>(); - for(String strs:list) { - String[] str = strs.split(","); - for(String s:str) { - if (!StringUtils.isEmpty(s) && FileUtils.isFileExist(filePath + filePathSlash + imagePath + s)) { - files.add(filePath + filePathSlash + imagePath + s); - } else { - isExists = false; - noExitsList.add(s); - } + for (String strs : list) { + if (!StringUtils.isEmpty(strs) && FileUtils.isFileExist(strs)) { + files.add(strs); + } else { + isExists = false; + noExitsList.add(strs); } } - if(!isExists) - return ResultVOUtils.error(9999,"以下文件不存在:\n"+JSON.toJSONString(noExitsList)); - String result = relayFile(files,host); + if (!isExists) + return ResultVOUtils.error(9999, "以下文件不存在:\n" + JSON.toJSONString(noExitsList)); + String result = relayFile(files, host); if (IDCUtils.isJson(result)) { - BaseResponse baseResponse = JSON.parseObject(result,BaseResponse.class); + BaseResponse baseResponse = JSON.parseObject(result, BaseResponse.class); return baseResponse; } } - return ResultVOUtils.error(9999,"失败"); + return ResultVOUtils.error(9999, "失败"); } - - - + + @Override - public BaseResponse fileDownload(HttpServletRequest request,Map params) { + public BaseResponse fileDownload(HttpServletRequest request, Map params) { List list = new ArrayList<>(); String[] strs = params.get("fileName").toString().split(","); - for(String str:strs) { + for (String str : strs) { list.add(str); } return fileToDownload(list); } - - + + private BaseResponse fileToDownload(List list) { - Map params = new HashMap(); + Map params = new HashMap(); String fileName = ""; - for(String str:list) { - fileName +=fileName.length()>0 ? ","+str : str; + for (String str : list) { + fileName += fileName.length() > 0 ? "," + str : str; } params.put("fileName", fileName); Map map = dbDao.get("select * from sync_data_set limit 1"); - if(map!=null&&map.get("syncIp")!=null) { - - String result = IDCUtils.post(map.get("syncIp").toString()+"/spssync/file/downloadFile", params); + if (map != null && map.get("syncIp") != null) { + + String result = IDCUtils.post(map.get("syncIp").toString() + "/spssync/file/downloadFile", params); boolean success = false; - if(IDCUtils.isJson(result)) { + if (IDCUtils.isJson(result)) { JSONObject object = JSON.parseObject(result); - - if(object.getInteger("code")==20000) { + + if (object.getInteger("code") == 20000) { String[] files = params.get("fileName").toString().split(","); success = true; - for(String str:files) { - if(!idcService.signleDownloadFile(map.get("syncIp").toString(), str)) + for (String str : files) { + if (!idcService.signleDownloadFile(map.get("syncIp").toString(), str)) success = false; } } } - if(!success) - return ResultVOUtils.error(9999,"失败"); + if (!success) + return ResultVOUtils.error(9999, "失败"); } else { - return ResultVOUtils.error(9999,"中继服务地址未配置，请至同步设置中进行配置"); + return ResultVOUtils.error(9999, "中继服务地址未配置，请至同步设置中进行配置"); } return ResultVOUtils.success(null); } - + @Override - public BaseResponse receiveFile(HttpServletRequest request,String content,MultipartFile[] files) { + public BaseResponse receiveFile(HttpServletRequest request, String content, MultipartFile[] files) { boolean isRelay = false; String filePathSlash = filePath.substring(filePath.length() - 1).equals("/") ? "" : "/"; String host = ""; + + try { - Map config =dbDao.get("select paramValue from system_param_config where paramKey='upper_server_ip'"); - if(config!=null&&config.get("paramValue")!=null) { + Map config = dbDao.get("select paramValue from system_param_config where paramKey='upper_server_ip'"); + if (config != null && config.get("paramValue") != null) { isRelay = true; host = config.get("paramValue").toString(); } - + } catch (Exception ex) { - + } ArrayList saveFiles = new ArrayList<>(); Date startTime = new Date(); if (files != null) { - if(!FileUtils.makeDirectory(filePath + filePathSlash + imagePath)) + if (!FileUtils.makeDirectory(filePath + filePathSlash + imagePath)) IDCUtils.createDirectory(filePath + filePathSlash + imagePath); try { for (MultipartFile file : files) { - String imageName = filePath + filePathSlash + imagePath + file.getOriginalFilename(); + String flodPath; + if (file.getName().contains(".jrxml") || file.getName().contains(".jasper")) { + flodPath = pdfPath; + } else { + flodPath = imagePath; + } + String imageName = filePath + filePathSlash + flodPath + file.getOriginalFilename(); saveFiles.add(imageName); - IDCUtils.writeFile(file.getBytes(), filePath + filePathSlash + imagePath, file.getOriginalFilename()); - } + IDCUtils.writeFile(file.getBytes(), filePath + filePathSlash + flodPath, file.getOriginalFilename()); + } } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -204,24 +207,24 @@ public class FileServiceImpl implements FileService { } - if(isRelay) { - String result = relayFile(saveFiles,host); + if (isRelay) { + String result = relayFile(saveFiles, host); logger.info(result); - if (IDCUtils.isJson(result)&&!result.contains(" files, String ip) { String host = ip; String result = ""; - + if (!StringUtils.isEmpty(host)) { host += "/spssync/file/uploadFile"; OkHttpClient client = new OkHttpClient().newBuilder() @@ -244,7 +247,7 @@ public class FileServiceImpl implements FileService { } } } - + RequestBody body = builder.build(); Request req = new Request.Builder() @@ -270,34 +273,34 @@ public class FileServiceImpl implements FileService { } return result; } - + @Override - public BaseResponse downloadFile(HttpServletRequest request,Map params) { + public BaseResponse downloadFile(HttpServletRequest request, Map params) { String host = ""; try { - Map config =dbDao.get("select paramValue from system_param_config where paramKey='upper_server_ip'"); - if(config!=null&&config.get("paramValue")!=null) + Map config = dbDao.get("select paramValue from system_param_config where paramKey='upper_server_ip'"); + if (config != null && config.get("paramValue") != null) host = config.get("paramValue").toString(); } catch (Exception ex) { - + } - if(!StringUtils.isEmpty(host)) { - String result = IDCUtils.post(host+"/spssync/file/downloadFile", params); + if (!StringUtils.isEmpty(host)) { + String result = IDCUtils.post(host + "/spssync/file/downloadFile", params); JSONObject object = JSON.parseObject(result); boolean success = false; - if(object.getInteger("code")==20000) { + if (object.getInteger("code") == 20000) { String[] files = params.get("fileName").toString().split(","); success = true; - for(String str:files) { - if(!idcService.signleDownloadFile(host, str)) + for (String str : files) { + if (!idcService.signleDownloadFile(host, str)) success = false; } } - if(!success) - ResultVOUtils.error(9999,"失败"); - + if (!success) + ResultVOUtils.error(9999, "失败"); + } - return ResultVOUtils.success(null); + return ResultVOUtils.success(null); } - -} \ No newline at end of file + +} diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 410bcb3fa..624a5f390 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -1023,7 +1023,27 @@ public class HeartService { if (dataResponse != null) { dataResponse.setTaskId(taskId); dataResponse.setType(BasicExportTypeEnum.SYS_SET_DATA.getRemark()); + if (CollUtil.isNotEmpty(dataResponse.getSystemPDFTemplateEntities())) { +// List> list = new ArrayList<>(spsSyncSysSettingResponse.getSystemPDFTemplateEntities().size() * 2); + List list = new ArrayList<>(); + dataResponse.getSystemPDFTemplateEntities().forEach(systemPDFTemplateEntity -> { + list.add(systemPDFTemplateEntity.getPath()); + }); + + BaseResponse response = spGetHttp.postTemplateFile(list); + if (response.getCode() == 20000) { + log.info("模板文件列表上传成功"); +// uploadFileLog = "\n模板文件列表上传成功"; + } else { + log.info("模板文件上传失败，响应信息：{}", response.getMessage()); +// uploadFileLog = "\n模板文件列表上传失败，错误信息：" + response.getMessage(); + } + } } + + + + return dataResponse; } From aa9d903fd78e0acc914a869be309e5ae5c9bcbec Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 27 Apr 2023 14:33:51 +0800 Subject: [PATCH 12/12] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/constant/BasicExportTypeEnum.java | 2 +- .../glxp/api/constant/BasicProcessStatus.java | 4 +++- .../api/idc/service/impl/FileServiceImpl.java | 5 +---- .../glxp/api/res/sync/BaseSyncResponse.java | 2 +- .../glxp/api/service/sync/HeartService.java | 22 ++++++++++++------- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java index ed46d9ed9..399ba98e9 100644 --- a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java +++ b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java @@ -15,7 +15,7 @@ public enum BasicExportTypeEnum { /** * 国家库DI数据 */ - COUNTRY_DI_DATA("country_di_data", "国家库DI数据"), +// COUNTRY_DI_DATA("country_di_data", "国家库DI数据"), /** * 单据类型 diff --git a/src/main/java/com/glxp/api/constant/BasicProcessStatus.java b/src/main/java/com/glxp/api/constant/BasicProcessStatus.java index 382b2e7bb..6c569ad44 100644 --- a/src/main/java/com/glxp/api/constant/BasicProcessStatus.java +++ b/src/main/java/com/glxp/api/constant/BasicProcessStatus.java @@ -28,6 +28,8 @@ public class BasicProcessStatus { public static final String NEW_ALL_DATA = "7"; //所有最新数据 public static final String NEW_ALL_BUS = "8"; public static final String NEW_ALL_ORDER = "出入库扫码单据"; + + /** * 基础数据 */ @@ -37,7 +39,7 @@ public class BasicProcessStatus { */ public static final String OTHER_DATA = "22"; public static final String ALL_BUS_ORDER = "业务单据"; - public static final String NEW_ALL_DI = "10"; + public static final String NEW_ALL_UDIS = "国家库数据"; public static final String NEW_ALL_THR_DATA = "12"; //所有第三方基础数据 public static final String NEW_ALL_THR_PRODUCTS = "13"; //所有第三方产品数据 public static final String NEW_ALL_SYS_SETTING = "14"; //所有系统设置数据 diff --git a/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java index fdb4e299d..064542d71 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java @@ -168,8 +168,6 @@ public class FileServiceImpl implements FileService { boolean isRelay = false; String filePathSlash = filePath.substring(filePath.length() - 1).equals("/") ? "" : "/"; String host = ""; - - try { Map config = dbDao.get("select paramValue from system_param_config where paramKey='upper_server_ip'"); if (config != null && config.get("paramValue") != null) { @@ -178,10 +176,9 @@ public class FileServiceImpl implements FileService { } } catch (Exception ex) { - + ex.printStackTrace(); } ArrayList saveFiles = new ArrayList<>(); - Date startTime = new Date(); if (files != null) { if (!FileUtils.makeDirectory(filePath + filePathSlash + imagePath)) IDCUtils.createDirectory(filePath + filePathSlash + imagePath); diff --git a/src/main/java/com/glxp/api/res/sync/BaseSyncResponse.java b/src/main/java/com/glxp/api/res/sync/BaseSyncResponse.java index b8748a2af..b28aeec75 100644 --- a/src/main/java/com/glxp/api/res/sync/BaseSyncResponse.java +++ b/src/main/java/com/glxp/api/res/sync/BaseSyncResponse.java @@ -8,7 +8,7 @@ import java.util.List; public class BaseSyncResponse { private String taskId; - private List files; + private List syncFiles; private List uploadFiles; private String updateTime; private String type; diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 624a5f390..052f86ec4 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -28,6 +28,7 @@ import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; import com.glxp.api.entity.system.*; import com.glxp.api.entity.thrsys.*; import com.glxp.api.http.sync.SpGetHttpClient; +import com.glxp.api.idc.service.FileService; import com.glxp.api.req.sync.SpsSyncDataRequest; import com.glxp.api.res.sync.*; import com.glxp.api.service.auth.*; @@ -63,6 +64,7 @@ import java.util.*; import java.util.function.Function; import static com.glxp.api.constant.BasicProcessStatus.NEW_ALL_ORDER; +import static com.glxp.api.constant.BasicProcessStatus.NEW_ALL_UDIS; @Slf4j @Service @@ -1042,8 +1044,6 @@ public class HeartService { } - - return dataResponse; } @@ -1085,7 +1085,7 @@ public class HeartService { exportStatus.setCacheFilePath(fileFullPath); } catch (IOException e) { throw new RuntimeException(e); - }finally { + } finally { applicationContext.getBean(this.getClass()).insertExportStatus(exportStatus); } if (baseResponse.getCode() != 20000) { @@ -1365,7 +1365,7 @@ public class HeartService { // 下载最近更新国家库数据-上级服务 @Transactional(propagation = Propagation.NESTED) public void dlAllDiProducts() { - BaseResponse> baseResponse = spGetHttp.getBasicStatus(BasicExportTypeEnum.COUNTRY_DI_DATA.getRemark() + ""); + BaseResponse> baseResponse = spGetHttp.getBasicStatus(NEW_ALL_UDIS); List pageSimpleResponse = baseResponse.getData(); if (pageSimpleResponse != null) { List basicExportStatusEntities = pageSimpleResponse; @@ -1373,7 +1373,7 @@ public class HeartService { for (BasicExportStatusEntity basicExportStatusEntity : basicExportStatusEntities) { long curTime = System.currentTimeMillis(); // log.info("--------等待时间------" + curTime); - String datas = spGetHttp.getBasicData(basicExportStatusEntity.getId(), BasicProcessStatus.NEW_ALL_DI); + String datas = spGetHttp.getBasicData(basicExportStatusEntity.getId(), BasicProcessStatus.NEW_ALL_UDIS); // logger.info("--------等待时间1------" + (System.currentTimeMillis() - curTime) / 1000); long curTime2 = System.currentTimeMillis(); BaseResponse response = JSONObject.parseObject(datas, new TypeReference>() { @@ -1387,7 +1387,7 @@ public class HeartService { basicDownloadStatusEntity.setStartTime(new Date()); basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_DI_PRODUCTS); basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_WAIT); //下载中 - basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_DI); + basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_UDIS); basicDownloadStatusEntity.setScheduleType(1); basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); @@ -1472,8 +1472,6 @@ public class HeartService { case DOCUMENT_TYPE_DATA: this.insertDocumentTypeData(bean.getFileContent()); break; - case COUNTRY_DI_DATA: - break; } String taskId = bean.getTaskId(); if (StrUtil.isNotBlank(taskId)) { @@ -1521,6 +1519,8 @@ public class HeartService { List supManufacturerList = JSONUtil.toList(jsonObject.getJSONArray(SupManufacturerEntity.class.getSimpleName()), SupManufacturerEntity.class); List supProductList = JSONUtil.toList(jsonObject.getJSONArray(SupProductEntity.class.getSimpleName()), SupProductEntity.class); + List syncFiles = JSONUtil.toList(jsonObject.getJSONArray("syncFiles"), String.class); + if (CollectionUtil.isNotEmpty(hospTypeList)) { basicHospTypeDao.insertOrUpdateBatch(hospTypeList); } @@ -1551,8 +1551,14 @@ public class HeartService { if (CollectionUtil.isNotEmpty(supProductList)) { supProductDao.insertOrUpdateBatch(supProductList); } + if (CollUtil.isNotEmpty(syncFiles)) { + fileService.download(syncFiles); + + } } + @Resource + FileService fileService; private final IoCodeLostMapper ioCodeLostMapper; private final IoCodeRelMapper ioCodeRelMapper;