Browse Source

1.增加对snm工厂线路的设定和对状态的显示

test
pref_mail@163.com 2 years ago
parent
commit
462b53ac7c
  1. 43
      blade-biz-common/src/main/java/org/springblade/common/constant/LogpmDataStatusEnum.java
  2. 2
      blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java
  3. 2
      blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/vo/StationlinenumVO.java
  4. 9
      blade-service/logpm-factory/pom.xml
  5. 12
      blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java
  6. 37
      blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/controller/StationlinenumController.java
  7. 93
      blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/excel/StationlinenumExcel.java
  8. 13
      blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/mapper/StationlinenumMapper.java
  9. 4
      blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/mapper/StationlinenumMapper.xml
  10. 12
      blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/IStationlinenumService.java
  11. 2
      blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java
  12. 12
      blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/StationlinenumServiceImpl.java
  13. 29
      blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/wrapper/StationlinenumWrapper.java

43
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;
}
}
}

2
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);
}
}

2
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;
}

9
blade-service/logpm-factory/pom.xml

@ -26,6 +26,10 @@
<groupId>org.springblade</groupId>
<artifactId>blade-starter-swagger</artifactId>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-excel</artifactId>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-oss</artifactId>
@ -39,6 +43,11 @@
<artifactId>logpm-factory-api</artifactId>
<version>${bladex.project.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-dict-api</artifactId>
<version>${bladex.project.version}</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>

12
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<String> factoryJobHandler(String param) throws Exception {
LocalDate date ;
List<StationlinenumEntity> 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 请求对方接口获取数据插入到我们的数据库

37
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<IPage<StationlinenumEntity>> list(StationlinenumEntity stationlinenum, Query query) {
IPage<StationlinenumEntity> pages = stationlinenumService.page(Condition.getPage(query), Condition.getQueryWrapper(stationlinenum));
return R.data(pages);
public R<IPage<StationlinenumVO>> list(@ApiIgnore @RequestParam Map<String, Object> stationlinenum, Query query) {
IPage<StationlinenumEntity> 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<String, Object> stationlinenum, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StationlinenumEntity> 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<StationlinenumExcel> list = stationlinenumService.exportStationlinenum(queryWrapper);
ExcelUtil.export(response, "诗尼曼线路数据" + DateUtil.time(), "诗尼曼线路数据表", list, StationlinenumExcel.class);
}
}

93
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;
}

13
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<StationlinenumEntity> {
*/
List<StationlinenumVO> selectStationlinenumPage(IPage page, StationlinenumVO stationlinenum);
/**
* 获取导出数据
*
* @param queryWrapper
* @return
*/
List<StationlinenumExcel> exportStationlinenum(@Param("ew") Wrapper<StationlinenumEntity> queryWrapper);
}

4
blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/mapper/StationlinenumMapper.xml

@ -20,6 +20,10 @@
<select id="selectStationlinenumPage" resultMap="stationlinenumResultMap">
select * from snm_stationlinenum where is_deleted = 0
</select>
<select id="exportStationlinenum" resultType="com.logpm.factory.snm.excel.StationlinenumExcel">
SELECT * FROM snm_stationlinenum ${ew.customSqlSegment}
</select>
</mapper>

12
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<StationlinenumEntity
IPage<StationlinenumVO> selectStationlinenumPage(IPage<StationlinenumVO> page, StationlinenumVO stationlinenum);
/**
* 导出数据
*
* @param queryWrapper
* @return
*/
List<StationlinenumExcel> exportStationlinenum(Wrapper<StationlinenumEntity> queryWrapper);
}

2
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());

12
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<StationlinenumMap
return page.setRecords(baseMapper.selectStationlinenumPage(page, stationlinenum));
}
@Override
public List<StationlinenumExcel> exportStationlinenum(Wrapper<StationlinenumEntity> queryWrapper) {
List<StationlinenumExcel> stationlinenumList = baseMapper.exportStationlinenum(queryWrapper);
//stationlinenumList.forEach(stationlinenum -> {
// stationlinenum.setTypeName(DictCache.getValue(DictEnum.YES_NO, Stationlinenum.getType()));
//});
return stationlinenumList;
}
}

29
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<StationlinenumEntity, StationlinenumVO> {
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;
}
}
Loading…
Cancel
Save