diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java new file mode 100644 index 000000000..b1bfad746 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java @@ -0,0 +1,222 @@ +package com.glxp.api.controller.thrsys; + +import com.github.pagehelper.PageInfo; + +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.thrsys.FilterThrCorpExportLogRequest; +import com.glxp.api.entity.thrsys.ThrCorpEntity; +import com.glxp.api.entity.thrsys.ThrCorpExportLogEntity; +import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; +import com.glxp.api.req.thrsys.FilterThrCorpRequest; +import com.glxp.api.req.thrsys.ThrCorpExportRequest; +import com.glxp.api.req.thrsys.ThrUnitMaintainFilterRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.thrsys.ThrCorpsResponse; +import com.glxp.api.service.thrsys.ThrCorpExportLogService; +import com.glxp.api.service.thrsys.ThrCorpService; +import com.glxp.api.service.thrsys.ThrCorpsDlService; +import com.glxp.api.util.CustomUtil; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 第三方数据往来单位导出日志 + */ +@RestController +public class ThrCorpExportLogController { + + @Resource + ThrCorpExportLogService thrCorpExportLogService; + @Resource + private ThrCorpService thrCorpService; + @Resource + ThrCorpsDlService thrCorpsDlService; + + @Resource + private ErpBasicClient erpBasicClient; + + @GetMapping("/udiwms/thrCorp/exportLog/filter") + public BaseResponse filter(FilterThrCorpExportLogRequest filterThrCorpExportLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrCorpExportLogEntities + = thrCorpExportLogService.filterThrCorpExportLog(filterThrCorpExportLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrCorpExportLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrCorpExportLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udiwms/thrCorp/exportLog/deleteLog") + public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + thrCorpExportLogService.deleteById(id + ""); + return ResultVOUtils.success("删除成功"); + } + + //往来单位excel文件下载 + @GetMapping("/udiwms/thrCorp/exportLog/download") + public void download(FilterThrCorpExportLogRequest filterThrCorpExportLogRequest, HttpServletResponse res) { + + List thrCorpExportLogEntities = thrCorpExportLogService.filterThrCorpExportLog(filterThrCorpExportLogRequest); + ThrCorpExportLogEntity thrOrderExportLogEntity = thrCorpExportLogEntities.get(0); + try { + String filePath = thrOrderExportLogEntity.getFilePath(); + String fileName = "temp"; + if (filePath != null && filePath.length() > 0) { + String[] data = filePath.split("/"); + fileName = data[data.length - 1]; + } + res.setHeader("Content-disposition", "attachment;fileName=" + fileName); + res.setContentType("text/plain;charset=UTF-8"); + FileInputStream input = new FileInputStream(new File(filePath)); + OutputStream out = res.getOutputStream(); + byte[] b = new byte[2048]; + int len; + while ((len = input.read(b)) != -1) { + out.write(b, 0, len); + } + input.close(); + if (thrOrderExportLogEntity.getDlCount() == 0) { + thrOrderExportLogEntity.setDlCount(1); + } else { + thrOrderExportLogEntity.setDlCount(thrOrderExportLogEntity.getDlCount() + 1); + } + thrCorpExportLogService.updateThrCorpExportLog(thrOrderExportLogEntity); + } catch (Exception ex) { + System.out.println("下载失败！"); + } + + + } + + //往来单位导出生成Excel，并创建生成记录 + @PostMapping("/udiwms/thrCorp/importLog/export") + public BaseResponse excelDownload(@RequestBody ThrCorpExportRequest thrCorpExportRequest) { + + //String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".xls"; + String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".udi"; + File file = new File(fileName); + if (!file.exists()) { + try { + file.createNewFile(); + } catch (IOException e) { + e.printStackTrace(); + } + } + ThrCorpExportLogEntity thrCorpExportLogEntity = new ThrCorpExportLogEntity(); + thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); + String genKey = CustomUtil.getId(); + thrCorpExportLogEntity.setGenKey(genKey); + thrCorpExportLogEntity.setFilePath(fileName); + thrCorpExportLogEntity.setUpdateTime(new Date()); + thrCorpExportLogEntity.setDlCount(0); + thrCorpExportLogEntity.setType(BasicProcessStatus.EXPORT_EXCEL); + thrCorpExportLogService.insertThrCorpExportLog(thrCorpExportLogEntity); + //thrCorpsDlService.genExcel(genKey, thrCorpExportRequest); + //修改为导出json文件 + thrCorpsDlService.genJsonFile(genKey, thrCorpExportRequest); + return ResultVOUtils.success("后台正在导出生成udi文件，请稍后刷新查看!"); + + } + + + //往来单位导出生成Excel，并创建生成记录 + @PostMapping("/udiwms/thrCorp/importLog/upload") + public BaseResponse uploadSmp(@RequestBody ThrCorpExportRequest thrCorpExportRequest) { + + //String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".xls"; + String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".udi"; + File file = new File(fileName); + if (!file.exists()) { + try { + file.createNewFile(); + } catch (IOException e) { + e.printStackTrace(); + } + } + ThrCorpExportLogEntity thrCorpExportLogEntity = new ThrCorpExportLogEntity(); + thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); + String genKey = CustomUtil.getId(); + thrCorpExportLogEntity.setGenKey(genKey); + thrCorpExportLogEntity.setFilePath(fileName); + thrCorpExportLogEntity.setUpdateTime(new Date()); + thrCorpExportLogEntity.setDlCount(0); + thrCorpExportLogEntity.setType(BasicProcessStatus.EXPORT_SMP); + thrCorpExportLogService.insertThrCorpExportLog(thrCorpExportLogEntity); + thrCorpsDlService.uploadSmp(genKey, thrCorpExportRequest); + return ResultVOUtils.success("后台正在导出生成udi文件，请稍后刷新查看!"); + + } + + + //第三方往来单位接口下载（第三方使用） + @GetMapping("/udiwms/thrsys/thrCorp/download") + public BaseResponse downloadThrCorps(ThrUnitMaintainFilterRequest unitMaintainFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + BasicThirdSysDetailEntity basicThirdSysDetailEntity = thrCorpService.selectByKey("corpUrl", unitMaintainFilterRequest.getThirdSys()); + if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) + return ResultVOUtils.error(500, "往来单位接口地址未定义"); + if (basicThirdSysDetailEntity.getEnabled()) { + if (basicThirdSysDetailEntity.getFromType() == 0) { + BaseResponse> udiDlDeviceResponse = + erpBasicClient.getErpCrop(unitMaintainFilterRequest); + return udiDlDeviceResponse; + } else { + FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); + BeanUtils.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest); + filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys()); + List thrCorpEntities = thrCorpService.filterThrCorps(filterThrCorpRequest); + List thrCorpEntityList = thrCorpEntities.stream().map(item -> + { + ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); + BeanUtils.copyProperties(item, thrCorpEntity); + return thrCorpEntity; + }).collect(Collectors.toList()); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrCorpEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrCorpEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + } else { + return ResultVOUtils.error(500, "第三方系统往来单位接口服务未启用"); + } + + + } +} diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java new file mode 100644 index 000000000..69e0553b7 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java @@ -0,0 +1,86 @@ +package com.glxp.api.controller.thrsys; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.thrsys.ThrCorpImportDetailEntity; +import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity; +import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.thrsys.ThrCorpImportDetailService; +import com.glxp.api.service.thrsys.ThrCorpImportLogService; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 第三方数据往来单位导入日志 + */ +@RestController +public class ThrCorpImportLogController { + + @Resource + ThrCorpImportLogService thrCorpImportLogService; + @Resource + ThrCorpImportDetailService thrCorpImportDetailService; + + @GetMapping("/udiwms/thrCorp/importLog/filter") + public BaseResponse filter(FilterThrCorpImportLogRequest filterThrCorpImportLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrCorpImportLogEntities = thrCorpImportLogService.filterThrCorpImportLog(filterThrCorpImportLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrCorpImportLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrCorpImportLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/udiwms/thrCorp/importLog/filterDetail") + public BaseResponse filterDetail(FilterThrCorpImportLogRequest filterThrCorpImportLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrCorpImportDetailEntities + = thrCorpImportDetailService.filterCorpDetailImport(filterThrCorpImportLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrCorpImportDetailEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrCorpImportDetailEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udiwms/thrCorp/importLog/deleteLog") + public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + FilterThrCorpImportLogRequest filterInCodeLogRequest = new FilterThrCorpImportLogRequest(); + filterInCodeLogRequest.setId(Integer.parseInt(id)); + List thrCorpImportLogEntities = thrCorpImportLogService.filterThrCorpImportLog(filterInCodeLogRequest); + if (thrCorpImportLogEntities != null && thrCorpImportLogEntities.size() > 0) { + ThrCorpImportLogEntity thrCorpImportLogEntity = thrCorpImportLogEntities.get(0); + thrCorpImportLogService.deleteById(thrCorpImportLogEntity.getId() + ""); + thrCorpImportDetailService.deleteByGenkey(thrCorpImportLogEntity.getGenKey()); + } + return ResultVOUtils.success("删除成功"); + } + + +} diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java new file mode 100644 index 000000000..81092fcc5 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java @@ -0,0 +1,240 @@ +package com.glxp.api.controller.thrsys; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.Constant; +import com.glxp.api.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.entity.thrsys.ThrCorpEntity; +import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity; +import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; +import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.req.thrsys.FilterThrCorpRequest; +import com.glxp.api.req.thrsys.PostThrCorpRequest; +import com.glxp.api.req.thrsys.ThrUnitMaintainFilterRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.thrsys.ThrCorpsResponse; +import com.glxp.api.service.thrsys.ThrCorpImportLogService; +import com.glxp.api.service.thrsys.ThrCorpService; +import com.glxp.api.service.thrsys.ThrCorpsDlService; +import com.glxp.api.service.thrsys.ThrSystemDetailService; +import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.RedisUtil; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +@RestController +public class ThrCorpsController { + @Resource + RedisUtil redisUtil; + @Resource + private ThrCorpService thrCorpService; + @Resource + private ThrCorpsDlService thrCorpsDlService; + @Resource + private ThrCorpImportLogService thrCorpImportLogService; + @Resource + private ErpBasicClient erpBasicClient; + @Resource + private ThrSystemDetailService thrSystemDetailService; + + @GetMapping("/udiwms/thrsys/getCorps") + public BaseResponse getCorps(FilterThrCorpRequest filterThrCorpRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrCorpEntities + = thrCorpService.filterThrCorps(filterThrCorpRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrCorpEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrCorpEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @AuthRuleAnnotation("") + @PostMapping("/udiwms/thrsys/delCorps") + public BaseResponse delCorps(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + thrCorpService.deleteByUnitId(id); + return ResultVOUtils.success("删除成功"); + } + + @AuthRuleAnnotation("") + @RequestMapping("/udiwms/thrsys/corp/delAll") + public BaseResponse delAll() { + thrCorpService.deleteAll(); + return ResultVOUtils.success("删除成功"); + } + + + //第三方服务上传（包括文件导入后上传） + @PostMapping("/udiwms/thrsys/postCorps") + public BaseResponse postCorps(@RequestBody PostThrCorpRequest postThrCorpRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrCorpsResponseList = postThrCorpRequest.getCorps(); + if (thrCorpsResponseList != null && thrCorpsResponseList.size() > 0) { + String genKey = postThrCorpRequest.getGenKey(); + if (genKey == null) { + genKey = CustomUtil.getId(); + } + ThrCorpImportLogEntity thrCorpImportLogEntity = thrCorpImportLogService.selectByGenKey(genKey); + if (thrCorpImportLogEntity == null) { + thrCorpImportLogEntity = new ThrCorpImportLogEntity(); + thrCorpImportLogEntity.setGenKey(genKey); + if (postThrCorpRequest.getUploadType() != null) { + thrCorpImportLogEntity.setFromType(postThrCorpRequest.getUploadType()); + } else + thrCorpImportLogEntity.setFromType("第三方系统上传"); + thrCorpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); + thrCorpImportLogEntity.setUpdateTime(new Date()); + thrCorpImportLogEntity.setThirdSysFk(postThrCorpRequest.getThirdSys()); + thrCorpImportLogService.insertImportLog(thrCorpImportLogEntity); + } + thrCorpsDlService.insertData(genKey, postThrCorpRequest.getThirdSys(), thrCorpsResponseList); + return ResultVOUtils.success("往来单位上传成功！后台正在处理，请稍后刷新查看！"); + } + return ResultVOUtils.error(500, "上传数据为空"); + } + + //接口一键全部 + @AuthRuleAnnotation("") + @RequestMapping("/udiwms/thrsys/corp/downloadAll") + public BaseResponse downloadAll(FilterThrCorpRequest filterThrProductsRequest) { + String data = (String) redisUtil.get(Constant.dlThrProducts); + if (data != null && data.equals("true")) { + return ResultVOUtils.error(500, "当前任务正在下载更新产品信息，请稍后重试！"); + } else { + redisUtil.set(Constant.dlThrCorps, "true", 30); + if (filterThrProductsRequest.getThirdSysFk() == null) { + return ResultVOUtils.error(500, "未选择第三方系统！"); + } + ThrCorpImportLogEntity thrCorpImportLogEntity = new ThrCorpImportLogEntity(); + String genKey = CustomUtil.getId(); + thrCorpImportLogEntity.setGenKey(genKey); + thrCorpImportLogEntity.setFromType("第三方系统获取"); + thrCorpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); + thrCorpImportLogEntity.setUpdateTime(new Date()); + thrCorpImportLogEntity.setThirdSysFk(filterThrProductsRequest.getThirdSysFk()); + thrCorpImportLogService.insertImportLog(thrCorpImportLogEntity); + thrCorpsDlService.importCorps(genKey,null, filterThrProductsRequest.getThirdSysFk()); + return ResultVOUtils.success("后台开始下载更新，请稍后刷新查看"); + } + } + + //选中或者下载全部 + @AuthRuleAnnotation("") + @PostMapping("/udiwms/thrsys/corp/corpsDlAll") + public BaseResponse corpsDlAll(@RequestBody ThrUnitMaintainFilterRequest thrUnitMaintainFilterRequest) { + thrUnitMaintainFilterRequest.setThirdSysFk(thrUnitMaintainFilterRequest.getThirdSys()); + String data = (String) redisUtil.get(Constant.dlThrProducts); + if (data != null && data.equals("true")) { + return ResultVOUtils.error(500, "当前任务正在下载更新产品信息，请稍后重试！"); + } else { + redisUtil.set(Constant.dlThrCorps, "true", 30); + if (thrUnitMaintainFilterRequest.getThirdSysFk() == null) { + return ResultVOUtils.error(500, "未选择第三方系统！"); + } + ThrCorpImportLogEntity thrCorpImportLogEntity = new ThrCorpImportLogEntity(); + String genKey = CustomUtil.getId(); + thrCorpImportLogEntity.setGenKey(genKey); + thrCorpImportLogEntity.setFromType("第三方系统获取"); + thrCorpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); + thrCorpImportLogEntity.setUpdateTime(new Date()); + thrCorpImportLogEntity.setThirdSysFk(thrUnitMaintainFilterRequest.getThirdSysFk()); + thrCorpImportLogService.insertImportLog(thrCorpImportLogEntity); + + if (thrUnitMaintainFilterRequest.getThrCorpEntities() != null && thrUnitMaintainFilterRequest.getThrCorpEntities().size() > 0) {//选中导出 + thrCorpsDlService.importSelectCorps(genKey, thrUnitMaintainFilterRequest.getThrCorpEntities(), thrUnitMaintainFilterRequest.getThirdSysFk()); + } else { //结果导出 + thrCorpsDlService.importCorps(genKey,thrUnitMaintainFilterRequest, thrUnitMaintainFilterRequest.getThirdSysFk()); + } + +// thrCorpsDlService.importCorps(genKey, filterThrCorpRequest.getThirdSysFk()); + return ResultVOUtils.success("后台开始下载更新，请稍后刷新查看"); + } + } + + //查询ERP往来单位 + @AuthRuleAnnotation("") + @GetMapping("/udiwms/unitMaintain/filterErp") + public BaseResponse filterErp(ThrUnitMaintainFilterRequest thrUnitMaintainFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + ThrSystemDetailEntity thrSystemDetailEntity = thrSystemDetailService.selectByKey("corpUrl", thrUnitMaintainFilterRequest.getThirdSys()); + if (thrSystemDetailEntity == null || thrSystemDetailEntity.getValue() == null) + return ResultVOUtils.error(500, "往来单位接口地址未定义"); + if (thrSystemDetailEntity.getEnabled()) { + if (thrSystemDetailEntity.getFromType() == 0 || (thrUnitMaintainFilterRequest.getIsDownThrSys() != null && thrUnitMaintainFilterRequest.getIsDownThrSys())) { + BaseResponse> udiDlDeviceResponse = erpBasicClient.getErpCrop(thrUnitMaintainFilterRequest); + if (udiDlDeviceResponse.getCode() == 20000) { + for (ThrCorpsResponse erpUnitsResponse : udiDlDeviceResponse.getData().getList()) { + BasicUnitMaintainEntity basicUnitMaintainEntity = thrCorpService.selectByThirdId(erpUnitsResponse.getId(), thrUnitMaintainFilterRequest.getThirdSys()); + if (basicUnitMaintainEntity != null) { + erpUnitsResponse.setChecked(true); + } else { + erpUnitsResponse.setChecked(false); + } + } + + return udiDlDeviceResponse; + } else { + return udiDlDeviceResponse; + } + + } else { + FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); + BeanUtils.copyProperties(thrUnitMaintainFilterRequest, filterThrCorpRequest); + filterThrCorpRequest.setThirdSysFk(thrUnitMaintainFilterRequest.getThirdSys()); + List thrCorpEntities = thrCorpService.filterThrCorps(filterThrCorpRequest); + List thrCorpEntityList = thrCorpEntities.stream().map(item -> + { + ThrCorpsResponse thrCorpEntity = new ThrCorpsResponse(); + BeanUtils.copyProperties(item, thrCorpEntity); + BasicUnitMaintainEntity basicUnitMaintainEntity = thrCorpService.selectByThirdId(item.getUnitId(), thrUnitMaintainFilterRequest.getThirdSys()); + if (basicUnitMaintainEntity != null) { + thrCorpEntity.setChecked(true); + } else { + thrCorpEntity.setChecked(false); + } + thrCorpEntity.setId(item.getUnitId()); + return thrCorpEntity; + }).collect(Collectors.toList()); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrCorpEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrCorpEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + } else { + return ResultVOUtils.error(500, "第三方系统往来单位服务接口未启用"); + } + } + + +} diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java index 72856f8d3..5ac491e1d 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java @@ -1,27 +1,22 @@ package com.glxp.api.controller.thrsys; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.entity.basic.BasicThirdSysEntity; + import com.glxp.api.entity.thrsys.ThrProductsEntity; +import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.http.ErpBasicClient; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterThrProductsRequest; -import com.glxp.api.req.thrsys.ThrProductsRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrProductsResponse; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.basic.BasicThirdSysDetailService; import com.glxp.api.service.thrsys.ThrProductsService; -import org.springframework.beans.BeanUtils; +import com.glxp.api.service.thrsys.ThrSystemDetailService; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -44,7 +39,7 @@ public class ThrProductsController { ThrProductsService thrProductsService; @Resource - BasicThirdSysDetailService basicThirdSysDetailService; + ThrSystemDetailService thrSystemDetailService; @Resource private ErpBasicClient erpBasicClient; @@ -62,13 +57,13 @@ public class ThrProductsController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", filterThrProductsRequest.getThirdSys()); - if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { + ThrSystemDetailEntity thrSystemDetailEntity = thrSystemDetailService.selectByKey("piQueryUrl", filterThrProductsRequest.getThirdSys()); + if (thrSystemDetailEntity == null || thrSystemDetailEntity.getValue() == null) { return ResultVOUtils.error(500, "ERP产品信息接口地址未定义"); } - if (basicThirdSysDetailEntity.getEnabled()) { - if (basicThirdSysDetailEntity.getFromType() == 0 || (filterThrProductsRequest.getIsDownThrSys() != null && filterThrProductsRequest.getIsDownThrSys())) { + if (thrSystemDetailEntity.getEnabled()) { + if (thrSystemDetailEntity.getFromType() == 0 || (filterThrProductsRequest.getIsDownThrSys() != null && filterThrProductsRequest.getIsDownThrSys())) { BaseResponse> udiDlDeviceResponse = erpBasicClient.getErpProducts(filterThrProductsRequest); if (udiDlDeviceResponse.getCode() == 20000) { List invmandocResponses = udiDlDeviceResponse.getData().getList(); 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 0f897c0fa..7bd4c246a 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java @@ -5,9 +5,8 @@ import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BasicProcessStatus; -import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrProductsExportLogEntity; +import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.http.ErpBasicClient; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterThrProductsExportLogRequest; @@ -16,10 +15,10 @@ import com.glxp.api.req.thrsys.ThrProductsExportRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrProductsResponse; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.basic.BasicThirdSysDetailService; import com.glxp.api.service.thrsys.ThrProductsDlService; import com.glxp.api.service.thrsys.ThrProductsExportLogService; import com.glxp.api.service.thrsys.ThrProductsService; +import com.glxp.api.service.thrsys.ThrSystemDetailService; import com.glxp.api.util.CustomUtil; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; @@ -47,7 +46,7 @@ public class ThrProductsExportLogController { @Resource ThrProductsDlService thrProductsDlService; @Resource - BasicThirdSysDetailService basicThirdSysDetailService; + ThrSystemDetailService thrSystemDetailService; @Resource private CustomerService customerService; @@ -177,11 +176,11 @@ public class ThrProductsExportLogController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", filterThrProductsRequest.getThirdSys()); - if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) + ThrSystemDetailEntity thrSystemDetailEntity = thrSystemDetailService.selectByKey("piQueryUrl", filterThrProductsRequest.getThirdSys()); + if (thrSystemDetailEntity == null || thrSystemDetailEntity.getValue() == null) return ResultVOUtils.error(500, "ERP产品信息接口地址未定义"); - if (basicThirdSysDetailEntity.getEnabled()) { - if (basicThirdSysDetailEntity.getFromType() == 0) { + if (thrSystemDetailEntity.getEnabled()) { + if (thrSystemDetailEntity.getFromType() == 0) { ErpBasicClient erpBasicHttpClient = new ErpBasicClient(); BaseResponse> udiDlDeviceResponse = erpBasicHttpClient.getErpProducts(filterThrProductsRequest); if (udiDlDeviceResponse.getCode() == 20000) { diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java index a5a0c9b5a..d78e85569 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity; import com.glxp.api.entity.thrsys.ThrProductsImportLogEntity; import com.glxp.api.entity.thrsys.ThrProductsImportDetailEntity; import com.glxp.api.req.system.DeleteRequest; @@ -81,4 +82,5 @@ public class ThrProductsImportLogController { return ResultVOUtils.success("删除成功"); } + } diff --git a/src/main/java/com/glxp/api/dao/basic/BasicThirdSysDao.java b/src/main/java/com/glxp/api/dao/basic/BasicThirdSysDao.java deleted file mode 100644 index 170727401..000000000 --- a/src/main/java/com/glxp/api/dao/basic/BasicThirdSysDao.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.glxp.api.dao.basic; - - -import com.glxp.api.entity.basic.BasicThirdSysEntity; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface BasicThirdSysDao { - -// boolean updateBasicThiSys(BasicThirdSysEntity basicThirdSysEntity); -// - BasicThirdSysEntity selectByThirdId(@Param("thirdId") String thirdId); -// -// List filterBasicThiSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest); -// -// /** -// * 查询启用的第三方系统的ID -// * -// * @return -// */ -// List selectEnabledThirdId(); -// -// /** -// * 查询第三方系统名称数量 -// * -// * @param thirdName -// * @return -// */ -// int selectCountByThirdName(@Param("thirdName") String thirdName); -// -// /** -// * 根据系统ID和名称查询第三方系统配置信息 -// * -// * @param thirdId -// * @param thirdName -// * @return -// */ -// BasicThirdSysEntity selectByThirdIdAndThirdName(@Param("thirdId") String thirdId, @Param("thirdName") String thirdName); -// - /** - * 根据第三方系统ID查询第三方系统名称 - * - * @param thirdId - * @return - */ - String selectThirdNameByThirdId(@Param("thirdId") String thirdId); -// -// int countThirdSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest); -} diff --git a/src/main/java/com/glxp/api/dao/basic/BasicThirdSysDetailDao.java b/src/main/java/com/glxp/api/dao/basic/BasicThirdSysDetailDao.java deleted file mode 100644 index d115afbb8..000000000 --- a/src/main/java/com/glxp/api/dao/basic/BasicThirdSysDetailDao.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.glxp.api.dao.basic; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.entity.thrsys.ThrProductsEntity; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface BasicThirdSysDetailDao extends BaseMapper { - - BasicThirdSysDetailEntity selectByKey(@Param("key") String key,@Param("thirdSys") String thirdSys); - -} diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrCorpDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpDao.java new file mode 100644 index 000000000..f58b13e09 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpDao.java @@ -0,0 +1,38 @@ +package com.glxp.api.dao.thrsys; + + +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.entity.thrsys.ThrCorpEntity; +import com.glxp.api.req.thrsys.FilterThrCorpRequest; +import com.glxp.api.req.thrsys.ThrUnitMaintainFilterRequest; +import com.glxp.api.res.thrsys.ThrCorpsResponse; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrCorpDao { + + List filterThrCorps(FilterThrCorpRequest filterThrCorpRequest); + + boolean insertThrCorps(ThrCorpEntity thrCorpEntity); + + boolean insertThrCorpss(@Param("thrCorpEntitys") List thrCorpEntitys); + + boolean updateThrCorps(ThrCorpEntity thrCorpEntity); + + boolean deleteById(@Param("id") String id); + + boolean deleteByUnitId(@Param("unitId") String unitId); + + boolean deleteAll(); + + void importThrCorp(ThrCorpEntity thrCorpEntity); + + BasicUnitMaintainEntity selectByThirdId(ThrUnitMaintainFilterRequest thrUnitMaintainFilterRequest); + + BasicThirdSysDetailEntity selectByKey(@Param("key") String key, @Param("thirdSys") String thirdSys); + +} diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrCorpExportLogDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpExportLogDao.java new file mode 100644 index 000000000..9ba9c3fa3 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpExportLogDao.java @@ -0,0 +1,27 @@ +package com.glxp.api.dao.thrsys; + + +import com.glxp.api.entity.thrsys.FilterThrCorpExportLogRequest; +import com.glxp.api.entity.thrsys.ThrCorpExportLogEntity; +import com.glxp.api.req.thrsys.FilterThrProductsExportLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrCorpExportLogDao { + + + List filterThrCorpExportLog(FilterThrCorpExportLogRequest filterThrCorpExportLogRequest); + + boolean insertThrCorpExportLog(ThrCorpExportLogEntity thrCorpExportLogEntity); + + boolean updateThrCorpExportLog(ThrCorpExportLogEntity thrCorpExportLogEntity); + + boolean deleteById(@Param("id") String id); + + boolean deleteByTime(); + + String selectFilePathById(@Param("id") String id); +} diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrCorpImportDetailDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpImportDetailDao.java new file mode 100644 index 000000000..d34a64636 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpImportDetailDao.java @@ -0,0 +1,26 @@ +package com.glxp.api.dao.thrsys; + + +import com.glxp.api.entity.thrsys.ThrCorpImportDetailEntity; +import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrCorpImportDetailDao { + List filterCorpDetailImport(FilterThrCorpImportLogRequest filterThrCorpImportLogRequest); + + boolean insertCorpDetailImport(ThrCorpImportDetailEntity thrCorpImportDetailEntity); + + boolean updateCorpDetailImport(ThrCorpImportDetailEntity thrCorpImportDetailEntity); + + boolean insertCorpDetailImports(@Param("corps") List thrCorpImportDetailEntities); + + boolean deleteById(@Param("id") String id); + + boolean deleteByGenkey(@Param("genKey") String genKey); + + boolean deleteByTime(); +} diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrCorpImportLogDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpImportLogDao.java new file mode 100644 index 000000000..a1195980f --- /dev/null +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpImportLogDao.java @@ -0,0 +1,25 @@ +package com.glxp.api.dao.thrsys; + + +import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity; +import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; +import com.glxp.api.req.thrsys.FilterThrProductsImportLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrCorpImportLogDao { + + List filterThrCorpImportLog(FilterThrCorpImportLogRequest filterThrCorpImportLogRequest); + + boolean insertImportLog(ThrCorpImportLogEntity thrCorpImportLogEntity); + + boolean updateImportLog(ThrCorpImportLogEntity thrCorpImportLogEntity); + + boolean deleteById(@Param("id") String id); + + boolean deleteByTime(); + +} diff --git a/src/main/java/com/glxp/api/entity/basic/BasicUnitMaintainEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicUnitMaintainEntity.java new file mode 100644 index 000000000..d4bac6e82 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/basic/BasicUnitMaintainEntity.java @@ -0,0 +1,43 @@ +package com.glxp.api.entity.basic; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.Date; + +@Data +public class BasicUnitMaintainEntity { + + private Integer id; + private String erpId; + + @NotBlank(message = "往来单位名称不能为空！") + private String name; + private String spell; + private String addr; + private String status; + private String type; + + @NotBlank(message = "社会信用号不能为空！") + private String creditNo; + private String contact; + private String mobile; + + private String thirdId; + private String thirdId1; + private String thirdId2; + private String thirdId3; + private String thirdId4; + + private String thirdName; + private String thirdName1; + private String thirdName2; + private String thirdName3; + private String thirdName4; + + private Date updateTime; + private Integer corpType; + + private Integer outType; + +} diff --git a/src/main/java/com/glxp/api/entity/thrsys/FilterThrCorpExportLogRequest.java b/src/main/java/com/glxp/api/entity/thrsys/FilterThrCorpExportLogRequest.java new file mode 100644 index 000000000..bd9696f8f --- /dev/null +++ b/src/main/java/com/glxp/api/entity/thrsys/FilterThrCorpExportLogRequest.java @@ -0,0 +1,15 @@ +package com.glxp.api.entity.thrsys; + + +import com.glxp.api.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterThrCorpExportLogRequest extends ListPageRequest { + + + + private String genKey; + private Integer status; + private Integer type; +} diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrCorpEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrCorpEntity.java new file mode 100644 index 000000000..fea927cb8 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrCorpEntity.java @@ -0,0 +1,80 @@ +package com.glxp.api.entity.thrsys; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.Date; + +/** + *

+ * + *

+ * @since 2023-01-12 + */ +@Data +public class ThrCorpEntity{ + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @TableField("unitId") + private String unitId; + + @TableField("spell") + private String spell; + + @TableField("addr") + private String addr; + + @TableField("creditNo") + private String creditNo; + + @TableField("contact") + private String contact; + + @TableField("mobile") + private String mobile; + + @TableField("thirdSysFk") + private String thirdSysFk; + + @TableField("name") + private String name; + + /** + * 创建人 + */ + @TableField("createUser") + private String createUser; + + /** + * 创建时间 + */ + @TableField("createTime") + private Date createTime; + + /** + * 更新人 + */ + @TableField("updateUser") + private String updateUser; + + /** + * 更新时间 + */ + @TableField("updateTime") + private Date updateTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + +} diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrCorpExportLogEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrCorpExportLogEntity.java new file mode 100644 index 000000000..41a4c655d --- /dev/null +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrCorpExportLogEntity.java @@ -0,0 +1,84 @@ +package com.glxp.api.entity.thrsys; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.Date; + +/** + *

+ * + *

+ * + * @since 2023-01-12 + */ +@Data +public class ThrCorpExportLogEntity{ + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 生成日志记录 + */ + @TableField("genKey") + private String genKey; + + /** + * 生成状态0：失败；1：成功 + */ + @TableField("status") + private Integer status; + + /** + * 下载次数 + */ + @TableField("dlCount") + private Integer dlCount; + + /** + * 文件下载路径 + */ + @TableField("filePath") + private String filePath; + + @TableField("type") + private Integer type; + + /** + * 创建人 + */ + @TableField("createUser") + private String createUser; + + /** + * 创建时间 + */ + @TableField("createTime") + private Date createTime; + + /** + * 更新人 + */ + @TableField("updateUser") + private String updateUser; + + /** + * 更新时间 + */ + @TableField("updateTime") + private Date updateTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + +} diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrCorpImportDetailEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrCorpImportDetailEntity.java new file mode 100644 index 000000000..d69d719bd --- /dev/null +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrCorpImportDetailEntity.java @@ -0,0 +1,83 @@ +package com.glxp.api.entity.thrsys; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.Date; + +/** + *

+ * + * @since 2023-01-12 + */ + +@Data +public class ThrCorpImportDetailEntity{ + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @TableField("unitId") + private String unitId; + + @TableField("spell") + private String spell; + + @TableField("addr") + private String addr; + + @TableField("creditNo") + private String creditNo; + + @TableField("contact") + private String contact; + + @TableField("mobile") + private String mobile; + + @TableField("thirdSysFk") + private String thirdSysFk; + + @TableField("name") + private String name; + + @TableField("genKeyFk") + private String genKeyFk; + + /** + * 创建人 + */ + @TableField("createUser") + private String createUser; + + /** + * 创建时间 + */ + @TableField("createTime") + private Date createTime; + + /** + * 更新人 + */ + @TableField("updateUser") + private String updateUser; + + /** + * 更新时间 + */ + @TableField("updateTime") + private Date updateTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + +} diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrCorpImportLogEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrCorpImportLogEntity.java new file mode 100644 index 000000000..a6aabba50 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrCorpImportLogEntity.java @@ -0,0 +1,71 @@ +package com.glxp.api.entity.thrsys; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.Date; + +/** + *

+ * + *

+ * @since 2023-01-12 + */ +@Data +public class ThrCorpImportLogEntity{ + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @TableField("genKey") + private String genKey; + + /** + * 0:正在导入，1.正在处理，2.处理异常。3.处理完成 + */ + @TableField("status") + private Integer status; + + @TableField("fromType") + private String fromType; + + @TableField("thirdSysFk") + private String thirdSysFk; + + /** + * 创建人 + */ + @TableField("createUser") + private String createUser; + + /** + * 创建时间 + */ + @TableField("createTime") + private Date createTime; + + /** + * 更新人 + */ + @TableField("updateUser") + private String updateUser; + + /** + * 更新时间 + */ + @TableField("updateTime") + private Date updateTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + +} diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/http/ErpBasicClient.java index 8b8a0e3ce..14d5ac491 100644 --- a/src/main/java/com/glxp/api/http/ErpBasicClient.java +++ b/src/main/java/com/glxp/api/http/ErpBasicClient.java @@ -8,12 +8,16 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.http.req.UdiwmsBusTypeRequest; +import com.glxp.api.http.req.UdiwmsUnitRequest; import com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest; import com.glxp.api.req.thrsys.FilterThrProductsRequest; +import com.glxp.api.req.thrsys.ThrUnitMaintainFilterRequest; import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.thrsys.ThrCorpsResponse; import com.glxp.api.res.thrsys.ThrProductsResponse; import com.glxp.api.service.thrsys.ThrSystemService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -29,28 +33,29 @@ public class ErpBasicClient { @Resource private ThrSystemService basicThirdSysService; + //获取往来单位 + public BaseResponse> getErpCrop(ThrUnitMaintainFilterRequest thrUnitMaintainFilterRequest) { + UdiwmsUnitRequest udiwmsUnitRequest = new UdiwmsUnitRequest(); + BeanUtils.copyProperties(thrUnitMaintainFilterRequest, udiwmsUnitRequest); + udiwmsUnitRequest.setUnitId(thrUnitMaintainFilterRequest.getErpId()); + ThrSystemEntity thrSystemEntity = basicThirdSysService.selectByThirdId(thrUnitMaintainFilterRequest.getThirdSys()); + + try { + String url = thrSystemEntity.getThridUrl() + "/udiwms/erp/getUnits"; + String response = httpOkClient.uCloudPost(url, udiwmsUnitRequest, thrSystemEntity); + if(StrUtil.isBlank(response)){ + return ResultVOUtils.error(500, "连接第三方系统接口服务出错！"); + } + BaseResponse> udiDlDeviceResponse = + JSONObject.parseObject(response, new TypeReference>>() { + }); + return udiDlDeviceResponse; + } catch (Exception e) { + log.error("获取往来单位异常", e); + return ResultVOUtils.error(500, "连接第三方系统接口服务出错！"); + } + } - //todo 基础信息相关接口还未完成 -// //获取往来单位 -// public BaseResponse> getErpCrop(BasicUnitMaintainFilterRequest unitMaintainFilterRequest) { -// UdiwmsUnitRequest udiwmsUnitRequest = new UdiwmsUnitRequest(); -// BeanUtils.copyProperties(unitMaintainFilterRequest, udiwmsUnitRequest); -// udiwmsUnitRequest.setUnitId(unitMaintainFilterRequest.getErpId()); -// BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(unitMaintainFilterRequest.getThirdSys()); -// -// try { -// String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getUnits"; -// String response = httpOkClient.uCloudPost(url, udiwmsUnitRequest, basicThirdSysEntity); -// BaseResponse> udiDlDeviceResponse = -// JSONObject.parseObject(response, new TypeReference>>() { -// }); -// return udiDlDeviceResponse; -// } catch (Exception e) { -// log.error("获取往来单位异常", e); -// return ResultVOUtils.error(500, "连接第三方系统接口服务出错！"); -// } -// } -// //获取产品信息 public BaseResponse> getErpProducts(FilterThrProductsRequest filterThrProductsRequest) { diff --git a/src/main/java/com/glxp/api/http/req/UdiwmsUnitRequest.java b/src/main/java/com/glxp/api/http/req/UdiwmsUnitRequest.java new file mode 100644 index 000000000..323bb3c72 --- /dev/null +++ b/src/main/java/com/glxp/api/http/req/UdiwmsUnitRequest.java @@ -0,0 +1,12 @@ +package com.glxp.api.http.req; + + +import com.glxp.api.req.ListPageRequest; +import lombok.Data; + +@Data +public class UdiwmsUnitRequest extends ListPageRequest { + String key; + private String unitId; + private String name; +} diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpImportLogRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpImportLogRequest.java new file mode 100644 index 000000000..379b2a69f --- /dev/null +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpImportLogRequest.java @@ -0,0 +1,17 @@ +package com.glxp.api.req.thrsys; + + +import com.glxp.api.req.ListPageRequest; +import lombok.Data; + + +@Data +public class FilterThrCorpImportLogRequest extends ListPageRequest { + + private Integer id; + private String genKey; + private Integer status; + private String thirdSysFk; + private String fromType; + private String lastUpdateTime; +} diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpRequest.java new file mode 100644 index 000000000..c2f875bb9 --- /dev/null +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpRequest.java @@ -0,0 +1,22 @@ +package com.glxp.api.req.thrsys; + + +import com.glxp.api.req.ListPageRequest; +import com.glxp.api.res.thrsys.ThrCorpsResponse; +import lombok.Data; + +import java.util.List; + +@Data +public class FilterThrCorpRequest extends ListPageRequest { + + + + private String thirdSysFk; + private String thirdSys; + private String unitId; + private String name; + List thrCorpEntities; + private String lastUpdateTime; + +} diff --git a/src/main/java/com/glxp/api/req/thrsys/PostThrCorpRequest.java b/src/main/java/com/glxp/api/req/thrsys/PostThrCorpRequest.java new file mode 100644 index 000000000..24ced42eb --- /dev/null +++ b/src/main/java/com/glxp/api/req/thrsys/PostThrCorpRequest.java @@ -0,0 +1,17 @@ +package com.glxp.api.req.thrsys; + + +import com.glxp.api.entity.thrsys.ThrCorpEntity; +import com.glxp.api.res.thrsys.ThrCorpsResponse; +import lombok.Data; + +import java.util.List; + +@Data +public class PostThrCorpRequest { + private String genKey; + private String thirdSys; + private String uploadType; + private List corps; + private List datas; +} diff --git a/src/main/java/com/glxp/api/req/thrsys/ThrCorpExportRequest.java b/src/main/java/com/glxp/api/req/thrsys/ThrCorpExportRequest.java new file mode 100644 index 000000000..7b278c37f --- /dev/null +++ b/src/main/java/com/glxp/api/req/thrsys/ThrCorpExportRequest.java @@ -0,0 +1,19 @@ +package com.glxp.api.req.thrsys; + + +import com.glxp.api.entity.thrsys.ThrCorpEntity; +import com.glxp.api.req.ListPageRequest; +import lombok.Data; + +import java.util.List; + +@Data +public class ThrCorpExportRequest extends ListPageRequest { + + private List thrCorpEntities; + private String thirdSysFk; + private String unitId; + private String thirdSys; + private String name; + +} diff --git a/src/main/java/com/glxp/api/req/thrsys/ThrUnitMaintainFilterRequest.java b/src/main/java/com/glxp/api/req/thrsys/ThrUnitMaintainFilterRequest.java new file mode 100644 index 000000000..b4b4278f7 --- /dev/null +++ b/src/main/java/com/glxp/api/req/thrsys/ThrUnitMaintainFilterRequest.java @@ -0,0 +1,31 @@ +package com.glxp.api.req.thrsys; + + +import com.glxp.api.req.ListPageRequest; +import com.glxp.api.res.thrsys.ThrCorpsResponse; +import lombok.Data; + +import java.util.List; + +@Data +public class ThrUnitMaintainFilterRequest extends ListPageRequest { + + private Integer id; + private String key; + private String unitId; + private String name; + private String thirdSys; + private String thirdSysFk; + + private String thirdId; + private String thirdId1; + private String thirdId2; + private String thirdId3; + private String thirdId4; + private String erpId; + private Integer corpType; + private Integer outType; + private Boolean isDownThrSys; + private String lastUpdateTime; + List thrCorpEntities; +} diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrCorpsResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrCorpsResponse.java new file mode 100644 index 000000000..c8d9eec2c --- /dev/null +++ b/src/main/java/com/glxp/api/res/thrsys/ThrCorpsResponse.java @@ -0,0 +1,27 @@ +package com.glxp.api.res.thrsys; + +import lombok.Data; + +import java.util.Date; + +@Data +public class ThrCorpsResponse { + + private String id; + private String name; + private String spell; + private String addr; + private String creditNo; + private String contact; + private String mobile; + private Boolean checked; + private String unitId; //必填 往来单位ID + private String thirdSysFk; + private String createUser; + private Date createTime; + private String updateUser; + private Date updateTime; + private String remark; + + +} diff --git a/src/main/java/com/glxp/api/service/basic/BasicThirdSysDetailService.java b/src/main/java/com/glxp/api/service/basic/BasicThirdSysDetailService.java deleted file mode 100644 index b1f7409f2..000000000 --- a/src/main/java/com/glxp/api/service/basic/BasicThirdSysDetailService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.glxp.api.service.basic; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.entity.basic.BasicThirdSysEntity; -import com.glxp.api.entity.thrsys.ThrInvProductsEntity; -import com.glxp.api.entity.thrsys.ThrSystemEntity; - -import java.util.List; - -public interface BasicThirdSysDetailService{ - - BasicThirdSysDetailEntity selectByKey(String key, String thirdSys); - - /** - * 测试第三方服务连通性 - * - * @param thrSystemEntity - */ - BaseResponse testThirdService(ThrSystemEntity thrSystemEntity); -} diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicThirdSysDetailServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicThirdSysDetailServiceImpl.java deleted file mode 100644 index 11142f33b..000000000 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicThirdSysDetailServiceImpl.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.glxp.api.service.basic.impl; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.dao.basic.BasicThirdSysDetailDao; -import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.entity.thrsys.ThrSystemEntity; -import com.glxp.api.http.ErpBasicClient; -import com.glxp.api.service.basic.BasicThirdSysDetailService; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; - - -@Service -public class BasicThirdSysDetailServiceImpl implements BasicThirdSysDetailService { - - @Resource - private ErpBasicClient erpBasicClient; - @Resource - BasicThirdSysDetailDao basicThirdSysDetailDao; - - - - @Override - public BasicThirdSysDetailEntity selectByKey(String key, String thirdSys) { - return basicThirdSysDetailDao.selectByKey(key,thirdSys); - } - - @Override - public BaseResponse testThirdService(ThrSystemEntity thrSystemEntity) { - return erpBasicClient.testThridConnect(thrSystemEntity); - } -} diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrCorpExportLogService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpExportLogService.java new file mode 100644 index 000000000..970d95a1c --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpExportLogService.java @@ -0,0 +1,26 @@ +package com.glxp.api.service.thrsys; + + + +import com.glxp.api.entity.thrsys.FilterThrCorpExportLogRequest; +import com.glxp.api.entity.thrsys.ThrCorpExportLogEntity; + +import java.util.List; + +public interface ThrCorpExportLogService { + + + ThrCorpExportLogEntity selectByGenKey(String genKey); + + + List filterThrCorpExportLog(FilterThrCorpExportLogRequest filterThrCorpExportLogRequest); + + boolean insertThrCorpExportLog(ThrCorpExportLogEntity thrCorpExportLogEntity); + + boolean updateThrCorpExportLog(ThrCorpExportLogEntity thrCorpExportLogEntity); + + boolean deleteById(String id); + + boolean deleteByTime(); + +} diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrCorpImportDetailService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpImportDetailService.java new file mode 100644 index 000000000..95f6d3114 --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpImportDetailService.java @@ -0,0 +1,27 @@ +package com.glxp.api.service.thrsys; + + +import com.glxp.api.entity.thrsys.ThrCorpImportDetailEntity; +import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public interface ThrCorpImportDetailService { + + List filterCorpDetailImport(FilterThrCorpImportLogRequest filterThrCorpImportLogRequest); + + boolean insertCorpDetailImport(ThrCorpImportDetailEntity thrCorpImportDetailEntity); + + boolean updateCorpDetailImport(ThrCorpImportDetailEntity thrCorpImportDetailEntity); + + boolean insertCorpDetailImports( List thrCorpImportDetailEntities); + + boolean deleteById( String id); + + boolean deleteByGenkey( String genKey); + + boolean deleteByTime(); + +} diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrCorpImportLogService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpImportLogService.java new file mode 100644 index 000000000..c4cbd1355 --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpImportLogService.java @@ -0,0 +1,23 @@ +package com.glxp.api.service.thrsys; + + +import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity; +import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; + +import java.util.List; + +public interface ThrCorpImportLogService { + + ThrCorpImportLogEntity selectByGenKey(String genKey); + + List filterThrCorpImportLog(FilterThrCorpImportLogRequest filterInCodeLogRequest); + + boolean insertImportLog(ThrCorpImportLogEntity thrCorpImportLogEntity); + + boolean updateImportLog(ThrCorpImportLogEntity thrCorpImportLogEntity); + + boolean deleteById(String id); + + boolean deleteByTime(); + +} diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java new file mode 100644 index 000000000..164b191f1 --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java @@ -0,0 +1,33 @@ +package com.glxp.api.service.thrsys; + + + +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.entity.thrsys.ThrCorpEntity; +import com.glxp.api.req.thrsys.FilterThrCorpRequest; +import com.glxp.api.res.thrsys.ThrCorpsResponse; + +import java.util.List; + +public interface ThrCorpService { + + List filterThrCorps(FilterThrCorpRequest filterThrCorpRequest); + + boolean insertThrCorps(ThrCorpEntity thrCorpEntity); + + boolean insertThrCorpss(List thrCorpEntitys); + + boolean updateThrCorps(ThrCorpEntity thrCorpEntity); + + boolean deleteById(String id); + + boolean deleteByUnitId(String id); + + boolean deleteAll(); + + BasicUnitMaintainEntity selectByThirdId(String thirdId, String thirdSys); + + BasicThirdSysDetailEntity selectByKey(String key, String thirdSys); + +} diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java new file mode 100644 index 000000000..65bf4985f --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java @@ -0,0 +1,500 @@ +package com.glxp.api.service.thrsys; + +import cn.hutool.core.io.file.FileWriter; +import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.config.WebSocketServer; +import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.Constant; +import com.glxp.api.entity.system.SyncDataSetEntity; +import com.glxp.api.entity.thrsys.*; +import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.http.HttpOkClient; +import com.glxp.api.req.thrsys.*; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.thrsys.ThrCorpsResponse; +import com.glxp.api.res.thrsys.ThrProductsResponse; +import com.glxp.api.service.system.SyncDataSetService; +import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.ExcelUtil; +import com.glxp.api.util.RedisUtil; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class ThrCorpsDlService { + + @Resource + ThrCorpService thrCorpService; + @Resource + ThrSystemDetailService thrSystemDetailService; + @Resource + RedisUtil redisUtil; + @Resource + ThrCorpImportLogService thrCorpImportLogService; + @Resource + ThrCorpExportLogService thrCorpExportLogService; + @Resource + private ThrCorpImportDetailService thrCorpImportDetailService; +// @Value("${SPSYNC_IP}") +// private String spsSyncUrl; + @Resource + ErpBasicClient erpBasicClient; + @Resource + SyncDataSetService syncDataSetService; + @Resource + HttpOkClient httpOkClient; + + public String getIpUrl() { + SyncDataSetEntity syncDataSetEntity = syncDataSetService.findSet(); + return syncDataSetEntity.getSyncIp(); + } + + @Async + public void importSelectCorps(String genKey, List thrCorpsResponseList, String thirdSys) { + ThrSystemDetailEntity piDetailEntity = thrSystemDetailService.selectByKey("corpUrl", thirdSys); + if (piDetailEntity == null || piDetailEntity.getValue() == null) { + WebSocketServer.sendInfo("往来单位接口未设置！", "sid"); + return; + } + ThrCorpImportLogEntity thrProductsImportLogEntity = thrCorpImportLogService.selectByGenKey(genKey); + if (thrCorpsResponseList != null && thrCorpsResponseList.size() > 0) { + + List thrCorpImportDetailEntities; + String finalGenKey = genKey; + thrCorpImportDetailEntities = thrCorpsResponseList.stream().map( + item -> { + ThrCorpImportDetailEntity thrCorpEntity = new ThrCorpImportDetailEntity(); + BeanUtils.copyProperties(item, thrCorpEntity); + thrCorpEntity.setUnitId(item.getUnitId()); + thrCorpEntity.setGenKeyFk(finalGenKey); + thrCorpEntity.setUpdateTime(new Date()); + thrCorpEntity.setThirdSysFk(thirdSys); + return thrCorpEntity; + } + ).collect(Collectors.toList()); + thrCorpImportDetailService.insertCorpDetailImports(thrCorpImportDetailEntities); + FilterThrCorpImportLogRequest filterThrCorpImportLogRequest = new FilterThrCorpImportLogRequest(); + filterThrCorpImportLogRequest.setGenKey(genKey); + List temps = thrCorpImportDetailService.filterCorpDetailImport(filterThrCorpImportLogRequest); + List thrCorpEntities = temps.stream().map( + item -> { + ThrCorpEntity thrProductsEntity = new ThrCorpEntity(); + BeanUtils.copyProperties(item, thrProductsEntity); + thrProductsEntity.setThirdSysFk(thirdSys); + thrProductsEntity.setUpdateTime(new Date()); + return thrProductsEntity; + } + ).collect(Collectors.toList()); + thrCorpService.insertThrCorpss(thrCorpEntities); + redisUtil.set(Constant.dlThrProducts, "false"); + WebSocketServer.sendInfo("往来单位信息下载已完成，请刷新查看！", "sid"); + thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); + thrProductsImportLogEntity.setUpdateTime(new Date()); + thrCorpImportLogService.updateImportLog(thrProductsImportLogEntity); + } + } + + //主动下载第三方系统往来单位信息 + @Async + public void importCorps(String genKey, ThrUnitMaintainFilterRequest thrUnitMaintainFilterRequest, String thirdSys) { + ThrSystemDetailEntity piDetailEntity = thrSystemDetailService.selectByKey("corpUrl", thirdSys); + if (piDetailEntity == null || piDetailEntity.getValue() == null) { + WebSocketServer.sendInfo("往来单位接口未设置！", "sid"); + return; + } + ThrCorpImportLogEntity thrProductsImportLogEntity = thrCorpImportLogService.selectByGenKey(genKey); + + int page = 1; + int limit = 100; + while (page != -1) { + page = getCorps(page, limit, piDetailEntity.getValue(), thrProductsImportLogEntity, thirdSys, genKey, thrUnitMaintainFilterRequest); + } + FilterThrCorpImportLogRequest filterUdiIpLogRequest = new FilterThrCorpImportLogRequest(); + filterUdiIpLogRequest.setGenKey(genKey); + List thrCorpImportDetailEntities = thrCorpImportDetailService.filterCorpDetailImport(filterUdiIpLogRequest); + List thrCorpEntities = thrCorpImportDetailEntities.stream().map( + item -> { + ThrCorpEntity thrProductsEntity = new ThrCorpEntity(); + BeanUtils.copyProperties(item, thrProductsEntity); + thrProductsEntity.setUpdateTime(new Date()); + thrProductsEntity.setThirdSysFk(thirdSys); + return thrProductsEntity; + } + ).collect(Collectors.toList()); + + List> splitList = CustomUtil.splitList(thrCorpEntities, 100); + for (List data : splitList) { + thrCorpService.insertThrCorpss(data); + } + redisUtil.set(Constant.dlThrProducts, "false"); + WebSocketServer.sendInfo("往来单位信息下载已完成，请刷新查看！", "sid"); + thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); + thrProductsImportLogEntity.setUpdateTime(new Date()); + thrCorpImportLogService.updateImportLog(thrProductsImportLogEntity); + } + + //导出生成Excel文件 + @Async + public void genExcel(String genKey, ThrCorpExportRequest thrCorpExportRequest) { + ThrCorpExportLogEntity thrCorpExportLogEntity = thrCorpExportLogService.selectByGenKey(genKey); + List> excelData = new ArrayList<>(); + List head = new ArrayList<>(); + head.add("往来单位ID"); + head.add("往来单位名称"); + head.add("拼音简写"); + head.add("地址"); + head.add("社会信用号"); + head.add("联系人"); + head.add("联系电话"); + excelData.add(head); + //选中导出 + if (thrCorpExportRequest.getThrCorpEntities() != null && thrCorpExportRequest.getThrCorpEntities().size() > 0) { + List corpEntities = thrCorpExportRequest.getThrCorpEntities(); + for (ThrCorpEntity thrCorpEntity : corpEntities) { + List rows = new ArrayList<>(); + rows.add(thrCorpEntity.getUnitId()); + rows.add(thrCorpEntity.getName()); + rows.add(thrCorpEntity.getSpell()); + rows.add(thrCorpEntity.getAddr()); + rows.add(thrCorpEntity.getCreditNo()); + rows.add(thrCorpEntity.getContact()); + rows.add(thrCorpEntity.getMobile()); + excelData.add(rows); + } + } else {//一键导出 + + //判断是否启用实时获取 + ThrSystemDetailEntity thrSystemDetailEntity = thrSystemDetailService.selectByKey("corpUrl", thrCorpExportRequest.getThirdSys()); + if (thrSystemDetailEntity == null || thrSystemDetailEntity.getValue() == null) { + thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); + thrCorpExportLogEntity.setRemark("往来单位接口地址未定义"); + thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity); + return; + } + + if (!thrSystemDetailEntity.getEnabled()) { + thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); + thrCorpExportLogEntity.setRemark("第三方接口往来单位服务接口未启用"); + thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity); + return; + } + + if (thrSystemDetailEntity.getFromType() == 0) { + //根据查询条件一键导出第三方系统往来单位 + List thrCorpEntities = exportCorps(thrCorpExportRequest); + excelData.addAll(getRows(thrCorpEntities)); + } else { + //根据查询条件一键导出数据库往来单位 + FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); + BeanUtils.copyProperties(thrCorpExportRequest, filterThrCorpRequest); + filterThrCorpRequest.setPage(null); + List> genDatas = genExcelData(filterThrCorpRequest); + if (genDatas != null && genDatas.size() > 0) { + excelData.addAll(genDatas); + } + } + + } + String sheetName = "往来单位信息"; + new ExcelUtil().exportExcel(excelData, sheetName, thrCorpExportLogEntity.getFilePath(), 20); + thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); + thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity); + + } + + //接收第三方上传或文件导入数据 + @Async + public void insertData(String genKey, String thirdSys, List thrCorpsResponseList) { + + ThrCorpImportLogEntity thrCorpImportLogEntity = thrCorpImportLogService.selectByGenKey(genKey); + //转入临时表 + List thrCorpEntities; + List thrCorpImportDetailEntities; + String finalGenKey = genKey; + thrCorpImportDetailEntities = thrCorpsResponseList.stream().map( + item -> { + ThrCorpImportDetailEntity thrCorpEntity = new ThrCorpImportDetailEntity(); + BeanUtils.copyProperties(item, thrCorpEntity); + thrCorpEntity.setGenKeyFk(finalGenKey); + thrCorpEntity.setUpdateTime(new Date()); + thrCorpEntity.setThirdSysFk(thirdSys); + return thrCorpEntity; + } + ).collect(Collectors.toList()); +// thrCorpImportDetailService.insertCorpDetailImports(thrCorpImportDetailEntities); + thrCorpEntities = thrCorpImportDetailEntities.stream().map( + item -> { + ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); + BeanUtils.copyProperties(item, thrCorpEntity); +// thrCorpEntity.setUnitId(item.getId()); + thrCorpEntity.setUpdateTime(new Date()); + thrCorpEntity.setThirdSysFk(thirdSys); + return thrCorpEntity; + } + ).collect(Collectors.toList()); + thrCorpService.insertThrCorpss(thrCorpEntities); + thrCorpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); + thrCorpImportLogEntity.setUpdateTime(new Date()); + thrCorpImportLogService.updateImportLog(thrCorpImportLogEntity); + } + + + public int getCorps(int page, int limit, String corpUrl, ThrCorpImportLogEntity thrCorpImportLogEntity, String thirdSys, String genKey, ThrUnitMaintainFilterRequest thrUnitMaintainFilterRequest) { + if (thrUnitMaintainFilterRequest == null) + thrUnitMaintainFilterRequest = new ThrUnitMaintainFilterRequest(); + thrUnitMaintainFilterRequest.setPage(page); + thrUnitMaintainFilterRequest.setLimit(limit); + BaseResponse> erpCrops = erpBasicClient.getErpCrop(thrUnitMaintainFilterRequest); + if (erpCrops == null || erpCrops.getCode() != 20000) { + + thrCorpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); + thrCorpImportLogEntity.setRemark(erpCrops.getMessage()); + thrCorpImportLogService.updateImportLog(thrCorpImportLogEntity); + return -1; + } + List erpUnitsResponses = erpCrops.getData().getList(); + if (erpUnitsResponses != null && erpUnitsResponses.size() > 0) { + + List thrCorpImportDetailEntities; + String finalGenKey = genKey; + thrCorpImportDetailEntities = erpUnitsResponses.stream().map( + item -> { + ThrCorpImportDetailEntity thrCorpEntity = new ThrCorpImportDetailEntity(); + BeanUtils.copyProperties(item, thrCorpEntity); + thrCorpEntity.setUnitId(item.getUnitId()); + thrCorpEntity.setGenKeyFk(finalGenKey); + thrCorpEntity.setUpdateTime(new Date()); + thrCorpEntity.setThirdSysFk(thirdSys); + return thrCorpEntity; + } + ).collect(Collectors.toList()); + thrCorpImportDetailService.insertCorpDetailImports(thrCorpImportDetailEntities); + + if (erpUnitsResponses.size() >= limit) + page++; + else { + return -1; + } + return page; + } + thrCorpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); + thrCorpImportLogService.updateImportLog(thrCorpImportLogEntity); + return -1; + } + + + public List exportCorps(ThrCorpExportRequest thrCorpExportRequest) { + ThrSystemDetailEntity corpEntity = thrSystemDetailService.selectByKey("corpUrl", thrCorpExportRequest.getThirdSys()); + int page = 1; + int limit = 100; + List thrCorpEntities = new ArrayList<>(); + while (true) { + List datas = getCorps(page, limit, corpEntity.getValue(), thrCorpExportRequest); + if (datas != null && datas.size() >= limit) { + thrCorpEntities.addAll(datas); + } else { + if (datas != null) { + thrCorpEntities.addAll(datas); + } + break; + } + } + return thrCorpEntities; + } + + public List getCorps(int page, int limit, String corpUrl, ThrCorpExportRequest thrCorpExportRequest) { + ThrUnitMaintainFilterRequest thrUnitMaintainFilterRequest = new ThrUnitMaintainFilterRequest(); + thrUnitMaintainFilterRequest.setName(thrCorpExportRequest.getName()); + thrUnitMaintainFilterRequest.setErpId(thrCorpExportRequest.getUnitId()); + thrUnitMaintainFilterRequest.setPage(page); + thrUnitMaintainFilterRequest.setLimit(limit); + BaseResponse> erpCrops = new ErpBasicClient().getErpCrop(thrUnitMaintainFilterRequest); + if (erpCrops.getCode() != 20000) { + return null; + } + List erpUnitsResponses = erpCrops.getData().getList(); + if (erpUnitsResponses != null && erpUnitsResponses.size() > 0) { + List thrCorpEntities = erpUnitsResponses.stream().map( + item -> { + ThrCorpEntity thrProductsEntity = new ThrCorpEntity(); + BeanUtils.copyProperties(item, thrProductsEntity); + thrProductsEntity.setUnitId(item.getId()); + return thrProductsEntity; + } + ).collect(Collectors.toList()); + return thrCorpEntities; + } + return null; + } + + public List> genExcelData(FilterThrCorpRequest filterThrOrderRequest) { + + List> excelData = new ArrayList<>(); + List thrCorpEntityList=new ArrayList<>(); + List thrCorpsResponseList = thrCorpService.filterThrCorps(filterThrOrderRequest); + if(thrCorpsResponseList.size()>0){ + thrCorpEntityList = thrCorpsResponseList.stream().map( + item -> { + ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); + BeanUtils.copyProperties(item, thrCorpEntity); + return thrCorpEntity; + } + ).collect(Collectors.toList()); + } + excelData.addAll(getRows(thrCorpEntityList)); + return excelData; + } + + public List> getRows(List thrCorpEntities) { + List> excelData = new ArrayList<>(); + for (ThrCorpEntity thrCorpEntity : thrCorpEntities) { + List rows = new ArrayList<>(); + rows.add(thrCorpEntity.getUnitId()); + rows.add(thrCorpEntity.getName()); + rows.add(thrCorpEntity.getSpell()); + rows.add(thrCorpEntity.getAddr()); + rows.add(thrCorpEntity.getCreditNo()); + rows.add(thrCorpEntity.getContact()); + rows.add(thrCorpEntity.getMobile()); + excelData.add(rows); + + } + return excelData; + } + + + //导出生成json文件 + @Async + public void genJsonFile(String genKey, ThrCorpExportRequest thrCorpExportRequest) { + ThrCorpExportLogEntity thrCorpExportLogEntity = thrCorpExportLogService.selectByGenKey(genKey); + List exportData = new ArrayList<>(); + //选中导出 + if (thrCorpExportRequest.getThrCorpEntities() != null && thrCorpExportRequest.getThrCorpEntities().size() > 0) { + List corpEntities = thrCorpExportRequest.getThrCorpEntities(); + exportData.addAll(corpEntities); + } else {//一键导出 + + //判断是否启用实时获取 + ThrSystemDetailEntity basicThirdSysDetailEntity = thrSystemDetailService.selectByKey("corpUrl", thrCorpExportRequest.getThirdSys()); + if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { + thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); + thrCorpExportLogEntity.setRemark("往来单位接口地址未定义"); + thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity); + return; + } + + if (!basicThirdSysDetailEntity.getEnabled()) { + thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); + thrCorpExportLogEntity.setRemark("第三方接口往来单位服务接口未启用"); + thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity); + return; + } + + if (basicThirdSysDetailEntity.getFromType() == 0) { + //根据查询条件一键导出第三方系统往来单位 + List thrCorpEntities = exportCorps(thrCorpExportRequest); + exportData.addAll(thrCorpEntities); + } else { + //根据查询条件一键导出数据库往来单位 + List thrCorpEntityList=new ArrayList<>(); + FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); + BeanUtils.copyProperties(thrCorpExportRequest, filterThrCorpRequest); + filterThrCorpRequest.setPage(null); + List thrCorpsResponseList = thrCorpService.filterThrCorps(filterThrCorpRequest); + if(thrCorpsResponseList.size()>0){ + thrCorpEntityList = thrCorpsResponseList.stream().map( + item -> { + ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); + BeanUtils.copyProperties(item, thrCorpEntity); + return thrCorpEntity; + } + ).collect(Collectors.toList()); + } + exportData.addAll(thrCorpEntityList); + } + } + FileWriter writer = new FileWriter(thrCorpExportLogEntity.getFilePath()); + writer.write(JSONUtil.toJsonStr(exportData)); + thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); + thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity); + } + + + @Async + public void uploadSmp(String genKey, ThrCorpExportRequest thrCorpExportRequest) { + ThrCorpExportLogEntity thrCorpExportLogEntity = thrCorpExportLogService.selectByGenKey(genKey); + List exportData = new ArrayList<>(); + PostThrCorpRequest postThrCorpRequest = new PostThrCorpRequest(); + //选中导出 + if (thrCorpExportRequest.getThrCorpEntities() != null && thrCorpExportRequest.getThrCorpEntities().size() > 0) { + List corpEntities = thrCorpExportRequest.getThrCorpEntities(); + exportData.addAll(corpEntities); + } else {//一键导出 + + //判断是否启用实时获取 + ThrSystemDetailEntity basicThirdSysDetailEntity = thrSystemDetailService.selectByKey("corpUrl", thrCorpExportRequest.getThirdSys()); + if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { + thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); + thrCorpExportLogEntity.setRemark("往来单位接口地址未定义"); + thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity); + return; + } + + if (!basicThirdSysDetailEntity.getEnabled()) { + thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); + thrCorpExportLogEntity.setRemark("第三方接口往来单位服务接口未启用"); + thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity); + return; + } + + if (basicThirdSysDetailEntity.getFromType() == 0) { + //根据查询条件一键导出第三方系统往来单位 + List thrCorpEntities = exportCorps(thrCorpExportRequest); + exportData.addAll(thrCorpEntities); + } else { + //根据查询条件一键导出数据库往来单位 + List thrCorpEntityList=new ArrayList<>(); + FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); + BeanUtils.copyProperties(thrCorpExportRequest, filterThrCorpRequest); + filterThrCorpRequest.setPage(null); + List thrCorpsResponseList = thrCorpService.filterThrCorps(filterThrCorpRequest); + if(thrCorpsResponseList.size()>0){ + thrCorpEntityList = thrCorpsResponseList.stream().map( + item -> { + ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); + BeanUtils.copyProperties(item, thrCorpEntity); + return thrCorpEntity; + } + ).collect(Collectors.toList()); + } + exportData.addAll(thrCorpEntityList); + } + } + + postThrCorpRequest.setDatas(exportData); + postThrCorpRequest.setGenKey(genKey); + postThrCorpRequest.setThirdSys(thrCorpExportRequest.getThirdSys()); + postThrCorpRequest.setUploadType("接口上传"); + String response = httpOkClient.uCloudPost(getIpUrl() + "/spssync/thirdsys/corp/upload", postThrCorpRequest); + BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference() { + }); + if (baseResponse.getCode() == 20000) { + thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); + } else { + thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); + } + thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); + thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity); + } +} diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java index e2c661d76..907f208f5 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java @@ -10,6 +10,7 @@ import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.entity.system.SyncDataSetEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrProductsExportLogEntity; +import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.http.ErpBasicClient; import com.glxp.api.http.HttpOkClient; import com.glxp.api.req.thrsys.FilterThrProductsRequest; @@ -17,7 +18,6 @@ import com.glxp.api.req.thrsys.PostThrProductsRequest; import com.glxp.api.req.thrsys.ThrProductsExportRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrProductsResponse; -import com.glxp.api.service.basic.BasicThirdSysDetailService; import com.glxp.api.service.system.SyncDataSetService; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; @@ -25,7 +25,6 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -40,7 +39,7 @@ public class ThrProductsDlService { @Resource ThrProductsService thrProductsService; @Resource - BasicThirdSysDetailService basicThirdSysDetailService; + ThrSystemDetailService thrSystemDetailService; // @Resource // RedisUtil redisUtil; // @Resource @@ -315,15 +314,15 @@ public class ThrProductsDlService { } else {//一键导出 - BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", thrProductsExportRequest.getThirdSys()); - if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { + ThrSystemDetailEntity thrSystemDetailEntity = thrSystemDetailService.selectByKey("piQueryUrl", thrProductsExportRequest.getThirdSys()); + if (thrSystemDetailEntity == null || thrSystemDetailEntity.getValue() == null) { thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); thrProductsExportLogEntity.setRemark("产品信息接口未定义！"); thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); return; } - if (!basicThirdSysDetailEntity.getEnabled()) { + if (!thrSystemDetailEntity.getEnabled()) { thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); thrProductsExportLogEntity.setRemark("第三方系统产品信息接口服务未启用！"); thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); @@ -331,7 +330,7 @@ public class ThrProductsDlService { } List thrProductsResponses=new ArrayList<>(); - if (basicThirdSysDetailEntity.getFromType() == 0) { + if (thrSystemDetailEntity.getFromType() == 0) { FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); BeanUtils.copyProperties(thrProductsExportRequest, filterThrProductsRequest); List thrProductsEntities= exportThrProducts(filterThrProductsRequest); @@ -464,12 +463,12 @@ public class ThrProductsDlService { // } // public List exportThrProducts(FilterThrProductsRequest filterThrProductsRequest) { - BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", filterThrProductsRequest.getThirdSys()); + ThrSystemDetailEntity thrSystemDetailEntity = thrSystemDetailService.selectByKey("piQueryUrl", filterThrProductsRequest.getThirdSys()); int page = 1; int limit = 100; List thrProductsEntities = new ArrayList<>(); while (true) { - List datas = getThrProducrts(page, limit, basicThirdSysDetailEntity.getValue(), filterThrProductsRequest); + List datas = getThrProducrts(page, limit, thrSystemDetailEntity.getValue(), filterThrProductsRequest); if (datas != null && datas.size() >= limit) { thrProductsEntities.addAll(datas); page++; @@ -565,22 +564,22 @@ public class ThrProductsDlService { exportData.addAll(thrProductsEntities); } else {//一键导出 - BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", thrProductsExportRequest.getThirdSys()); - if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { + ThrSystemDetailEntity thrSystemDetailEntity = thrSystemDetailService.selectByKey("piQueryUrl", thrProductsExportRequest.getThirdSys()); + if (thrSystemDetailEntity == null || thrSystemDetailEntity.getValue() == null) { thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); thrProductsExportLogEntity.setRemark("产品信息接口未定义！"); thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); return; } - if (!basicThirdSysDetailEntity.getEnabled()) { + if (!thrSystemDetailEntity.getEnabled()) { thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); thrProductsExportLogEntity.setRemark("第三方系统产品信息接口服务未启用！"); thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); return; } - if (basicThirdSysDetailEntity.getFromType() == 0) { + if (thrSystemDetailEntity.getFromType() == 0) { FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); BeanUtils.copyProperties(thrProductsExportRequest, filterThrProductsRequest); List thrProductsEntities = exportThrProducts(filterThrProductsRequest); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java b/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java index 4359c9c35..e6e3a3d6a 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java @@ -3,6 +3,7 @@ package com.glxp.api.service.thrsys; import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -25,6 +26,13 @@ public interface ThrSystemService { * @return */ boolean selectThirdNameExists(String thirdId, String thirdName); + /** + * 根据第三方系统ID查询第三方系统名称 + * + * @param thirdId + * @return + */ + String selectThirdNameByThirdId(@Param("thirdId") String thirdId); int countThirdSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java new file mode 100644 index 000000000..8ef983c92 --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java @@ -0,0 +1,69 @@ +package com.glxp.api.service.thrsys.impl; + +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.thrsys.ThrCorpExportLogDao; +import com.glxp.api.entity.thrsys.FilterThrCorpExportLogRequest; +import com.glxp.api.entity.thrsys.ThrCorpExportLogEntity; +import com.glxp.api.service.thrsys.ThrCorpExportLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrCorpExportLogServiceImpl implements ThrCorpExportLogService { + @Resource + ThrCorpExportLogDao thrCorpExportLogDao; + + @Override + public ThrCorpExportLogEntity selectByGenKey(String genKey) { + FilterThrCorpExportLogRequest filterThrCorpExportLogRequest = new FilterThrCorpExportLogRequest(); + filterThrCorpExportLogRequest.setGenKey(genKey); + List data = thrCorpExportLogDao.filterThrCorpExportLog(filterThrCorpExportLogRequest); + if (data != null && data.size() > 0) { + return data.get(0); + } + return null; + } + + @Override + public List filterThrCorpExportLog(FilterThrCorpExportLogRequest filterThrCorpExportLogRequest) { + if (filterThrCorpExportLogRequest == null) { + return Collections.emptyList(); + } + if (filterThrCorpExportLogRequest.getPage() != null) { + int offset = (filterThrCorpExportLogRequest.getPage() - 1) * filterThrCorpExportLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterThrCorpExportLogRequest.getLimit()); + } + List data = thrCorpExportLogDao.filterThrCorpExportLog(filterThrCorpExportLogRequest); + return data; + } + + @Override + public boolean insertThrCorpExportLog(ThrCorpExportLogEntity thrCorpExportLogEntity) { + return thrCorpExportLogDao.insertThrCorpExportLog(thrCorpExportLogEntity); + } + + @Override + public boolean updateThrCorpExportLog(ThrCorpExportLogEntity thrCorpExportLogEntity) { + return thrCorpExportLogDao.updateThrCorpExportLog(thrCorpExportLogEntity); + } + + @Override + public boolean deleteById(String id) { + //删除日志同步删除文件 + String filePath = thrCorpExportLogDao.selectFilePathById(id); + if (StrUtil.isNotBlank(filePath)) { + FileUtil.del(filePath); + } + return thrCorpExportLogDao.deleteById(id); + } + + @Override + public boolean deleteByTime() { + return thrCorpExportLogDao.deleteByTime(); + } +} diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java new file mode 100644 index 000000000..2239aedc6 --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java @@ -0,0 +1,62 @@ +package com.glxp.api.service.thrsys.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.thrsys.ThrCorpImportDetailDao; +import com.glxp.api.entity.thrsys.ThrCorpImportDetailEntity; +import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; +import com.glxp.api.service.thrsys.ThrCorpImportDetailService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrCorpImportDetailServiceImpl implements ThrCorpImportDetailService { + + @Resource + ThrCorpImportDetailDao thrCorpImportDetailDao; + + @Override + public List filterCorpDetailImport(FilterThrCorpImportLogRequest filterThrCorpImportLogRequest) { + if (filterThrCorpImportLogRequest == null) { + return Collections.emptyList(); + } + if (filterThrCorpImportLogRequest.getPage() != null) { + int offset = (filterThrCorpImportLogRequest.getPage() - 1) * filterThrCorpImportLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterThrCorpImportLogRequest.getLimit()); + } + List data = thrCorpImportDetailDao.filterCorpDetailImport(filterThrCorpImportLogRequest); + return data; + } + + @Override + public boolean insertCorpDetailImport(ThrCorpImportDetailEntity thrCorpImportDetailEntity) { + return thrCorpImportDetailDao.insertCorpDetailImport(thrCorpImportDetailEntity); + } + + @Override + public boolean updateCorpDetailImport(ThrCorpImportDetailEntity thrCorpImportDetailEntity) { + return thrCorpImportDetailDao.updateCorpDetailImport(thrCorpImportDetailEntity); + } + + @Override + public boolean insertCorpDetailImports(List thrCorpImportDetailEntities) { + return thrCorpImportDetailDao.insertCorpDetailImports(thrCorpImportDetailEntities); + } + + @Override + public boolean deleteById(String id) { + return thrCorpImportDetailDao.deleteById(id); + } + + @Override + public boolean deleteByGenkey(String genKey) { + return thrCorpImportDetailDao.deleteByGenkey(genKey); + } + + @Override + public boolean deleteByTime() { + return thrCorpImportDetailDao.deleteByTime(); + } +} diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportLogServiceImpl.java new file mode 100644 index 000000000..de2a6c2d9 --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportLogServiceImpl.java @@ -0,0 +1,64 @@ +package com.glxp.api.service.thrsys.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.thrsys.ThrCorpImportLogDao; +import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity; +import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; +import com.glxp.api.service.thrsys.ThrCorpImportLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrCorpImportLogServiceImpl implements ThrCorpImportLogService { + @Resource + ThrCorpImportLogDao thrCorpImportLogDao; + + @Override + public ThrCorpImportLogEntity selectByGenKey(String genKey) { + FilterThrCorpImportLogRequest filterUdiIpLogRequest = new FilterThrCorpImportLogRequest(); + filterUdiIpLogRequest.setGenKey(genKey); + List data = thrCorpImportLogDao.filterThrCorpImportLog(filterUdiIpLogRequest); + if (data != null && data.size() > 0) { + return data.get(0); + } + return null; + } + + @Override + public List filterThrCorpImportLog(FilterThrCorpImportLogRequest filterThrCorpImportLogRequest) { + if (filterThrCorpImportLogRequest == null) { + return Collections.emptyList(); + } + if (filterThrCorpImportLogRequest.getPage() != null) { + int offset = (filterThrCorpImportLogRequest.getPage() - 1) * filterThrCorpImportLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterThrCorpImportLogRequest.getLimit()); + } + List data = thrCorpImportLogDao.filterThrCorpImportLog(filterThrCorpImportLogRequest); + return data; + + } + + @Override + public boolean insertImportLog(ThrCorpImportLogEntity thrCorpImportLogEntity) { + return thrCorpImportLogDao.insertImportLog(thrCorpImportLogEntity); + } + + @Override + public boolean updateImportLog(ThrCorpImportLogEntity thrCorpImportLogEntity) { + return thrCorpImportLogDao.updateImportLog(thrCorpImportLogEntity); + } + + @Override + public boolean deleteById(String id) { + return thrCorpImportLogDao.deleteById(id); + } + + @Override + public boolean deleteByTime() { + return thrCorpImportLogDao.deleteByTime(); + } + +} diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java new file mode 100644 index 000000000..18fb5ee9e --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java @@ -0,0 +1,90 @@ +package com.glxp.api.service.thrsys.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.thrsys.ThrCorpDao; +import com.glxp.api.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.entity.thrsys.ThrCorpEntity; +import com.glxp.api.req.thrsys.FilterThrCorpRequest; +import com.glxp.api.req.thrsys.ThrUnitMaintainFilterRequest; +import com.glxp.api.res.thrsys.ThrCorpsResponse; +import com.glxp.api.service.thrsys.ThrCorpService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrCorpServiceImpl implements ThrCorpService { + + @Resource + private ThrCorpDao thrCorpDao; + + @Override + public List filterThrCorps(FilterThrCorpRequest filterThrCorpRequest) { + if (filterThrCorpRequest == null) { + return Collections.emptyList(); + } + if (filterThrCorpRequest.getPage() != null) { + int offset = (filterThrCorpRequest.getPage() - 1) * filterThrCorpRequest.getLimit(); + PageHelper.offsetPage(offset, filterThrCorpRequest.getLimit()); + } + List data = thrCorpDao.filterThrCorps(filterThrCorpRequest); + return data; + } + + @Override + public boolean insertThrCorps(ThrCorpEntity thrCorpEntity) { + return thrCorpDao.insertThrCorps(thrCorpEntity); + } + + @Override + public boolean insertThrCorpss(List thrCorpEntitys) { + return thrCorpDao.insertThrCorpss(thrCorpEntitys); + } + + @Override + public boolean updateThrCorps(ThrCorpEntity thrCorpEntity) { + return thrCorpDao.updateThrCorps(thrCorpEntity); + } + + @Override + public boolean deleteById(String id) { + return thrCorpDao.deleteById(id); + } + + @Override + public boolean deleteByUnitId(String id) { + return thrCorpDao.deleteByUnitId(id); + } + + @Override + public boolean deleteAll() { + return thrCorpDao.deleteAll(); + } + @Override + public BasicUnitMaintainEntity selectByThirdId(String thirdId, String thirdSys) { + + + ThrUnitMaintainFilterRequest filterUdiInfoRequest = new ThrUnitMaintainFilterRequest(); + if ("thirdId".equals(thirdSys)) { + filterUdiInfoRequest.setThirdId(thirdId); + } else if ("thirdId1".equals(thirdSys)) { + filterUdiInfoRequest.setThirdId1(thirdId); + } else if ("thirdId2".equals(thirdSys)) { + filterUdiInfoRequest.setThirdId2(thirdId); + } else if ("thirdId3".equals(thirdSys)) { + filterUdiInfoRequest.setThirdId3(thirdId); + } else if ("thirdId4".equals(thirdSys)) { + filterUdiInfoRequest.setThirdId4(thirdId); + } + return thrCorpDao.selectByThirdId(filterUdiInfoRequest); + } + + @Override + public BasicThirdSysDetailEntity selectByKey(String key, String thirdSys) { + return thrCorpDao.selectByKey(key,thirdSys); + } + +} diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java index b60968e90..9026f4105 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java @@ -2,16 +2,14 @@ package com.glxp.api.service.thrsys.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.basic.BasicThirdSysDao; -import com.glxp.api.dao.basic.BasicThirdSysDetailDao; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.dao.thrsys.ThrProductsDao; +import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.res.thrsys.ThrProductsResponse; import com.glxp.api.service.thrsys.ThrProductsService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.service.thrsys.ThrSystemService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -33,7 +31,7 @@ public class ThrProductsServiceImpl implements ThrProductsService { ThrProductsDao thrProductsDao; @Resource - BasicThirdSysDao basicThirdSysDao; + ThrSystemService thrSystemService; @Override public List filterThrProductsRequest(FilterThrProductsRequest filterThrProductsRequest) { @@ -49,7 +47,7 @@ public class ThrProductsServiceImpl implements ThrProductsService { if (CollUtil.isNotEmpty(data)) { for (ThrProductsResponse thrProductsResponse : data) { if (StrUtil.isNotBlank(thrProductsResponse.getThirdSysFk())) { - String thirdName = basicThirdSysDao.selectThirdNameByThirdId(thrProductsResponse.getThirdSysFk()); + String thirdName = thrSystemService.selectThirdNameByThirdId(thrProductsResponse.getThirdSysFk()); thrProductsResponse.setThirdSysName(thirdName); } } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java index 5d07c5e85..099e6cfc7 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java @@ -86,6 +86,11 @@ public class ThrSystemServiceImpl implements ThrSystemService { return false; } + @Override + public String selectThirdNameByThirdId(String thirdId) { + return thrSystemDao.selectThirdNameByThirdId(thirdId); + } + @Override public int countThirdSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest) { return thrSystemDao.countThirdSys(filterBasicThirdSysRequest); diff --git a/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml b/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml deleted file mode 100644 index 22f3475dc..000000000 --- a/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/basic/BasicThirdSysDetailDao.xml b/src/main/resources/mybatis/mapper/basic/BasicThirdSysDetailDao.xml deleted file mode 100644 index 7cb4e1f05..000000000 --- a/src/main/resources/mybatis/mapper/basic/BasicThirdSysDetailDao.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml new file mode 100644 index 000000000..db8a17c50 --- /dev/null +++ b/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml @@ -0,0 +1,157 @@ + + + + + + + + + + replace + INTO thr_corp + ( + unitId,name,spell,addr,creditNo, + contact,mobile,thirdSysFk,updateTime + ) + values + ( + #{unitId}, + #{name}, + #{spell}, + #{addr}, + #{creditNo}, + #{contact}, + #{mobile}, + #{thirdSysFk}, + #{updateTime} + ) + + + + replace INTO thr_corp + ( + unitId,name,spell,addr,creditNo, + contact,mobile,thirdSysFk,updateTime + ) + values + + + ( + #{item.unitId}, + #{item.name}, + #{item.spell}, + #{item.addr}, + #{item.creditNo}, + #{item.contact}, + #{item.mobile}, + #{item.thirdSysFk},#{item.updateTime} + ) + + + + + DELETE + FROM thr_corp + WHERE id = #{id} + + + + DELETE + FROM thr_corp + WHERE unitId = #{unitId} + + + + DELETE + FROM thr_corp + + + UPDATE thr_corp + + unitId=#{unitId}, + name=#{name}, + spell=#{spell}, + addr=#{addr}, + creditNo=#{creditNo}, + contact=#{contact}, + mobile=#{mobile}, + thirdSysFk=#{thirdSysFk}, + updateTime=#{updateTime}, + + + WHERE id = #{id} + + + + replace + into thr_corp (unitId, spell, addr, creditNo, contact, mobile, thirdSysFk, name, updateTime) + values ( + #{unitId}, + #{spell}, + #{addr}, + #{creditNo}, + #{contact}, + #{mobile}, + #{thirdSysFk}, + #{name}, + #{updateTime} + ) + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml new file mode 100644 index 000000000..5714d0804 --- /dev/null +++ b/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + insert INTO thr_corp_export_log + (genKey,updateTime,dlCount,status,filePath,remark,`type`) + values + ( + #{genKey}, + #{updateTime}, + #{dlCount},#{status},#{filePath},#{remark},#{type} + ) + + + + + DELETE FROM thr_corp_export_log WHERE id = #{id} + + + + UPDATE thr_corp_export_log + + updateTime=#{updateTime}, + dlCount=#{dlCount}, + status=#{status}, + filePath=#{filePath}, + remark=#{remark}, + + WHERE genKey = #{genKey} + + + + Delete From thr_corp_export_log + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportDetailDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportDetailDao.xml new file mode 100644 index 000000000..082585b14 --- /dev/null +++ b/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportDetailDao.xml @@ -0,0 +1,97 @@ + + + + + + + + + + insert INTO thr_corp_import_detail + ( + unitId,name,spell,addr,creditNo, + contact,mobile,thirdSysFk,updateTime ,genKeyFk + ) + values + ( + #{unitId}, + #{name}, + #{spell}, + #{addr}, + #{creditNo}, + #{contact}, + #{mobile}, + #{thirdSysFk}, + #{updateTime}, + #{genKeyFk} + ) + + + + insert INTO thr_corp_import_detail + ( + unitId,name,spell,addr,creditNo, + contact,mobile,thirdSysFk ,updateTime ,genKeyFk ) + values + + ( + #{item.unitId}, + #{item.name}, + #{item.spell}, + #{item.addr}, + #{item.creditNo}, + #{item.contact}, + #{item.mobile}, + #{item.thirdSysFk} ,#{item.updateTime},#{item.genKeyFk} ) + + + + DELETE FROM thr_corp_import_detail WHERE id = #{id} + + + DELETE FROM thr_corp_import_detail WHERE genKeyFk = #{genKey} + + + + UPDATE thr_corp_import_detail + + unitId=#{unitId}, + name=#{name}, + spell=#{spell}, + addr=#{addr}, + creditNo=#{creditNo}, + contact=#{contact}, + mobile=#{mobile}, + thirdSysFk=#{thirdSysFk}, + updateTime=#{updateTime}, + genKeyFk=#{genKeyFk}, + + WHERE id = #{id} + + + + Delete From thr_corp_import_detail + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml new file mode 100644 index 000000000..dc674c03f --- /dev/null +++ b/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml @@ -0,0 +1,63 @@ + + + + + + + + + + insert INTO thr_corp_import_log + (genKey,fromType,updateTime,thirdSysFk,status) + values + ( + #{genKey}, + #{fromType}, + #{updateTime}, + #{thirdSysFk},#{status} + ) + + + + + DELETE FROM thr_corp_import_log WHERE id = #{id} + + + + UPDATE thr_corp_import_log + + genKey=#{genKey}, + fromType=#{fromType}, + updateTime=#{updateTime}, + thirdSysFk=#{thirdSysFk}, + status=#{status}, + remark=#{remark}, + + WHERE genKey = #{genKey} + + + + Delete From thr_corp_import_log + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + + \ No newline at end of file