From 7d6341a9c2a822ce654d933ae80790a9f14918a8 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 17 Apr 2023 16:18:05 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=AF=BC=E5=87=BAexcel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 15 + .../controller/inv/ApiExcelController.java | 100 +++++++ .../com/glxp/api/dao/inout/IoStatDayDao.java | 4 +- .../com/glxp/api/entity/inout/ExcelVO.java | 104 +++++++ .../idc/service/impl/ConnectServiceImpl.java | 6 +- .../api/idc/service/impl/IdcServiceImpl.java | 1 + .../com/glxp/api/req/inout/ExcelRequest.java | 14 + .../glxp/api/service/inout/ExcelService.java | 63 ++++ .../api/service/inout/IoStatDayService.java | 2 + .../service/inout/impl/ExcelServiceImpl.java | 223 ++++++++++++++ .../inout/impl/IoStatDayServiceImpl.java | 5 + .../com/glxp/api/util/Excel/ExcelHandler.java | 274 ++++++++++++++++++ .../api/util/Excel/ExcelTemplateEnum.java | 66 +++++ .../util/Excel/Exception/RenException.java | 56 ++++ .../api/util/Excel/UploadDataListener.java | 61 ++++ .../mybatis/mapper/inout/IoStatDayDao.xml | 8 +- 16 files changed, 997 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/inv/ApiExcelController.java create mode 100644 src/main/java/com/glxp/api/entity/inout/ExcelVO.java create mode 100644 src/main/java/com/glxp/api/req/inout/ExcelRequest.java create mode 100644 src/main/java/com/glxp/api/service/inout/ExcelService.java create mode 100644 src/main/java/com/glxp/api/service/inout/impl/ExcelServiceImpl.java create mode 100644 src/main/java/com/glxp/api/util/Excel/ExcelHandler.java create mode 100644 src/main/java/com/glxp/api/util/Excel/ExcelTemplateEnum.java create mode 100644 src/main/java/com/glxp/api/util/Excel/Exception/RenException.java create mode 100644 src/main/java/com/glxp/api/util/Excel/UploadDataListener.java diff --git a/pom.xml b/pom.xml index 1d0809fb1..e06eef846 100644 --- a/pom.xml +++ b/pom.xml @@ -294,6 +294,21 @@ iTextAsian 3.0 + + + com.alibaba + easyexcel + 2.2.10 + + + + + hu.blackbelt.bundles.swagger-parser + io.swagger.parser + 1.0.47_1 + + + diff --git a/src/main/java/com/glxp/api/controller/inv/ApiExcelController.java b/src/main/java/com/glxp/api/controller/inv/ApiExcelController.java new file mode 100644 index 000000000..27c0b980c --- /dev/null +++ b/src/main/java/com/glxp/api/controller/inv/ApiExcelController.java @@ -0,0 +1,100 @@ +package com.glxp.api.controller.inv; + +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.entity.inout.IoStatDayEntity; +import com.glxp.api.req.inout.FilterStatDataDetailRequest; +import com.glxp.api.service.inout.ExcelService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * @author : zhangsan + * @date : 2023/4/17 11:14 + * @modyified By : + */ + +@RestController +@Api(tags = "文件接口") +public class ApiExcelController { + + @Resource + private ExcelService excelService; + + /** + * excel导入-单个sheet + * + * @param multipartFile 文件流 + * @return + * @throws Exception + */ + @PostMapping("/excelImport") + @ApiOperation(value = "excel导入") + public BaseResponse excelImport(@RequestParam("file") MultipartFile multipartFile){ + excelService.excelImport(multipartFile); + return new BaseResponse<>(); + } + + /** + * excel导出-单个sheet + * + * @param response 响应流 + */ + @GetMapping("/udiwms/inv/excelExportOut") + public void export(HttpServletResponse response,String billNo) { + excelService.excelExport(response,billNo); + } + + /** + * excel导入-多个sheet + * + * @param multipartFile 文件流 + * @return 响应体 + */ + @PostMapping("/excelSheetImport") + @ApiOperation(value = "excel导入-多个sheet") + public BaseResponse excelSheetImport(@RequestParam("file") MultipartFile multipartFile){ + excelService.excelSheetImport(multipartFile); + return new BaseResponse<>(); + } + + /** + * excel导出-多个sheet + * + * @param response 响应流 + */ + @ApiOperation(value = "excel导出-多个sheet", httpMethod = "GET") + @GetMapping("/excelSheetExport") + public void excelSheetExport(HttpServletResponse response) { + excelService.excelSheetExport(response); + } + + /** + * excel模板导出-单个sheet + * + * @param response 响应流 + */ + @ApiOperation(value = "excel模板导出", httpMethod = "GET") + @GetMapping("/excelTemplate") + public void excelTemplate(HttpServletResponse response) { + + excelService.excelTemplate(response); + } + + /** + * excel模板导出-多个sheet + * + * @param response 响应流 + */ + @ApiOperation(value = "excel模板导出-多个sheet", httpMethod = "GET") + @GetMapping("/excelSheetTemplate") + public void excelSheetTemplate(HttpServletResponse response) throws Exception { + excelService.excelSheetTemplate(response); + } + +} diff --git a/src/main/java/com/glxp/api/dao/inout/IoStatDayDao.java b/src/main/java/com/glxp/api/dao/inout/IoStatDayDao.java index d03fbd7e0..6a272f80c 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoStatDayDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoStatDayDao.java @@ -18,4 +18,6 @@ public interface IoStatDayDao extends BaseMapper { * @return */ List filterList(FilterStatDataDetailRequest statDataDetailRequest); -} \ No newline at end of file + + List filterListByRecordKey(String recordKey); +} diff --git a/src/main/java/com/glxp/api/entity/inout/ExcelVO.java b/src/main/java/com/glxp/api/entity/inout/ExcelVO.java new file mode 100644 index 000000000..a6c28cfb1 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/inout/ExcelVO.java @@ -0,0 +1,104 @@ +package com.glxp.api.entity.inout; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author : zhangsan + * @date : 2023/4/17 11:11 + * @modyified By : + */ + +@Data +@ApiModel(value = "导出实体") +public class ExcelVO { + + @ColumnWidth(80) + @ExcelProperty("序号") + @ApiModelProperty(value = "序号") + private Integer id; + + @ColumnWidth(80) + @ExcelProperty("产品通用名") + @ApiModelProperty(value = "产品通用名") + private String productName; + + @ColumnWidth(80) + @ExcelProperty("规格型号") + @ApiModelProperty(value = "规格型号") + private String ggxh; + + @ColumnWidth(80) + @ExcelProperty("批次号") + @ApiModelProperty(value = "批次号") + private String batchNo; + + @ColumnWidth(80) + @ExcelProperty("数量") + @ApiModelProperty(value = "数量") + private Integer beginCount; + + @ColumnWidth(80) + @ExcelProperty("价格") + @ApiModelProperty(value = "价格") + private BigDecimal beginPrice; + + @ColumnWidth(80) + @ExcelProperty("金额") + @ApiModelProperty(value = "金额") + private BigDecimal beginAmount; + + @ColumnWidth(80) + @ExcelProperty("数量") + @ApiModelProperty(value = "数量") + private Integer inCount; + + @ColumnWidth(80) + @ExcelProperty("价格") + @ApiModelProperty(value = "价格") + private BigDecimal inPrice; + + @ColumnWidth(80) + @ExcelProperty("金额") + @ApiModelProperty(value = "金额") + private BigDecimal inAmount; + + @ColumnWidth(80) + @ExcelProperty("数量") + @ApiModelProperty(value = "数量") + private Integer outCount; + + @ColumnWidth(80) + @ExcelProperty("价格") + @ApiModelProperty(value = "价格") + private BigDecimal outPrice; + + @ColumnWidth(80) + @ExcelProperty("金额") + @ApiModelProperty(value = "金额") + private BigDecimal outAmount; + + @ColumnWidth(80) + @ExcelProperty("数量") + @ApiModelProperty(value = "数量") + private Integer balanceCount; + + @ColumnWidth(80) + @ExcelProperty("价格") + @ApiModelProperty(value = "价格") + private BigDecimal balancePrice; + + @ColumnWidth(80) + @ExcelProperty("金额") + @ApiModelProperty(value = "金额") + private BigDecimal balanceAmount; + + //无需导出字段使用此注解 + //@JsonSerialize(using = ToStringSerializer.class) + +} diff --git a/src/main/java/com/glxp/api/idc/service/impl/ConnectServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/ConnectServiceImpl.java index 6a599e4bf..f83aad1f6 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/ConnectServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/ConnectServiceImpl.java @@ -43,7 +43,7 @@ public class ConnectServiceImpl implements ConnectService { Map map = new HashMap(); map.put("level", level); Map config = new HashMap<>(); - try + try { if(level==0) { config = dbDao.get("select syncIp as paramValue from sync_data_set limit 1"); @@ -51,7 +51,7 @@ public class ConnectServiceImpl implements ConnectService { config = dbDao.get("select * from system_param_config where paramKey='upper_server_ip'"); } } catch (Exception ex) { - + } String msg = "UDI管理系统"; for(int i=1;i filterList(FilterStatDataDetailRequest statDataDetailRequest); + + List filterListByRecordKey(String recordKey); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/ExcelServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ExcelServiceImpl.java new file mode 100644 index 000000000..1615e631c --- /dev/null +++ b/src/main/java/com/glxp/api/service/inout/impl/ExcelServiceImpl.java @@ -0,0 +1,223 @@ +package com.glxp.api.service.inout.impl; + +/** + * @author : zhangsan + * @date : 2023/4/17 11:13 + * @modyified By : + */ + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.glxp.api.entity.inout.ExcelVO; +import com.glxp.api.entity.inout.IoStatDayEntity; +import com.glxp.api.req.inout.FilterStatDataDetailRequest; +import com.glxp.api.service.inout.ExcelService; +import com.glxp.api.service.inout.IoStatDayService; +import com.glxp.api.util.Excel.ExcelHandler; +import com.glxp.api.util.Excel.ExcelTemplateEnum; +import com.glxp.api.util.Excel.Exception.RenException; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.*; + +/** + * 导出业务实现 + */ +@Slf4j +@Service +public class ExcelServiceImpl implements ExcelService { + + @Resource + ExcelHandler excelHandler; + + @Resource + private IoStatDayService statDayService; + + /** + * excel导入-单个sheet + * + * @param multipartFile 文件流 + */ + @Override + public void excelImport(MultipartFile multipartFile) { + try { + List voList = excelHandler.importExcel(multipartFile, ExcelVO.class, null); + if (CollectionUtils.isNotEmpty(voList)) { + System.out.println("本次成功导出：" + voList.size() + "条,数据如下---------------"); + voList.forEach(vo -> { + System.out.println("vo=" + vo.toString()); + }); + + } + } catch (Exception e) { + throw new RenException("导入失败"); + } + } + + /** + * excel导出-单个sheet + * + * @param response 响应体 + */ + @Override + public void excelExport(HttpServletResponse response, String billNo) { + try { + List excelVOS = structureDate(billNo); + excelHandler.exportExcel(response, excelVOS, ExcelVO.class, "excel导出-单et", "excel导出heet"); + } catch (Exception e) { + throw new RenException("导出失败"); + } + } + + /** + * excel导入-多个sheet + * + * @param multipartFile 文件流 + */ + @Override + public void excelSheetImport(MultipartFile multipartFile) { + try { + List indexList = new ArrayList<>(); + indexList.add(0); + indexList.add(1); + indexList.add(2); + indexList.add(3); + indexList.add(4); + indexList.add(5); + List objList = new ArrayList<>(); + objList.add(new ExcelVO()); + objList.add(new ExcelVO()); + objList.add(new ExcelVO()); + objList.add(new ExcelVO()); + objList.add(new ExcelVO()); + objList.add(new ExcelVO()); + List> resultList = excelHandler.importExcelsByIndex(multipartFile, objList, 6, indexList); + System.out.println("resultList="+resultList.size()); + resultList.forEach(vo->{ + List voList = JSON.parseArray(JSON.toJSONString(vo), ExcelVO.class); + System.out.println("voList="+voList.size()+"条数据"); + }); + } catch (Exception e) { + throw new RenException("导入失败"); + } + } + + /** + * excel导出-多个sheet + * + * @param response 响应体 + */ + @Override + public void excelSheetExport(HttpServletResponse response) { +// try { +// //构建多集合集合 +// List> lists = new ArrayList<>(); +// lists.add(structureDate(10)); +// lists.add(structureDate(20)); +// lists.add(structureDate(30)); +// lists.add(structureDate(40)); +// lists.add(structureDate(50)); +// lists.add(structureDate(60)); +// //Sheet页初始化 +// Map clazzMap = new HashMap<>(); +// clazzMap.put(0, "一年级成绩表"); +// clazzMap.put(1, "二年级成绩表"); +// clazzMap.put(2, "三年级成绩表"); +// clazzMap.put(3, "四年级成绩表"); +// clazzMap.put(4, "五年级成绩表"); +// clazzMap.put(5, "六年级成绩表"); +// excelHandler.exportExcels(response, Collections.singletonList(lists), clazzMap, "excel导出-单sheet"); +// } catch (Exception e) { +// throw new RenException("导出失败"); +// } + } + + /** + * excel模板导出-单个sheet + * + * @param response 响应流 + */ + @Override + public void excelTemplate(HttpServletResponse response) { +// try { +// //准备数据 +// JSONObject obj = new JSONObject(); +// obj.put("date","2022年"); +// obj.put("season","秋季"); +// obj.put("user","王远"); +// obj.put("userDate",new Date()); +// List list = structureDate(20); +// excelHandler.exportTemplateExcels(response,list,obj, ExcelTemplateEnum.TEMPLATE_1.getDesc(),ExcelTemplateEnum.TEMPLATE_1.getDesc()); +// }catch (Exception e){ +// log.error("导出错误：{}", e.getMessage()); +// throw new RenException("导出错误"); +// } + } + + /** + * excel模板导出-多个sheet + * + * @param response 响应流 + */ + @Override + public void excelSheetTemplate(HttpServletResponse response) throws Exception { +// 准备数据 +// JSONObject obj = new JSONObject(); +// obj.put("date","2022年"); +// obj.put("season","秋季"); +// obj.put("user","王远"); +// obj.put("userDate",new Date()); +// List list = structureDate(20); +// excelHandler.exportSheetTemplateExcels(response,list,list,obj,obj, ExcelTemplateEnum.TEMPLATE_1.getDesc(),ExcelTemplateEnum.TEMPLATE_1.getDesc()); + } + + /** + * 构造数据 + * + * @return 数据集合 + */ + private List structureDate(String billNo) { + List list = new ArrayList<>(); + + List ioStatDayEntities = statDayService.filterListByRecordKey(billNo); + ExcelVO vo = new ExcelVO(); + for (int i=0; i < ioStatDayEntities.size(); i++) { + vo.setId(i+1); + vo.setProductName(ioStatDayEntities.get(i).getProductName()); + vo.setGgxh(ioStatDayEntities.get(i).getGgxh()); + vo.setBatchNo(ioStatDayEntities.get(i).getBatchNo()); + vo.setBeginCount(ioStatDayEntities.get(i).getBeginCount()); + vo.setBeginPrice(ioStatDayEntities.get(i).getBeginPrice()); + vo.setBeginAmount(ioStatDayEntities.get(i).getBeginAmount()); + vo.setInCount(ioStatDayEntities.get(i).getInCount()); + vo.setInPrice(ioStatDayEntities.get(i).getInPrice()); + vo.setInAmount(ioStatDayEntities.get(i).getInAmount()); + vo.setOutCount(ioStatDayEntities.get(i).getOutCount()); + + vo.setOutPrice(ioStatDayEntities.get(i).getOutPrice()); + vo.setOutAmount(ioStatDayEntities.get(i).getOutAmount()); + vo.setBalanceCount(ioStatDayEntities.get(i).getBalanceCount()); + vo.setBalancePrice(ioStatDayEntities.get(i).getBalancePrice()); + vo.setBalanceAmount(ioStatDayEntities.get(i).getBalanceAmount()); + list.add(vo); + } + + +// for (int i = 0; i < size; i++) { +// ExcelVO vo = new ExcelVO(); +// vo.setId(i); +//// vo.setAge(i); +//// vo.setName("张三" + i); +//// vo.setWen(new Random().nextInt(99)); +//// vo.setRichard(new Random().nextInt(99)); +//// vo.setSum(vo.getWen() + vo.getRichard()); +// list.add(vo); +// } + return list; + } +} diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoStatDayServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoStatDayServiceImpl.java index 1a25c5450..f6eb7bb96 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoStatDayServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoStatDayServiceImpl.java @@ -99,6 +99,11 @@ public class IoStatDayServiceImpl implements IoStatDayService { return statDayDao.filterList(statDataDetailRequest); } + @Override + public List filterListByRecordKey(String recordKey) { + return statDayDao.filterListByRecordKey(recordKey); + } + /** * 获取统计数据 * diff --git a/src/main/java/com/glxp/api/util/Excel/ExcelHandler.java b/src/main/java/com/glxp/api/util/Excel/ExcelHandler.java new file mode 100644 index 000000000..e6fdcb91b --- /dev/null +++ b/src/main/java/com/glxp/api/util/Excel/ExcelHandler.java @@ -0,0 +1,274 @@ +package com.glxp.api.util.Excel; + +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.EasyExcelFactory; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.read.builder.ExcelReaderBuilder; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.excel.write.metadata.fill.FillConfig; +import com.glxp.api.util.Excel.Exception.RenException; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +/** + * @author : zhangsan + * @date : 2023/4/17 11:06 + * @modyified By : + */ +@Slf4j +@Component +public class ExcelHandler { + /** + * 导入简单excel数据 + * @param file ：文件流 + * @param clazz：数据对象 + * @param sheetName：要读取的sheet [不传：默认读取第一个sheet] + * @throws Exception + */ + public List importExcel(MultipartFile file, Class clazz, String sheetName) throws Exception{ + this.checkFile(file); + UploadDataListener uploadDataListener = new UploadDataListener<>(); + ExcelReaderBuilder builder = EasyExcelFactory.read(file.getInputStream(), clazz, uploadDataListener); + if (StringUtils.isEmpty(sheetName)) { + builder.sheet().doRead(); + } else { + builder.sheet(sheetName).doRead(); + } + return uploadDataListener.getList(); + } + /** + * 指定sheet页导入通用方法 + * @param multipartFile 传入文件 + * @param objList 需要导入的sheet页实体类型集合 + * @param index sheet页个数 + * @param indexList 需要导入sheet页下标集合 + * @param + * @return List> + * @throws Exception + */ + public List> importExcelsByIndex(MultipartFile multipartFile, List objList, int index,List indexList) throws Exception { + if (multipartFile == null) { + throw new RenException("文件为空"); + } + List> resultList = new LinkedList<>(); + //初始化导入sheet页实体类型下标 + int objListClass = 0; + for (int i = 0; i < index; i++) { + if(indexList.contains(i)){ + UploadDataListener uploadDataListener = new UploadDataListener<>(); + List excels; + EasyExcelFactory.read(multipartFile.getInputStream(), objList.get(objListClass).getClass(), uploadDataListener).sheet(i).doRead(); + excels = uploadDataListener.getList(); + resultList.add(excels); + objListClass++; + } + } + return resultList; + } + /** + * 读取多个sheet + * @param file：文件流 + * @param index：需要读取的sheet个数 [默认0开始，如果传入3，则读取0 1 2] + * @param params：每个sheet里面需要封装的对象[如果index为3，则需要传入对应的3个对象] + * @param + * @return + */ + public List> importExcels(MultipartFile file, int index, List params) throws Exception { + this.checkFile(file); + List> resultList = new LinkedList<>(); + for (int i=0; i uploadDataListener = new UploadDataListener<>(); + ExcelReaderBuilder builder = EasyExcelFactory.read(file.getInputStream(), params.get(i).getClass(), uploadDataListener); + builder.sheet(i).doRead(); + List list = uploadDataListener.getList(); + resultList.add(list); + } + return resultList; + } + + /** + * 导出excel表格 + * @param response ： + * @param dataList ：数据列表 + * @param clazz ：数据对象 + * @param fileName ：文件名称 + * @param sheetName：sheet名称 + * @throws Exception + */ + public void exportExcel(HttpServletResponse response, List dataList, Class clazz, String fileName, String sheetName) throws Exception { + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding(StandardCharsets.UTF_8.name()); + fileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.name()); + response.setHeader("Content-disposition", "attachment;filename=" + fileName + ExcelTemplateEnum.TEMPLATE_SUFFIX.getDesc()); + EasyExcelFactory.write(response.getOutputStream(), clazz).sheet(sheetName).doWrite(dataList); + } + + /** + * 导出多个sheet + * @param response： + * @param dataList：多个数据列表 + * @param clazzMap：对应每个列表里面的数据对应的sheet名称 + * @param fileName：文件名 + * @param + * @throws Exception + */ + public void exportExcels(HttpServletResponse response, List> dataList, Map clazzMap, String fileName) throws Exception { + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding(StandardCharsets.UTF_8.name()); + fileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.name()); + response.setHeader("Content-disposition", "attachment;filename=" + fileName + ExcelTemplateEnum.TEMPLATE_SUFFIX.getDesc()); + ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).build(); + int len = dataList.get(0).size(); + for (int i=0; i objects = (List) dataList.get(0).get(i); + Class aClass = objects.get(0).getClass(); + WriteSheet writeSheet0 = EasyExcel.writerSheet(i, clazzMap.get(i)).head(aClass).build(); + excelWriter.write(objects, writeSheet0); + } + excelWriter.finish(); + } + + /** + * 根据模板将集合对象填充表格-单个sheet + * @param list：填充对象集合 + * @param object ：填充对象 + * @param fileName：文件名称 + * @param templateName：模板名称 + * @throws Exception + */ + public void exportTemplateExcels(HttpServletResponse response, List list, Object object, String fileName, String templateName) throws Exception{ + String template = ExcelTemplateEnum.TEMPLATE_PATH.getDesc() + File.separator + templateName + ExcelTemplateEnum.TEMPLATE_SUFFIX.getDesc(); + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(template); + FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); + ExcelWriter excelWriter = EasyExcelFactory.write(getOutputStream(fileName, response)).withTemplate(inputStream).build(); + WriteSheet writeSheet0 = EasyExcelFactory.writerSheet(0).build(); + excelWriter.fill(object, fillConfig, writeSheet0); + excelWriter.fill(list, fillConfig, writeSheet0); + excelWriter.finish(); + } + + /** + * 根据模板将集合对象填充表格-多个sheet + * @param list1：填充对象集合 + * @param list2：填充对象集合 + * @param object1 ：填充对象 + * @param object2 ：填充对象 + * @param fileName：文件名称 + * @param templateName：模板名称 + * @throws Exception + */ + public void exportSheetTemplateExcels(HttpServletResponse response, List list1,List list2, Object object1,Object object2, String fileName, String templateName) throws Exception{ + String template = ExcelTemplateEnum.TEMPLATE_PATH.getDesc() + File.separator + templateName + ExcelTemplateEnum.TEMPLATE_SUFFIX.getDesc(); + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(template); + FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); + ExcelWriter excelWriter = EasyExcelFactory.write(getOutputStream(fileName, response)).withTemplate(inputStream).build(); + WriteSheet writeSheet0 = EasyExcelFactory.writerSheet(0).build(); + WriteSheet writeSheet1 = EasyExcelFactory.writerSheet(1).build(); + excelWriter.fill(object1, fillConfig, writeSheet0); + excelWriter.fill(list1, fillConfig, writeSheet0); + excelWriter.fill(object2, fillConfig, writeSheet1); + excelWriter.fill(list2, fillConfig, writeSheet1); + excelWriter.finish(); + } + + /** + * 根据模板将单个对象填充表格 + * @param object ：填充对象 + * @param templateName：模板名称 + * @param fileName ：文件名称 + * @param sheetName ：需要写入的sheet名称 [不传：填充到第一个sheet] + * @throws Exception + */ + public void exportTemplateExcel(HttpServletResponse response, Object object, String templateName, String fileName, String sheetName) throws Exception{ + String template = ExcelTemplateEnum.TEMPLATE_PATH.getDesc() + File.separator + templateName + ExcelTemplateEnum.TEMPLATE_SUFFIX.getDesc(); + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(template); + if (StringUtils.isEmpty(sheetName)) { + EasyExcelFactory.write(getOutputStream(fileName, response)).withTemplate(inputStream).sheet().doFill(object); + } else { + EasyExcelFactory.write(getOutputStream(fileName, response)).withTemplate(inputStream).sheet(sheetName).doFill(object); + } + } + + /** + * 根据模板将集合对象填充表格 + * @param list：填充对象集合 + * @param fileName：文件名称 + * @param templateName：模板名称 + * @param sheetName：需要写入的sheet [不传：填充到第一个sheet] + * @throws Exception + */ + public void exportTemplateExcelList(HttpServletResponse response, List list, String fileName, String templateName, String sheetName) throws Exception{ + log.info("模板名称：{}", templateName); + String template = ExcelTemplateEnum.TEMPLATE_PATH.getDesc() + File.separator + templateName + ExcelTemplateEnum.TEMPLATE_SUFFIX.getDesc(); + log.info("模板路径：{}", template); + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(template); + // 全部填充：全部加载到内存中一次填充 + if (StringUtils.isEmpty(sheetName)) { + EasyExcelFactory.write(getOutputStream(fileName, response)).withTemplate(inputStream).sheet().doFill(list); + } else { + EasyExcelFactory.write(getOutputStream(fileName, response)).withTemplate(inputStream).sheet(sheetName).doFill(list); + } + } + /** + * 根据模板将集合对象填充表格 + * @param list：填充对象集合 + * @param fileName：文件名称 + * @param templateName：模板名称 + * @throws Exception + */ + public void exportTemplateExcel2(HttpServletResponse response, List list, String fileName, String templateName) throws Exception{ + String template = ExcelTemplateEnum.TEMPLATE_PATH.getDesc() + File.separator + templateName + ExcelTemplateEnum.TEMPLATE_SUFFIX.getDesc(); + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(template); + ExcelWriter excelWriter = EasyExcelFactory.write(getOutputStream(fileName, response)).withTemplate(inputStream).build(); + WriteSheet writeSheet = EasyExcelFactory.writerSheet().build(); + excelWriter.fill(list, writeSheet); + excelWriter.finish(); + } + /** + * 构建输出流 + * @param fileName：文件名称 + * @param response： + * @return + * @throws Exception + */ + private OutputStream getOutputStream(String fileName, HttpServletResponse response) throws Exception { + fileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.name()); + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding(StandardCharsets.UTF_8.name()); + response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ExcelTemplateEnum.TEMPLATE_SUFFIX.getDesc()); + return response.getOutputStream(); + } + + /** + * 文件格式校验 + * @param file： + */ + private void checkFile(MultipartFile file) { + if (file == null) { + throw new RenException("文件不能为空"); + } + String fileName = file.getOriginalFilename(); + if (StringUtils.isEmpty(fileName)) { + throw new RenException("文件不能为空"); + } + if (!fileName.endsWith(ExcelTemplateEnum.TEMPLATE_SUFFIX.getDesc()) + && !fileName.endsWith(ExcelTemplateEnum.TEMPLATE_SUFFIX_XLS.getDesc())) { + throw new RenException("请上传.xlsx或.xls文件"); + } + } + + + +} diff --git a/src/main/java/com/glxp/api/util/Excel/ExcelTemplateEnum.java b/src/main/java/com/glxp/api/util/Excel/ExcelTemplateEnum.java new file mode 100644 index 000000000..5bf5867e7 --- /dev/null +++ b/src/main/java/com/glxp/api/util/Excel/ExcelTemplateEnum.java @@ -0,0 +1,66 @@ +package com.glxp.api.util.Excel; + +import lombok.Getter; + +/** + * @author : zhangsan + * @date : 2023/4/17 11:09 + * @modyified By : + */ + +@Getter +public enum ExcelTemplateEnum { + /**单sheet导出*/ + TEMPLATE_1("1","complex"), + + /**模板格式*/ + TEMPLATE_SUFFIX("xlsx",".xlsx"), + TEMPLATE_SUFFIX_XLS("xls",".xls"), + TEMPLATE_SUFFIX_DOCX("docx",".docx"), + /**模板路径*/ + TEMPLATE_PATH("path","excel"), + ; + + private final String code; + private final String desc; + + ExcelTemplateEnum(String code, String desc) { + this.code = code; + this.desc = desc; + } + + /** + * 通过code获取msg + * + * @param code 枚举值 + * @return + */ + public static String getMsgByCode(String code) { + if (code == null) { + return null; + } + ExcelTemplateEnum enumList = getByCode(code); + if (enumList == null) { + return null; + } + return enumList.getDesc(); + } + + public static String getCode(ExcelTemplateEnum enumList) { + if (enumList == null) { + return null; + } + return enumList.getCode(); + } + + public static ExcelTemplateEnum getByCode(String code) { + for (ExcelTemplateEnum enumList : values()) { + if (enumList.getCode().equals(code)) { + return enumList; + } + } + return null; + } + +} + diff --git a/src/main/java/com/glxp/api/util/Excel/Exception/RenException.java b/src/main/java/com/glxp/api/util/Excel/Exception/RenException.java new file mode 100644 index 000000000..915a1c3ff --- /dev/null +++ b/src/main/java/com/glxp/api/util/Excel/Exception/RenException.java @@ -0,0 +1,56 @@ +package com.glxp.api.util.Excel.Exception; + +/** + * @author : zhangsan + * @date : 2023/4/17 11:21 + * @modyified By : + */ + + +public class RenException extends RuntimeException { + private static final long serialVersionUID = 1L; + + private String msg; + private int code = 500; + + public RenException(String msg) { + super(msg); + this.msg = msg; + } + + public RenException(String msg, Throwable e) { + super(msg, e); + this.msg = msg; + } + + public RenException(String msg, int code) { + super(msg); + this.msg = msg; + this.code = code; + } + + public RenException(String msg, int code, Throwable e) { + super(msg, e); + this.msg = msg; + this.code = code; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + +} + diff --git a/src/main/java/com/glxp/api/util/Excel/UploadDataListener.java b/src/main/java/com/glxp/api/util/Excel/UploadDataListener.java new file mode 100644 index 000000000..ee3c11114 --- /dev/null +++ b/src/main/java/com/glxp/api/util/Excel/UploadDataListener.java @@ -0,0 +1,61 @@ +package com.glxp.api.util.Excel; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.event.AnalysisEventListener; +import com.alibaba.excel.exception.ExcelDataConvertException; +import com.glxp.api.util.Excel.Exception.RenException; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : zhangsan + * @date : 2023/4/17 11:09 + * @modyified By : + */ + +public class UploadDataListener extends AnalysisEventListener { + + /**数据集*/ + private final List list = new ArrayList<>(); + + public List getList(){ + return this.list; + } + + /** + * 每条数据都会进入 + * @param object： + * @param analysisContext： + */ + @Override + public void invoke(T object, AnalysisContext analysisContext) { + this.list.add(object); + } + + /** + * 数据解析完调用 + * @param analysisContext： + */ + @Override + public void doAfterAllAnalysed(AnalysisContext analysisContext) { + + } + + /** + * 异常时调用 + * @param exception： + * @param context： + * @throws Exception + */ + @Override + public void onException(Exception exception, AnalysisContext context) throws Exception { + // 数据解析异常 + if (exception instanceof ExcelDataConvertException) { + ExcelDataConvertException excelDataConvertException = (ExcelDataConvertException)exception; + throw new RenException("第" + excelDataConvertException.getRowIndex() + "行" + excelDataConvertException.getColumnIndex() + "列" + "数据解析异常"); + } + // 其他异常... + } +} + diff --git a/src/main/resources/mybatis/mapper/inout/IoStatDayDao.xml b/src/main/resources/mybatis/mapper/inout/IoStatDayDao.xml index 884e07224..0139ed839 100644 --- a/src/main/resources/mybatis/mapper/inout/IoStatDayDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoStatDayDao.xml @@ -20,4 +20,10 @@ - \ No newline at end of file + + + From c68cb845a0ecc2a614a57a8c2985e7d9c4dc1a0a Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 17 Apr 2023 16:48:19 +0800 Subject: [PATCH 2/7] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=92=8C=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/constant/BasicProcessStatus.java | 3 + .../com/glxp/api/constant/ConstantStatus.java | 4 + .../dao/schedule/SystemParamConfigDao.java | 2 + .../api/dao/system/SystemPDFModuleDao.java | 4 + .../api/dao/system/SystemPDFTemplateDao.java | 4 + .../com/glxp/api/dao/thrsys/ThrCorpDao.java | 3 + .../com/glxp/api/dao/thrsys/ThrDeptDao.java | 9 + .../api/dao/thrsys/ThrInvWarehouseDao.java | 2 + .../glxp/api/dao/thrsys/ThrProductsDao.java | 4 +- .../api/entity/system/SyncDataSetEntity.java | 1 + .../SysPdfTemplateRelevanceBizEntity.java | 6 + .../SysPdfTemplateRelevanceCodeEntity.java | 5 + .../SysPdfTemplateRelevanceLabelEntity.java | 5 + ...SysPdfTemplateRelevanceStatemenEntity.java | 5 + .../system/SystemParamConfigEntity.java | 4 + .../entity/thrsys/ThrInvWarehouseEntity.java | 4 + .../glxp/api/http/sync/SpGetHttpClient.java | 43 ++++ .../api/idc/service/impl/IdcServiceImpl.java | 27 ++- .../res/sync/SpsSyncSysSettingResponse.java | 80 +++++++ .../api/res/sync/SpsSyncThrDataResponse.java | 30 +++ .../res/sync/SpsSyncThrProductsResponse.java | 19 ++ .../api/res/system/SyncDataSetResponse.java | 4 +- .../api/service/basic/EntrustReceService.java | 2 + .../basic/IBasicBusTypePreService.java | 3 + .../impl/BasicBusTypePreServiceImpl.java | 5 + .../basic/impl/EntrustReceServiceImpl.java | 8 + .../glxp/api/service/sync/HeartService.java | 226 ++++++++++++++++-- .../glxp/api/service/sync/UpBasicService.java | 106 ++++++-- .../api/service/sync/UpThrDataService.java | 89 +++++++ .../system/SystemPDFModuleService.java | 3 + .../SystemPDFTemplateRelevanceBizService.java | 4 +- ...SystemPDFTemplateRelevanceCodeService.java | 5 +- ...ystemPDFTemplateRelevanceLabelService.java | 4 +- ...emPDFTemplateRelevanceStatemenService.java | 4 +- .../system/SystemPDFTemplateService.java | 3 + .../system/SystemParamConfigService.java | 2 + .../impl/SystemPDFModuleServiceImpl.java | 6 + ...temPDFTemplateRelevanceBizServiceImpl.java | 6 + ...emPDFTemplateRelevanceCodeServiceImpl.java | 6 + ...mPDFTemplateRelevanceLabelServiceImpl.java | 7 + ...FTemplateRelevanceStatemenServiceImpl.java | 6 + .../impl/SystemPDFTemplateServiceImpl.java | 7 + .../impl/SystemParamConfigServiceImpl.java | 6 + .../api/service/thrsys/ThrCorpService.java | 4 +- .../api/service/thrsys/ThrDeptService.java | 10 + .../thrsys/ThrInvWarehouseService.java | 2 + .../service/thrsys/ThrProductsService.java | 2 + .../thrsys/impl/ThrCorpServiceImpl.java | 6 + .../thrsys/impl/ThrDeptServiceImpl.java | 5 + .../impl/ThrInvWarehouseServiceImpl.java | 6 + .../thrsys/impl/ThrProductsServiceImpl.java | 9 +- .../java/com/glxp/api/task/SyncHeartTask.java | 4 +- .../mapper/schedule/SystemParamConfigDao.xml | 4 + .../mapper/system/SystemPDFModuleDao.xml | 4 + .../mapper/system/SystemPDFTemplateDao.xml | 4 + .../mybatis/mapper/thrsys/ThrCorpDao.xml | 3 + .../mybatis/mapper/thrsys/ThrDeptDao.xml | 4 + .../mapper/thrsys/ThrInvWarehouseDao.xml | 4 +- .../mybatis/mapper/thrsys/ThrProductsDao.xml | 3 + src/main/resources/schemas/schema_v2.1.sql | 7 + 60 files changed, 789 insertions(+), 68 deletions(-) create mode 100644 src/main/java/com/glxp/api/res/sync/SpsSyncSysSettingResponse.java create mode 100644 src/main/java/com/glxp/api/res/sync/SpsSyncThrDataResponse.java create mode 100644 src/main/java/com/glxp/api/res/sync/SpsSyncThrProductsResponse.java create mode 100644 src/main/java/com/glxp/api/service/sync/UpThrDataService.java diff --git a/src/main/java/com/glxp/api/constant/BasicProcessStatus.java b/src/main/java/com/glxp/api/constant/BasicProcessStatus.java index 2139f78e0..ed797e892 100644 --- a/src/main/java/com/glxp/api/constant/BasicProcessStatus.java +++ b/src/main/java/com/glxp/api/constant/BasicProcessStatus.java @@ -30,6 +30,9 @@ public class BasicProcessStatus { public static final String NEW_ALL_ORDER = "9"; public static final String ALL_BUS_ORDER = "11"; public static final int NEW_ALL_DI = 10; + public static final String NEW_ALL_THR_DATA = "12"; //所有第三方基础数据 + public static final String NEW_ALL_THR_PRODUCTS = "13"; //所有第三方产品数据 + public static final String NEW_ALL_SYS_SETTING = "14"; //所有系统设置数据 public static final int SCHEDULE_NORMAL = 1; //常规任务 public static final int SCHEDULE_TRANSFER = 2; //需要传递任务 diff --git a/src/main/java/com/glxp/api/constant/ConstantStatus.java b/src/main/java/com/glxp/api/constant/ConstantStatus.java index 8509f47d1..ed092c876 100644 --- a/src/main/java/com/glxp/api/constant/ConstantStatus.java +++ b/src/main/java/com/glxp/api/constant/ConstantStatus.java @@ -222,6 +222,10 @@ public class ConstantStatus { public static final String SYNC_BUS_TYPE = "AutoUploadBusType"; public static final String SYNC_SCAN_ORDER = "AutoUploadOrder"; public static final String SYNC_BUS_ORDER = "AutoUploadBusOrder"; + public static final String SYNC_THR_DATA = "AutoUploadThrData"; + public static final String SYNC_THR_PRODUCTS = "AutoUploadThrProducts"; + public static final String SYNC_SYS_SETTING = "AutoUploadSysSetting"; + //自动下载所有数据 public static final String SYNC_DOWNLOAD_BASIC_DATA = "AutoDownloadAllData"; diff --git a/src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java b/src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java index c19df8550..e8e75a5cf 100644 --- a/src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java +++ b/src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java @@ -6,6 +6,7 @@ import com.glxp.api.req.system.SysParamConfigSaveRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; @Mapper @@ -29,4 +30,5 @@ public interface SystemParamConfigDao { boolean insert(SystemParamConfigEntity systemParamConfigEntity); + List selectByLastTime(@Param("lastUpdateTime") Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java b/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java index 094b2b3e7..07254727c 100644 --- a/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java +++ b/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java @@ -4,7 +4,9 @@ import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.req.system.FilterPdfModuleRequest; import com.glxp.api.req.system.SysPdfModuleSaveRequest; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; @Mapper @@ -25,4 +27,6 @@ public interface SystemPDFModuleDao { boolean insert(SystemPDFModuleEntity systemPDFModuleEntity); boolean deleteById(Integer id); + + List selectByLastTime(@Param("lastUpdateTime") Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java b/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java index 3dff5d4ff..bc9e8fa2f 100644 --- a/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java +++ b/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java @@ -4,7 +4,9 @@ import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.req.system.FilterPdfTemplateRequest; import com.glxp.api.req.system.SysPdfTemplateSaveRequest; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; @Mapper @@ -23,4 +25,6 @@ public interface SystemPDFTemplateDao { boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity); boolean deleteById(Integer id); + + List selectByLastTime(@Param("lastUpdateTime") Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrCorpDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpDao.java index a75bc5034..4e435cd66 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrCorpDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpDao.java @@ -10,6 +10,7 @@ import com.glxp.api.res.thrsys.ThrUnitMaintainResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; @Mapper @@ -36,4 +37,6 @@ public interface ThrCorpDao { ThrSystemDetailEntity selectByKey(@Param("key") String key, @Param("thirdSys") String thirdSys); + List selectByLastTime(@Param("lastUpdateTime") Date lastUpdateTime); + } diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrDeptDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrDeptDao.java index 32e8f7ced..e2eabe7e7 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrDeptDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrDeptDao.java @@ -5,6 +5,7 @@ import com.glxp.api.req.thrsys.FilterThrDeptRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; @Mapper @@ -30,4 +31,12 @@ public interface ThrDeptDao { ThrDeptEntity selectByCode(@Param("code") String code); ThrDeptEntity selectMaxCode(FilterThrDeptRequest filterThrDeptRequest); + + /** + * 查询指定日期之后更新的部门信息 + * + * @param lastUpdateTime + * @return + */ + List selectByLastTime(@Param("lastUpdateTime") Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrInvWarehouseDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrInvWarehouseDao.java index df1b16eda..0b77c9319 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrInvWarehouseDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrInvWarehouseDao.java @@ -6,6 +6,7 @@ import com.glxp.api.res.thrsys.ThrInvWarehouseResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; @Mapper @@ -33,4 +34,5 @@ public interface ThrInvWarehouseDao { List filterThrInvWarehouseResponse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest); + List selectByLastTime(@Param("lastUpdateTime") Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java index c28a80873..e228b9aa7 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java @@ -1,12 +1,11 @@ package com.glxp.api.dao.thrsys; import com.glxp.api.entity.thrsys.ThrProductsEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.res.thrsys.ThrProductsResponse; -import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; /** @@ -32,4 +31,5 @@ public interface ThrProductsDao { boolean insertThrProducts(ThrProductsEntity thrProductsEntity); + List selectByLastTime(@Param("lastUpdateTime") Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java b/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java index 14e9f7400..f7345f2a2 100644 --- a/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java @@ -15,6 +15,7 @@ public class SyncDataSetEntity { private int basicCorp; //往来单位字典 private int basicDept; //部门字典 private int basicInv; //仓库字典 + private int basicThirdDept; //第三方那个部门信息 private int basicThirdProducts; //第三方产品信息 private int basicThirdCorp; //第三方往来信息 private int basicThirdInv; //第三方仓库信息 diff --git a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceBizEntity.java b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceBizEntity.java index 614cea497..f60a5cb4a 100644 --- a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceBizEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceBizEntity.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.util.Date; + /** * PDF用户对应表 */ @@ -59,4 +61,8 @@ public class SysPdfTemplateRelevanceBizEntity { @TableField(value = "`modelKey`") private String modelKey; + + @TableField(value = "updateTime") + private Date updateTime; + } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceCodeEntity.java b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceCodeEntity.java index 0e6739f49..fd7fdd974 100644 --- a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceCodeEntity.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.util.Date; + /** * PDF用户对应表 */ @@ -60,4 +62,7 @@ public class SysPdfTemplateRelevanceCodeEntity { @TableField(value = "`modelKey`") private String modelKey; + + @TableField(value = "updateTime") + private Date updateTime; } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceLabelEntity.java b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceLabelEntity.java index b6d10c733..4026052fb 100644 --- a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceLabelEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceLabelEntity.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.util.Date; + /** * PDF用户对应表 */ @@ -59,4 +61,7 @@ public class SysPdfTemplateRelevanceLabelEntity { @TableField(value = "`modelKey`") private String modelKey; + + @TableField(value = "updateTime") + private Date updateTime; } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceStatemenEntity.java b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceStatemenEntity.java index 4b05c2848..aa7436ba9 100644 --- a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceStatemenEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceStatemenEntity.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.util.Date; + /** * PDF用户对应表 */ @@ -62,4 +64,7 @@ public class SysPdfTemplateRelevanceStatemenEntity { @TableField(value = "`modelKey`") private String modelKey; + + @TableField(value = "updateTime") + private Date updateTime; } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/system/SystemParamConfigEntity.java b/src/main/java/com/glxp/api/entity/system/SystemParamConfigEntity.java index 58f733d6e..03c43d551 100644 --- a/src/main/java/com/glxp/api/entity/system/SystemParamConfigEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SystemParamConfigEntity.java @@ -2,6 +2,8 @@ package com.glxp.api.entity.system; import lombok.Data; +import java.util.Date; + @Data public class SystemParamConfigEntity { @@ -13,4 +15,6 @@ public class SystemParamConfigEntity { private int paramStatus; private int paramType; private String paramExplain; + + private Date updateTime; } diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrInvWarehouseEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrInvWarehouseEntity.java index 1cdb56b07..ef66da1e3 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrInvWarehouseEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrInvWarehouseEntity.java @@ -2,6 +2,8 @@ package com.glxp.api.entity.thrsys; import lombok.Data; +import java.util.Date; + @Data public class ThrInvWarehouseEntity { @@ -14,5 +16,7 @@ public class ThrInvWarehouseEntity { private String thirdSysFk; private String parentName; + private Date updateTime; + } diff --git a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java index 880668c46..8098630da 100644 --- a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java +++ b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java @@ -235,5 +235,48 @@ public class SpGetHttpClient { return response; } + /** + * 上传第三方基础信息数据 + * + * @param spsSyncThrDataResponse + * @return + */ + public BaseResponse postThrData(SpsSyncThrDataResponse spsSyncThrDataResponse) { + String json = JSONUtil.toJsonStr(spsSyncThrDataResponse); + String result = okHttpCli.doPostJson(getIpUrl() + "/sps/sync/thrData/upload", json, buildHeader()); + BaseResponse response = + JSONObject.parseObject(result, new TypeReference>() { + }); + return response; + } + + /** + * 上传第三方产品信息数据 + * + * @param spsSyncThrProductsResponse + * @return + */ + public BaseResponse postThrProducts(SpsSyncThrProductsResponse spsSyncThrProductsResponse) { + String json = JSONUtil.toJsonStr(spsSyncThrProductsResponse); + String result = okHttpCli.doPostJson(getIpUrl() + "/sps/sync/thrData/products/upload", json, buildHeader()); + BaseResponse response = + JSONObject.parseObject(result, new TypeReference>() { + }); + return response; + } + /** + * 上传系统设置数据 + * + * @param spsSyncSysSettingResponse + * @return + */ + public BaseResponse postSysSetting(SpsSyncSysSettingResponse spsSyncSysSettingResponse) { + String json = JSONUtil.toJsonStr(spsSyncSysSettingResponse); + String result = okHttpCli.doPostJson(getIpUrl() + "/sps/sync/sys/setting", json, buildHeader()); + BaseResponse response = + JSONObject.parseObject(result, new TypeReference>() { + }); + return response; + } } diff --git a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java index 93b1874d8..c8b787586 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java @@ -41,19 +41,32 @@ import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.idc.service.IdcService; import com.glxp.api.idc.utils.DBAUtils; import com.glxp.api.idc.utils.IDCUtils; +import com.glxp.api.idc.utils.TableUtils; import com.glxp.api.req.system.ScheduledRequest; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.DateUtil; import com.glxp.api.util.FileUtils; - import lombok.extern.slf4j.Slf4j; -import okhttp3.MediaType; -import okhttp3.MultipartBody; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.RequestBody; -import okhttp3.Response; +import okhttp3.*; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.text.WordUtils; +import org.apache.tools.ant.util.DateUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.scheduling.annotation.Async; +import org.springframework.scheduling.support.CronSequenceGenerator; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.util.*; +import java.util.concurrent.TimeUnit; /*数据中继数据中心(接收)*/ @Slf4j diff --git a/src/main/java/com/glxp/api/res/sync/SpsSyncSysSettingResponse.java b/src/main/java/com/glxp/api/res/sync/SpsSyncSysSettingResponse.java new file mode 100644 index 000000000..0dc4f3fd7 --- /dev/null +++ b/src/main/java/com/glxp/api/res/sync/SpsSyncSysSettingResponse.java @@ -0,0 +1,80 @@ +package com.glxp.api.res.sync; + +import cn.hutool.core.collection.CollUtil; +import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; +import com.glxp.api.entity.basic.BasicBusTypePreEntity; +import com.glxp.api.entity.basic.EntrustReceEntity; +import com.glxp.api.entity.system.*; +import lombok.Data; + +import java.util.List; + +/** + * 同步系统设置数据 + */ +@Data +public class SpsSyncSysSettingResponse extends BaseSyncResponse { + + private List systemParamConfigEntities; + + private List entrustReceEntities; + + private List systemPDFModuleEntities; + + private List systemPDFTemplateEntities; + + private List sysPdfTemplateRelevanceCodeEntities; + + private List sysPdfTemplateRelevanceBizEntities; + + private List sysPdfTemplateRelevanceLabelEntities; + + private List sysPdfTemplateRelevanceStatemenEntities; + + private List basicBusTypePreEntities; + + private List basicBusTypeChangeEntities; + + + /** + * 拼接日志 + * + * @return + */ + public String logs() { + StringBuilder logs = new StringBuilder(); + if (CollUtil.isNotEmpty(this.systemParamConfigEntities)) { + logs.append("系统运行参数：").append(this.systemParamConfigEntities.size()).append("条\n"); + } + if (CollUtil.isNotEmpty(this.entrustReceEntities)) { + logs.append("委托验收设置：").append(this.entrustReceEntities.size()).append("条\n"); + } + if (CollUtil.isNotEmpty(this.systemPDFModuleEntities)) { + logs.append("打印模块：").append(this.systemPDFModuleEntities.size()).append("条\n"); + } + if (CollUtil.isNotEmpty(this.systemPDFTemplateEntities)) { + logs.append("打印模板：").append(this.systemPDFTemplateEntities.size()).append("条\n"); + } + if (CollUtil.isNotEmpty(this.sysPdfTemplateRelevanceCodeEntities)) { + logs.append("扫码单据关联表：").append(this.sysPdfTemplateRelevanceCodeEntities.size()).append("条\n"); + } + if (CollUtil.isNotEmpty(this.sysPdfTemplateRelevanceBizEntities)) { + logs.append("业务单据关联表：").append(this.sysPdfTemplateRelevanceBizEntities.size()).append("条\n"); + } + if (CollUtil.isNotEmpty(this.sysPdfTemplateRelevanceLabelEntities)) { + logs.append("内部码打印关联表：").append(this.sysPdfTemplateRelevanceLabelEntities.size()).append("条\n"); + } + if (CollUtil.isNotEmpty(this.sysPdfTemplateRelevanceStatemenEntities)) { + logs.append("资质证书打印关联表：").append(this.sysPdfTemplateRelevanceStatemenEntities.size()).append("条\n"); + } + if (CollUtil.isNotEmpty(this.basicBusTypePreEntities)) { + logs.append("自动建出入库单设置：").append(this.basicBusTypePreEntities.size()).append("条\n"); + } + if (CollUtil.isNotEmpty(this.basicBusTypeChangeEntities)) { + logs.append("自动建业务单设置：").append(this.basicBusTypeChangeEntities.size()).append("条\n"); + } + return logs.toString(); + } + + +} diff --git a/src/main/java/com/glxp/api/res/sync/SpsSyncThrDataResponse.java b/src/main/java/com/glxp/api/res/sync/SpsSyncThrDataResponse.java new file mode 100644 index 000000000..670d9eab5 --- /dev/null +++ b/src/main/java/com/glxp/api/res/sync/SpsSyncThrDataResponse.java @@ -0,0 +1,30 @@ +package com.glxp.api.res.sync; + +import com.glxp.api.entity.thrsys.ThrCorpEntity; +import com.glxp.api.entity.thrsys.ThrDeptEntity; +import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; +import lombok.Data; + +import java.util.List; + +/** + * 同步第三方基础数据 + */ +@Data +public class SpsSyncThrDataResponse extends BaseSyncResponse { + + /** + * 部门信息 + */ + private List deptEntities; + + /** + * 仓库信息 + */ + private List invWarehouseEntities; + + /** + * 往来单位信息 + */ + private List corpEntities; +} diff --git a/src/main/java/com/glxp/api/res/sync/SpsSyncThrProductsResponse.java b/src/main/java/com/glxp/api/res/sync/SpsSyncThrProductsResponse.java new file mode 100644 index 000000000..367003634 --- /dev/null +++ b/src/main/java/com/glxp/api/res/sync/SpsSyncThrProductsResponse.java @@ -0,0 +1,19 @@ +package com.glxp.api.res.sync; + +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import lombok.Data; + +import java.util.List; + +/** + * 同步第三方产品数据 + */ +@Data +public class SpsSyncThrProductsResponse extends BaseSyncResponse { + + /** + * 产品信息 + */ + private List productsEntities; + +} diff --git a/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java b/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java index 7e1a53c83..2fad45b10 100644 --- a/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java +++ b/src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java @@ -1,8 +1,7 @@ package com.glxp.api.res.system; -import com.glxp.api.entity.system.SyncDataChangeBustypesEntity; import com.glxp.api.entity.system.SyncDataBustypeEntity; -import com.glxp.api.entity.system.SyncDataPurTypeEntity; +import com.glxp.api.entity.system.SyncDataChangeBustypesEntity; import lombok.Data; import java.util.List; @@ -17,6 +16,7 @@ public class SyncDataSetResponse { private int basicCorp; private int basicInv; private int basicDept; + private int basicThirdDept; private int basicThirdProducts; private int basicThirdCorp; private int basicThirdInv; diff --git a/src/main/java/com/glxp/api/service/basic/EntrustReceService.java b/src/main/java/com/glxp/api/service/basic/EntrustReceService.java index 6843ac24c..abf42527a 100644 --- a/src/main/java/com/glxp/api/service/basic/EntrustReceService.java +++ b/src/main/java/com/glxp/api/service/basic/EntrustReceService.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.basic.EntrustReceEntity; import com.glxp.api.req.basic.BasicEntrustRecRequest; import com.glxp.api.res.basic.EntrustReceResponse; +import java.util.Date; import java.util.List; public interface EntrustReceService { @@ -29,4 +30,5 @@ public interface EntrustReceService { int updateEntrustRec(EntrustReceEntity warehouseEntity); + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java index 8c3aa4c01..3822a371d 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java @@ -5,6 +5,7 @@ import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.req.basic.FilterBusTypePreRequest; import com.glxp.api.res.basic.BasicBusTypePreResponse; +import java.util.Date; import java.util.List; /** @@ -79,4 +80,6 @@ public interface IBasicBusTypePreService { * @return */ boolean verifyExists(BasicBusTypePreEntity basicBusTypePreEntity); + + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java index 2b898f0d9..1fb71d32e 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java @@ -105,6 +105,11 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { return false; } + @Override + public List findByLastTime(Date lastUpdateTime) { + return basicBusTypePreDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); + } + /** * 设置创建/更新信息 * diff --git a/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java index dfccaac6f..8baa6c206 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.InvWarehouseDao; import com.glxp.api.dao.basic.EntrustReceDao; @@ -14,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; +import java.util.Date; import java.util.List; @Service @@ -114,4 +116,10 @@ public class EntrustReceServiceImpl implements EntrustReceService { public int updateEntrustRec(EntrustReceEntity entrustReceEntity) { return entrustReceDao.updateById(entrustReceEntity); } + + @Override + public List findByLastTime(Date lastUpdateTime) { + return entrustReceDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); + } + } diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 75cbb5c05..abf0cd76b 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -1,41 +1,34 @@ package com.glxp.api.service.sync; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.annotation.Resource; - -import com.glxp.api.dao.inout.*; -import com.glxp.api.entity.inout.*; -import com.glxp.api.res.sync.SpsSyncBusResponse; -import com.glxp.api.res.sync.SpsSyncDataResponse; -import com.glxp.api.service.inout.*; -import org.apache.ibatis.session.ExecutorType; -import org.apache.ibatis.session.SqlSession; -import org.apache.ibatis.session.SqlSessionFactory; -import org.apache.ibatis.session.TransactionIsolationLevel; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; 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.ConstantStatus; +import com.glxp.api.entity.inout.*; import com.glxp.api.entity.sync.BasicDownloadStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; import com.glxp.api.http.sync.SpGetHttpClient; import com.glxp.api.req.sync.SpsSyncDataRequest; -import com.glxp.api.res.sync.SpsSyncBusOrderResponse; -import com.glxp.api.res.sync.SpsSyncOrderResponse; +import com.glxp.api.res.sync.*; +import com.glxp.api.service.inout.*; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.DateUtil; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.session.SqlSessionFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; -import cn.hutool.core.collection.CollUtil; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +@Slf4j @Service public class HeartService { @Resource @@ -56,6 +49,8 @@ public class HeartService { IoAddInoutService addInoutService; @Resource IoCheckInoutService ioCheckInoutService; + @Resource + private UpThrDataService upThrDataService; //上传最近更新扫码单据 public BaseResponse uploadAllOrder(String syncTime) { @@ -482,4 +477,193 @@ public class HeartService { } + /** + * 同步第三方基础数据 + * + * @param syncTime 同步时间 + */ + public BaseResponse uploadThrData(String syncTime) { + SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest(); + if (syncTime == null) { + BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey(ConstantStatus.SYNC_THR_DATA); + if (basicExportStatusTimeEntity == null) { + basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); + basicExportStatusTimeEntity.setLastUpdateTime("1949-10-01 09:00:00"); + } + spsSyncDataRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime()); + } else { + spsSyncDataRequest.setLastUpdateTime(syncTime); + } + SpsSyncThrDataResponse spsSyncThrDataResponse = upThrDataService.upThrData(spsSyncDataRequest); + if (CollUtil.isEmpty(spsSyncThrDataResponse.getDeptEntities()) && CollUtil.isEmpty(spsSyncThrDataResponse.getInvWarehouseEntities()) + && CollUtil.isEmpty(spsSyncThrDataResponse.getCorpEntities())) { + //无数据不记录 + log.info("无第三方基础数据需要同步"); + return ResultVOUtils.success("无数据"); + } + + BasicExportStatusEntity basicExportStatusEntity1 = basicExportService.findByData(ConstantStatus.SYNC_THR_DATA, 0); + if (basicExportStatusEntity1 == null) { + BasicExportStatusEntity thrDataStatusEntity = new BasicExportStatusEntity(); + thrDataStatusEntity.setId(CustomUtil.getId()); + thrDataStatusEntity.setIdDatas(ConstantStatus.SYNC_THR_DATA); + thrDataStatusEntity.setType(BasicProcessStatus.NEW_ALL_THR_DATA); + thrDataStatusEntity.setUpdateTime(new Date()); + thrDataStatusEntity.setStartTime(new Date()); + thrDataStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_WAIT); + thrDataStatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL); + basicExportService.insertExportStatus(thrDataStatusEntity); + basicExportStatusEntity1 = thrDataStatusEntity; + } + + BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); + basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss")); + basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_THR_DATA); + spsSyncThrDataResponse.setTaskId(basicExportStatusEntity1.getId()); + BaseResponse baseResponse = spGetHttp.postThrData(spsSyncThrDataResponse); + if (baseResponse.getCode() == 20000) { + basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); + } else { + basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_FAIL); + } + basicExportStatusEntity1.setEndTime(new Date()); + basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity); + + //拼接日志 + StringBuilder logs = new StringBuilder(); + if (CollUtil.isNotEmpty(spsSyncThrDataResponse.getDeptEntities())) { + logs.append("第三方部门信息：").append(spsSyncThrDataResponse.getDeptEntities().size()).append("条\n"); + } + if (CollUtil.isNotEmpty(spsSyncThrDataResponse.getInvWarehouseEntities())) { + logs.append("第三方仓库信息：").append(spsSyncThrDataResponse.getInvWarehouseEntities().size()).append("条\n"); + } + if (CollUtil.isNotEmpty(spsSyncThrDataResponse.getCorpEntities())) { + logs.append("第三方往来单位信息：").append(spsSyncThrDataResponse.getCorpEntities().size()).append("条\n"); + } + basicExportStatusEntity1.setRemark(logs.toString()); + basicExportStatusEntity1.setUpdateTime(new Date()); + basicExportService.updateExportStatus(basicExportStatusEntity1); + return ResultVOUtils.success(); + } + + /** + * 同步系统设置 + * + * @param syncTime 同步时间 + * @return + */ + public BaseResponse uploadSysSetting(String syncTime) { + SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest(); + if (syncTime == null) { + BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey(ConstantStatus.SYNC_SYS_SETTING); + if (basicExportStatusTimeEntity == null) { + basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); + basicExportStatusTimeEntity.setLastUpdateTime("1949-10-01 09:00:00"); + } + spsSyncDataRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime()); + } else { + spsSyncDataRequest.setLastUpdateTime(syncTime); + } + SpsSyncSysSettingResponse spsSyncSysSettingResponse = upBasicService.upSysSetting(spsSyncDataRequest); + if (BeanUtil.isEmpty(spsSyncSysSettingResponse)) { + //无数据不记录 + log.info("无第系统设置需要同步"); + return ResultVOUtils.success("无数据"); + } + + BasicExportStatusEntity basicExportStatusEntity1 = basicExportService.findByData(ConstantStatus.SYNC_SYS_SETTING, 0); + if (basicExportStatusEntity1 == null) { + BasicExportStatusEntity thrDataStatusEntity = new BasicExportStatusEntity(); + thrDataStatusEntity.setId(CustomUtil.getId()); + thrDataStatusEntity.setIdDatas(ConstantStatus.SYNC_SYS_SETTING); + thrDataStatusEntity.setType(BasicProcessStatus.NEW_ALL_SYS_SETTING); + thrDataStatusEntity.setUpdateTime(new Date()); + thrDataStatusEntity.setStartTime(new Date()); + thrDataStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_WAIT); + thrDataStatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL); + basicExportService.insertExportStatus(thrDataStatusEntity); + basicExportStatusEntity1 = thrDataStatusEntity; + } + + BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); + basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss")); + basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_SYS_SETTING); + spsSyncSysSettingResponse.setTaskId(basicExportStatusEntity1.getId()); + BaseResponse baseResponse = spGetHttp.postSysSetting(spsSyncSysSettingResponse); + if (baseResponse.getCode() == 20000) { + basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); + } else { + basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_FAIL); + } + basicExportStatusEntity1.setEndTime(new Date()); + basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity); + + basicExportStatusEntity1.setRemark(spsSyncSysSettingResponse.logs()); + basicExportStatusEntity1.setUpdateTime(new Date()); + basicExportService.updateExportStatus(basicExportStatusEntity1); + return ResultVOUtils.success(); + } + + /** + * 同步第三方产品数据 + * + * @param syncTime + * @return + */ + public BaseResponse uploadThrProducts(String syncTime) { + SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest(); + if (syncTime == null) { + BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey(ConstantStatus.SYNC_THR_PRODUCTS); + if (basicExportStatusTimeEntity == null) { + basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); + basicExportStatusTimeEntity.setLastUpdateTime("1949-10-01 09:00:00"); + } + spsSyncDataRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime()); + } else { + spsSyncDataRequest.setLastUpdateTime(syncTime); + } + SpsSyncThrProductsResponse spsSyncThrProductsResponse = upThrDataService.upThrProducts(spsSyncDataRequest); + if (CollUtil.isEmpty(spsSyncThrProductsResponse.getProductsEntities())) { + //无数据不记录 + log.info("无第三方产品数据需要同步"); + return ResultVOUtils.success("无数据"); + } + + BasicExportStatusEntity basicExportStatusEntity1 = basicExportService.findByData(ConstantStatus.SYNC_THR_PRODUCTS, 0); + if (basicExportStatusEntity1 == null) { + BasicExportStatusEntity thrDataStatusEntity = new BasicExportStatusEntity(); + thrDataStatusEntity.setId(CustomUtil.getId()); + thrDataStatusEntity.setIdDatas(ConstantStatus.SYNC_THR_PRODUCTS); + thrDataStatusEntity.setType(BasicProcessStatus.NEW_ALL_THR_PRODUCTS); + thrDataStatusEntity.setUpdateTime(new Date()); + thrDataStatusEntity.setStartTime(new Date()); + thrDataStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_WAIT); + thrDataStatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL); + basicExportService.insertExportStatus(thrDataStatusEntity); + basicExportStatusEntity1 = thrDataStatusEntity; + } + + BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); + basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss")); + basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_THR_PRODUCTS); + spsSyncThrProductsResponse.setTaskId(basicExportStatusEntity1.getId()); + BaseResponse baseResponse = spGetHttp.postThrProducts(spsSyncThrProductsResponse); + if (baseResponse.getCode() == 20000) { + basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); + } else { + basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_FAIL); + } + basicExportStatusEntity1.setEndTime(new Date()); + basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity); + + //拼接日志 + StringBuilder logs = new StringBuilder(); + if (CollUtil.isNotEmpty(spsSyncThrProductsResponse.getProductsEntities())) { + logs.append("第三方产品信息：").append(spsSyncThrProductsResponse.getProductsEntities().size()).append("条\n"); + } + basicExportStatusEntity1.setRemark(logs.toString()); + basicExportStatusEntity1.setUpdateTime(new Date()); + basicExportService.updateExportStatus(basicExportStatusEntity1); + return ResultVOUtils.success(); + } } diff --git a/src/main/java/com/glxp/api/service/sync/UpBasicService.java b/src/main/java/com/glxp/api/service/sync/UpBasicService.java index 2dca7ef66..9cfecdfa4 100644 --- a/src/main/java/com/glxp/api/service/sync/UpBasicService.java +++ b/src/main/java/com/glxp/api/service/sync/UpBasicService.java @@ -3,40 +3,32 @@ package com.glxp.api.service.sync; import cn.hutool.core.collection.CollUtil; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.auth.*; -import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; +import com.glxp.api.entity.basic.BasicBusTypePreEntity; +import com.glxp.api.entity.basic.BasicBussinessTypeEntity; +import com.glxp.api.entity.basic.EntrustReceEntity; import com.glxp.api.entity.inout.*; -import com.glxp.api.entity.purchase.*; -import com.glxp.api.entity.system.SyncDataBustypeEntity; -import com.glxp.api.entity.system.SyncDataChangeBustypesEntity; -import com.glxp.api.entity.system.SyncDataPurTypeEntity; -import com.glxp.api.entity.thrsys.*; +import com.glxp.api.entity.purchase.PurOrderDetailEntity; +import com.glxp.api.entity.purchase.PurOrderEntity; +import com.glxp.api.entity.system.*; +import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity; import com.glxp.api.req.auth.*; -import com.glxp.api.req.basic.BasicEntrustRecRequest; -import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; -import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest; -import com.glxp.api.req.basic.FilterUdiInfoRequest; import com.glxp.api.req.inout.FilterOrderRequest; -import com.glxp.api.req.purchase.FilterPoductRequest; -import com.glxp.api.req.purchase.FilterSupCompanyRequest; -import com.glxp.api.req.purchase.FilterSupManufacturerRequest; import com.glxp.api.req.sync.SpsSyncDataRequest; -import com.glxp.api.req.thrsys.*; -import com.glxp.api.res.sync.SpsSyncBusOrderResponse; -import com.glxp.api.res.sync.SpsSyncBusResponse; -import com.glxp.api.res.sync.SpsSyncDataResponse; -import com.glxp.api.res.sync.SpsSyncOrderResponse; +import com.glxp.api.res.sync.*; import com.glxp.api.res.system.SyncDataSetResponse; import com.glxp.api.service.auth.*; +import com.glxp.api.service.basic.EntrustReceService; import com.glxp.api.service.basic.IBasicBusTypeChangeService; +import com.glxp.api.service.basic.IBasicBusTypePreService; import com.glxp.api.service.basic.IBasicBussinessTypeService; -import com.glxp.api.service.basic.impl.BasicBussinessTypeServiceImpl; import com.glxp.api.service.inout.*; import com.glxp.api.service.purchase.PurOrderDetailService; import com.glxp.api.service.purchase.PurOrderService; +import com.glxp.api.service.system.*; import com.glxp.api.service.thrsys.IThrBusTypeOriginService; import com.glxp.api.util.DateUtil; import org.springframework.beans.BeanUtils; -import org.springframework.data.annotation.Reference; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -68,6 +60,24 @@ public class UpBasicService { PurOrderDetailService purOrderDetailService; @Resource IoOrderInvoiceService orderInvoiceService; + @Resource + private SystemParamConfigService systemParamConfigService; + @Resource + private EntrustReceService entrustReceService; + @Resource + private SystemPDFModuleService systemPDFModuleService; + @Resource + private SystemPDFTemplateService systemPDFTemplateService; + @Resource + private SystemPDFTemplateRelevanceCodeService systemPDFTemplateRelevanceCodeService; + @Resource + private SystemPDFTemplateRelevanceBizService systemPDFTemplateRelevanceBizService; + @Resource + private SystemPDFTemplateRelevanceLabelService systemPDFTemplateRelevanceLabelService; + @Resource + private SystemPDFTemplateRelevanceStatemenService systemPDFTemplateRelevanceStatemenService; + @Resource + private IBasicBusTypePreService basicBusTypePreService; //上传最近更新扫码单据 public SpsSyncOrderResponse upAllOrder(SpsSyncDataRequest spsSyncDataRequest) { @@ -285,4 +295,60 @@ public class UpBasicService { return syncDataResponse; } + /** + * 上传最近更新的系统设置数据 + * + * @param spsSyncDataRequest + * @return + */ + public SpsSyncSysSettingResponse upSysSetting(SpsSyncDataRequest spsSyncDataRequest) { + SpsSyncSysSettingResponse spsSyncSysSettingResponse = new SpsSyncSysSettingResponse(); + //查询数据同步设置 + SyncDataSetResponse syncDataSet = syncDataSetService.selectSet(); + + //系统运行参数 + if (syncDataSet.getSystemConfig() == 1) { + List systemParamConfigEntities = systemParamConfigService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + spsSyncSysSettingResponse.setSystemParamConfigEntities(systemParamConfigEntities); + } + + //委托验收设置 + if (syncDataSet.getEntrustAction() == 1) { + List entrustReceEntities = entrustReceService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + spsSyncSysSettingResponse.setEntrustReceEntities(entrustReceEntities); + } + + //打印设置 + if (syncDataSet.getPrintConfig() == 1) { + List systemPDFModuleEntities = systemPDFModuleService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List systemPDFTemplateEntities = systemPDFTemplateService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List sysPdfTemplateRelevanceCodeEntities = systemPDFTemplateRelevanceCodeService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List sysPdfTemplateRelevanceBizEntities = systemPDFTemplateRelevanceBizService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List sysPdfTemplateRelevanceLabelEntities = systemPDFTemplateRelevanceLabelService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + List sysPdfTemplateRelevanceStatemenEntities = systemPDFTemplateRelevanceStatemenService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + + spsSyncSysSettingResponse.setSystemPDFModuleEntities(systemPDFModuleEntities); + spsSyncSysSettingResponse.setSystemPDFTemplateEntities(systemPDFTemplateEntities); + spsSyncSysSettingResponse.setSysPdfTemplateRelevanceCodeEntities(sysPdfTemplateRelevanceCodeEntities); + spsSyncSysSettingResponse.setSysPdfTemplateRelevanceBizEntities(sysPdfTemplateRelevanceBizEntities); + spsSyncSysSettingResponse.setSysPdfTemplateRelevanceLabelEntities(sysPdfTemplateRelevanceLabelEntities); + spsSyncSysSettingResponse.setSysPdfTemplateRelevanceStatemenEntities(sysPdfTemplateRelevanceStatemenEntities); + } + + //自动建出入库单 + if (syncDataSet.getScanChangeConfig() == 1) { + List basicBusTypePreEntities = basicBusTypePreService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + spsSyncSysSettingResponse.setBasicBusTypePreEntities(basicBusTypePreEntities); + } + + //自动建业务单设置 + if (syncDataSet.getBusChangeConfig() == 1) { + List basicBusTypeChangeEntities = basicBusTypeChangeService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + spsSyncSysSettingResponse.setBasicBusTypeChangeEntities(basicBusTypeChangeEntities); + } + + return spsSyncSysSettingResponse; + } + + } diff --git a/src/main/java/com/glxp/api/service/sync/UpThrDataService.java b/src/main/java/com/glxp/api/service/sync/UpThrDataService.java new file mode 100644 index 000000000..89356bfcf --- /dev/null +++ b/src/main/java/com/glxp/api/service/sync/UpThrDataService.java @@ -0,0 +1,89 @@ +package com.glxp.api.service.sync; + +import com.glxp.api.entity.thrsys.ThrCorpEntity; +import com.glxp.api.entity.thrsys.ThrDeptEntity; +import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import com.glxp.api.req.sync.SpsSyncDataRequest; +import com.glxp.api.res.sync.SpsSyncThrDataResponse; +import com.glxp.api.res.sync.SpsSyncThrProductsResponse; +import com.glxp.api.res.system.SyncDataSetResponse; +import com.glxp.api.service.thrsys.ThrCorpService; +import com.glxp.api.service.thrsys.ThrDeptService; +import com.glxp.api.service.thrsys.ThrInvWarehouseService; +import com.glxp.api.service.thrsys.ThrProductsService; +import com.glxp.api.util.DateUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 上传第三方基础数据到自助平台 + */ +@Service +public class UpThrDataService { + + @Resource + private SyncDataSetService syncDataSetService; + @Resource + private ThrDeptService thrDeptService; + @Resource + private ThrInvWarehouseService thrInvWarehouseService; + @Resource + private ThrProductsService thrProductsService; + @Resource + private ThrCorpService thrCorpService; + + /** + * 上传最近更新的第三方基础信息数据 + * + * @param spsSyncDataRequest + * @return + */ + public SpsSyncThrDataResponse upThrData(SpsSyncDataRequest spsSyncDataRequest) { + SpsSyncThrDataResponse spsSyncThrDataResponse = new SpsSyncThrDataResponse(); + //查询数据同步设置 + SyncDataSetResponse syncDataSet = syncDataSetService.selectSet(); + + //第三方部门信息 + if (syncDataSet.getBasicThirdDept() == 1) { + List deptEntities = thrDeptService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + spsSyncThrDataResponse.setDeptEntities(deptEntities); + } + + //第三方仓库信息 + if (syncDataSet.getBasicThirdInv() == 1) { + List invWarehouseEntities = thrInvWarehouseService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + spsSyncThrDataResponse.setInvWarehouseEntities(invWarehouseEntities); + } + + //第三方往来单位信息 + if (syncDataSet.getBasicThirdCorp() == 1) { + List corpEntities = thrCorpService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + spsSyncThrDataResponse.setCorpEntities(corpEntities); + } + return spsSyncThrDataResponse; + } + + /** + * 上传最近更新的第三方产品信息数据 + * + * @param spsSyncDataRequest + * @return + */ + public SpsSyncThrProductsResponse upThrProducts(SpsSyncDataRequest spsSyncDataRequest) { + SpsSyncThrProductsResponse spsSyncThrProductsResponse = new SpsSyncThrProductsResponse(); + //查询数据同步设置 + SyncDataSetResponse syncDataSet = syncDataSetService.selectSet(); + + //第三方产品信息 + if (syncDataSet.getBasicThirdProducts() == 1) { + List thrProductsEntities = thrProductsService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); + spsSyncThrProductsResponse.setProductsEntities(thrProductsEntities); + } + + return spsSyncThrProductsResponse; + } + +} diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java b/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java index b04f6429d..cfcdf4a9f 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.req.system.FilterPdfModuleRequest; import com.glxp.api.req.system.SysPdfModuleSaveRequest; +import java.util.Date; import java.util.List; @@ -23,4 +24,6 @@ public interface SystemPDFModuleService { boolean insert(SystemPDFModuleEntity systemPDFModuleEntity); boolean deleteById(Integer id); + + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java index b65840785..2cb617907 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; +import java.util.Date; import java.util.List; public interface SystemPDFTemplateRelevanceBizService { @@ -18,6 +19,5 @@ public interface SystemPDFTemplateRelevanceBizService { boolean insert(SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity); - - + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java index 9eafd92da..221c69ca0 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; +import java.util.Date; import java.util.List; public interface SystemPDFTemplateRelevanceCodeService { @@ -22,7 +23,5 @@ public interface SystemPDFTemplateRelevanceCodeService { SysPdfTemplateRelevanceCodeEntity selectNameAndAction(String name,String localAction); - - - + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceLabelService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceLabelService.java index 72d6fecb4..68dc43569 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceLabelService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceLabelService.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; +import java.util.Date; import java.util.List; public interface SystemPDFTemplateRelevanceLabelService { @@ -16,6 +17,5 @@ public interface SystemPDFTemplateRelevanceLabelService { boolean udpateRl(SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity); - - + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java index 2b3ded350..bb6afb255 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; +import java.util.Date; import java.util.List; public interface SystemPDFTemplateRelevanceStatemenService { @@ -16,6 +17,5 @@ public interface SystemPDFTemplateRelevanceStatemenService { boolean udpateRl(SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity); - - + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java index 3f2df73b6..d01a20417 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.req.system.FilterPdfTemplateRequest; import com.glxp.api.req.system.SysPdfTemplateSaveRequest; +import java.util.Date; import java.util.List; @@ -23,4 +24,6 @@ public interface SystemPDFTemplateService { boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity); boolean deleteById(Integer id); + + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java b/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java index 32cb6c2d3..8265bc4df 100644 --- a/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java +++ b/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.req.system.FilterParamConfigRequest; import com.glxp.api.req.system.SysParamConfigSaveRequest; +import java.util.Date; import java.util.List; import java.util.Map; @@ -34,4 +35,5 @@ public interface SystemParamConfigService { Map findBasicAll(); + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java index 920d26cdf..a9734e635 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @Service @@ -61,4 +62,9 @@ public class SystemPDFModuleServiceImpl implements SystemPDFModuleService { public boolean deleteById(Integer id) { return systemPDFModuleDao.deleteById(id); } + + @Override + public List findByLastTime(Date lastUpdateTime) { + return systemPDFModuleDao.selectByLastTime(lastUpdateTime); + } } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java index 0b3f039c9..1fa040276 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java @@ -9,6 +9,7 @@ import com.glxp.api.service.system.SystemPDFTemplateRelevanceBizService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @Service @@ -54,4 +55,9 @@ public class SystemPDFTemplateRelevanceBizServiceImpl implements SystemPDFTempla return true; } + + @Override + public List findByLastTime(Date lastUpdateTime) { + return sysPdfTemplateRelevanceBizDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); + } } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java index 6eafd6cd7..28fdd08e2 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java @@ -9,6 +9,7 @@ import com.glxp.api.service.system.SystemPDFTemplateRelevanceCodeService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @Service @@ -68,4 +69,9 @@ public class SystemPDFTemplateRelevanceCodeServiceImpl implements SystemPDFTempl public SysPdfTemplateRelevanceCodeEntity selectNameAndAction(String name, String localAction) { return sysPdfTemplateRelevanceCodeDao.selectNameAndAction(name,localAction); } + + @Override + public List findByLastTime(Date lastUpdateTime) { + return sysPdfTemplateRelevanceCodeDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); + } } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java index 5cb6ebf8d..713cfbbcc 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java @@ -9,6 +9,7 @@ import com.glxp.api.service.system.SystemPDFTemplateRelevanceLabelService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @Service @@ -46,4 +47,10 @@ public class SystemPDFTemplateRelevanceLabelServiceImpl implements SystemPDFTemp return false; } } + + @Override + public List findByLastTime(Date lastUpdateTime) { + return sysPdfTemplateRelevanceLabelDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); + } + } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java index 5ccd934a2..e060234ca 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java @@ -9,6 +9,7 @@ import com.glxp.api.service.system.SystemPDFTemplateRelevanceStatemenService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @Service @@ -46,4 +47,9 @@ public class SystemPDFTemplateRelevanceStatemenServiceImpl implements SystemPDFT return false; } } + + @Override + public List findByLastTime(Date lastUpdateTime) { + return sysPdfTemplateRelevanceStatemenDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); + } } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java index 4f2cccc66..eb0ea7533 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @Service @@ -61,4 +62,10 @@ public class SystemPDFTemplateServiceImpl implements SystemPDFTemplateService { public boolean deleteById(Integer id) { return systemPDFTemplateDao.deleteById(id); } + + @Override + public List findByLastTime(Date lastUpdateTime) { + return systemPDFTemplateDao.selectByLastTime(lastUpdateTime); + } + } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java index 242794772..f7e12492b 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -105,4 +106,9 @@ public class SystemParamConfigServiceImpl implements SystemParamConfigService { return systemParamConfigEntityMap; } + + @Override + public List findByLastTime(Date lastUpdateTime) { + return systemParamConfigDao.selectByLastTime(lastUpdateTime); + } } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java index 3e37496e2..bf14238dc 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java @@ -1,14 +1,13 @@ package com.glxp.api.service.thrsys; - import com.glxp.api.entity.thrsys.ThrCorpEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; 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.res.thrsys.ThrUnitMaintainResponse; +import java.util.Date; import java.util.List; public interface ThrCorpService { @@ -31,4 +30,5 @@ public interface ThrCorpService { ThrSystemDetailEntity selectByKey(String key, String thirdSys); + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java b/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java index bc031d578..99abbb784 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java @@ -5,12 +5,14 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.entity.thrsys.ThrDeptEntity; import com.glxp.api.req.thrsys.FilterThrDeptRequest; +import java.util.Date; import java.util.List; public interface ThrDeptService { ThrDeptEntity findDefault(Boolean advaceType, Boolean isDefault); + List filterThrInvWarehouse(FilterThrDeptRequest filterThrDeptRequest); List filterGroupInvWarehouse(FilterThrDeptRequest filterThrDeptRequest); @@ -44,4 +46,12 @@ public interface ThrDeptService { * @return */ BaseResponse deleteInvById(String id); + + /** + * 根据最近更新时间查询部门列表 + * + * @param lastUpdateTime + * @return + */ + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java index 073a23ba3..7ab3d0864 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.api.req.thrsys.FilterThrSubInvWarehouseRequest; import com.glxp.api.res.thrsys.ThrInvWarehouseResponse; +import java.util.Date; import java.util.List; public interface ThrInvWarehouseService { @@ -33,4 +34,5 @@ public interface ThrInvWarehouseService { */ List filterThrInvWarehouseResponse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest); + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java index a422aa291..e6ae6cb15 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.res.thrsys.ThrProductsResponse; +import java.util.Date; import java.util.List; /** @@ -33,4 +34,5 @@ public interface ThrProductsService { boolean insertThrProducts(ThrProductsEntity thrProductsEntity); + List findByLastTime(Date lastUpdateTime); } 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 index d3d58d6d2..117f1c53e 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java @@ -14,6 +14,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; +import java.util.Date; import java.util.List; @Service @@ -89,4 +90,9 @@ public class ThrCorpServiceImpl implements ThrCorpService { return thrCorpDao.selectByKey(key,thirdSys); } + @Override + public List findByLastTime(Date lastUpdateTime) { + return thrCorpDao.selectByLastTime(lastUpdateTime); + } + } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java index edf61e192..a831e93cc 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java @@ -183,4 +183,9 @@ public class ThrDeptServiceImpl implements ThrDeptService { return ResultVOUtils.success("删除成功"); } + + @Override + public List findByLastTime(Date lastUpdateTime) { + return thrDeptDao.selectByLastTime(lastUpdateTime); + } } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java index af40e60fe..ad2ffd491 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java @@ -13,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; +import java.util.Date; import java.util.List; @Service @@ -109,4 +110,9 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService { return thrInvWarehouseDao.filterThrInvWarehouseResponse(filterThrSubInvWarehouseRequest); } + @Override + public List findByLastTime(Date lastUpdateTime) { + return thrInvWarehouseDao.selectByLastTime(lastUpdateTime); + } + } 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 5d2fa6479..9f84eeace 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,19 +2,18 @@ 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.entity.thrsys.ThrProductsEntity; import com.glxp.api.dao.thrsys.ThrProductsDao; +import com.glxp.api.entity.thrsys.ThrProductsEntity; 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 org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; +import java.util.Date; import java.util.List; /** @@ -98,5 +97,9 @@ public class ThrProductsServiceImpl implements ThrProductsService { return thrProductsDao.insertThrProducts(thrProductsEntity); } + @Override + public List findByLastTime(Date lastUpdateTime) { + return thrProductsDao.selectByLastTime(lastUpdateTime); + } } diff --git a/src/main/java/com/glxp/api/task/SyncHeartTask.java b/src/main/java/com/glxp/api/task/SyncHeartTask.java index 4dc6326f9..d7a13dec7 100644 --- a/src/main/java/com/glxp/api/task/SyncHeartTask.java +++ b/src/main/java/com/glxp/api/task/SyncHeartTask.java @@ -6,7 +6,6 @@ import com.glxp.api.entity.system.ScheduledEntity; import com.glxp.api.entity.system.SyncDataSetEntity; import com.glxp.api.req.system.ScheduledRequest; import com.glxp.api.service.sync.HeartService; -import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.RedisUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,6 +69,9 @@ public class SyncHeartTask implements SchedulingConfigurer { heartService.uploadAllBus(null); heartService.uploadAllUserData(null); // heartService.uploadScheduleList(); + heartService.uploadThrData(null); + heartService.uploadThrProducts(null); + heartService.uploadSysSetting(null); redisUtil.set("SPS_SYNC_UPLOAD_DATA", curTime1); } diff --git a/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml b/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml index 6c99e5ebe..4121263bd 100644 --- a/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml +++ b/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml @@ -78,4 +78,8 @@ + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml index 21924892a..c4cec8f5a 100644 --- a/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml +++ b/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml @@ -92,4 +92,8 @@ from sys_pdf_module where id = #{id} + + diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml index f024c5cc9..1d5299913 100644 --- a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml +++ b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml @@ -78,4 +78,8 @@ from sys_pdf_template where id = #{id} + + \ 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 index dd0c5b319..a297e26f5 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml @@ -171,4 +171,7 @@ and basic_third_sys.enabled = 1 + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml index aed99624a..0681dd883 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml @@ -192,4 +192,8 @@ #{item.thirdSysFk}) + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml index fa340e07e..034bc08bb 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml @@ -122,5 +122,7 @@ WHERE id = #{id} - + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml index bdc13e045..bac14b4ef 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml @@ -192,4 +192,7 @@ ) + diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 0387239b7..9aa1cff3d 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -155,6 +155,13 @@ CALL Pro_Temp_ColumnWork('sync_data_set', 'systemConfig', 'tinyint', 1); CALL Pro_Temp_ColumnWork('sync_data_set', 'printConfig', 'tinyint', 1); CALL Pro_Temp_ColumnWork('sync_data_set', 'scanChangeConfig', 'tinyint', 1); CALL Pro_Temp_ColumnWork('sync_data_set', 'busChangeConfig', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('sync_data_set', 'basicThirdDept', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'updateTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('sys_param_config', 'updateTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_code', 'updateTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_biz', 'updateTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_label', 'updateTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_statemen', 'updateTime', 'datetime', 1); # CALL Pro_Temp_ColumnWork('sup_cert_set', 'foreign', 'tinyint', 3); # CALL Pro_Temp_ColumnWork('sup_cert_set', 'needForeign', 'tinyint', 1); From 1e57b7ca4fbfea04d76d48eaf4a72fc6b379963b Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 17 Apr 2023 18:10:28 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=B1=87=E6=80=BB=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=87=BAexcel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inv/ApiExcelController.java | 5 +- .../glxp/api/dao/inout/IoStatMonthDao.java | 4 +- .../glxp/api/dao/inout/IoStatQuarterDao.java | 4 +- .../com/glxp/api/dao/inout/IoStatYearDao.java | 4 +- .../com/glxp/api/entity/inout/ExcelVO.java | 41 ++--- .../SysPdfTemplateRelevanceCodeEntity.java | 2 +- .../glxp/api/service/inout/ExcelService.java | 2 +- .../api/service/inout/IoStatMonthService.java | 2 + .../service/inout/IoStatQuarterService.java | 2 + .../api/service/inout/IoStatYearService.java | 3 + .../service/inout/impl/ExcelServiceImpl.java | 143 +++++++++++++----- .../inout/impl/IoStatMonthServiceImpl.java | 5 + .../inout/impl/IoStatQuarterServiceImpl.java | 5 + .../inout/impl/IoStatYearServiceImpl.java | 5 + .../com/glxp/api/util/Excel/ExcelHandler.java | 6 +- .../mybatis/mapper/inout/IoStatMonthDao.xml | 7 +- .../mybatis/mapper/inout/IoStatQuarterDao.xml | 8 +- .../mybatis/mapper/inout/IoStatYearDao.xml | 8 +- 18 files changed, 176 insertions(+), 80 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inv/ApiExcelController.java b/src/main/java/com/glxp/api/controller/inv/ApiExcelController.java index 27c0b980c..c483f5699 100644 --- a/src/main/java/com/glxp/api/controller/inv/ApiExcelController.java +++ b/src/main/java/com/glxp/api/controller/inv/ApiExcelController.java @@ -46,8 +46,9 @@ public class ApiExcelController { * @param response 响应流 */ @GetMapping("/udiwms/inv/excelExportOut") - public void export(HttpServletResponse response,String billNo) { - excelService.excelExport(response,billNo); + public void export(HttpServletResponse response,String billNo,String key) { + + excelService.excelExport(response,billNo,key); } /** diff --git a/src/main/java/com/glxp/api/dao/inout/IoStatMonthDao.java b/src/main/java/com/glxp/api/dao/inout/IoStatMonthDao.java index 019141375..a1d18649d 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoStatMonthDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoStatMonthDao.java @@ -18,4 +18,6 @@ public interface IoStatMonthDao extends BaseMapper { * @return */ List filterList(FilterStatDataDetailRequest statDataDetailRequest); -} \ No newline at end of file + + List filterListByRecordKey(String recordKey); +} diff --git a/src/main/java/com/glxp/api/dao/inout/IoStatQuarterDao.java b/src/main/java/com/glxp/api/dao/inout/IoStatQuarterDao.java index baba1db4a..97245b6bf 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoStatQuarterDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoStatQuarterDao.java @@ -18,4 +18,6 @@ public interface IoStatQuarterDao extends BaseMapper { * @return */ List filterList(FilterStatDataDetailRequest statDataDetailRequest); -} \ No newline at end of file + + List filterListByRecordKey(String recordKey); +} diff --git a/src/main/java/com/glxp/api/dao/inout/IoStatYearDao.java b/src/main/java/com/glxp/api/dao/inout/IoStatYearDao.java index 222a86ac8..0aa7ce2a9 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoStatYearDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoStatYearDao.java @@ -18,4 +18,6 @@ public interface IoStatYearDao extends BaseMapper { * @return */ List filterList(FilterStatDataDetailRequest statDataDetailRequest); -} \ No newline at end of file + + List filterListByRecordKey(String recordKey); +} diff --git a/src/main/java/com/glxp/api/entity/inout/ExcelVO.java b/src/main/java/com/glxp/api/entity/inout/ExcelVO.java index a6c28cfb1..604ac89cd 100644 --- a/src/main/java/com/glxp/api/entity/inout/ExcelVO.java +++ b/src/main/java/com/glxp/api/entity/inout/ExcelVO.java @@ -18,83 +18,68 @@ import java.math.BigDecimal; @ApiModel(value = "导出实体") public class ExcelVO { - @ColumnWidth(80) @ExcelProperty("序号") @ApiModelProperty(value = "序号") private Integer id; - @ColumnWidth(80) @ExcelProperty("产品通用名") @ApiModelProperty(value = "产品通用名") private String productName; - @ColumnWidth(80) @ExcelProperty("规格型号") @ApiModelProperty(value = "规格型号") private String ggxh; - @ColumnWidth(80) @ExcelProperty("批次号") @ApiModelProperty(value = "批次号") private String batchNo; - @ColumnWidth(80) - @ExcelProperty("数量") + @ExcelProperty({"期初","数量"}) @ApiModelProperty(value = "数量") private Integer beginCount; - @ColumnWidth(80) - @ExcelProperty("价格") + @ExcelProperty({"期初","价格"}) @ApiModelProperty(value = "价格") private BigDecimal beginPrice; - @ColumnWidth(80) - @ExcelProperty("金额") + @ExcelProperty({"期初","金额"}) @ApiModelProperty(value = "金额") private BigDecimal beginAmount; - @ColumnWidth(80) - @ExcelProperty("数量") + @ExcelProperty({"入库","数量"}) @ApiModelProperty(value = "数量") private Integer inCount; - @ColumnWidth(80) - @ExcelProperty("价格") + @ExcelProperty({"入库","价格"}) @ApiModelProperty(value = "价格") private BigDecimal inPrice; - @ColumnWidth(80) - @ExcelProperty("金额") + @ExcelProperty({"入库","金额"}) @ApiModelProperty(value = "金额") private BigDecimal inAmount; - @ColumnWidth(80) - @ExcelProperty("数量") + @ExcelProperty({"出库","数量"}) @ApiModelProperty(value = "数量") private Integer outCount; - @ColumnWidth(80) - @ExcelProperty("价格") + @ExcelProperty({"出库","价格"}) @ApiModelProperty(value = "价格") private BigDecimal outPrice; - @ColumnWidth(80) - @ExcelProperty("金额") + @ExcelProperty({"出库","金额"}) @ApiModelProperty(value = "金额") private BigDecimal outAmount; - @ColumnWidth(80) - @ExcelProperty("数量") + + @ExcelProperty({"结余","数量"}) @ApiModelProperty(value = "数量") private Integer balanceCount; - @ColumnWidth(80) - @ExcelProperty("价格") + @ExcelProperty({"结余","价格"}) @ApiModelProperty(value = "价格") private BigDecimal balancePrice; - @ColumnWidth(80) - @ExcelProperty("金额") + @ExcelProperty({"结余","金额"}) @ApiModelProperty(value = "金额") private BigDecimal balanceAmount; diff --git a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceCodeEntity.java b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceCodeEntity.java index fd7fdd974..69fb37323 100644 --- a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceCodeEntity.java @@ -65,4 +65,4 @@ public class SysPdfTemplateRelevanceCodeEntity { @TableField(value = "updateTime") private Date updateTime; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/service/inout/ExcelService.java b/src/main/java/com/glxp/api/service/inout/ExcelService.java index 3f31382f2..c8c161edb 100644 --- a/src/main/java/com/glxp/api/service/inout/ExcelService.java +++ b/src/main/java/com/glxp/api/service/inout/ExcelService.java @@ -30,7 +30,7 @@ public interface ExcelService { * * @param response 响应体 */ - void excelExport(HttpServletResponse response,String billNo); + void excelExport(HttpServletResponse response,String billNo,String key); /** * excel多入-多个sheet diff --git a/src/main/java/com/glxp/api/service/inout/IoStatMonthService.java b/src/main/java/com/glxp/api/service/inout/IoStatMonthService.java index fd5721407..057b90738 100644 --- a/src/main/java/com/glxp/api/service/inout/IoStatMonthService.java +++ b/src/main/java/com/glxp/api/service/inout/IoStatMonthService.java @@ -25,4 +25,6 @@ public interface IoStatMonthService { * @return */ List filterList(FilterStatDataDetailRequest statDataDetailRequest); + + List filterListByRecordKey(String recordKey); } diff --git a/src/main/java/com/glxp/api/service/inout/IoStatQuarterService.java b/src/main/java/com/glxp/api/service/inout/IoStatQuarterService.java index 9239c55ba..5d1f2e84b 100644 --- a/src/main/java/com/glxp/api/service/inout/IoStatQuarterService.java +++ b/src/main/java/com/glxp/api/service/inout/IoStatQuarterService.java @@ -26,4 +26,6 @@ public interface IoStatQuarterService { */ List filterList(FilterStatDataDetailRequest statDataDetailRequest); + List filterListByRecordKey(String recordKey); + } diff --git a/src/main/java/com/glxp/api/service/inout/IoStatYearService.java b/src/main/java/com/glxp/api/service/inout/IoStatYearService.java index 71a614ad5..1147e52cf 100644 --- a/src/main/java/com/glxp/api/service/inout/IoStatYearService.java +++ b/src/main/java/com/glxp/api/service/inout/IoStatYearService.java @@ -25,4 +25,7 @@ public interface IoStatYearService { * @return */ List filterList(FilterStatDataDetailRequest statDataDetailRequest); + + List filterListByRecordKey(String recordKey); + } diff --git a/src/main/java/com/glxp/api/service/inout/impl/ExcelServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ExcelServiceImpl.java index 1615e631c..f3563b913 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/ExcelServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/ExcelServiceImpl.java @@ -9,11 +9,9 @@ package com.glxp.api.service.inout.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import com.glxp.api.entity.inout.ExcelVO; -import com.glxp.api.entity.inout.IoStatDayEntity; +import com.glxp.api.entity.inout.*; import com.glxp.api.req.inout.FilterStatDataDetailRequest; -import com.glxp.api.service.inout.ExcelService; -import com.glxp.api.service.inout.IoStatDayService; +import com.glxp.api.service.inout.*; import com.glxp.api.util.Excel.ExcelHandler; import com.glxp.api.util.Excel.ExcelTemplateEnum; import com.glxp.api.util.Excel.Exception.RenException; @@ -37,6 +35,14 @@ public class ExcelServiceImpl implements ExcelService { @Resource private IoStatDayService statDayService; + @Resource + private IoStatMonthService statMonthService; + + @Resource + private IoStatQuarterService statQuarterService; + + @Resource + private IoStatYearService statYearService; /** * excel导入-单个sheet @@ -65,9 +71,9 @@ public class ExcelServiceImpl implements ExcelService { * @param response 响应体 */ @Override - public void excelExport(HttpServletResponse response, String billNo) { + public void excelExport(HttpServletResponse response, String billNo,String key) { try { - List excelVOS = structureDate(billNo); + List excelVOS = structureDate(billNo,key); excelHandler.exportExcel(response, excelVOS, ExcelVO.class, "excel导出-单et", "excel导出heet"); } catch (Exception e) { throw new RenException("导出失败"); @@ -181,43 +187,98 @@ public class ExcelServiceImpl implements ExcelService { * * @return 数据集合 */ - private List structureDate(String billNo) { + private List structureDate(String billNo ,String key) { List list = new ArrayList<>(); + if("day".equals(key)){ + List ioStatDayEntities = statDayService.filterListByRecordKey(billNo); + for (int i=0; i < ioStatDayEntities.size(); i++) { + ExcelVO vo = new ExcelVO(); + vo.setId(i+1); + vo.setProductName(ioStatDayEntities.get(i).getProductName()); + vo.setGgxh(ioStatDayEntities.get(i).getGgxh()); + vo.setBatchNo(ioStatDayEntities.get(i).getBatchNo()); + vo.setBeginCount(ioStatDayEntities.get(i).getBeginCount()); + vo.setBeginPrice(ioStatDayEntities.get(i).getBeginPrice()); + vo.setBeginAmount(ioStatDayEntities.get(i).getBeginAmount()); + vo.setInCount(ioStatDayEntities.get(i).getInCount()); + vo.setInPrice(ioStatDayEntities.get(i).getInPrice()); + vo.setInAmount(ioStatDayEntities.get(i).getInAmount()); + vo.setOutCount(ioStatDayEntities.get(i).getOutCount()); + vo.setOutPrice(ioStatDayEntities.get(i).getOutPrice()); + vo.setOutAmount(ioStatDayEntities.get(i).getOutAmount()); + vo.setBalanceCount(ioStatDayEntities.get(i).getBalanceCount()); + vo.setBalancePrice(ioStatDayEntities.get(i).getBalancePrice()); + vo.setBalanceAmount(ioStatDayEntities.get(i).getBalanceAmount()); + list.add(vo); + } + }else if("month".equals(key)){ + List ioStatMonthEntities = statMonthService.filterListByRecordKey(billNo); + for (int i=0; i < ioStatMonthEntities.size(); i++) { + ExcelVO vo = new ExcelVO(); + vo.setId(i+1); + vo.setProductName(ioStatMonthEntities.get(i).getProductName()); + vo.setGgxh(ioStatMonthEntities.get(i).getGgxh()); + vo.setBatchNo(ioStatMonthEntities.get(i).getBatchNo()); + vo.setBeginCount(ioStatMonthEntities.get(i).getBeginCount()); + vo.setBeginPrice(ioStatMonthEntities.get(i).getBeginPrice()); + vo.setBeginAmount(ioStatMonthEntities.get(i).getBeginAmount()); + vo.setInCount(ioStatMonthEntities.get(i).getInCount()); + vo.setInPrice(ioStatMonthEntities.get(i).getInPrice()); + vo.setInAmount(ioStatMonthEntities.get(i).getInAmount()); + vo.setOutCount(ioStatMonthEntities.get(i).getOutCount()); + vo.setOutPrice(ioStatMonthEntities.get(i).getOutPrice()); + vo.setOutAmount(ioStatMonthEntities.get(i).getOutAmount()); + vo.setBalanceCount(ioStatMonthEntities.get(i).getBalanceCount()); + vo.setBalancePrice(ioStatMonthEntities.get(i).getBalancePrice()); + vo.setBalanceAmount(ioStatMonthEntities.get(i).getBalanceAmount()); + list.add(vo); + } + }else if("quarter".equals(key)){ + List ioStatQuarterEntities = statQuarterService.filterListByRecordKey(billNo); + for (int i=0; i < ioStatQuarterEntities.size(); i++) { + ExcelVO vo = new ExcelVO(); + vo.setId(i+1); + vo.setProductName(ioStatQuarterEntities.get(i).getProductName()); + vo.setGgxh(ioStatQuarterEntities.get(i).getGgxh()); + vo.setBatchNo(ioStatQuarterEntities.get(i).getBatchNo()); + vo.setBeginCount(ioStatQuarterEntities.get(i).getBeginCount()); + vo.setBeginPrice(ioStatQuarterEntities.get(i).getBeginPrice()); + vo.setBeginAmount(ioStatQuarterEntities.get(i).getBeginAmount()); + vo.setInCount(ioStatQuarterEntities.get(i).getInCount()); + vo.setInPrice(ioStatQuarterEntities.get(i).getInPrice()); + vo.setInAmount(ioStatQuarterEntities.get(i).getInAmount()); + vo.setOutCount(ioStatQuarterEntities.get(i).getOutCount()); + vo.setOutPrice(ioStatQuarterEntities.get(i).getOutPrice()); + vo.setOutAmount(ioStatQuarterEntities.get(i).getOutAmount()); + vo.setBalanceCount(ioStatQuarterEntities.get(i).getBalanceCount()); + vo.setBalancePrice(ioStatQuarterEntities.get(i).getBalancePrice()); + vo.setBalanceAmount(ioStatQuarterEntities.get(i).getBalanceAmount()); + list.add(vo); + } + }else{ + List ioStatYearEntities = statYearService.filterListByRecordKey(billNo); + for (int i=0; i < ioStatYearEntities.size(); i++) { + ExcelVO vo = new ExcelVO(); + vo.setId(i+1); + vo.setProductName(ioStatYearEntities.get(i).getProductName()); + vo.setGgxh(ioStatYearEntities.get(i).getGgxh()); + vo.setBatchNo(ioStatYearEntities.get(i).getBatchNo()); + vo.setBeginCount(ioStatYearEntities.get(i).getBeginCount()); + vo.setBeginPrice(ioStatYearEntities.get(i).getBeginPrice()); + vo.setBeginAmount(ioStatYearEntities.get(i).getBeginAmount()); + vo.setInCount(ioStatYearEntities.get(i).getInCount()); + vo.setInPrice(ioStatYearEntities.get(i).getInPrice()); + vo.setInAmount(ioStatYearEntities.get(i).getInAmount()); + vo.setOutCount(ioStatYearEntities.get(i).getOutCount()); + vo.setOutPrice(ioStatYearEntities.get(i).getOutPrice()); + vo.setOutAmount(ioStatYearEntities.get(i).getOutAmount()); + vo.setBalanceCount(ioStatYearEntities.get(i).getBalanceCount()); + vo.setBalancePrice(ioStatYearEntities.get(i).getBalancePrice()); + vo.setBalanceAmount(ioStatYearEntities.get(i).getBalanceAmount()); + list.add(vo); + } - List ioStatDayEntities = statDayService.filterListByRecordKey(billNo); - ExcelVO vo = new ExcelVO(); - for (int i=0; i < ioStatDayEntities.size(); i++) { - vo.setId(i+1); - vo.setProductName(ioStatDayEntities.get(i).getProductName()); - vo.setGgxh(ioStatDayEntities.get(i).getGgxh()); - vo.setBatchNo(ioStatDayEntities.get(i).getBatchNo()); - vo.setBeginCount(ioStatDayEntities.get(i).getBeginCount()); - vo.setBeginPrice(ioStatDayEntities.get(i).getBeginPrice()); - vo.setBeginAmount(ioStatDayEntities.get(i).getBeginAmount()); - vo.setInCount(ioStatDayEntities.get(i).getInCount()); - vo.setInPrice(ioStatDayEntities.get(i).getInPrice()); - vo.setInAmount(ioStatDayEntities.get(i).getInAmount()); - vo.setOutCount(ioStatDayEntities.get(i).getOutCount()); - - vo.setOutPrice(ioStatDayEntities.get(i).getOutPrice()); - vo.setOutAmount(ioStatDayEntities.get(i).getOutAmount()); - vo.setBalanceCount(ioStatDayEntities.get(i).getBalanceCount()); - vo.setBalancePrice(ioStatDayEntities.get(i).getBalancePrice()); - vo.setBalanceAmount(ioStatDayEntities.get(i).getBalanceAmount()); - list.add(vo); - } - - -// for (int i = 0; i < size; i++) { -// ExcelVO vo = new ExcelVO(); -// vo.setId(i); -//// vo.setAge(i); -//// vo.setName("张三" + i); -//// vo.setWen(new Random().nextInt(99)); -//// vo.setRichard(new Random().nextInt(99)); -//// vo.setSum(vo.getWen() + vo.getRichard()); -// list.add(vo); -// } + } return list; } } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java index ffd1b9b83..9120efa99 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java @@ -90,6 +90,11 @@ public class IoStatMonthServiceImpl implements IoStatMonthService { return statMonthDao.filterList(statDataDetailRequest); } + @Override + public List filterListByRecordKey(String recordKey) { + return statMonthDao.filterListByRecordKey(recordKey); + } + /** * 保存月汇总数据记录到数据库 * diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java index c1e87aa0c..22958b7f7 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java @@ -85,6 +85,11 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService { return statQuarterDao.filterList(statDataDetailRequest); } + @Override + public List filterListByRecordKey(String recordKey) { + return statQuarterDao.filterListByRecordKey(recordKey); + } + /** * 插入汇总数据 * diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java index cb8a44390..2bcaf64e9 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java @@ -87,6 +87,11 @@ public class IoStatYearServiceImpl implements IoStatYearService { return statYearDao.filterList(statDataDetailRequest); } + @Override + public List filterListByRecordKey(String recordKey) { + return statYearDao.filterListByRecordKey(recordKey); + } + /** * 插入汇总数据 * diff --git a/src/main/java/com/glxp/api/util/Excel/ExcelHandler.java b/src/main/java/com/glxp/api/util/Excel/ExcelHandler.java index e6fdcb91b..59be2806a 100644 --- a/src/main/java/com/glxp/api/util/Excel/ExcelHandler.java +++ b/src/main/java/com/glxp/api/util/Excel/ExcelHandler.java @@ -12,6 +12,7 @@ import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.InputStream; @@ -112,7 +113,10 @@ public class ExcelHandler { response.setCharacterEncoding(StandardCharsets.UTF_8.name()); fileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.name()); response.setHeader("Content-disposition", "attachment;filename=" + fileName + ExcelTemplateEnum.TEMPLATE_SUFFIX.getDesc()); - EasyExcelFactory.write(response.getOutputStream(), clazz).sheet(sheetName).doWrite(dataList); + ServletOutputStream outputStream = response.getOutputStream(); + EasyExcelFactory.write(outputStream, clazz).sheet(sheetName).doWrite(dataList); + outputStream.flush(); + outputStream.close(); } /** diff --git a/src/main/resources/mybatis/mapper/inout/IoStatMonthDao.xml b/src/main/resources/mybatis/mapper/inout/IoStatMonthDao.xml index 99fc2096b..cd602804a 100644 --- a/src/main/resources/mybatis/mapper/inout/IoStatMonthDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoStatMonthDao.xml @@ -19,4 +19,9 @@ - \ No newline at end of file + + diff --git a/src/main/resources/mybatis/mapper/inout/IoStatQuarterDao.xml b/src/main/resources/mybatis/mapper/inout/IoStatQuarterDao.xml index 35db8efe6..210790bbd 100644 --- a/src/main/resources/mybatis/mapper/inout/IoStatQuarterDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoStatQuarterDao.xml @@ -19,4 +19,10 @@ - \ No newline at end of file + + + diff --git a/src/main/resources/mybatis/mapper/inout/IoStatYearDao.xml b/src/main/resources/mybatis/mapper/inout/IoStatYearDao.xml index 6c53ddd8c..1cd0ad16c 100644 --- a/src/main/resources/mybatis/mapper/inout/IoStatYearDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoStatYearDao.xml @@ -19,4 +19,10 @@ - \ No newline at end of file + + + From 2bd885c398c903920f48d0730f96034620a5dd17 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 17 Apr 2023 18:20:52 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=9B=BD=E5=AE=B6?= =?UTF-8?q?=E5=BA=93=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/constant/BasicProcessStatus.java | 2 +- .../glxp/api/http/sync/SpGetHttpClient.java | 2 + .../glxp/api/res/sync/SpSyncUdiResponse.java | 15 +++ .../glxp/api/service/sync/HeartService.java | 126 ++++++++++++++---- src/main/resources/application-wmd.yml | 55 ++++++++ 5 files changed, 174 insertions(+), 26 deletions(-) create mode 100644 src/main/java/com/glxp/api/res/sync/SpSyncUdiResponse.java create mode 100644 src/main/resources/application-wmd.yml diff --git a/src/main/java/com/glxp/api/constant/BasicProcessStatus.java b/src/main/java/com/glxp/api/constant/BasicProcessStatus.java index ed797e892..ec0c5da9c 100644 --- a/src/main/java/com/glxp/api/constant/BasicProcessStatus.java +++ b/src/main/java/com/glxp/api/constant/BasicProcessStatus.java @@ -29,7 +29,7 @@ public class BasicProcessStatus { public static final String NEW_ALL_BUS = "8"; public static final String NEW_ALL_ORDER = "9"; public static final String ALL_BUS_ORDER = "11"; - public static final int NEW_ALL_DI = 10; + public static final String NEW_ALL_DI = "10"; public static final String NEW_ALL_THR_DATA = "12"; //所有第三方基础数据 public static final String NEW_ALL_THR_PRODUCTS = "13"; //所有第三方产品数据 public static final String NEW_ALL_SYS_SETTING = "14"; //所有系统设置数据 diff --git a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java index 8098630da..74d8ef8ba 100644 --- a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java +++ b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java @@ -224,6 +224,8 @@ public class SpGetHttpClient { } + + public BaseResponse postBasicStatus(String id) { BasicExportStatusRequest basicStatusFilterRequest = new BasicExportStatusRequest(); basicStatusFilterRequest.setId(id); diff --git a/src/main/java/com/glxp/api/res/sync/SpSyncUdiResponse.java b/src/main/java/com/glxp/api/res/sync/SpSyncUdiResponse.java new file mode 100644 index 000000000..76f71462c --- /dev/null +++ b/src/main/java/com/glxp/api/res/sync/SpSyncUdiResponse.java @@ -0,0 +1,15 @@ +package com.glxp.api.res.sync; + +import com.glxp.api.entity.basic.ProductInfoEntity; +import com.glxp.api.entity.basic.UdiCompanyEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class SpSyncUdiResponse extends BaseSyncResponse{ + + //同步任务ID + List productInfoEntityList; + List udiCompanyEntities; +} diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index abf0cd76b..91da593c0 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -1,33 +1,43 @@ package com.glxp.api.service.sync; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.annotation.Resource; + import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; +import com.glxp.api.dao.basic.ProductInfoDao; +import com.glxp.api.dao.basic.UdiCompanyDao; +import com.glxp.api.dao.inout.*; +import com.glxp.api.entity.basic.ProductInfoEntity; +import com.glxp.api.entity.basic.UdiCompanyEntity; +import com.glxp.api.entity.inout.*; +import com.glxp.api.res.sync.*; +import com.glxp.api.service.inout.*; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.session.ExecutorType; +import org.apache.ibatis.session.SqlSession; +import org.apache.ibatis.session.SqlSessionFactory; +import org.apache.ibatis.session.TransactionIsolationLevel; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; 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.ConstantStatus; -import com.glxp.api.entity.inout.*; import com.glxp.api.entity.sync.BasicDownloadStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; import com.glxp.api.http.sync.SpGetHttpClient; import com.glxp.api.req.sync.SpsSyncDataRequest; -import com.glxp.api.res.sync.*; -import com.glxp.api.service.inout.*; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.DateUtil; -import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.session.SqlSessionFactory; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import cn.hutool.core.collection.CollUtil; @Slf4j @Service public class HeartService { @@ -52,6 +62,17 @@ public class HeartService { @Resource private UpThrDataService upThrDataService; + @Resource + IoCodeTempService codeTempService; + @Resource + IoOrderDetailBizService orderDetailBizService; + @Resource + IoOrderDetailCodeService orderDetailCodeService; + @Resource + IoOrderDetailResultService orderDetailResultService; + @Resource + IoOrderInvoiceService orderInvoiceService; + //上传最近更新扫码单据 public BaseResponse uploadAllOrder(String syncTime) { SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest(); @@ -326,18 +347,7 @@ public class HeartService { // } - @Resource - IoCodeTempService codeTempService; - @Resource - IoOrderDetailBizService orderDetailBizService; - @Resource - IoOrderDetailCodeService orderDetailCodeService; - @Resource - IoOrderDetailResultService orderDetailResultService; - @Resource - IoOrderInvoiceService orderInvoiceService; - - //下载最近更新扫码单据 + //下载最近更新扫码单据--上级服务 public void dlAllOrder() { BaseResponse> baseResponse = spGetHttp.getBasicStatus(BasicProcessStatus.NEW_ALL_ORDER + ""); List pageSimpleResponse = baseResponse != null ? baseResponse.getData() : new ArrayList<>(); @@ -417,6 +427,72 @@ public class HeartService { } } + // 下载最近更新国家库数据-上级服务 + public void dlAllDiProducts() { + BaseResponse> baseResponse = spGetHttp.getBasicStatus(BasicProcessStatus.NEW_ALL_DI + ""); + List pageSimpleResponse = baseResponse.getData(); + if (pageSimpleResponse != null) { + List basicExportStatusEntities = pageSimpleResponse; + if (basicExportStatusEntities != null && basicExportStatusEntities.size() > 0) { + for (BasicExportStatusEntity basicExportStatusEntity : basicExportStatusEntities) { + long curTime = System.currentTimeMillis(); +// log.info("--------等待时间------" + curTime); + String datas = spGetHttp.getBasicData(basicExportStatusEntity.getId(), BasicProcessStatus.NEW_ALL_DI); +// logger.info("--------等待时间1------" + (System.currentTimeMillis() - curTime) / 1000); + long curTime2 = System.currentTimeMillis(); + BaseResponse response = JSONObject.parseObject(datas, new TypeReference>() { + }); +// logger.info("--------等待时间2------" + (System.currentTimeMillis() - curTime2) / 1000); + if (response.getCode() == 20000 && response.getData() != null) { + SpSyncUdiResponse spSyncUdiResponse = response.getData(); + BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); + basicDownloadStatusEntity.setId(CustomUtil.getId()); + basicDownloadStatusEntity.setTaskId(spSyncUdiResponse.getTaskId()); + basicDownloadStatusEntity.setStartTime(new Date()); + basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_DI_PRODUCTS); + basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_WAIT); //下载中 + basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_DI); + basicDownloadStatusEntity.setScheduleType(1); + + basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); + StringBuffer remark = new StringBuffer(); + + SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); + if (CollUtil.isNotEmpty(spSyncUdiResponse.getUdiCompanyEntities())) { + List udiCompanyEntities = spSyncUdiResponse.getUdiCompanyEntities(); + UdiCompanyDao mapper = batchSession.getMapper(UdiCompanyDao.class); + for (UdiCompanyEntity udiCompanyEntity : udiCompanyEntities) { + mapper.insertUdiCompany(udiCompanyEntity); + } + batchSession.commit(); + remark.append("公司信息：").append(spSyncUdiResponse.getUdiCompanyEntities().size()).append("条\n"); + } + + if (CollUtil.isNotEmpty(spSyncUdiResponse.getProductInfoEntityList())) { + List productInfoEntities = spSyncUdiResponse.getProductInfoEntityList(); + ProductInfoDao mapper = batchSession.getMapper(ProductInfoDao.class); + for (ProductInfoEntity productInfoEntity : productInfoEntities) { + mapper.insertProductInfo(productInfoEntity); + } + batchSession.commit(); + remark.append("产品信息：").append(spSyncUdiResponse.getProductInfoEntityList().size()).append("条\n"); + } + batchSession.close(); + spGetHttp.postBasicStatus(basicExportStatusEntity.getId()); + + basicDownloadStatusEntity.setUpdateTime(new Date()); + basicDownloadStatusEntity.setEndTime(new Date()); + basicDownloadStatusEntity.setRemark(remark.toString()); + basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); + basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity); + } + } + + } + } + + } + public void insetOrderDb(SpsSyncOrderResponse syncDataResponse, IoOrderEntity orderEntity) { //更新码详情 if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailCodeEntities())) { diff --git a/src/main/resources/application-wmd.yml b/src/main/resources/application-wmd.yml new file mode 100644 index 000000000..e0ec69b11 --- /dev/null +++ b/src/main/resources/application-wmd.yml @@ -0,0 +1,55 @@ +server: + port: 9991 +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + jdbc-url: jdbc:mysql://192.168.0.66:3364/udi_wms_glxp?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + username: root + password: Glxp@6066 + hikari: + connection-timeout: 60000 + maximum-pool-size: 60 + minimum-idle: 10 + redis: + database: 8 + host: 127.0.0.1 + port: 6401 + # password: 123456 + timeout: 300 + jedis: + pool: + max-active: 8 + max-wait: -1 + max-idle: 8 + min-idle: 0 + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + servlet: + multipart: + max-file-size: 500MB + max-request-size: 500MB + +ok: + http: + connect-timeout: 3000 + read-timeout: 3000 + write-timeout: 3000 + max-idle-connections: 200 + keep-alive-duration: 300 + + +logging: + level: + com.glxp.api.dao: debug + +file_path: D:/udi/udiwms/udiwmsfile/ +UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df +UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test +SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs + +back_file_path: D:/share/udisps/back/ +API_KEY: 1101 +API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ9L + + From 3a13555c5c3a774737cb447d733d1d2bdfc06802 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 17 Apr 2023 19:10:25 +0800 Subject: [PATCH 5/7] =?UTF-8?q?by=E4=B8=AD=E7=BB=A7=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=E5=8D=95=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inout/IoOrderReviewController.java | 11 ++++++++++- .../com/glxp/api/res/inout/AcceptOrderResponse.java | 3 +++ .../com/glxp/api/service/inout/IoOrderService.java | 2 ++ .../api/service/inout/impl/IoOrderServiceImpl.java | 11 +++++++++++ 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index 37cbb6f85..ad705b720 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -26,6 +26,7 @@ import com.glxp.api.req.inout.UpdateExportStatusRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.inout.AcceptOrderResponse; import com.glxp.api.res.inout.IoOrderDetailResultResponse; +import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.sync.SpsSyncOrderResponse; import com.glxp.api.service.auth.AuthAdminService; import com.glxp.api.service.basic.EntrustReceService; @@ -444,8 +445,11 @@ public class IoOrderReviewController extends BaseController { AcceptOrderResponse acceptOrderEntity = new AcceptOrderResponse(); acceptOrderEntity.setBillNo(billNo); List datas = (List) redisUtil.get(ConstantStatus.REDIS_BILLNO + billNo); + IoOrderResponse orderResponse; if (CollUtil.isNotEmpty(datas)) { + orderResponse = orderService.findGroupBillNo(billNo); acceptOrderEntity.setOrderDetailEntities(datas); + acceptOrderEntity.setOrderEntity(orderResponse); acceptOrderEntity.setExitAccept(true); } else { FilterOrderDetailResultRequest filterOrderDetailResultRequest = new FilterOrderDetailResultRequest(); @@ -454,6 +458,8 @@ public class IoOrderReviewController extends BaseController { //本地已存在，则直接返回 if (CollUtil.isNotEmpty(orderDetailResultResponses)) { acceptOrderEntity.setOrderDetailEntities(orderDetailResultResponses); + orderResponse = orderService.findGroupBillNo(billNo); + acceptOrderEntity.setOrderEntity(orderResponse); acceptOrderEntity.setExitAccept(false); } else { //获取自助平台待审核单据，并插入到数据库 @@ -462,7 +468,8 @@ public class IoOrderReviewController extends BaseController { SpsSyncOrderResponse spsSyncOrderResponse = baseResponse.getData(); List orderEntities = spsSyncOrderResponse.getOrderEntities(); if (CollUtil.isNotEmpty(orderEntities)) { - IoOrderEntity orderEntity = orderEntities.get(0); + IoOrderEntity orderEntity; + orderEntity = orderEntities.get(0); orderEntity.setUpdateTime(null); orderEntity.setFromType(ConstantStatus.FROM_UDISP); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); @@ -478,6 +485,8 @@ public class IoOrderReviewController extends BaseController { if (CollUtil.isNotEmpty(detailResultResponses)) { acceptOrderEntity.setOrderDetailEntities(detailResultResponses); acceptOrderEntity.setExitAccept(false); + orderResponse = orderService.findGroupBillNo(billNo); + acceptOrderEntity.setOrderEntity(orderResponse); } } } else { diff --git a/src/main/java/com/glxp/api/res/inout/AcceptOrderResponse.java b/src/main/java/com/glxp/api/res/inout/AcceptOrderResponse.java index 0be91b5d2..64d0c7b82 100644 --- a/src/main/java/com/glxp/api/res/inout/AcceptOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/AcceptOrderResponse.java @@ -1,6 +1,7 @@ package com.glxp.api.res.inout; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; +import com.glxp.api.entity.inout.IoOrderEntity; import lombok.Data; import java.util.List; @@ -17,6 +18,8 @@ public class AcceptOrderResponse { private boolean finishAccept; + IoOrderResponse orderEntity; + private List orderDetailEntities; } diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderService.java b/src/main/java/com/glxp/api/service/inout/IoOrderService.java index a288ee0bf..9ef9eb466 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderService.java @@ -23,6 +23,8 @@ public interface IoOrderService { IoOrderEntity findByBillNo(String billNO); + IoOrderResponse findGroupBillNo(String billNo); + List findByStatus(String action, Integer status, Date lastUpdateTime); int insertOrder(IoOrderEntity orderEntity); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 7e94dd03f..57ce166e5 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -137,6 +137,17 @@ public class IoOrderServiceImpl implements IoOrderService { return orderDao.selectOne(new QueryWrapper().eq("billNo", billNO)); } + @Override + public IoOrderResponse findGroupBillNo(String billNo) { + FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); + filterOrderRequest.setBillNo(billNo); + List orderResponses = orderDao.filterList(filterOrderRequest); + if (CollUtil.isNotEmpty(orderResponses)) { + return orderResponses.get(0); + } + return null; + } + @Override public List findByStatus(String action, Integer status, Date lastUpdateTime) { return orderDao.selectList(new QueryWrapper().eq("action", action).eq("status", status).gt("updateTime", lastUpdateTime)); From 628d991efea530afc44f9a9de061769dcede1e0e Mon Sep 17 00:00:00 2001 From: x_z Date: Tue, 18 Apr 2023 10:01:16 +0800 Subject: [PATCH 6/7] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E7=9A=84=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...stemPDFTemplateRelevanceBizController.java | 5 +-- ...temPDFTemplateRelevanceCodeController.java | 11 +++---- ...emPDFTemplateRelevanceLabelController.java | 5 +-- .../req/system/SysParamConfigSaveRequest.java | 3 ++ ...temPDFTemplateRelevanceBizServiceImpl.java | 25 +++++++-------- ...emPDFTemplateRelevanceCodeServiceImpl.java | 32 +++++++++---------- ...mPDFTemplateRelevanceLabelServiceImpl.java | 22 ++++++------- ...FTemplateRelevanceStatemenServiceImpl.java | 22 ++++++------- .../impl/SystemParamConfigServiceImpl.java | 3 +- .../thrsys/impl/ThrDeptServiceImpl.java | 1 + .../impl/ThrInvWarehouseServiceImpl.java | 3 ++ .../mapper/schedule/SystemParamConfigDao.xml | 6 ++-- .../system/SysPdfTemplateRelevanceBizDao.xml | 31 +++++++++--------- .../system/SysPdfTemplateRelevanceCodeDao.xml | 5 +-- .../mapper/thrsys/ThrInvWarehouseDao.xml | 10 +++--- 15 files changed, 94 insertions(+), 90 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceBizController.java b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceBizController.java index 83b6ff5c4..af33049db 100644 --- a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceBizController.java +++ b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceBizController.java @@ -47,7 +47,7 @@ public class SystemPDFTemplateRelevanceBizController { systemPDFTemplateRelevanceBizService.insert(systemPDFTemplateRelevanceEntity); } - List sysPdfTemplateRelevanceBizEntityList= systemPDFTemplateRelevanceBizService.filterList(filterPdfTemplateRelevanceRequest); + List sysPdfTemplateRelevanceBizEntityList = systemPDFTemplateRelevanceBizService.filterList(filterPdfTemplateRelevanceRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(sysPdfTemplateRelevanceBizEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -63,7 +63,4 @@ public class SystemPDFTemplateRelevanceBizController { } - - - } diff --git a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceCodeController.java b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceCodeController.java index 37b586af1..d579e8fc6 100644 --- a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceCodeController.java +++ b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceCodeController.java @@ -33,11 +33,11 @@ public class SystemPDFTemplateRelevanceCodeController { @PostMapping("/system/pdf/templateRelevanceCode/getListByModelId") public BaseResponse getListByModelId(@RequestBody FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) { - List ids=new ArrayList<>(); + List ids = new ArrayList<>(); FilterBussinessTypeRequest filterBussinessTypeRequest = new FilterBussinessTypeRequest(); filterBussinessTypeRequest.setEnable(true); - List list=systemPDFTemplateRelevanceCodeService.selectList(filterPdfTemplateRelevanceRequest); - for (SysPdfTemplateRelevanceCodeEntity obj:list){ + List list = systemPDFTemplateRelevanceCodeService.selectList(filterPdfTemplateRelevanceRequest); + for (SysPdfTemplateRelevanceCodeEntity obj : list) { ids.add(obj.getLocalAction()); } @@ -50,7 +50,7 @@ public class SystemPDFTemplateRelevanceCodeController { systemPDFTemplateRelevanceCodeService.insert(systemPDFTemplateRelevanceEntity); } - List sysPdfTemplateRelevanceCodeEntityList= systemPDFTemplateRelevanceCodeService.filterList(filterPdfTemplateRelevanceRequest); + List sysPdfTemplateRelevanceCodeEntityList = systemPDFTemplateRelevanceCodeService.filterList(filterPdfTemplateRelevanceRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(sysPdfTemplateRelevanceCodeEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -66,7 +66,4 @@ public class SystemPDFTemplateRelevanceCodeController { } - - - } diff --git a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceLabelController.java b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceLabelController.java index d36ecd0ec..92e39d547 100644 --- a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceLabelController.java +++ b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceLabelController.java @@ -26,7 +26,7 @@ public class SystemPDFTemplateRelevanceLabelController { @PostMapping("/system/pdf/templateRelevanceLabel/getListByModelId") public BaseResponse getListByModelId(@RequestBody FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) { - List sysPdfTemplateRelevanceLabelEntityList= systemPDFTemplateRelevanceLabelService.filterList(filterPdfTemplateRelevanceRequest); + List sysPdfTemplateRelevanceLabelEntityList = systemPDFTemplateRelevanceLabelService.filterList(filterPdfTemplateRelevanceRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(sysPdfTemplateRelevanceLabelEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -42,7 +42,4 @@ public class SystemPDFTemplateRelevanceLabelController { } - - - } diff --git a/src/main/java/com/glxp/api/req/system/SysParamConfigSaveRequest.java b/src/main/java/com/glxp/api/req/system/SysParamConfigSaveRequest.java index 19a64c476..dbc4cf814 100644 --- a/src/main/java/com/glxp/api/req/system/SysParamConfigSaveRequest.java +++ b/src/main/java/com/glxp/api/req/system/SysParamConfigSaveRequest.java @@ -2,6 +2,8 @@ package com.glxp.api.req.system; import lombok.Data; +import java.util.Date; + @Data public class SysParamConfigSaveRequest { @@ -13,4 +15,5 @@ public class SysParamConfigSaveRequest { private int paramStatus; private int paramType; private String paramExplain; + private Date updateTime; } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java index 1fa040276..d9221cac7 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java @@ -22,11 +22,11 @@ public class SystemPDFTemplateRelevanceBizServiceImpl implements SystemPDFTempla @Override public List getListByModelId(Integer modelId) { - QueryWrapper ew=new QueryWrapper(); - if(modelId!=null){ - ew.eq("moduleId",modelId); + QueryWrapper ew = new QueryWrapper(); + if (modelId != null) { + ew.eq("moduleId", modelId); } - List sysPdfTemplateRelevanceBizEntityList=sysPdfTemplateRelevanceBizDao.selectList(ew); + List sysPdfTemplateRelevanceBizEntityList = sysPdfTemplateRelevanceBizDao.selectList(ew); return sysPdfTemplateRelevanceBizEntityList; } @@ -38,21 +38,20 @@ public class SystemPDFTemplateRelevanceBizServiceImpl implements SystemPDFTempla @Override public boolean udpateRl(SysPdfTemplateRelevanceBizEntity systemPDFTemplateRelevanceEntity) { + systemPDFTemplateRelevanceEntity.setUpdateTime(new Date()); + int count = sysPdfTemplateRelevanceBizDao.updateById(systemPDFTemplateRelevanceEntity); - int count= sysPdfTemplateRelevanceBizDao.updateById(systemPDFTemplateRelevanceEntity); - - if(count>0){ - return true; - }else{ - return false; - } + if (count > 0) { + return true; + } else { + return false; + } } @Override public boolean insert(SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity) { - + sysPdfTemplateRelevanceBizEntity.setUpdateTime(new Date()); sysPdfTemplateRelevanceBizDao.upInsert(sysPdfTemplateRelevanceBizEntity); - return true; } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java index 28fdd08e2..737078eeb 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java @@ -22,11 +22,11 @@ public class SystemPDFTemplateRelevanceCodeServiceImpl implements SystemPDFTempl @Override public List getListByModelId(Integer modelId) { - QueryWrapper ew=new QueryWrapper(); - if(modelId!=null){ - ew.eq("moduleId",modelId); + QueryWrapper ew = new QueryWrapper(); + if (modelId != null) { + ew.eq("moduleId", modelId); } - List sysPdfTemplateRelevanceCodeEntityList=sysPdfTemplateRelevanceCodeDao.selectList(ew); + List sysPdfTemplateRelevanceCodeEntityList = sysPdfTemplateRelevanceCodeDao.selectList(ew); return sysPdfTemplateRelevanceCodeEntityList; } @@ -39,35 +39,35 @@ public class SystemPDFTemplateRelevanceCodeServiceImpl implements SystemPDFTempl @Override public List selectList(FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) { - QueryWrapper ew=new QueryWrapper<>(); - if(filterPdfTemplateRelevanceRequest.getModelKey()!=null){ - ew.eq("modelKey",filterPdfTemplateRelevanceRequest.getModelKey()); + QueryWrapper ew = new QueryWrapper<>(); + if (filterPdfTemplateRelevanceRequest.getModelKey() != null) { + ew.eq("modelKey", filterPdfTemplateRelevanceRequest.getModelKey()); } return sysPdfTemplateRelevanceCodeDao.selectList(ew); } @Override public boolean udpateRl(SysPdfTemplateRelevanceCodeEntity systemPDFTemplateRelevanceEntity) { + systemPDFTemplateRelevanceEntity.setUpdateTime(new Date()); + int count = sysPdfTemplateRelevanceCodeDao.updateById(systemPDFTemplateRelevanceEntity); - int count= sysPdfTemplateRelevanceCodeDao.updateById(systemPDFTemplateRelevanceEntity); - - if(count>0){ - return true; - }else{ - return false; - } + if (count > 0) { + return true; + } else { + return false; + } } @Override public boolean insert(SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity) { - + sysPdfTemplateRelevanceCodeEntity.setUpdateTime(new Date()); sysPdfTemplateRelevanceCodeDao.upInsert(sysPdfTemplateRelevanceCodeEntity); return false; } @Override public SysPdfTemplateRelevanceCodeEntity selectNameAndAction(String name, String localAction) { - return sysPdfTemplateRelevanceCodeDao.selectNameAndAction(name,localAction); + return sysPdfTemplateRelevanceCodeDao.selectNameAndAction(name, localAction); } @Override diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java index 713cfbbcc..2f2b23fb2 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java @@ -22,11 +22,11 @@ public class SystemPDFTemplateRelevanceLabelServiceImpl implements SystemPDFTemp @Override public List getListByModelId(Integer modelId) { - QueryWrapper ew=new QueryWrapper(); - if(modelId!=null){ - ew.eq("moduleId",modelId); + QueryWrapper ew = new QueryWrapper(); + if (modelId != null) { + ew.eq("moduleId", modelId); } - List sysPdfTemplateRelevanceLabelEntityList=sysPdfTemplateRelevanceLabelDao.selectList(ew); + List sysPdfTemplateRelevanceLabelEntityList = sysPdfTemplateRelevanceLabelDao.selectList(ew); return sysPdfTemplateRelevanceLabelEntityList; } @@ -38,14 +38,14 @@ public class SystemPDFTemplateRelevanceLabelServiceImpl implements SystemPDFTemp @Override public boolean udpateRl(SysPdfTemplateRelevanceLabelEntity systemPDFTemplateRelevanceEntity) { + systemPDFTemplateRelevanceEntity.setUpdateTime(new Date()); + int count = sysPdfTemplateRelevanceLabelDao.updateById(systemPDFTemplateRelevanceEntity); - int count= sysPdfTemplateRelevanceLabelDao.updateById(systemPDFTemplateRelevanceEntity); - - if(count>0){ - return true; - }else{ - return false; - } + if (count > 0) { + return true; + } else { + return false; + } } @Override diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java index e060234ca..e9fd4a65b 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java @@ -22,11 +22,11 @@ public class SystemPDFTemplateRelevanceStatemenServiceImpl implements SystemPDFT @Override public List getListByModelId(Integer modelId) { - QueryWrapper ew=new QueryWrapper(); - if(modelId!=null){ - ew.eq("moduleId",modelId); + QueryWrapper ew = new QueryWrapper(); + if (modelId != null) { + ew.eq("moduleId", modelId); } - List sysPdfTemplateRelevanceStatemenEntityList=sysPdfTemplateRelevanceStatemenDao.selectList(ew); + List sysPdfTemplateRelevanceStatemenEntityList = sysPdfTemplateRelevanceStatemenDao.selectList(ew); return sysPdfTemplateRelevanceStatemenEntityList; } @@ -38,14 +38,14 @@ public class SystemPDFTemplateRelevanceStatemenServiceImpl implements SystemPDFT @Override public boolean udpateRl(SysPdfTemplateRelevanceStatemenEntity systemPDFTemplateRelevanceEntity) { + systemPDFTemplateRelevanceEntity.setUpdateTime(new Date()); + int count = sysPdfTemplateRelevanceStatemenDao.updateById(systemPDFTemplateRelevanceEntity); - int count= sysPdfTemplateRelevanceStatemenDao.updateById(systemPDFTemplateRelevanceEntity); - - if(count>0){ - return true; - }else{ - return false; - } + if (count > 0) { + return true; + } else { + return false; + } } @Override diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java index f7e12492b..a130793da 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java @@ -70,7 +70,7 @@ public class SystemParamConfigServiceImpl implements SystemParamConfigService { @Override public boolean updateById(SysParamConfigSaveRequest sysParamConfigSaveRequest) { - + sysParamConfigSaveRequest.setUpdateTime(new Date()); return systemParamConfigDao.updateById(sysParamConfigSaveRequest); } @@ -82,6 +82,7 @@ public class SystemParamConfigServiceImpl implements SystemParamConfigService { @Override public boolean insert(SystemParamConfigEntity systemParamConfigEntity) { + systemParamConfigEntity.setUpdateTime(new Date()); return systemParamConfigDao.insert(systemParamConfigEntity); } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java index a831e93cc..ae916967e 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java @@ -151,6 +151,7 @@ public class ThrDeptServiceImpl implements ThrDeptService { thrInvWarehouseEntity.setThirdSysFk(thirdSysFk); thrInvWarehouseEntity.setParentId(response.getCode()); thrInvWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId() + ""); + thrInvWarehouseEntity.setUpdateTime(new Date()); thrInvWarehouseDao.insertThrInvWarehouse(thrInvWarehouseEntity); } } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java index ad2ffd491..af51cc40a 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java @@ -80,16 +80,19 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService { @Override public boolean insertThrInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity) { + thrInvWarehouseEntity.setUpdateTime(new Date()); return thrInvWarehouseDao.insertThrInvWarehouse(thrInvWarehouseEntity); } @Override public boolean insertInvWarehouses(List thrInvWarehouseEntitys) { + thrInvWarehouseEntitys.forEach(thrInvWarehouseEntity -> thrInvWarehouseEntity.setUpdateTime(new Date())); return thrInvWarehouseDao.insertThrInvWarehouses(thrInvWarehouseEntitys); } @Override public boolean updateThrInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity) { + thrInvWarehouseEntity.setUpdateTime(new Date()); return thrInvWarehouseDao.updateThrInvWarehouse(thrInvWarehouseEntity); } diff --git a/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml b/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml index 4121263bd..6646aafae 100644 --- a/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml +++ b/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml @@ -52,6 +52,7 @@ paramStatus=#{paramStatus}, paramType=#{paramType}, paramExplain=#{paramExplain}, + updateTime=#{updateTime}, WHERE id=#{id} @@ -66,13 +67,14 @@ insert INTO sys_param_config(paramName, - paramKey, paramValue, paramStatus, paramType, paramExplain) + paramKey, paramValue, paramStatus, paramType, paramExplain, updateTime) values (#{paramName}, #{paramKey}, #{paramValue}, #{paramStatus}, #{paramType}, - #{paramExplain}) + #{paramExplain}, + #{updateTime}) - insert - ignore - INTO sys_pdf_template_relevance_biz - (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType,modelKey) - values (#{templateId}, - #{customerId}, - #{adminId}, - #{moduleId}, - #{localAction}, - #{remark1}, - #{remark2}, - #{remark3}, - #{printType}, - #{modelKey} -) + insert + ignore + INTO sys_pdf_template_relevance_biz + (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType, modelKey, + updateTime) + values (#{templateId}, + #{customerId}, + #{adminId}, + #{moduleId}, + #{localAction}, + #{remark1}, + #{remark2}, + #{remark3}, + #{printType}, + #{modelKey}, + #{updateTime}) diff --git a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml index e281a4ecb..0c2aeeece 100644 --- a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml +++ b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml @@ -58,7 +58,7 @@ insert ignore INTO sys_pdf_template_relevance_code - (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType,modelKey) + (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType,modelKey,updateTime) values (#{templateId}, #{customerId}, #{adminId}, @@ -68,7 +68,8 @@ #{remark2}, #{remark3}, #{printType}, - #{modelKey} + #{modelKey}, + #{updateTime} ) diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml index 034bc08bb..4bf8afc4f 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml @@ -80,27 +80,28 @@ parameterType="com.glxp.api.entity.thrsys.ThrInvWarehouseEntity"> replace INTO thr_inv_warehouse - (id, code, `name`, parentId, remark, thirdSysFk) + (id, code, `name`, parentId, remark, thirdSysFk, updateTime) values ( #{id}, #{code}, #{name}, #{parentId}, #{remark}, - #{thirdSysFk} + #{thirdSysFk}, + #{updateTime} ) replace INTO thr_inv_warehouse - (id, code, `name`, parentId, remark, thirdSysFk) + (id, code, `name`, parentId, remark, thirdSysFk,updateTime) VALUES ( #{item.id}, #{item.code}, #{item.name}, #{item.parentId}, - #{item.remark}, #{item.thirdSysFk}) + #{item.remark}, #{item.thirdSysFk}, #{item.updateTime}) @@ -118,6 +119,7 @@ parentId=#{parentId}, remark=#{remark}, thirdSysFk=#{thirdSysFk}, + updateTime=#{updateTime}, WHERE id = #{id} From f5d87597d614a01928e50971f114eb3da111c236 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 18 Apr 2023 10:16:55 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A2=84=E9=AA=8C?= =?UTF-8?q?=E6=94=B6=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E9=80=80=E5=9B=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicBussinessTypeEntity.java | 5 +- .../req/basic/BussinessTypeSaveRequest.java | 4 +- .../res/basic/BasicBussinessTypeResponse.java | 3 + .../mapper/basic/BasicBussinessTypeDao.xml | 150 +++++++++--------- src/main/resources/schemas/schema_v2.1.sql | 3 + 5 files changed, 88 insertions(+), 77 deletions(-) diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java index bbe36eb46..9f9aa5682 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java @@ -396,5 +396,8 @@ public class BasicBussinessTypeEntity { @TableField(value = "checkCertExpire") private boolean checkCertExpire; - + @TableField(value = "preInBackAction") + private String preInBackAction; + @TableField(value = "backPreinType") + private Integer backPreinType; } diff --git a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java index ac0603cb5..bb787fb6d 100644 --- a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java @@ -294,10 +294,12 @@ public class BussinessTypeSaveRequest { private boolean fillCodeRel; - private boolean checkVailDate; private boolean checkExpire; private boolean checkCertExpire; + private String preInBackAction; + private Integer backPreinType; + } diff --git a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java index 7076379bc..354bdefb4 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java @@ -148,4 +148,7 @@ public class BasicBussinessTypeResponse { private boolean checkExpire; private boolean checkCertExpire; + private String preInBackAction; + private Integer backPreinType; + } diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml index b73f09df8..e4dad59ca 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml @@ -58,75 +58,76 @@ insert - ignore + ignore into basic_bussiness_type (mainAction, action, name, enable, remark, thirdSysFk, genUnit, - innerOrder, secCheckEnable, checkEnable, checkUdims, checkPdaEd, - checkPdaUn, checkPc, checkWebNew, checkSp, checkChange, secCheckUdims, - secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew, - secCheckChange, secCheckSp, corpType, supplementOrderType, - checkBalance, secCheckBalance, useDyCount, expireTip, updateTime, - defaultUnit, prefix, outToSpms, ullageFill, scanPreIn, vailInv, - entrutSpms, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType, - checkCopy, secCheckCopy, originAction, changeEnable, - spUse, preIn, supplementAll, createUser, createTime, preInBack, vailDispatch, - vailGroupBuy, busType, inStock, actionType - , thrCheckEnable, thrCheckWebNew, thrCheckPdaUn, thrCheckPdaEd, thrCheckUdims, thrCheckPc, thrCheckSp - , thrCheckChange, thrCheckBalance, thrCheckCopy, fillCodeRel, checkVailDate, checkCertExpire) + innerOrder, secCheckEnable, checkEnable, checkUdims, checkPdaEd, + checkPdaUn, checkPc, checkWebNew, checkSp, checkChange, secCheckUdims, + secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew, + secCheckChange, secCheckSp, corpType, supplementOrderType, + checkBalance, secCheckBalance, useDyCount, expireTip, updateTime, + defaultUnit, prefix, outToSpms, ullageFill, scanPreIn, vailInv, + entrutSpms, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType, + checkCopy, secCheckCopy, originAction, changeEnable, + spUse, preIn, supplementAll, createUser, createTime, preInBack, vailDispatch, + vailGroupBuy, busType, inStock, actionType + , thrCheckEnable, thrCheckWebNew, thrCheckPdaUn, thrCheckPdaEd, thrCheckUdims, thrCheckPc, thrCheckSp + , thrCheckChange, thrCheckBalance, thrCheckCopy, fillCodeRel, checkVailDate, checkCertExpire, + preInBackAction, backPreinType) values (#{mainAction}, - #{action}, - #{name}, - #{enable}, - #{remark}, - #{thirdSysFk}, - #{genUnit}, - #{innerOrder}, - #{secCheckEnable}, - #{checkEnable}, - #{checkUdims}, - #{checkPdaEd}, - #{checkPdaUn}, - #{checkPc}, - #{checkWebNew}, - #{checkSp}, - #{checkChange}, - #{secCheckUdims}, - #{secCheckPdaEd}, - #{secCheckPdaUn}, - #{secCheckPc}, - #{secCheckWebNew}, - #{secCheckChange}, - #{secCheckSp}, - #{corpType}, - #{supplementOrderType}, - #{checkBalance}, - #{secCheckBalance}, - #{useDyCount}, - #{expireTip}, - #{updateTime}, - #{defaultUnit}, - #{prefix}, - #{outToSpms}, - #{ullageFill}, - #{scanPreIn}, - #{vailInv}, - #{entrutSpms}, - #{codeFillCheck}, - #{defaultSubInv}, - #{defaultInv}, - #{orderVisibleType}, - #{checkCopy}, - #{secCheckCopy}, - #{originAction}, - #{changeEnable}, - #{spUse}, - #{preIn}, - #{supplementAll}, - #{createUser}, - #{createTime}, #{preInBack}, #{vailDispatch}, #{vailGroupBuy}, #{busType}, #{inStock}, #{actionType} - , #{thrCheckEnable}, #{thrCheckWebNew}, #{thrCheckPdaUn}, #{thrCheckPdaEd}, #{thrCheckUdims}, - #{thrCheckPc} - , #{thrCheckSp}, #{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}, #{fillCodeRel} - , #{checkVailDate}, #{checkExpire}, #{checkCertExpire}) + #{action}, + #{name}, + #{enable}, + #{remark}, + #{thirdSysFk}, + #{genUnit}, + #{innerOrder}, + #{secCheckEnable}, + #{checkEnable}, + #{checkUdims}, + #{checkPdaEd}, + #{checkPdaUn}, + #{checkPc}, + #{checkWebNew}, + #{checkSp}, + #{checkChange}, + #{secCheckUdims}, + #{secCheckPdaEd}, + #{secCheckPdaUn}, + #{secCheckPc}, + #{secCheckWebNew}, + #{secCheckChange}, + #{secCheckSp}, + #{corpType}, + #{supplementOrderType}, + #{checkBalance}, + #{secCheckBalance}, + #{useDyCount}, + #{expireTip}, + #{updateTime}, + #{defaultUnit}, + #{prefix}, + #{outToSpms}, + #{ullageFill}, + #{scanPreIn}, + #{vailInv}, + #{entrutSpms}, + #{codeFillCheck}, + #{defaultSubInv}, + #{defaultInv}, + #{orderVisibleType}, + #{checkCopy}, + #{secCheckCopy}, + #{originAction}, + #{changeEnable}, + #{spUse}, + #{preIn}, + #{supplementAll}, + #{createUser}, + #{createTime}, #{preInBack}, #{vailDispatch}, #{vailGroupBuy}, #{busType}, #{inStock}, #{actionType} + , #{thrCheckEnable}, #{thrCheckWebNew}, #{thrCheckPdaUn}, #{thrCheckPdaEd}, #{thrCheckUdims}, + #{thrCheckPc} + , #{thrCheckSp}, #{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}, #{fillCodeRel} + , #{checkVailDate}, #{checkExpire}, #{checkCertExpire}, #{preInBackAction}, #{backPreinType}) - diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 9aa1cff3d..81ebaad1b 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -58,6 +58,9 @@ CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'fillCodeRel', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkVailDate', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkExpire', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkCertExpire', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'preInBackAction', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'backPreinType', 'tinyint', 1); + CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'batchNo', 'varchar(255) ', 1);