diff --git a/src/main/java/com/glxp/api/controller/basic/BasicUnitMaintainController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java similarity index 99% rename from src/main/java/com/glxp/api/controller/basic/BasicUnitMaintainController.java rename to src/main/java/com/glxp/api/controller/basic/BasicCorpController.java index 0374925cc..4670435bc 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicUnitMaintainController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java @@ -8,7 +8,6 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; -import com.glxp.api.entity.thrsys.ThrCorpEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.http.ErpBasicClient; @@ -16,12 +15,11 @@ import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; import com.glxp.api.req.basic.CombineUnitRequest; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest; -import com.glxp.api.req.thrsys.FilterThrCorpRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.BasicErpUnitsResponse; import com.glxp.api.res.basic.BasicProductThirdSysResponse; import com.glxp.api.res.basic.BasicUnitMaintainResponse; -import com.glxp.api.service.basic.BasicUnitMaintainService; +import com.glxp.api.service.basic.BasicCorpService; import com.glxp.api.service.system.CompanyService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.service.thrsys.ThrCorpService; @@ -45,10 +43,10 @@ import java.util.stream.Collectors; * 往来单位信息维护 */ @RestController -public class BasicUnitMaintainController { +public class BasicCorpController { @Resource - private BasicUnitMaintainService basicUnitMaintainService; + private BasicCorpService basicUnitMaintainService; @Resource ThrSystemDetailService thrSystemDetailService; @Resource diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpExportLogController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpExportLogController.java index ce2340212..1601761f7 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpExportLogController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpExportLogController.java @@ -14,7 +14,7 @@ import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.BasicCorpExportLogResponse; import com.glxp.api.service.basic.BasicCorpExportLogService; -import com.glxp.api.service.basic.BasicUnitMaintainService; +import com.glxp.api.service.basic.BasicCorpService; import com.glxp.api.util.CustomUtil; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; @@ -37,7 +37,7 @@ public class BasicCorpExportLogController { @Resource BasicCorpExportLogService basicCorpExportLogService; @Resource - private BasicUnitMaintainService basicUnitMaintainService; + private BasicCorpService basicUnitMaintainService; @Resource private BasicGenJsonService basicGenJsonService;; @@ -110,12 +110,14 @@ public class BasicCorpExportLogController { public BaseResponse excelDownload(@RequestBody BasicCorpsExportRequest basicCorpsExportRequest) { String fileName = "D:\\udiwms\\exportFile\\" + "往来单位信息导出" + System.currentTimeMillis() + ".UpperIn"; BasicCorpsExportLogEntity corpExportLogEntity = new BasicCorpsExportLogEntity(); + List ids=basicCorpsExportRequest.getIds(); corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); String genKey = CustomUtil.getId(); corpExportLogEntity.setGenKey(genKey); corpExportLogEntity.setFilePath(fileName); corpExportLogEntity.setUpdateTime(new Date()); corpExportLogEntity.setDlCount(0); + corpExportLogEntity.setRemark("本次导出数据"+ids.size()+"条"); corpExportLogEntity.setType(BasicProcessStatus.EXPORT_JSON); basicCorpExportLogService.insertCorpExportLog(corpExportLogEntity); //basicGenExcelService.exportCorp(genKey, corpsExportRequest); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java index 7ceffd695..a110c3fca 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java @@ -10,12 +10,10 @@ import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.entity.basic.BasicCorpsImportDetailEntity; import com.glxp.api.entity.basic.BasicCorpsImportLogEntity; import com.glxp.api.req.basic.FilterCorpImportLogRequest; -import com.glxp.api.req.basic.PostBasicCorpRequest; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.BasicCorpExportLogResponse; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.basic.BasicCorpImportDetailService; import com.glxp.api.service.basic.BasicCorpImportLogService; import com.glxp.api.service.thrsys.ThrSystemService; import com.glxp.api.util.CustomUtil; @@ -35,8 +33,6 @@ public class BasicCorpImportLogController { @Resource BasicCorpImportLogService basicCorpImportLogService; @Resource - BasicCorpImportDetailService basicCorpImportDetailService; - @Resource ThrSystemService thrSystemService; @Resource CustomerService customerService; @@ -59,23 +55,6 @@ public class BasicCorpImportLogController { return ResultVOUtils.success(pageSimpleResponse); } - @GetMapping("/udiwms/corps/importLog/filterDetail") - public BaseResponse filterDetail(FilterCorpImportLogRequest filterCorpImportLogRequest, - BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - List corpImportDetailEntities = basicCorpImportDetailService.filterCorpImport(filterCorpImportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(corpImportDetailEntities); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(corpImportDetailEntities); - return ResultVOUtils.success(pageSimpleResponse); - } - - @PostMapping("/udiwms/corps/importLog/deleteLog") public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -89,25 +68,11 @@ public class BasicCorpImportLogController { if (corpImportLogEntities != null && corpImportLogEntities.size() > 0) { BasicCorpsImportLogEntity corpImportLogEntity = corpImportLogEntities.get(0); basicCorpImportLogService.deleteById(corpImportLogEntity.getId() + ""); - basicCorpImportDetailService.deleteByGenkey(corpImportLogEntity.getGenKey()); } return ResultVOUtils.success("删除成功"); } - @PostMapping("/udiwms/corps/importLog/delete") - public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - if (basicCorpImportDetailService.deleteById(deleteRequest.getId())) - return ResultVOUtils.success("删除成功"); - else - return ResultVOUtils.error(500, "删除成功"); - } - - //往来单位信息文件导入 @PostMapping("/udiwms/corps/importLog/upload") public BaseResponse uploadCorp(@RequestParam("file") List files, @RequestParam("thirdSys") String thirdSys) { @@ -136,12 +101,12 @@ public class BasicCorpImportLogController { corpImportLogEntity.setFromType("文件导入"); corpImportLogEntity.setUpdateTime(new Date()); corpImportLogEntity.setCreateTime(new Date()); - corpImportLogEntity.setCreateUser(String.valueOf(customerService.getUserId())); - corpImportLogEntity.setUpdateUser(String.valueOf(customerService.getUserId())); +// corpImportLogEntity.setCreateUser(String.valueOf(customerService.getUserId())); +// corpImportLogEntity.setUpdateUser(String.valueOf(customerService.getUserId())); corpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS); corpImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); basicCorpImportLogService.insertImportLog(corpImportLogEntity); - basicCorpImportLogService.importJsonData(data); + basicCorpImportLogService.importJsonData(data,corpImportLogEntity.getGenKey()); corpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); basicCorpImportLogService.updateImportLog(corpImportLogEntity); } else { diff --git a/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java b/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java index 19f0449d7..0dba1bac7 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.constant.BasicProcessStatus; -import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.BasicCorpsExportLogEntity; import com.glxp.api.entity.system.SyncDataSetEntity; @@ -12,12 +11,9 @@ import com.glxp.api.http.HttpOkClient; import com.glxp.api.req.basic.BasicCorpsExportRequest; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; import com.glxp.api.res.basic.BasicCorpExportLogResponse; -import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.basic.BasicCorpExportLogService; -import com.glxp.api.service.basic.BasicUnitMaintainService; -import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.basic.BasicCorpService; import com.glxp.api.service.system.SyncDataSetService; -import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.ExcelUtil; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; @@ -45,7 +41,7 @@ public class BasicGenExcelService { @Resource BasicCorpExportLogService basicCorpExportLogService; @Resource - BasicUnitMaintainService basicUnitMaintainService; + BasicCorpService basicUnitMaintainService; // @Resource // UdiInfoExportLogService udiInfoExportLogService; // @Resource diff --git a/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java b/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java index 155f07abb..e75c99699 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.basic; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.file.FileWriter; import cn.hutool.core.util.ReflectUtil; @@ -11,21 +10,18 @@ import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.dao.thrsys.ThrCorpDao; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.BasicCorpsExportLogEntity; -import com.glxp.api.entity.thrsys.ThrCorpEntity; import com.glxp.api.req.basic.BasicCorpsExportRequest; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; import com.glxp.api.req.thrsys.FilterThrCorpRequest; import com.glxp.api.res.basic.BasicCorpExportLogResponse; import com.glxp.api.res.thrsys.ThrCorpsResponse; import com.glxp.api.service.basic.BasicCorpExportLogService; -import com.glxp.api.service.basic.BasicUnitMaintainService; +import com.glxp.api.service.basic.BasicCorpService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.io.File; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; @@ -37,7 +33,7 @@ public class BasicGenJsonService { @Resource BasicCorpExportLogService corpExportLogService; @Resource - BasicUnitMaintainService basicUnitMaintainService; + BasicCorpService basicUnitMaintainService; // @Resource // UdiInfoExportLogService udiInfoExportLogService; // @Resource diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index 2ee49113e..e1df80e2c 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -20,7 +20,7 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRlSupResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.auth.AuthAdminService; -import com.glxp.api.service.basic.BasicUnitMaintainService; +import com.glxp.api.service.basic.BasicCorpService; import com.glxp.api.service.basic.UdiRlSupService; import com.glxp.api.service.basic.CompanyProductsRelService; import com.glxp.api.service.basic.UdiRelevanceService; @@ -50,7 +50,7 @@ public class UdiRlSupController { @Resource private CompanyProductsRelService companyProductsRelService; @Resource - private BasicUnitMaintainService basicUnitMaintainService; + private BasicCorpService basicUnitMaintainService; @Resource private UdiRelevanceService udiRelevanceService; 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 c36bd2560..0d259c52e 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -17,7 +17,6 @@ import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.inout.IoCodeEnttity; import com.glxp.api.entity.inout.IoCodeTempEntity; -import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.http.SpsDirectClient; @@ -32,7 +31,6 @@ import com.glxp.api.res.basic.UdiRlSupResponse; import com.glxp.api.res.inout.AddCodeResult; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.*; -import com.glxp.api.service.inout.IoCodeService; import com.glxp.api.service.inout.IoCodeTempService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.inout.IoTransInoutService; @@ -78,7 +76,7 @@ public class IoCodeTempController extends BaseController { @Resource UdiProductService udiProductService; @Resource - BasicUnitMaintainService basicUnitMaintainService; + BasicCorpService basicUnitMaintainService; @Resource GennerOrderUtils gennerOrderUtils; @Resource diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java index 05391bf5a..248da8ad1 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java @@ -126,7 +126,7 @@ public class ThrCorpExportLogController { public BaseResponse excelDownload(@RequestBody ThrCorpExportRequest thrCorpExportRequest) { //String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".xls"; - String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".udi"; + String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".UpperIn"; File file = new File(fileName); if (!file.exists()) { try { @@ -160,7 +160,7 @@ public class ThrCorpExportLogController { public BaseResponse uploadSmp(@RequestBody ThrCorpExportRequest thrCorpExportRequest) { //String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".xls"; - String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".udi"; + String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".UpperIn"; File file = new File(fileName); if (!file.exists()) { try { diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java index a027c2d26..0d7187adb 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java @@ -120,7 +120,7 @@ public class ThrProductsExportLogController { ThrProductsExportLogEntity thrProductsExportLogEntity = new ThrProductsExportLogEntity(); thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); String genKey = CustomUtil.getId(); - String fileName = "D:\\udiwms\\exportFile\\" + "第三方产品信息" + genKey + ".udi"; + String fileName = "D:\\udiwms\\exportFile\\" + "第三方产品信息" + genKey + ".UpperIn"; File file = new File(fileName); if (!file.exists()) { try { diff --git a/src/main/java/com/glxp/api/dao/basic/BasicUnitMaintainDao.java b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java similarity index 97% rename from src/main/java/com/glxp/api/dao/basic/BasicUnitMaintainDao.java rename to src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java index 64b441ab4..b0a874e52 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicUnitMaintainDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface BasicUnitMaintainDao { +public interface BasicCorpDao { List filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); boolean insertBasicUnitMaintain(BasicCorpEntity basicUnitMaintainEntity); diff --git a/src/main/java/com/glxp/api/dao/basic/BasicCorpImportDetailDao.java b/src/main/java/com/glxp/api/dao/basic/BasicCorpImportDetailDao.java deleted file mode 100644 index 1a3bbf40b..000000000 --- a/src/main/java/com/glxp/api/dao/basic/BasicCorpImportDetailDao.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.glxp.api.dao.basic; - - -import com.glxp.api.entity.basic.BasicCorpsImportDetailEntity; -import com.glxp.api.req.basic.FilterCorpImportLogRequest; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface BasicCorpImportDetailDao { - - List filterCorpImport(FilterCorpImportLogRequest filterCorpImportLogRequest); - - boolean insertCorpImport(BasicCorpsImportDetailEntity corpImportDetailEntity); - - boolean updateCorpImport(BasicCorpsImportDetailEntity corpImportDetailEntity); - - boolean insertCorpImports(@Param("corps") List corpImportDetailEntities); - - boolean deleteById(@Param("id") String id); - - boolean deleteByGenkey(@Param("genKey") String genKey); - -} diff --git a/src/main/java/com/glxp/api/service/basic/BasicCorpImportDetailService.java b/src/main/java/com/glxp/api/service/basic/BasicCorpImportDetailService.java deleted file mode 100644 index 1f34404c7..000000000 --- a/src/main/java/com/glxp/api/service/basic/BasicCorpImportDetailService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.glxp.api.service.basic; - - -import com.glxp.api.entity.basic.BasicCorpsImportDetailEntity; -import com.glxp.api.req.basic.FilterCorpImportLogRequest; - -import java.util.List; - -public interface BasicCorpImportDetailService { - - List filterCorpImport(FilterCorpImportLogRequest filterCorpImportLogRequest); - - boolean insertCorpImport(BasicCorpsImportDetailEntity corpImportDetailEntity); - - boolean updateCorpImport(BasicCorpsImportDetailEntity corpImportDetailEntity); - - boolean insertCorpImports(List corpImportDetailEntities); - - boolean deleteById(String id); - - boolean deleteByGenkey(String genKey); - -} diff --git a/src/main/java/com/glxp/api/service/basic/BasicCorpImportLogService.java b/src/main/java/com/glxp/api/service/basic/BasicCorpImportLogService.java index 0d73f872b..f9f2235ae 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicCorpImportLogService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicCorpImportLogService.java @@ -20,10 +20,9 @@ public interface BasicCorpImportLogService { boolean deleteById(@Param("id") String id); - void importCorps(String genKey); - void importJsonData(BasicCorpExportLogResponse importData); + void importJsonData(BasicCorpExportLogResponse importData,String genKey); diff --git a/src/main/java/com/glxp/api/service/basic/BasicUnitMaintainService.java b/src/main/java/com/glxp/api/service/basic/BasicCorpService.java similarity index 96% rename from src/main/java/com/glxp/api/service/basic/BasicUnitMaintainService.java rename to src/main/java/com/glxp/api/service/basic/BasicCorpService.java index 6d6c434bb..35d0657bd 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicUnitMaintainService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicCorpService.java @@ -8,7 +8,7 @@ import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; import java.util.List; -public interface BasicUnitMaintainService { +public interface BasicCorpService { List filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportDetailServiceImpl.java deleted file mode 100644 index 13b6fb39b..000000000 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportDetailServiceImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.glxp.api.service.basic.impl; - -import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.basic.BasicCorpImportDetailDao; -import com.glxp.api.entity.basic.BasicCorpsImportDetailEntity; -import com.glxp.api.req.basic.FilterCorpImportLogRequest; -import com.glxp.api.service.basic.BasicCorpImportDetailService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.Collections; -import java.util.List; - -@Service -public class BasicCorpImportDetailServiceImpl implements BasicCorpImportDetailService { - @Resource - BasicCorpImportDetailDao basicCorpImportDetailDao; - - @Override - public List filterCorpImport(FilterCorpImportLogRequest filterCorpImportLogRequest) { - if (filterCorpImportLogRequest == null) { - return Collections.emptyList(); - } - if (filterCorpImportLogRequest.getPage() != null) { - int offset = (filterCorpImportLogRequest.getPage() - 1) * filterCorpImportLogRequest.getLimit(); - PageHelper.offsetPage(offset, filterCorpImportLogRequest.getLimit()); - } - List data = basicCorpImportDetailDao.filterCorpImport(filterCorpImportLogRequest); - return data; - } - - @Override - public boolean insertCorpImport(BasicCorpsImportDetailEntity basicCorpsImportDetailEntity) { - return basicCorpImportDetailDao.insertCorpImport(basicCorpsImportDetailEntity); - } - - @Override - public boolean updateCorpImport(BasicCorpsImportDetailEntity basicCorpsImportDetailEntity) { - return basicCorpImportDetailDao.updateCorpImport(basicCorpsImportDetailEntity); - } - - @Override - public boolean insertCorpImports(List basicCorpsImportDetailEntity) { - return basicCorpImportDetailDao.insertCorpImports(basicCorpsImportDetailEntity); - } - - @Override - public boolean deleteById(String id) { - return basicCorpImportDetailDao.deleteById(id); - } - - @Override - public boolean deleteByGenkey(String genKey) { - return basicCorpImportDetailDao.deleteByGenkey(genKey); - } -} diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java index 1c7f7e2c6..16ee8c452 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java @@ -2,21 +2,16 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.dao.basic.BasicCorpImportLogDao; -import com.glxp.api.dao.basic.BasicUnitMaintainDao; +import com.glxp.api.dao.basic.BasicCorpDao; import com.glxp.api.dao.thrsys.ThrCorpDao; import com.glxp.api.entity.basic.BasicCorpEntity; -import com.glxp.api.entity.basic.BasicCorpsImportDetailEntity; import com.glxp.api.entity.basic.BasicCorpsImportLogEntity; import com.glxp.api.entity.thrsys.ThrCorpEntity; -import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; import com.glxp.api.req.basic.FilterCorpImportLogRequest; import com.glxp.api.res.basic.BasicCorpExportLogResponse; import com.glxp.api.res.thrsys.ThrCorpsResponse; -import com.glxp.api.service.basic.BasicCorpImportDetailService; import com.glxp.api.service.basic.BasicCorpImportLogService; -import com.glxp.api.service.basic.BasicUnitMaintainService; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; @@ -36,12 +31,8 @@ public class BasicCorpImportLogServiceImpl implements BasicCorpImportLogService @Resource BasicCorpImportLogDao basicCorpImportLogDao; - - @Resource - BasicCorpImportDetailService basicCorpImportDetailService; - @Resource - BasicUnitMaintainService basicUnitMaintainService; + BasicCorpImportLogService basicCorpImportLogService; @Resource SqlSessionFactory sqlSessionFactory; @@ -85,40 +76,6 @@ public class BasicCorpImportLogServiceImpl implements BasicCorpImportLogService return basicCorpImportLogDao.deleteById(id); } - @Async - @Override - public void importCorps(String genKey) { - - BasicCorpsImportLogEntity corpImportLogEntity =selectByGenKey(genKey); - if (corpImportLogEntity != null && corpImportLogEntity.getStatus() == BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS) { - FilterCorpImportLogRequest filterUdiIpLogRequest = new FilterCorpImportLogRequest(); - filterUdiIpLogRequest.setGenKey(genKey); - List corpImportDetailEntities - = basicCorpImportDetailService.filterCorpImport(filterUdiIpLogRequest); - if (corpImportDetailEntities != null) { - for (BasicCorpsImportDetailEntity corpImportDetailEntity : corpImportDetailEntities) { - BasicCorpEntity basicCorpEntity = new BasicCorpEntity(); - BeanUtils.copyProperties(corpImportDetailEntity, basicCorpEntity); - BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest = new BasicUnitMaintainFilterRequest(); - BeanUtils.copyProperties(corpImportDetailEntity, basicUnitMaintainFilterRequest); - List basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); - if (basicUnitMaintainEntities != null && basicUnitMaintainEntities.size() > 0) { - basicUnitMaintainService.insertBasicUnitMaintain(basicCorpEntity); - corpImportDetailEntity.setImportStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_SUCESS); - } else { - corpImportDetailEntity.setImportStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_FAIL); - corpImportDetailEntity.setRemark("重复导入！"); - } - basicCorpImportDetailService.updateCorpImport(corpImportDetailEntity); - - } - } - corpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); - updateImportLog(corpImportLogEntity); - } - - - } /** * 导入上传文件中的往来单位信息 @@ -126,24 +83,29 @@ public class BasicCorpImportLogServiceImpl implements BasicCorpImportLogService * @param */ @Async - public void importJsonData(BasicCorpExportLogResponse importData) { - - - + public void importJsonData(BasicCorpExportLogResponse importData,String genKey) { if (null != importData) { SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); if (CollUtil.isNotEmpty(importData.getCorpList())) { try { List corpList = importData.getCorpList(); - BasicUnitMaintainDao mapper = batchSession.getMapper(BasicUnitMaintainDao.class); + BasicCorpDao mapper = batchSession.getMapper(BasicCorpDao.class); for (BasicCorpEntity basicUnitMaintainEntity : corpList) { mapper.importBasicUnitMaintain(basicUnitMaintainEntity); } batchSession.commit(); log.info("导入往来单位数据成功，导入数量为：{} 条", corpList.size()); + BasicCorpsImportLogEntity basicCorpsImportLogEntity=new BasicCorpsImportLogEntity(); + basicCorpsImportLogEntity.setGenKey(genKey); + basicCorpsImportLogEntity.setRemark("导入数据成功，导入数量为:"+ corpList.size()+"条"); + basicCorpImportLogService.updateImportLog(basicCorpsImportLogEntity); } catch (Exception e) { log.error("导入往来单位信息异常", e); + BasicCorpsImportLogEntity basicCorpsImportLogEntity=new BasicCorpsImportLogEntity(); + basicCorpsImportLogEntity.setGenKey(genKey); + basicCorpsImportLogEntity.setRemark("导入数据失败"); + basicCorpImportLogService.updateImportLog(basicCorpsImportLogEntity); } } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java similarity index 74% rename from src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java rename to src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java index f30c5ddcc..d72df1893 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java @@ -1,10 +1,10 @@ package com.glxp.api.service.basic.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.basic.BasicUnitMaintainDao; +import com.glxp.api.dao.basic.BasicCorpDao; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; -import com.glxp.api.service.basic.BasicUnitMaintainService; +import com.glxp.api.service.basic.BasicCorpService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -13,10 +13,10 @@ import java.util.Date; import java.util.List; @Service -public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService { +public class BasicCorpServiceImpl implements BasicCorpService { @Resource - BasicUnitMaintainDao basicUnitMaintainDao; + BasicCorpDao basicCorpDao; @Override public List filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest) { @@ -28,34 +28,34 @@ public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService { PageHelper.offsetPage(offset, basicUnitMaintainFilterRequest.getLimit()); } - List data = basicUnitMaintainDao.filterList(basicUnitMaintainFilterRequest); + List data = basicCorpDao.filterList(basicUnitMaintainFilterRequest); return data; } @Override public boolean insertBasicUnitMaintainignore(BasicCorpEntity basicUnitMaintainEntity) { - return basicUnitMaintainDao.insertBasicUnitMaintainignore(basicUnitMaintainEntity); + return basicCorpDao.insertBasicUnitMaintainignore(basicUnitMaintainEntity); } @Override public boolean insertBasicUnitMaintain(BasicCorpEntity basicUnitMaintainEntity) { - return basicUnitMaintainDao.insertBasicUnitMaintain(basicUnitMaintainEntity); + return basicCorpDao.insertBasicUnitMaintain(basicUnitMaintainEntity); } @Override public boolean insert(BasicCorpEntity basicUnitMaintainEntity) { - return basicUnitMaintainDao.insert(basicUnitMaintainEntity); + return basicCorpDao.insert(basicUnitMaintainEntity); } @Override public boolean updateById(BasicCorpEntity basicUnitMaintainSaveRequest) { basicUnitMaintainSaveRequest.setUpdateTime(new Date()); - return basicUnitMaintainDao.updateById(basicUnitMaintainSaveRequest); + return basicCorpDao.updateById(basicUnitMaintainSaveRequest); } @Override public boolean deleteById(String id) { - return basicUnitMaintainDao.deleteById(id); + return basicCorpDao.deleteById(id); } @Override @@ -74,27 +74,27 @@ public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService { } else if ("thirdId4".equals(thirdSys)) { filterUdiInfoRequest.setThirdId4(thirdId); } - return basicUnitMaintainDao.selectByThirdId(filterUdiInfoRequest); + return basicCorpDao.selectByThirdId(filterUdiInfoRequest); } @Override public List batchSelectByIds(List ids) { - return basicUnitMaintainDao.batchSelectByIds(ids); + return basicCorpDao.batchSelectByIds(ids); } @Override public List batchSelectByErpIds(List erpIds) { - return basicUnitMaintainDao.batchSelectByErpIds(erpIds); + return basicCorpDao.batchSelectByErpIds(erpIds); } @Override public List batchSelectByErpIdsAndName(List erpIds, String name) { - return basicUnitMaintainDao.batchSelectByErpIdsAndName(erpIds, name); + return basicCorpDao.batchSelectByErpIdsAndName(erpIds, name); } @Override public BasicCorpEntity selectById(String id) { - return basicUnitMaintainDao.selectById(id); + return basicCorpDao.selectById(id); } @Override @@ -104,7 +104,7 @@ public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService { } BasicUnitMaintainFilterRequest filterUdiInfoRequest = new BasicUnitMaintainFilterRequest(); filterUdiInfoRequest.setErpId(id); - List basicUnitMaintainEntities = basicUnitMaintainDao.filterList(filterUdiInfoRequest); + List basicUnitMaintainEntities = basicCorpDao.filterList(filterUdiInfoRequest); if (basicUnitMaintainEntities != null && basicUnitMaintainEntities.size() > 0) return basicUnitMaintainEntities.get(0); return null; @@ -112,7 +112,7 @@ public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService { @Override public BasicCorpEntity selectByName(String name) { - return basicUnitMaintainDao.selectByName(name); + return basicCorpDao.selectByName(name); } @Override diff --git a/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml similarity index 99% rename from src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml rename to src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml index 17bb00951..38aa741d6 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml @@ -1,7 +1,7 @@ - + - SELECT * FROM basic_corps_import_detail - - - AND genKeyFk = #{genKey} - - - AND id = #{id} - - - AND status = #{status} - - - - - - - - insert INTO basic_corps_import_detail - ( - thirdId,erpId,name,spell, - addr,status,type,creditNo,contact,mobile,thirdId1,thirdId2,thirdId3,thirdId4, - thirdName,thirdName1,thirdName2,thirdName3,thirdName4, - importStatus,updateTime,remark,genKeyFk) - values - ( - #{thirdId}, - #{erpId}, - #{name}, - #{spell}, - #{addr}, - #{status}, - #{type}, - #{creditNo}, - #{contact}, - #{mobile},#{thirdId1},#{thirdId2},#{thirdId3},#{thirdId4}, - #{thirdName},#{thirdName1},#{thirdName2},#{thirdName3},#{thirdName4}, - #{importStatus}, - #{updateTime},#{remark}, #{genKeyFk} - ) - - - - insert INTO basic_corps_import_detail - ( - thirdId,erpId,name,spell, - addr,status,type,creditNo,contact,mobile,thirdId1,thirdId2,thirdId3,thirdId4, - thirdName,thirdName1,thirdName2,thirdName3,thirdName4, - importStatus,updateTime,remark,genKeyFk) - values - - ( - #{item.thirdId}, - #{item.erpId}, - #{item.name}, - #{item.spell}, - #{item.addr}, - #{item.status}, - #{item.type}, - #{item.creditNo}, - #{item.contact}, - #{item.mobile},#{item.thirdId1},#{item.thirdId2},#{item.thirdId3},#{item.thirdId4}, - #{item.thirdName},#{item.thirdName1},#{item.thirdName2},#{item.thirdName3},#{item.thirdName4}, - #{item.importStatus}, - #{item.updateTime},#{item.remark}, #{item.genKeyFk} - ) - - - - DELETE FROM basic_corps_import_detail WHERE id = #{id} - - - DELETE FROM basic_corps_import_detail WHERE genKeyFk = #{genKey} - - - - UPDATE basic_corps_import_detail - - thirdId=#{thirdId}, - erpId=#{erpId}, - name=#{name}, - spell=#{spell}, - addr=#{addr}, - status=#{status}, - type=#{type}, - creditNo=#{creditNo}, - contact=#{contact}, - mobile=#{mobile}, - thirdId1=#{thirdId1}, - thirdId2=#{thirdId2}, - thirdId3=#{thirdId3}, - thirdId4=#{thirdId4}, - thirdName=#{thirdName}, - thirdName1=#{thirdName1}, - thirdName2=#{thirdName2}, - thirdName3=#{thirdName3}, - thirdName4=#{thirdName4}, - importStatus=#{importStatus}, - updateTime=#{updateTime}, - remark=#{remark}, - - WHERE id = #{id} - - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml index 3903e3bbf..3a6338867 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml @@ -5,7 +5,7 @@ resultType="com.glxp.api.entity.thrsys.ThrDeptEntity"> SELECT * FROM thr_dept thrInv - left join basic_third_sys thrSys on thrInv.thirdSysFk = thrSys.thirdId + left join thr_system thrSys on thrInv.thirdSysFk = thrSys.thirdId thrSys.enabled = true