From a25f2c8e57c42c9bac0b1ddaa23719dbf78a536e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Thu, 12 Jan 2023 11:32:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thrsys/ThrProductsController.java | 4 +- .../ThrProductsExportLogController.java | 206 ++++++ .../ThrProductsImportLogController.java | 84 +++ .../dao/basic/ThrProductsExportLogDao.java | 7 - .../dao/basic/ThrProductsImportDetailDao.java | 7 - .../dao/thrsys/ThrProductsExportLogDao.java | 31 + .../thrsys/ThrProductsImportDetailDao.java | 30 + .../dao/thrsys/ThrProductsImportLogDao.java | 22 + .../thrsys/ThrProductsImportLogEntity.java | 72 +++ .../com/glxp/api/http/ErpBasicClient.java | 3 + .../FilterThrProductsExportLogRequest.java | 19 + .../FilterThrProductsImportLogRequest.java | 16 + .../req/thrsys/PostThrProductsRequest.java | 27 + .../req/thrsys/ThrProductsExportRequest.java | 15 + .../service/thrsys/ThrProductsDlService.java | 602 ++++++++++++++++++ .../thrsys/ThrProductsExportLogService.java | 24 + .../ThrProductsImportDetailService.java | 26 + .../thrsys/ThrProductsImportLogService.java | 23 + .../impl/ThrProductsExportLogServiceImpl.java | 70 ++ .../ThrProductsImportDetailServiceImpl.java | 62 ++ .../impl/ThrProductsImportLogServiceImpl.java | 62 ++ .../mapper/thrsys/ThrProductsExportLogDao.xml | 89 ++- .../thrsys/ThrProductsImportDetailDao.xml | 148 +++-- .../mapper/thrsys/ThrProductsImportLogDao.xml | 68 ++ 24 files changed, 1639 insertions(+), 78 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java create mode 100644 src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java delete mode 100644 src/main/java/com/glxp/api/dao/basic/ThrProductsExportLogDao.java delete mode 100644 src/main/java/com/glxp/api/dao/basic/ThrProductsImportDetailDao.java create mode 100644 src/main/java/com/glxp/api/dao/thrsys/ThrProductsExportLogDao.java create mode 100644 src/main/java/com/glxp/api/dao/thrsys/ThrProductsImportDetailDao.java create mode 100644 src/main/java/com/glxp/api/dao/thrsys/ThrProductsImportLogDao.java create mode 100644 src/main/java/com/glxp/api/entity/thrsys/ThrProductsImportLogEntity.java create mode 100644 src/main/java/com/glxp/api/req/thrsys/FilterThrProductsExportLogRequest.java create mode 100644 src/main/java/com/glxp/api/req/thrsys/FilterThrProductsImportLogRequest.java create mode 100644 src/main/java/com/glxp/api/req/thrsys/PostThrProductsRequest.java create mode 100644 src/main/java/com/glxp/api/req/thrsys/ThrProductsExportRequest.java create mode 100644 src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java create mode 100644 src/main/java/com/glxp/api/service/thrsys/ThrProductsExportLogService.java create mode 100644 src/main/java/com/glxp/api/service/thrsys/ThrProductsImportDetailService.java create mode 100644 src/main/java/com/glxp/api/service/thrsys/ThrProductsImportLogService.java create mode 100644 src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsExportLogServiceImpl.java create mode 100644 src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java create mode 100644 src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java create mode 100644 src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml 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 4f868a43..72856f8d 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java @@ -173,8 +173,8 @@ public class ThrProductsController { if (null == thrProductsEntity) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - thrProductsEntity.setUpdateUser(customerService.getUserName()); - thrProductsEntity.setCreateUser(customerService.getUserName()); + thrProductsEntity.setUpdateUser(String.valueOf(customerService.getUserId())); + thrProductsEntity.setCreateUser(String.valueOf(customerService.getUserId())); thrProductsEntity.setUpdateTime(new Date()); thrProductsEntity.setCreateTime(new Date()); thrProductsService.insertThrProducts(thrProductsEntity); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java new file mode 100644 index 00000000..0f897c0f --- /dev/null +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java @@ -0,0 +1,206 @@ +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.ThrProductsEntity; +import com.glxp.api.entity.thrsys.ThrProductsExportLogEntity; +import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.req.thrsys.FilterThrProductsExportLogRequest; +import com.glxp.api.req.thrsys.FilterThrProductsRequest; +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.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; + +@RestController +public class ThrProductsExportLogController { + + @Resource + ThrProductsExportLogService thrProductsExportLogService; + @Resource + ThrProductsService thrProductsService; + @Resource + ThrProductsDlService thrProductsDlService; + @Resource + BasicThirdSysDetailService basicThirdSysDetailService; + @Resource + private CustomerService customerService; + + + @GetMapping("/udiwms/thrProducts/exportLog/filter") + public BaseResponse filter(FilterThrProductsExportLogRequest filterThrProductsExportLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrProductsExportLogEntities = thrProductsExportLogService.filterThrProductsExportLog(filterThrProductsExportLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrProductsExportLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrProductsExportLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udiwms/thrProducts/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(); + thrProductsExportLogService.deleteById(id + ""); + return ResultVOUtils.success("删除成功"); + } + + //产品信息excel文件下载 + @GetMapping("/udiwms/thrProducts/exportLog/download") + public void download(FilterThrProductsExportLogRequest filterThrProductsExportLogRequest, HttpServletResponse res) { + + List thrProductsExportLogEntities = thrProductsExportLogService.filterThrProductsExportLog(filterThrProductsExportLogRequest); + ThrProductsExportLogEntity thrProductsExportLogEntity = thrProductsExportLogEntities.get(0); + try { + String filePath = thrProductsExportLogEntity.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 (thrProductsExportLogEntity.getDlCount() == 0) { + thrProductsExportLogEntity.setDlCount(1); + } else { + thrProductsExportLogEntity.setDlCount(thrProductsExportLogEntity.getDlCount() + 1); + } + thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); + } catch (Exception ex) { + System.out.println("下载失败！"); + } + + + } + + //产品信息导出生成Excel，并创建生成记录 + @PostMapping("/udiwms/thrProducts/importLog/export") + public BaseResponse excelDownload(@RequestBody ThrProductsExportRequest thrProductsExportRequest) { + ThrProductsExportLogEntity thrProductsExportLogEntity = new ThrProductsExportLogEntity(); + thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); + String genKey = CustomUtil.getId(); + String fileName = "D:\\udiwms\\exportFile\\" + "第三方产品信息" + genKey + ".udi"; + File file = new File(fileName); + if (!file.exists()) { + try { + file.createNewFile(); + } catch (IOException e) { + e.printStackTrace(); + } + } + thrProductsExportLogEntity.setGenKey(genKey); + thrProductsExportLogEntity.setFilePath(fileName); + thrProductsExportLogEntity.setUpdateTime(new Date()); + thrProductsExportLogEntity.setDlCount(0); + thrProductsExportLogEntity.setType(BasicProcessStatus.EXPORT_JSON); + thrProductsExportLogEntity.setUpdateUser(String.valueOf(customerService.getUserId())); + thrProductsExportLogEntity.setCreateUser(String.valueOf(customerService.getUserId())); + thrProductsExportLogEntity.setUpdateTime(new Date()); + thrProductsExportLogEntity.setCreateTime(new Date()); + thrProductsExportLogService.insertThrProductsExportLog(thrProductsExportLogEntity); + //thrProductsDlService.genExcel(genKey, thrProductsExportRequest); + //修改为导出json文件 + thrProductsDlService.genJsonFile(genKey, thrProductsExportRequest); + + return ResultVOUtils.success("后台正在导出生成udi文件，请稍后刷新查看!"); + } + + + //产品信息上传供应商管理平台，并创建生成记录 + @PostMapping("/udiwms/thrProducts/importLog/uploadSmp") + public BaseResponse uploadSmp(@RequestBody ThrProductsExportRequest thrProductsExportRequest) { + + ThrProductsExportLogEntity thrProductsExportLogEntity = new ThrProductsExportLogEntity(); + thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); + String genKey = CustomUtil.getId(); + thrProductsExportLogEntity.setGenKey(genKey); + thrProductsExportLogEntity.setUpdateTime(new Date()); + thrProductsExportLogEntity.setDlCount(0); + thrProductsExportLogEntity.setType(BasicProcessStatus.EXPORT_SMP); + thrProductsExportLogEntity.setUpdateUser(String.valueOf(customerService.getUserId())); + thrProductsExportLogEntity.setCreateUser(String.valueOf(customerService.getUserId())); + thrProductsExportLogEntity.setUpdateTime(new Date()); + thrProductsExportLogEntity.setCreateTime(new Date()); + thrProductsExportLogService.insertThrProductsExportLog(thrProductsExportLogEntity); + thrProductsDlService.uploadSpssync(genKey, thrProductsExportRequest); + return ResultVOUtils.success("后台正在上传，请稍后刷新查看!"); + + } + + //第三方产品信息接口下载（第三方使用） + @GetMapping("/udiwms/thrsys/thrProducts/download") + public BaseResponse getErpProducts(FilterThrProductsRequest filterThrProductsRequest, + BindingResult bindingResult) { + + 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) + return ResultVOUtils.error(500, "ERP产品信息接口地址未定义"); + if (basicThirdSysDetailEntity.getEnabled()) { + if (basicThirdSysDetailEntity.getFromType() == 0) { + ErpBasicClient erpBasicHttpClient = new ErpBasicClient(); + BaseResponse> udiDlDeviceResponse = erpBasicHttpClient.getErpProducts(filterThrProductsRequest); + if (udiDlDeviceResponse.getCode() == 20000) { + return udiDlDeviceResponse; + } + return ResultVOUtils.error(500, "未查询到产品信息"); + } else { + FilterThrProductsRequest filterThrProductsRequest1 = new FilterThrProductsRequest(); + BeanUtils.copyProperties(filterThrProductsRequest, filterThrProductsRequest1); + List thrCorpEntities = thrProductsService.filterThrProductsRequest(filterThrProductsRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrCorpEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrCorpEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + } else { + return ResultVOUtils.error(500, "第三方系统产品信息接口服务未启用"); + } + } +} diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java new file mode 100644 index 00000000..a5a0c9b5 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java @@ -0,0 +1,84 @@ +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.ThrProductsImportLogEntity; +import com.glxp.api.entity.thrsys.ThrProductsImportDetailEntity; +import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.req.thrsys.FilterThrProductsImportLogRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.thrsys.ThrProductsImportDetailService; +import com.glxp.api.service.thrsys.ThrProductsImportLogService; +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 ThrProductsImportLogController { + + @Resource + ThrProductsImportLogService thrProductsImportLogService; + @Resource + ThrProductsImportDetailService thrProductsImportDetailService; + @Resource + private CustomerService customerService; + + @GetMapping("/udiwms/thrProducts/importLog/filter") + public BaseResponse filter(FilterThrProductsImportLogRequest filterThrProductsImportLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrProductsImportLogEntities = thrProductsImportLogService.filterThrPorductsImportLog(filterThrProductsImportLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrProductsImportLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrProductsImportLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/udiwms/thrProducts/importLog/filterDetail") + public BaseResponse filterDetail(FilterThrProductsImportLogRequest filterThrProductsImportLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrProductsImportDetailEntities = thrProductsImportDetailService.filterProductsDetailImport(filterThrProductsImportLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrProductsImportDetailEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrProductsImportDetailEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udiwms/thrProducts//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(); + FilterThrProductsImportLogRequest filterThrProductsImportLogRequest = new FilterThrProductsImportLogRequest(); + filterThrProductsImportLogRequest.setId(Integer.parseInt(id)); + List thrProductsImportLogEntities = thrProductsImportLogService.filterThrPorductsImportLog(filterThrProductsImportLogRequest); + if (thrProductsImportLogEntities != null && thrProductsImportLogEntities.size() > 0) { + ThrProductsImportLogEntity thrInvProductsImportLogEntity = thrProductsImportLogEntities.get(0); + thrProductsImportLogService.deleteById(thrInvProductsImportLogEntity.getId() + ""); + thrProductsImportDetailService.deleteByGenkey(thrInvProductsImportLogEntity.getGenKey()); + } + + return ResultVOUtils.success("删除成功"); + } +} diff --git a/src/main/java/com/glxp/api/dao/basic/ThrProductsExportLogDao.java b/src/main/java/com/glxp/api/dao/basic/ThrProductsExportLogDao.java deleted file mode 100644 index b6d87f56..00000000 --- a/src/main/java/com/glxp/api/dao/basic/ThrProductsExportLogDao.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.glxp.api.dao.basic; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.thrsys.ThrProductsExportLogEntity; - -public interface ThrProductsExportLogDao extends BaseMapper { -} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/basic/ThrProductsImportDetailDao.java b/src/main/java/com/glxp/api/dao/basic/ThrProductsImportDetailDao.java deleted file mode 100644 index dddda527..00000000 --- a/src/main/java/com/glxp/api/dao/basic/ThrProductsImportDetailDao.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.glxp.api.dao.basic; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.thrsys.ThrProductsImportDetailEntity; - -public interface ThrProductsImportDetailDao extends BaseMapper { -} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrProductsExportLogDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsExportLogDao.java new file mode 100644 index 00000000..047061e5 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsExportLogDao.java @@ -0,0 +1,31 @@ +package com.glxp.api.dao.thrsys; + + +import com.glxp.api.entity.thrsys.ThrProductsExportLogEntity; +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 ThrProductsExportLogDao { + + List filterThrProductsExportLog(FilterThrProductsExportLogRequest filterThrProductsExportLogRequest); + + boolean insertThrProductsExportLog(ThrProductsExportLogEntity thrProductsExportLogEntity); + + boolean updateThrProductsExportLog(ThrProductsExportLogEntity thrProductsExportLogEntity); + + boolean deleteById(@Param("id") String id); + + /** + * 查询文件路径 + * + * @param id + * @return + */ + String selectFilePathById(@Param("id") String id); + + boolean deleteByTime(); +} diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrProductsImportDetailDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsImportDetailDao.java new file mode 100644 index 00000000..ede1f8d6 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsImportDetailDao.java @@ -0,0 +1,30 @@ +package com.glxp.api.dao.thrsys; + + +import com.glxp.api.entity.thrsys.ThrProductsImportDetailEntity; +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 ThrProductsImportDetailDao { + + + List filterProductsDetailImport(FilterThrProductsImportLogRequest filterThrProductsImportLogRequest); + + boolean insertProductsDetailImport(ThrProductsImportDetailEntity thrOrderImportDetailEntity); + + boolean updateProductsDetailImport(ThrProductsImportDetailEntity thrOrderImportDetailEntity); + + boolean insertProductsDetailImports(@Param("products") List thrOrderImportDetailEntities); + + boolean deleteById(@Param("id") String id); + + + boolean deleteByTime(); + + boolean deleteByGenkey(@Param("genKey") String genKey); + +} diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrProductsImportLogDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsImportLogDao.java new file mode 100644 index 00000000..45ea90e8 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsImportLogDao.java @@ -0,0 +1,22 @@ +package com.glxp.api.dao.thrsys; + + +import com.glxp.api.entity.thrsys.ThrProductsImportLogEntity; +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 ThrProductsImportLogDao { + List filterThrPorductsImportLog(FilterThrProductsImportLogRequest filterThrProductsImportLogRequest); + + boolean insertImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity); + + boolean updateImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity); + + boolean deleteById(@Param("id") String id); + + boolean deleteByTime(); +} diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsImportLogEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsImportLogEntity.java new file mode 100644 index 00000000..5ea6693b --- /dev/null +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsImportLogEntity.java @@ -0,0 +1,72 @@ +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; + +/** + *

+ * + *

+ * + * @author lfh + * @since 2023-01-12 + */ +@Data +public class ThrProductsImportLogEntity { + + 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 LocalDateTime createTime; + + /** + * 更新人 + */ + @TableField("updateUser") + private String updateUser; + + /** + * 更新时间 + */ + @TableField("updateTime") + private LocalDateTime 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 077096f6..8b8a0e3c 100644 --- a/src/main/java/com/glxp/api/http/ErpBasicClient.java +++ b/src/main/java/com/glxp/api/http/ErpBasicClient.java @@ -59,6 +59,9 @@ public class ErpBasicClient { try { String response = httpOkClient.uCloudPost(url, filterThrProductsRequest, basicThirdSysEntity); + if(StrUtil.isBlank(response)){ + return ResultVOUtils.error(500, "连接第三方系统接口服务出错！"); + } BaseResponse> udiDlDeviceResponse = JSONObject.parseObject(response, new TypeReference>>() { }); diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsExportLogRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsExportLogRequest.java new file mode 100644 index 00000000..211b7085 --- /dev/null +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsExportLogRequest.java @@ -0,0 +1,19 @@ +package com.glxp.api.req.thrsys; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.glxp.api.req.ListPageRequest; +import lombok.Data; + +import java.util.Date; + +@Data +public class FilterThrProductsExportLogRequest extends ListPageRequest { + + + private String genKey; + private Integer status; + private Integer type; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsImportLogRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsImportLogRequest.java new file mode 100644 index 00000000..d09a0be8 --- /dev/null +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsImportLogRequest.java @@ -0,0 +1,16 @@ +package com.glxp.api.req.thrsys; + +import com.glxp.api.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterThrProductsImportLogRequest extends ListPageRequest { + + + private Integer id; + private String genKey; + private Integer status; + private String thirdSysFk; + private String fromType; + private String lastUpdateTime; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/req/thrsys/PostThrProductsRequest.java b/src/main/java/com/glxp/api/req/thrsys/PostThrProductsRequest.java new file mode 100644 index 00000000..ed46f0ad --- /dev/null +++ b/src/main/java/com/glxp/api/req/thrsys/PostThrProductsRequest.java @@ -0,0 +1,27 @@ +package com.glxp.api.req.thrsys; + + +import com.glxp.api.res.thrsys.ThrProductsResponse; +import lombok.Data; + +import java.util.List; + +@Data +public class PostThrProductsRequest { + + private String genKey; + private String thirdSys; + private String uploadType; + List datas; + + //添加字段 + private String model; //型号 + private String standard; //规格型号，二合一字段 + private String qtbm; //其他编码 + private String zczyxqz; //注册有效期截止时间 + private String remark; //备注 + private String remark1; //备注1 + private String remark2; //备注2 + private String remark3; //备注3 + +} diff --git a/src/main/java/com/glxp/api/req/thrsys/ThrProductsExportRequest.java b/src/main/java/com/glxp/api/req/thrsys/ThrProductsExportRequest.java new file mode 100644 index 00000000..bbb6248d --- /dev/null +++ b/src/main/java/com/glxp/api/req/thrsys/ThrProductsExportRequest.java @@ -0,0 +1,15 @@ +package com.glxp.api.req.thrsys; + +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class ThrProductsExportRequest { + private List thrProductsEntities; + private String code; + private String name; + private String thirdSys; + private String thirdSysFk; +} diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java new file mode 100644 index 00000000..e2c661d7 --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java @@ -0,0 +1,602 @@ +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.constant.BasicProcessStatus; +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.http.ErpBasicClient; +import com.glxp.api.http.HttpOkClient; +import com.glxp.api.req.thrsys.FilterThrProductsRequest; +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; +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 ThrProductsDlService { + + @Resource + HttpOkClient httpOkClient; + @Resource + SyncDataSetService syncDataSetService; + + @Resource + ThrProductsService thrProductsService; + @Resource + BasicThirdSysDetailService basicThirdSysDetailService; +// @Resource +// RedisUtil redisUtil; +// @Resource +// ThrProductsImportLogService thrProductsImportLogService; +// @Resource +// ThrProductsImportDetailService thrProductsImportDetailService; + @Resource + ThrProductsExportLogService thrProductsExportLogService; + + @Resource + private ErpBasicClient erpBasicClient; +// @Resource +// private BasicThirdSysService basicThirdSysService; +// @Resource +// private UdiRelevanceService udiRelevanceService; +// @Resource +// private UdiContrastService udiContrastService; +// +// @Async +// public void importSelectProducrs(String genKey, List thrProductsEntities, String thirdSys) { +// ThrProductsImportLogEntity thrProductsImportLogEntity = thrProductsImportLogService.selectByGenKey(genKey); +// if (thrProductsEntities != null && thrProductsEntities.size() > 0) { +// List thrProductsImportDetailEntities; +// thrProductsImportDetailEntities = thrProductsEntities.stream().map( +// item -> { +// ThrProductsImportDetailEntity thrProductsImportDetailEntity = new ThrProductsImportDetailEntity(); +// BeanUtils.copyProperties(item, thrProductsImportDetailEntity); +// thrProductsImportDetailEntity.setSpec(item.getStandard()); +// thrProductsImportDetailEntity.setThirdSysFk(thirdSys); +// thrProductsImportDetailEntity.setGenKeyFk(thrProductsImportLogEntity.getGenKey()); +// return thrProductsImportDetailEntity; +// } +// ).collect(Collectors.toList()); +// thrProductsImportDetailService.insertProductsDetailImports(thrProductsImportDetailEntities); +// FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); +// filterUdiIpLogRequest.setGenKey(genKey); +// List thrProductsImportDetailEntities1 = +// thrProductsImportDetailService.filterProductsDetailImport(filterUdiIpLogRequest); +// List thrProductsEntities1 = thrProductsImportDetailEntities1.stream().map( +// item -> { +// ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); +// BeanUtils.copyProperties(item, thrProductsEntity); +// thrProductsEntity.setUpdateTime(new Date()); +//// thrProductsService.insertOrUpdateSelective(thrProductsEntity); +// return thrProductsEntity; +// } +// ).collect(Collectors.toList()); +// thrProductsService.insertThrProductss(thrProductsEntities1); +// +// redisUtil.set(Constant.dlThrProducts, "false"); +// thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); +// thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); +// WebSocketServer.sendInfo("产品信息下载已完成，请刷新查看！", "sid"); +// } +// } +// +// //主动下载产品信息 +// @Async +// public void importProducrs(String genKey, FilterThrProductsRequest filterThrProductsRequest) { +// ThrProductsImportLogEntity thrProductsImportLogEntity = thrProductsImportLogService.selectByGenKey(genKey); +// BasicThirdSysDetailEntity piDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", filterThrProductsRequest.getThirdSysFk()); +// if (piDetailEntity == null || piDetailEntity.getValue() == null) { +// thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); +// thrProductsImportLogEntity.setRemark("产品信息接口未设置"); +// thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); +// WebSocketServer.sendInfo("产品信息接口未设置！", "sid"); +// return; +// } +// +// int page = 1; +// int limit = 50; +// while (page != -1) { +// FilterErpGoodsRequest filterErpGoodsRequest = new FilterErpGoodsRequest(); +// BeanUtils.copyProperties(filterThrProductsRequest, filterErpGoodsRequest); +// page = getInvmandoc(thrProductsImportLogEntity, page, limit, piDetailEntity.getValue(), filterErpGoodsRequest.getThirdSys(), filterErpGoodsRequest); +// } +// FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); +// filterUdiIpLogRequest.setGenKey(genKey); +// List thrProductsImportDetailEntities = +// thrProductsImportDetailService.filterProductsDetailImport(filterUdiIpLogRequest); +// List thrProductsEntities = thrProductsImportDetailEntities.stream().map( +// item -> { +// ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); +// BeanUtils.copyProperties(item, thrProductsEntity); +// thrProductsEntity.setUpdateTime(new Date()); +// return thrProductsEntity; +// } +// ).collect(Collectors.toList()); +// +// List> splitList = CustomUtil.splitList(thrProductsEntities, 100); +// for (List data : splitList) { +// thrProductsService.insertThrProductss(data); +// } +//// BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); +//// if (filterThrProductsRequest.getThirdSysFk().equals(basicThirdSysEntity.getThirdId())) { +//// for (ThrProductsEntity thrProductsEntity : thrProductsEntities) { +//// UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByMainIdLimitOne(thrProductsEntity.getCode()); +//// if (udiRelevanceEntity == null) { +//// udiContrastService.createOnlyMainId(thrProductsEntity.getCode()); +//// } +//// } +//// } +// redisUtil.set(Constant.dlThrProducts, "false"); +// thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); +// thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); +// WebSocketServer.sendInfo("产品信息下载已完成，请刷新查看！", "sid"); +// } +// +// //导出生成Excel文件 +// @Async +// public void genExcel(String genKey, ThrProductsExportRequest thrProductsExportRequest) { +// +// ThrProductsExportLogEntity thrProductsExportLogEntity = thrProductsExportLogService.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 (thrProductsExportRequest.getThrProductsEntities() != null && thrProductsExportRequest.getThrProductsEntities().size() > 0) { +// List thrProductsEntities = thrProductsExportRequest.getThrProductsEntities(); +// excelData.addAll(getRows(thrProductsEntities)); +// +// } else {//一键导出 +// +// BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", thrProductsExportRequest.getThirdSys()); +// if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { +// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); +// thrProductsExportLogEntity.setRemark("产品信息接口未定义！"); +// thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); +// return; +// } +// +// if (!basicThirdSysDetailEntity.getEnabled()) { +// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); +// thrProductsExportLogEntity.setRemark("第三方系统产品信息接口服务未启用！"); +// thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); +// return; +// } +// +// if (basicThirdSysDetailEntity.getFromType() == 0) { +// FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); +// BeanUtils.copyProperties(thrProductsExportRequest, filterThrProductsRequest); +// List thrProductsEntities = exportThrProducts(filterThrProductsRequest); +// excelData.addAll(getRows(thrProductsEntities)); +// +// } else { +// FilterThrProductsRequest filterThrInvProductsRequest = new FilterThrProductsRequest(); +// BeanUtils.copyProperties(thrProductsExportRequest, filterThrInvProductsRequest); +// List> genDatas = genExcelData(null, filterThrInvProductsRequest); +// if (genDatas != null && genDatas.size() > 0) { +// excelData.addAll(genDatas); +// } +// } +// } +// String sheetName = "产品信息"; +// new ExcelUtil().exportExcel(excelData, sheetName, thrProductsExportLogEntity.getFilePath(), 20); +// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); +// thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); +// +// } +// +// //上传SMP +// @Async +// public void uploadSmp(String genKey, ThrProductsExportRequest thrProductsExportRequest) { +// +// PostThrProductsRequest postThrProductsRequest = new PostThrProductsRequest(); +// List datas = new ArrayList<>(); +// ThrProductsExportLogEntity thrProductsExportLogEntity = thrProductsExportLogService.selectByGenKey(genKey); +// +// //选中导出 +// if (thrProductsExportRequest.getThrProductsEntities() != null && thrProductsExportRequest.getThrProductsEntities().size() > 0) { +// List thrProductsEntities = thrProductsExportRequest.getThrProductsEntities(); +// List lists = thrProductsEntities.stream().map( +// item -> { +// ErpProductsResponse thrProductsEntity = new ErpProductsResponse(); +// BeanUtils.copyProperties(item, thrProductsEntity); +// return thrProductsEntity; +// } +// ).collect(Collectors.toList()); +// datas.addAll(lists); +// postThrProductsRequest.setDatas(datas); +// postThrProductsRequest.setGenKey(genKey); +// postThrProductsRequest.setThirdSys(thrProductsExportRequest.getThirdSys()); +// postThrProductsRequest.setUploadType("接口上传"); +// +// +// } else {//一键导出 +// +// BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", thrProductsExportRequest.getThirdSys()); +// if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { +// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); +// thrProductsExportLogEntity.setRemark("产品信息接口未定义！"); +// thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); +// return; +// } +// +// if (!basicThirdSysDetailEntity.getEnabled()) { +// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); +// thrProductsExportLogEntity.setRemark("第三方系统产品信息接口服务未启用！"); +// thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); +// return; +// } +// List thrProductsEntities; +// if (basicThirdSysDetailEntity.getFromType() == 0) { +// FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); +// BeanUtils.copyProperties(thrProductsExportRequest, filterThrProductsRequest); +// thrProductsEntities = exportThrProducts(filterThrProductsRequest); +// } else { +// FilterThrProductsRequest filterThrInvProductsRequest = new FilterThrProductsRequest(); +// thrProductsEntities = thrProductsService.filterThrProductsRequest(filterThrInvProductsRequest); +// } +// if (thrProductsEntities != null) { +// List lists = thrProductsEntities.stream().map( +// item -> { +// ErpProductsResponse thrProductsEntity = new ErpProductsResponse(); +// BeanUtils.copyProperties(item, thrProductsEntity); +// return thrProductsEntity; +// } +// ).collect(Collectors.toList()); +// datas.addAll(lists); +// postThrProductsRequest.setDatas(datas); +// postThrProductsRequest.setGenKey(genKey); +// postThrProductsRequest.setThirdSys(thrProductsExportRequest.getThirdSys()); +// postThrProductsRequest.setUploadType("接口上传"); +// } +// +// +// } +// String response = httpOkClient.uCloudPost(getIpUrl() + "/udiwms/thrsys/postThrProducts", postThrProductsRequest); +// BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference() { +// }); +// if (baseResponse.getCode() == 20000) { +// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); +// } else { +// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); +// } +// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); +// thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); +// } +// +// + //上传SMP + @Async + public void uploadSpssync(String genKey, ThrProductsExportRequest thrProductsExportRequest) { + + PostThrProductsRequest postThrProductsRequest = new PostThrProductsRequest(); + List datas = new ArrayList<>(); + ThrProductsExportLogEntity thrProductsExportLogEntity = thrProductsExportLogService.selectByGenKey(genKey); + + //选中导出 + if (thrProductsExportRequest.getThrProductsEntities() != null && thrProductsExportRequest.getThrProductsEntities().size() > 0) { + List thrProductsEntities = thrProductsExportRequest.getThrProductsEntities(); + List lists = thrProductsEntities.stream().map( + item -> { + ThrProductsResponse thrProductsEntity = new ThrProductsResponse(); + BeanUtils.copyProperties(item, thrProductsEntity); + return thrProductsEntity; + } + ).collect(Collectors.toList()); + datas.addAll(lists); + postThrProductsRequest.setDatas(datas); + postThrProductsRequest.setGenKey(genKey); + postThrProductsRequest.setThirdSys(thrProductsExportRequest.getThirdSys()); + postThrProductsRequest.setUploadType("接口上传"); + + + } else {//一键导出 + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", thrProductsExportRequest.getThirdSys()); + if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { + thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); + thrProductsExportLogEntity.setRemark("产品信息接口未定义！"); + thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); + return; + } + + if (!basicThirdSysDetailEntity.getEnabled()) { + thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); + thrProductsExportLogEntity.setRemark("第三方系统产品信息接口服务未启用！"); + thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); + return; + } + + List thrProductsResponses=new ArrayList<>(); + if (basicThirdSysDetailEntity.getFromType() == 0) { + FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); + BeanUtils.copyProperties(thrProductsExportRequest, filterThrProductsRequest); + List thrProductsEntities= exportThrProducts(filterThrProductsRequest); + if(thrProductsEntities.size()>0){ + thrProductsResponses = thrProductsEntities.stream().map( + item -> { + ThrProductsResponse thrProductsResponse = new ThrProductsResponse(); + BeanUtils.copyProperties(item, thrProductsResponse); + return thrProductsResponse; + } + ).collect(Collectors.toList()); + } + } else { + FilterThrProductsRequest filterThrInvProductsRequest = new FilterThrProductsRequest(); + thrProductsResponses = thrProductsService.filterThrProductsRequest(filterThrInvProductsRequest); + } + if (thrProductsResponses.size()>0) { + List lists = thrProductsResponses.stream().map( + item -> { + ThrProductsResponse thrProductsEntity = new ThrProductsResponse(); + BeanUtils.copyProperties(item, thrProductsEntity); + return thrProductsEntity; + } + ).collect(Collectors.toList()); + datas.addAll(lists); + postThrProductsRequest.setDatas(datas); + postThrProductsRequest.setGenKey(genKey); + postThrProductsRequest.setThirdSys(thrProductsExportRequest.getThirdSys()); + postThrProductsRequest.setUploadType("接口上传"); + } + + + } + + String response = httpOkClient.uCloudPost(getIpUrl() + "/spssync/thirdsys/products/upload", postThrProductsRequest); + BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference() { + }); + if (baseResponse.getCode() == 20000) { + thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); + } else { + thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); + } + thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); + } + + public String getIpUrl() { + SyncDataSetEntity syncDataSetEntity = syncDataSetService.findSet(); + return syncDataSetEntity.getSyncIp(); + } +// +// // //接收第三方上传或文件导入数据 +// @Async +// public void insertData(String genKey, List erpProductsResponses, String thirdSys) { +// ThrProductsImportLogEntity thrProductsImportLogEntity = thrProductsImportLogService.selectByGenKey(genKey); +// if (erpProductsResponses != null && erpProductsResponses.size() > 0) { +// List thrProductsImportDetailEntities; +// thrProductsImportDetailEntities = erpProductsResponses.stream().map( +// item -> { +// ThrProductsImportDetailEntity thrProductsImportDetailEntity = new ThrProductsImportDetailEntity(); +// BeanUtils.copyProperties(item, thrProductsImportDetailEntity); +// thrProductsImportDetailEntity.setThirdSysFk(thirdSys); +// thrProductsImportDetailEntity.setGenKeyFk(genKey); +// return thrProductsImportDetailEntity; +// } +// ).collect(Collectors.toList()); +// +// List> splitList = CustomUtil.splitList(thrProductsImportDetailEntities, 100); +// for (List data : splitList) { +// thrProductsImportDetailService.insertProductsDetailImports(data); +// } +// List thrProductsEntities; +// thrProductsEntities = thrProductsImportDetailEntities.stream().map( +// item -> { +// ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); +// BeanUtils.copyProperties(item, thrProductsEntity); +// thrProductsEntity.setUpdateTime(new Date()); +// thrProductsService.insertOrUpdateSelective(thrProductsEntity); +// return thrProductsEntity; +// } +// ).collect(Collectors.toList()); +// List> products = CustomUtil.splitList(thrProductsEntities, 100); +//// for (List data : products) { +//// thrProductsService.insertThrProductss(data); +//// } +// thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); +// thrProductsImportLogEntity.setUpdateTime(new Date()); +// thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); +// } else { +// thrProductsImportLogEntity.setRemark("未选择产品信息"); +// thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); +// thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); +// } +// } +// +// public int getInvmandoc(ThrProductsImportLogEntity thrProductsImportLogEntity, int page, int limit, String +// productUrl, String thirdSys, FilterErpGoodsRequest filterErpGoodsRequest) { +// +// filterErpGoodsRequest.setPage(page); +// filterErpGoodsRequest.setLimit(limit); +// BaseResponse> erpProducts = erpBasicClient.getErpProducts(filterErpGoodsRequest); +// if (erpProducts != null && erpProducts.getCode() == 20000) { +// List erpProductsResponses = erpProducts.getData().getList(); +// if (erpProductsResponses != null && erpProductsResponses.size() > 0) { +// List thrProductsImportDetailEntities; +// thrProductsImportDetailEntities = erpProductsResponses.stream().map( +// item -> { +// ThrProductsImportDetailEntity thrProductsImportDetailEntity = new ThrProductsImportDetailEntity(); +// BeanUtils.copyProperties(item, thrProductsImportDetailEntity); +// thrProductsImportDetailEntity.setSpec(item.getStandard()); +// thrProductsImportDetailEntity.setThirdSysFk(thirdSys); +// thrProductsImportDetailEntity.setGenKeyFk(thrProductsImportLogEntity.getGenKey()); +// return thrProductsImportDetailEntity; +// } +// ).collect(Collectors.toList()); +// thrProductsImportDetailService.insertProductsDetailImports(thrProductsImportDetailEntities); +// page++; +// return page; +//// if (page * limit < erpProducts.getData().getTotal()) { +//// return page; +//// } +// } else { +// return -1; +// } +// } else { +// thrProductsImportLogEntity.setRemark(erpProducts.getMessage()); +// thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); +// thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); +// return -1; +// } +// } +// + public List exportThrProducts(FilterThrProductsRequest filterThrProductsRequest) { + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", filterThrProductsRequest.getThirdSys()); + int page = 1; + int limit = 100; + List thrProductsEntities = new ArrayList<>(); + while (true) { + List datas = getThrProducrts(page, limit, basicThirdSysDetailEntity.getValue(), filterThrProductsRequest); + if (datas != null && datas.size() >= limit) { + thrProductsEntities.addAll(datas); + page++; + + } else { + if (datas != null) { + thrProductsEntities.addAll(datas); + } + break; + } + + } + return thrProductsEntities; + } + + public List getThrProducrts(int page, int limit, String productUrl, FilterThrProductsRequest filterThrProductsRequest) { + + + filterThrProductsRequest.setPage(page); + filterThrProductsRequest.setLimit(limit); + BaseResponse> erpProducts = erpBasicClient.getErpProducts(filterThrProductsRequest); + if (erpProducts != null && erpProducts.getCode() == 20000) { + List erpProductsResponses = erpProducts.getData().getList(); + if (erpProductsResponses != null && erpProductsResponses.size() > 0) { + List thrProductsEntities = erpProductsResponses.stream().map( + item -> { + ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); + BeanUtils.copyProperties(item, thrProductsEntity); + return thrProductsEntity; + } + ).collect(Collectors.toList()); + return thrProductsEntities; + } + } + + return null; + } + +// public List> genExcelData(String id, FilterThrProductsRequest filterThrProductsRequest) { +// +// List> excelData = new ArrayList<>(); +// List thrProductsEntities = new ArrayList<>(); +// if (id != null) { +// ThrProductsEntity thrProductsEntity = thrProductsService.selectById(id); +// thrProductsEntities.add(thrProductsEntity); +// } else { +// thrProductsEntities = thrProductsService.filterThrProductsRequest(filterThrProductsRequest); +// } +// excelData.addAll(getRows(thrProductsEntities)); +// return excelData; +// } +// + public List genJsonData(String id, FilterThrProductsRequest filterThrProductsRequest) { + List jsonData = new ArrayList<>(); + if (id != null) { + ThrProductsEntity thrProductsEntity = thrProductsService.selectById(id); + ThrProductsResponse thrProductsResponse=new ThrProductsResponse(); + BeanUtils.copyProperties(thrProductsEntity, thrProductsResponse); + jsonData.add(thrProductsResponse); + } else { + jsonData = thrProductsService.filterThrProductsRequest(filterThrProductsRequest); + } + return jsonData; + } +// +// public List> getRows(List thrProductsEntities) { +// List> excelData = new ArrayList<>(); +// for (ThrProductsEntity thrProductsEntity : thrProductsEntities) { +// List rows = new ArrayList<>(); +// rows.add(thrProductsEntity.getCode()); +// rows.add(thrProductsEntity.getName()); +// rows.add(thrProductsEntity.getMeasname() + ""); +// rows.add(thrProductsEntity.getSpec()); +// rows.add(thrProductsEntity.getRegisterNo()); +// rows.add(thrProductsEntity.getManufactory()); +// rows.add(thrProductsEntity.getSupName()); +// excelData.add(rows); +// } +// return excelData; +// } +// +// + //导出json文件 + @Async + public void genJsonFile(String genKey, ThrProductsExportRequest thrProductsExportRequest) { + + ThrProductsExportLogEntity thrProductsExportLogEntity = thrProductsExportLogService.selectByGenKey(genKey); + + List exportData = new ArrayList<>(); + //选中导出 + if (thrProductsExportRequest.getThrProductsEntities() != null && thrProductsExportRequest.getThrProductsEntities().size() > 0) { + List thrProductsEntities = thrProductsExportRequest.getThrProductsEntities(); + exportData.addAll(thrProductsEntities); + } else {//一键导出 + + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", thrProductsExportRequest.getThirdSys()); + if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { + thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); + thrProductsExportLogEntity.setRemark("产品信息接口未定义！"); + thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); + return; + } + + if (!basicThirdSysDetailEntity.getEnabled()) { + thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); + thrProductsExportLogEntity.setRemark("第三方系统产品信息接口服务未启用！"); + thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); + return; + } + + if (basicThirdSysDetailEntity.getFromType() == 0) { + FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); + BeanUtils.copyProperties(thrProductsExportRequest, filterThrProductsRequest); + List thrProductsEntities = exportThrProducts(filterThrProductsRequest); + exportData.addAll(thrProductsEntities); + + } else { + List exportData1 = new ArrayList<>(); + FilterThrProductsRequest filterThrInvProductsRequest = new FilterThrProductsRequest(); + BeanUtils.copyProperties(thrProductsExportRequest, filterThrInvProductsRequest); + List jsonData = genJsonData(null, filterThrInvProductsRequest); + exportData1.addAll(jsonData); + } + } + FileWriter writer = new FileWriter(thrProductsExportLogEntity.getFilePath()); + writer.write(JSONUtil.toJsonStr(exportData)); + thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); + thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); + } +} diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsExportLogService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsExportLogService.java new file mode 100644 index 00000000..cb1a693c --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsExportLogService.java @@ -0,0 +1,24 @@ +package com.glxp.api.service.thrsys; + + + +import com.glxp.api.entity.thrsys.ThrProductsExportLogEntity; +import com.glxp.api.req.thrsys.FilterThrProductsExportLogRequest; + +import java.util.List; + +public interface ThrProductsExportLogService { + + ThrProductsExportLogEntity selectByGenKey(String genKey); + + List filterThrProductsExportLog(FilterThrProductsExportLogRequest filterThrProductsExportLogRequest); + + boolean insertThrProductsExportLog(ThrProductsExportLogEntity thrProductsExportLogEntity); + + boolean updateThrProductsExportLog(ThrProductsExportLogEntity thrProductsExportLogEntity); + + boolean deleteById(String id); + + boolean deleteByTime(); + +} diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportDetailService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportDetailService.java new file mode 100644 index 00000000..5e2e2e2b --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportDetailService.java @@ -0,0 +1,26 @@ +package com.glxp.api.service.thrsys; + + + +import com.glxp.api.entity.thrsys.ThrProductsImportDetailEntity; +import com.glxp.api.req.thrsys.FilterThrProductsImportLogRequest; + +import java.util.List; + +public interface ThrProductsImportDetailService { + + List filterProductsDetailImport(FilterThrProductsImportLogRequest filterThrProductsImportLogRequest); + + boolean insertProductsDetailImport(ThrProductsImportDetailEntity thrOrderImportDetailEntity); + + boolean updateProductsDetailImport(ThrProductsImportDetailEntity thrOrderImportDetailEntity); + + boolean insertProductsDetailImports(List thrOrderImportDetailEntities); + + boolean deleteById(String id); + + boolean deleteByTime(); + + boolean deleteByGenkey(String genKey); + +} diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportLogService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportLogService.java new file mode 100644 index 00000000..e1c48235 --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportLogService.java @@ -0,0 +1,23 @@ +package com.glxp.api.service.thrsys; + + + +import com.glxp.api.entity.thrsys.ThrProductsImportLogEntity; +import com.glxp.api.req.thrsys.FilterThrProductsImportLogRequest; + +import java.util.List; + +public interface ThrProductsImportLogService { + + List filterThrPorductsImportLog(FilterThrProductsImportLogRequest filterInCodeLogRequest); + + boolean insertImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity); + + boolean updateImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity); +// + boolean deleteById(String id); + + boolean deleteByTime(); +// +// ThrProductsImportLogEntity selectByGenKey(String genKey); +} diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsExportLogServiceImpl.java new file mode 100644 index 00000000..ea03fe81 --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsExportLogServiceImpl.java @@ -0,0 +1,70 @@ +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.ThrProductsExportLogDao; +import com.glxp.api.entity.thrsys.ThrProductsExportLogEntity; +import com.glxp.api.req.thrsys.FilterThrProductsExportLogRequest; +import com.glxp.api.service.thrsys.ThrProductsExportLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrProductsExportLogServiceImpl implements ThrProductsExportLogService { + @Resource + ThrProductsExportLogDao thrProductsExportLogDao; + + + @Override + public ThrProductsExportLogEntity selectByGenKey(String genKey) { + FilterThrProductsExportLogRequest filterThrProductsExportLogRequest = new FilterThrProductsExportLogRequest(); + filterThrProductsExportLogRequest.setGenKey(genKey); + List data = thrProductsExportLogDao.filterThrProductsExportLog(filterThrProductsExportLogRequest); + if (data != null) { + return data.get(0); + } + return null; + } + + @Override + public List filterThrProductsExportLog(FilterThrProductsExportLogRequest filterThrProductsExportLogRequest) { + if (filterThrProductsExportLogRequest == null) { + return Collections.emptyList(); + } + if (filterThrProductsExportLogRequest.getPage() != null) { + int offset = (filterThrProductsExportLogRequest.getPage() - 1) * filterThrProductsExportLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterThrProductsExportLogRequest.getLimit()); + } + List data = thrProductsExportLogDao.filterThrProductsExportLog(filterThrProductsExportLogRequest); + return data; + } + + @Override + public boolean insertThrProductsExportLog(ThrProductsExportLogEntity thrProductsExportLogEntity) { + return thrProductsExportLogDao.insertThrProductsExportLog(thrProductsExportLogEntity); + } + + @Override + public boolean updateThrProductsExportLog(ThrProductsExportLogEntity thrProductsExportLogEntity) { + return thrProductsExportLogDao.updateThrProductsExportLog(thrProductsExportLogEntity); + } + + @Override + public boolean deleteById(String id) { + //删除日志同步删除文件 + String filePath = thrProductsExportLogDao.selectFilePathById(id); + if (StrUtil.isNotBlank(filePath)) { + FileUtil.del(filePath); + } + return thrProductsExportLogDao.deleteById(id); + } + + @Override + public boolean deleteByTime() { + return thrProductsExportLogDao.deleteByTime(); + } +} diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java new file mode 100644 index 00000000..98e0798b --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java @@ -0,0 +1,62 @@ +package com.glxp.api.service.thrsys.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.thrsys.ThrProductsImportDetailDao; +import com.glxp.api.entity.thrsys.ThrProductsImportDetailEntity; +import com.glxp.api.req.thrsys.FilterThrProductsImportLogRequest; +import com.glxp.api.service.thrsys.ThrProductsImportDetailService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrProductsImportDetailServiceImpl implements ThrProductsImportDetailService { + + @Resource + ThrProductsImportDetailDao thrProductsImportDetailDao; + + @Override + public List filterProductsDetailImport(FilterThrProductsImportLogRequest filterThrProductsImportLogRequest) { + if (filterThrProductsImportLogRequest == null) { + return Collections.emptyList(); + } + if (filterThrProductsImportLogRequest.getPage() != null) { + int offset = (filterThrProductsImportLogRequest.getPage() - 1) * filterThrProductsImportLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterThrProductsImportLogRequest.getLimit()); + } + List data = thrProductsImportDetailDao.filterProductsDetailImport(filterThrProductsImportLogRequest); + return data; + } + + @Override + public boolean insertProductsDetailImport(ThrProductsImportDetailEntity thrOrderImportDetailEntity) { + return thrProductsImportDetailDao.insertProductsDetailImport(thrOrderImportDetailEntity); + } + + @Override + public boolean updateProductsDetailImport(ThrProductsImportDetailEntity thrOrderImportDetailEntity) { + return thrProductsImportDetailDao.updateProductsDetailImport(thrOrderImportDetailEntity); + } + + @Override + public boolean insertProductsDetailImports(List thrOrderImportDetailEntities) { + return thrProductsImportDetailDao.insertProductsDetailImports(thrOrderImportDetailEntities); + } + + @Override + public boolean deleteById(String id) { + return thrProductsImportDetailDao.deleteById(id); + } + + @Override + public boolean deleteByTime() { + return thrProductsImportDetailDao.deleteByTime(); + } + + @Override + public boolean deleteByGenkey(String genKey) { + return thrProductsImportDetailDao.deleteByGenkey(genKey); + } +} diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java new file mode 100644 index 00000000..34bff64e --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java @@ -0,0 +1,62 @@ +package com.glxp.api.service.thrsys.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.thrsys.ThrProductsImportLogDao; +import com.glxp.api.entity.thrsys.ThrProductsImportLogEntity; +import com.glxp.api.req.thrsys.FilterThrProductsImportLogRequest; +import com.glxp.api.service.thrsys.ThrProductsImportLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrProductsImportLogServiceImpl implements ThrProductsImportLogService { + @Resource + ThrProductsImportLogDao thrProductsImportLogDao; + + @Override + public List filterThrPorductsImportLog(FilterThrProductsImportLogRequest filterThrProductsImportLogRequest) { + if (filterThrProductsImportLogRequest == null) { + return Collections.emptyList(); + } + if (filterThrProductsImportLogRequest.getPage() != null) { + int offset = (filterThrProductsImportLogRequest.getPage() - 1) * filterThrProductsImportLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterThrProductsImportLogRequest.getLimit()); + } + List data = thrProductsImportLogDao.filterThrPorductsImportLog(filterThrProductsImportLogRequest); + return data; + } + + @Override + public boolean insertImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity) { + return thrProductsImportLogDao.insertImportLog(thrProductsImportLogEntity); + } + + @Override + public boolean updateImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity) { + return thrProductsImportLogDao.updateImportLog(thrProductsImportLogEntity); + } + + @Override + public boolean deleteById(String id) { + return thrProductsImportLogDao.deleteById(id); + } + + @Override + public boolean deleteByTime() { + return thrProductsImportLogDao.deleteByTime(); + } +// +// @Override +// public ThrProductsImportLogEntity selectByGenKey(String genKey) { +// FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); +// filterUdiIpLogRequest.setGenKey(genKey); +// List data = thrProductsImportLogDao.filterImportLog(filterUdiIpLogRequest); +// if (data != null && data.size() > 0) { +// return data.get(0); +// } +// return null; +// } +} diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsExportLogDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsExportLogDao.xml index 54e78eef..ad8c644a 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsExportLogDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsExportLogDao.xml @@ -1,24 +1,67 @@ - - - - - - - - - - - - - - - - - - - - - id, genKey, `status`, dlCount, filePath, `type`, `createUser`, createTime, updateUser, - updateTime, remark - + + + + + + + + + + + insert INTO thr_products_export_log + (genKey,updateTime,dlCount,status,filePath,remark,`type`,createUser,createTime,updateUser) + values + ( + #{genKey}, + #{updateTime}, + #{dlCount},#{status},#{filePath},#{remark},#{type},#{createUser}, + #{createTime}, + #{updateUser} + ) + + + + + DELETE FROM thr_products_export_log WHERE id = #{id} + + + + UPDATE thr_products_export_log + + updateTime=#{updateTime}, + dlCount=#{dlCount}, + status=#{status}, + filePath=#{filePath}, + remark=#{remark}, + createUser=#{createUser}, + createTime=#{createTime}, + updateUser=#{updateUser}, + + WHERE genKey = #{genKey} + + + + + Delete From thr_products_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/ThrProductsImportDetailDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml index aadb0397..532dd155 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml @@ -1,40 +1,110 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, code, `name`, measname, spec, registerNo, manufactory, thirdSysFk, cplb, flbm, - qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms, updateTime, - genKeyFk, supName, price, `createUser`, createTime, updateUser, remark - + + + + + + + + + + insert INTO thr_products_import_detail + (code, name, measname, spec, registerNo, manufactory, + cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms, + thirdSysFk, updateTime, genKeyFk, supName, price) + values (#{code}, + #{name}, + #{measname}, + #{spec}, + #{registerNo}, + #{manufactory}, + #{cplb}, #{flbm}, #{qxlb}, #{ybbm}, #{sptm}, + #{tyshxydm}, #{zczbhhzbapzbh}, #{ylqxzcrbarmc}, #{ylqxzcrbarywmc}, #{cpms} + #{thirdSysFk}, #{updateTime}, #{genKeyFk}, #{supName}, #{price}) + + + + insert INTO thr_products_import_detail + ( + code,name,measname,spec,registerNo,manufactory, + cplb,flbm,qxlb,ybbm,sptm,tyshxydm,zczbhhzbapzbh,ylqxzcrbarmc,ylqxzcrbarywmc,cpms, + thirdSysFk ,updateTime ,genKeyFk,supName,price ) + values + + ( + #{item.code}, + #{item.name}, + #{item.measname}, + #{item.spec}, + #{item.registerNo}, + #{item.manufactory}, + #{item.cplb}, #{item.flbm}, #{item.qxlb}, #{item.ybbm},#{item.sptm}, + #{item.tyshxydm}, #{item.zczbhhzbapzbh}, #{item.ylqxzcrbarmc}, #{item.ylqxzcrbarywmc},#{item.cpms}, + #{item.thirdSysFk} ,#{item.updateTime},#{item.genKeyFk} ,#{item.supName} ,#{item.price} ) + + + + DELETE + FROM thr_products_import_detail + WHERE id = #{id} + + + DELETE + FROM thr_products_import_detail + WHERE genKeyFk = #{genKey} + + + + UPDATE thr_products_import_detail + + code=#{code}, + name=#{name}, + measname=#{measname}, + spec=#{spec}, + registerNo=#{registerNo}, + cplb=#{cplb}, + flbm=#{flbm}, + qxlb=#{qxlb}, + ybbm=#{ybbm}, + sptm=#{sptm}, + tyshxydm=#{tyshxydm}, + zczbhhzbapzbh=#{zczbhhzbapzbh}, + ylqxzcrbarmc=#{ylqxzcrbarmc}, + ylqxzcrbarywmc=#{ylqxzcrbarywmc}, + manufactory=#{manufactory}, + cpms=#{cpms}, + thirdSysFk=#{thirdSysFk}, + updateTime=#{updateTime}, + genKeyFk=#{genKeyFk}, + supName=#{supName}, + + + WHERE id = #{id} + + + + Delete From thr_products_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/ThrProductsImportLogDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml new file mode 100644 index 00000000..574d9e57 --- /dev/null +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml @@ -0,0 +1,68 @@ + + + + + + + + + + insert INTO thr_products_import_log + (genKey,fromType,updateTime,thirdSysFk,status,remark,createUser,createTime,updateUser) + values + ( + #{genKey}, + #{fromType}, + #{updateTime}, + #{thirdSysFk},#{status},#{remark},#{createUser}, + #{createTime}, + #{updateUser} + ) + + + + + DELETE FROM thr_products_import_log WHERE id = #{id} + + + + UPDATE thr_products_import_log + + genKey=#{genKey}, + fromType=#{fromType}, + updateTime=#{updateTime}, + thirdSysFk=#{thirdSysFk}, + status=#{status}, + remark=#{remark}, + createUser=#{createUser}, + createTime=#{createTime}, + updateUser=#{updateUser}, + + WHERE genKey = #{genKey} + + + + + Delete From thr_products_import_log + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + + \ No newline at end of file