From 462b53ac7c215c448c776cdfc7184e6393ef51af Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Fri, 12 May 2023 14:42:56 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=AF=B9snm=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E7=BA=BF=E8=B7=AF=E7=9A=84=E8=AE=BE=E5=AE=9A=E5=92=8C?= =?UTF-8?q?=E5=AF=B9=E7=8A=B6=E6=80=81=E7=9A=84=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/LogpmDataStatusEnum.java | 43 +++++++++ .../gateway/GateWayApplication.java | 2 +- .../factory/snm/vo/StationlinenumVO.java | 2 + blade-service/logpm-factory/pom.xml | 9 ++ .../factory/jobhandler/FactoryXxlJob.java | 12 ++- .../controller/StationlinenumController.java | 37 +++++++- .../snm/excel/StationlinenumExcel.java | 93 +++++++++++++++++++ .../snm/mapper/StationlinenumMapper.java | 13 ++- .../snm/mapper/StationlinenumMapper.xml | 4 + .../snm/service/IStationlinenumService.java | 12 ++- .../snm/service/impl/OrderServiceImpl.java | 2 +- .../impl/StationlinenumServiceImpl.java | 12 +++ .../snm/wrapper/StationlinenumWrapper.java | 29 ++++++ 13 files changed, 259 insertions(+), 11 deletions(-) create mode 100644 blade-biz-common/src/main/java/org/springblade/common/constant/LogpmDataStatusEnum.java create mode 100644 blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/excel/StationlinenumExcel.java create mode 100644 blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/wrapper/StationlinenumWrapper.java diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/LogpmDataStatusEnum.java b/blade-biz-common/src/main/java/org/springblade/common/constant/LogpmDataStatusEnum.java new file mode 100644 index 000000000..390c0be40 --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/LogpmDataStatusEnum.java @@ -0,0 +1,43 @@ +package org.springblade.common.constant; + +/** + * 业务系统数据库字段常量 + */ +public enum LogpmDataStatusEnum { + + CLOSE("关闭", 1), OPEN("打开", 2); + private String name; + + private Integer value; + + private LogpmDataStatusEnum(String name, int value) { + this.name = name; + this.value = value; + } + + public int getValue() + { + return this.value; + } + + public String getName() + { + return this.name; + } + + public static LogpmDataStatusEnum valueOf(int value) + { + switch (value) + { + case 1: + return LogpmDataStatusEnum.CLOSE; + case 2: + return LogpmDataStatusEnum.OPEN; + default: + return null; + } + } + + + +} diff --git a/blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java b/blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java index d0b7ce388..acbd246cf 100644 --- a/blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java +++ b/blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java @@ -34,7 +34,7 @@ public class GateWayApplication { public static void main(String[] args) { - BladeApplication.run(AppConstant.APPLICATION_GATEWAY_NAME, GateWayApplication.class, args); + BladeApplication.run(AppConstant.APPLICATION_GATEWAY_NAME.concat("-pref"), GateWayApplication.class, args); } } diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/vo/StationlinenumVO.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/vo/StationlinenumVO.java index 5e0b5ad17..a8f9090cc 100644 --- a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/vo/StationlinenumVO.java +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/vo/StationlinenumVO.java @@ -32,4 +32,6 @@ import lombok.EqualsAndHashCode; public class StationlinenumVO extends StationlinenumEntity { private static final long serialVersionUID = 1L; + private String statusName; + } diff --git a/blade-service/logpm-factory/pom.xml b/blade-service/logpm-factory/pom.xml index 5acac7937..9e2e46ec4 100644 --- a/blade-service/logpm-factory/pom.xml +++ b/blade-service/logpm-factory/pom.xml @@ -26,6 +26,10 @@ org.springblade blade-starter-swagger + + org.springblade + blade-starter-excel + org.springblade blade-starter-oss @@ -39,6 +43,11 @@ logpm-factory-api ${bladex.project.version} + + org.springblade + blade-dict-api + ${bladex.project.version} + com.baomidou dynamic-datasource-spring-boot-starter diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java index f69441b3a..55f0d707d 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java @@ -13,18 +13,21 @@ import com.xxl.job.core.handler.annotation.XxlJob; import com.xxl.job.core.log.XxlJobLogger; import com.xxl.job.core.util.ShardingUtil; import lombok.AllArgsConstructor; +import org.apache.logging.log4j.util.Strings; import org.checkerframework.checker.units.qual.A; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.ObjectUtils; +import org.springframework.util.StringUtils; import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; +import java.text.SimpleDateFormat; import java.time.LocalDate; import java.util.*; import java.util.concurrent.TimeUnit; @@ -66,11 +69,16 @@ public class FactoryXxlJob { */ @XxlJob("factoryJobHandler") public ReturnT factoryJobHandler(String param) throws Exception { - + LocalDate date ; List ls = stationlinenumService.lambdaQuery().eq(StationlinenumEntity::getIsDeleted, 0).eq(StationlinenumEntity::getStatus, 1).list(); if (!ObjectUtils.isEmpty(ls)) { + if(Strings.isNotBlank(param)){ + // YYYY-mm-dd hh:mm:ss + date = LocalDate.parse(param); + }else{ + date = LocalDate.now(); + } // 获取当前时间 - LocalDate date = LocalDate.now(); //查询配置站点 ls.forEach(stationlinenumEntity -> { // 根据站点id和当前时间调用service 请求对方接口获取数据插入到我们的数据库 diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/controller/StationlinenumController.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/controller/StationlinenumController.java index f34f8a0d7..94b555efa 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/controller/StationlinenumController.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/controller/StationlinenumController.java @@ -16,6 +16,7 @@ */ package com.logpm.factory.snm.controller; +import com.logpm.factory.snm.wrapper.StationlinenumWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -29,21 +30,30 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.factory.snm.entity.StationlinenumEntity; import com.logpm.factory.snm.vo.StationlinenumVO; +import com.logpm.factory.snm.excel.StationlinenumExcel; import com.logpm.factory.snm.service.IStationlinenumService; import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; /** * 诗尼曼线路 控制器 * * @author pref - * @since 2023-03-28 + * @since 2023-05-11 */ @RestController @AllArgsConstructor -@RequestMapping("/snm/stationlinenum") +@RequestMapping("snm/stationlinenum") @Api(value = "诗尼曼线路", tags = "诗尼曼线路接口") public class StationlinenumController extends BladeController { @@ -65,9 +75,10 @@ public class StationlinenumController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入stationlinenum") - public R> list(StationlinenumEntity stationlinenum, Query query) { - IPage pages = stationlinenumService.page(Condition.getPage(query), Condition.getQueryWrapper(stationlinenum)); - return R.data(pages); + public R> list(@ApiIgnore @RequestParam Map stationlinenum, Query query) { + IPage pages = stationlinenumService.page(Condition.getPage(query), Condition.getQueryWrapper(stationlinenum, StationlinenumEntity.class)); + // 需要转换数据 + return R.data(StationlinenumWrapper.build().pageVO(pages)); } /** @@ -122,4 +133,20 @@ public class StationlinenumController extends BladeController { } + /** + * 导出数据 + */ + @GetMapping("/export-stationlinenum") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入stationlinenum") + public void exportStationlinenum(@ApiIgnore @RequestParam Map stationlinenum, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(stationlinenum, StationlinenumEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Stationlinenum::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(StationlinenumEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = stationlinenumService.exportStationlinenum(queryWrapper); + ExcelUtil.export(response, "诗尼曼线路数据" + DateUtil.time(), "诗尼曼线路数据表", list, StationlinenumExcel.class); + } + } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/excel/StationlinenumExcel.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/excel/StationlinenumExcel.java new file mode 100644 index 000000000..db6601a35 --- /dev/null +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/excel/StationlinenumExcel.java @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.factory.snm.excel; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 诗尼曼线路 Excel实体类 + * + * @author pref + * @since 2023-05-11 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class StationlinenumExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 线路编号 + */ + @ColumnWidth(20) + @ExcelProperty("线路编号") + private String logisticsLineNumber; + /** + * 线路名称 + */ + @ColumnWidth(20) + @ExcelProperty("线路名称") + private String logisticsLineName; + /** + * 创建人 + */ + @ColumnWidth(20) + @ExcelProperty("创建人") + private String createdUser; + /** + * 创建时间 + */ + @ColumnWidth(20) + @ExcelProperty("创建时间") + private Date createdTime; + /** + * 更新人 + */ + @ColumnWidth(20) + @ExcelProperty("更新人") + private String updatedUser; + /** + * 更新时间 + */ + @ColumnWidth(20) + @ExcelProperty("更新时间") + private Date updatedTime; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Integer isDeleted; + /** + * 创建部门 + */ + @ColumnWidth(20) + @ExcelProperty("创建部门") + private Integer createdDept; + +} diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/mapper/StationlinenumMapper.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/mapper/StationlinenumMapper.java index 7b940019d..b925eb094 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/mapper/StationlinenumMapper.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/mapper/StationlinenumMapper.java @@ -17,10 +17,15 @@ package com.logpm.factory.snm.mapper; import com.logpm.factory.snm.entity.StationlinenumEntity; +import com.logpm.factory.snm.excel.StationlinenumExcel; import com.logpm.factory.snm.vo.StationlinenumVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; /** * 诗尼曼线路 Mapper 接口 @@ -39,5 +44,11 @@ public interface StationlinenumMapper extends BaseMapper { */ List selectStationlinenumPage(IPage page, StationlinenumVO stationlinenum); - + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportStationlinenum(@Param("ew") Wrapper queryWrapper); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/mapper/StationlinenumMapper.xml b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/mapper/StationlinenumMapper.xml index a5c2c4644..138546f39 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/mapper/StationlinenumMapper.xml +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/mapper/StationlinenumMapper.xml @@ -20,6 +20,10 @@ + + diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/IStationlinenumService.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/IStationlinenumService.java index 5da4cdeae..c8b5169d2 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/IStationlinenumService.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/IStationlinenumService.java @@ -16,11 +16,15 @@ */ package com.logpm.factory.snm.service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.logpm.factory.snm.entity.StationlinenumEntity; +import com.logpm.factory.snm.excel.StationlinenumExcel; import com.logpm.factory.snm.vo.StationlinenumVO; import org.springblade.core.mp.base.BaseService; import com.baomidou.mybatisplus.core.metadata.IPage; +import java.util.List; + /** * 诗尼曼线路 服务类 * @@ -39,6 +43,12 @@ public interface IStationlinenumService extends BaseService selectStationlinenumPage(IPage page, StationlinenumVO stationlinenum); - + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportStationlinenum(Wrapper queryWrapper); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java index cd94ac214..3b3bf5130 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java @@ -66,7 +66,7 @@ public class OrderServiceImpl implements IOrderService { requestLineNumberVo.setLogistics_line_number(lineNum); requestLineNumberVo.setDispatch_time_start(dayDate); - requestLineNumberVo.setDispatch_time_end(dayDate); + requestLineNumberVo.setDispatch_time_end("2023-05-10"); SystemSign systemSign = new SystemSign(); systemSign.setTimestamp(now.getTime()); systemSign.setPublicKey(factorySnmdataProperties.getPublicKey()); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/StationlinenumServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/StationlinenumServiceImpl.java index 7d02d8a09..5b8611334 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/StationlinenumServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/StationlinenumServiceImpl.java @@ -16,7 +16,9 @@ */ package com.logpm.factory.snm.service.impl; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.logpm.factory.snm.entity.StationlinenumEntity; +import com.logpm.factory.snm.excel.StationlinenumExcel; import com.logpm.factory.snm.vo.StationlinenumVO; import com.logpm.factory.snm.mapper.StationlinenumMapper; import com.logpm.factory.snm.service.IStationlinenumService; @@ -24,6 +26,8 @@ import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; +import java.util.List; + /** * 诗尼曼线路 服务实现类 * @@ -38,5 +42,13 @@ public class StationlinenumServiceImpl extends BaseServiceImpl exportStationlinenum(Wrapper queryWrapper) { + List stationlinenumList = baseMapper.exportStationlinenum(queryWrapper); + //stationlinenumList.forEach(stationlinenum -> { + // stationlinenum.setTypeName(DictCache.getValue(DictEnum.YES_NO, Stationlinenum.getType())); + //}); + return stationlinenumList; + } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/wrapper/StationlinenumWrapper.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/wrapper/StationlinenumWrapper.java new file mode 100644 index 000000000..8a529d5c3 --- /dev/null +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/wrapper/StationlinenumWrapper.java @@ -0,0 +1,29 @@ +package com.logpm.factory.snm.wrapper; + +import com.logpm.factory.snm.entity.StationlinenumEntity; +import com.logpm.factory.snm.vo.StationlinenumVO; +import org.springblade.common.constant.LogpmDataStatusEnum; +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.system.enums.DictEnum; +import org.springblade.system.feign.IDictBizClient; +import org.springframework.stereotype.Component; + +import java.util.Objects; + +/** + * 对象转换 + */ +@Component +public class StationlinenumWrapper extends BaseEntityWrapper { + + public static StationlinenumWrapper build() { + return new StationlinenumWrapper(); + } + @Override + public StationlinenumVO entityVO(StationlinenumEntity entity) { + StationlinenumVO stationlinenumVO = Objects.requireNonNull(BeanUtil.copy(entity, StationlinenumVO.class)); + stationlinenumVO.setStatusName(LogpmDataStatusEnum.valueOf(entity.getStatus()).getName()); + return stationlinenumVO; + } +}