root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:映射

Browse Source
This commit is contained in:
gengby
2024-03-08 13:48:47 +08:00
parent ce7403b682
commit 803a4b30bd
19 changed files with 1286 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wms_pro/hd/nladmin-system/.gitignore vendored Normal file
View File

@@ -0,0 +1,8 @@
### IDEA ###
*/*.log
.idea/*
*.iml
*/target/*
*/*.iml
/.gradle/
/target/*

4
wms_pro/hd/nladmin-system/pom.xml
View File

@@ -39,7 +39,7 @@
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
<version>5.3.6</version>
<version>5.8.5</version>
</dependency>
<dependency>
@@ -280,7 +280,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<mainClass>org.nl.AppRun</mainClass>
<fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
<!--<fork>true</fork>--> <!-- 如果没有该配置，devtools不会生效 -->
</configuration>
<executions>

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/config/mybatis/CodeGenerator.java
View File

@@ -56,10 +56,10 @@ public class CodeGenerator {
mpg.setGlobalConfig(gc);
// 数据源配置
DataSourceConfig dsc = new DataSourceConfig();
dsc.setUrl("jdbc:mysql://localhost:3306/hl_one_mes?serverTimezone=GMT&setUnicode=true&characterEncoding=utf8");
dsc.setUrl("jdbc:mysql://localhost:3306/wms?serverTimezone=GMT&setUnicode=true&characterEncoding=utf8");
dsc.setDriverName("com.mysql.cj.jdbc.Driver");
dsc.setUsername("root");
dsc.setPassword("942464Yy");
dsc.setPassword("password");
mpg.setDataSource(dsc);
// 包配置
PackageConfig pc = new PackageConfig();

92
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/controller/BmExternalFieldMappingController.java Normal file
View File

@@ -0,0 +1,92 @@
package org.nl.wms.base_manage.field_mapping.controller;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.entity.PageQuery;
import org.nl.wms.base_manage.field_mapping.service.IBmExternalFieldMappingService;
import org.nl.wms.base_manage.field_mapping.service.dao.BmExternalFieldMapping;
import org.nl.wms.base_manage.field_mapping.service.dto.MappingQuery;
import org.nl.wms.base_manage.field_mapping.service.dto.RequestMappingParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
/**
* <p>
* 同步字段映射表 前端控制器
* </p>
*
* @author generator
* @since 2024-03-06
*/
@RestController
@RequestMapping("/api/externalFieldMapping")
public class BmExternalFieldMappingController {
@Autowired
private IBmExternalFieldMappingService mappingsService;
@GetMapping
public ResponseEntity<Object> getAll(MappingQuery query, PageQuery page) {
return new ResponseEntity<>(TableDataInfo.build(mappingsService.page(page.build(), query.build())), HttpStatus.OK);
}
@PostMapping
public ResponseEntity<Object> create(@Validated @RequestBody BmExternalFieldMapping dto) {
mappingsService.save(dto);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PostMapping("/addRows")
public ResponseEntity<Object> addRows(@RequestBody RequestMappingParam param) {
mappingsService.addRows(param);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PutMapping
public ResponseEntity<Object> update(@Validated @RequestBody BmExternalFieldMapping dto) {
mappingsService.update(dto, new LambdaUpdateWrapper<BmExternalFieldMapping>().eq(BmExternalFieldMapping::getId, dto.getId()));
return new ResponseEntity<>(HttpStatus.OK);
}
@PutMapping("/updateRows")
public ResponseEntity<Object> updateRows(@RequestBody RequestMappingParam param) {
mappingsService.updateRows(param);
return new ResponseEntity<>(HttpStatus.OK);
}
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
if (ids.length > 0) {
mappingsService.removeByIds(Arrays.asList(ids));
}
return new ResponseEntity<>(HttpStatus.OK);
}
@GetMapping("/getTableColumnNames/{table_name}")
public ResponseEntity<Object> getTableColumnNames(@PathVariable String table_name) {
return new ResponseEntity<>(mappingsService.getTableColumnNames(table_name), HttpStatus.OK);
}
@GetMapping("/getTableColumnNamesFromMapping/{table_name}")
public ResponseEntity<Object> getTableColumnNamesFromMapping(@PathVariable String table_name) {
return new ResponseEntity<>(mappingsService.getTableColumnNamesFromMapping(table_name), HttpStatus.OK);
}
@GetMapping("/getAllTableName")
public ResponseEntity<Object> getAllTableName() {
return new ResponseEntity<>(mappingsService.getAllTableName(), HttpStatus.OK);
}
@GetMapping("/getExistTableName")
public ResponseEntity<Object> getExistTableName() {
return new ResponseEntity<>(mappingsService.getExistTableName(), HttpStatus.OK);
}
}

66
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/IBmExternalFieldMappingService.java Normal file
View File

@@ -0,0 +1,66 @@
package org.nl.wms.base_manage.field_mapping.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.base_manage.field_mapping.service.dao.BmExternalFieldMapping;
import org.nl.wms.base_manage.field_mapping.service.dto.RequestMappingParam;
import java.util.List;
import java.util.Map;
/**
* <p>
* 同步字段映射表 服务类
* </p>
*
* @author generator
* @since 2024-03-06
*/
public interface IBmExternalFieldMappingService extends IService<BmExternalFieldMapping> {
/**
* 根据数据表名获取所有字段名称
*
* @param tableName
* @return
*/
List<Map<String, String>> getTableColumnNames(String tableName);
/**
* 获取数据库中所有表的名称
*
* @return
*/
List<String> getAllTableName();
/**
* 查询已配置的数据库表名
*
* @return
*/
List<String> getExistTableName();
/**
* 批量添加
*
* @param param
*/
void addRows(RequestMappingParam param);
/**
* 批量修改
*
* @param param
*/
void updateRows(RequestMappingParam param);
/**
* 从映射关系表中获取已配置映射关系的
*
* @param table_name
* @return
*/
BmExternalFieldMapping getTableColumnNamesFromMapping(String table_name);
}

79
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/BmExternalFieldMapping.java Normal file
View File

@@ -0,0 +1,79 @@
package org.nl.wms.base_manage.field_mapping.service.dao;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.nl.wms.base_manage.field_mapping.service.dto.MappingDto;
/**
* <p>
* 同步字段映射表
* </p>
*
* @author generator
* @since 2024-03-06
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("bm_external_field_mapping")
public class BmExternalFieldMapping implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String id;
/**
* 本地数据库表名称
*/
private String local_table_name;
/**
* 接口地址
*/
private String api_address;
/**
* 同步类型
*/
private String sync_type;
/**
* 外部系统
*/
private String external_system;
/**
* 映射关系
*/
private String mapping_json;
/**
* 修改人ID
*/
private String last_update_id;
/**
* 修改人名称
*/
private String last_update_name;
/**
* 修改时间
*/
private String last_update_time;
/**
* mapping_json解析
*/
@TableField(exist = false)
private List<MappingDto> dtos = new ArrayList<>();
}

41
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/mapper/BmExternalFieldMappingMapper.java Normal file
View File

@@ -0,0 +1,41 @@
package org.nl.wms.base_manage.field_mapping.service.dao.mapper;
import org.apache.ibatis.annotations.Param;
import org.nl.wms.base_manage.field_mapping.service.dao.BmExternalFieldMapping;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
import java.util.Map;
/**
* <p>
* 同步字段映射表 Mapper 接口
* </p>
*
* @author generator
* @since 2024-03-06
*/
public interface BmExternalFieldMappingMapper extends BaseMapper<BmExternalFieldMapping> {
/**
* 根据数据表名获取所有字段名称
*
* @param tableName
* @return
*/
List<Map<String, String>> getTableColumnNames(@Param("tableName") String tableName);
/**
* 获取数据库中所有表的名称
*
* @return
*/
List<String> getAllTableName();
/**
* 查询已配置的数据库表名
*
* @return
*/
List<String> getExistTableName();
}

25
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/mapper/xml/BmExternalFieldMappingMapper.xml Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.base_manage.field_mapping.service.dao.mapper.BmExternalFieldMappingMapper">
<select id="getTableColumnNames" resultType="map">
SELECT COLUMN_NAME local_field_name,
"" as external_field_name
FROM INFORMATION_SCHEMA.COLUMNS
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = #{tableName}
</select>
<select id="getAllTableName" resultType="java.lang.String">
SELECT TABLE_NAME
FROM INFORMATION_SCHEMA.TABLES
WHERE TABLE_TYPE = 'BASE TABLE'
AND TABLE_SCHEMA = DATABASE();
</select>
<select id="getExistTableName" resultType="java.lang.String">
SELECT distinct local_table_name
FROM bm_external_field_mapping
</select>
</mapper>

14
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dto/MappingDto.java Normal file
View File

@@ -0,0 +1,14 @@
package org.nl.wms.base_manage.field_mapping.service.dto;
import lombok.Data;
/**
* @Description TODO
* @Author Gengby
* @Date 2024/3/8
*/
@Data
public class MappingDto {
private String local_field_name;
private String external_field_name;
}

27
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dto/MappingQuery.java Normal file
View File

@@ -0,0 +1,27 @@
package org.nl.wms.base_manage.field_mapping.service.dto;
import lombok.Data;
import org.nl.common.domain.entity.BaseQuery;
import org.nl.common.domain.entity.QParam;
import org.nl.common.enums.QueryTEnum;
import org.nl.wms.base_manage.field_mapping.service.dao.BmExternalFieldMapping;
/*
* @author ZZQ
* @Date 2023/5/4 19:49
*/
@Data
public class MappingQuery extends BaseQuery<BmExternalFieldMapping> {
private String local_table_name;
private String search;
@Override
public void paramMapping() {
super.doP.put("local_table_name", QParam.builder().k(new String[]{"local_table_name"}).type(QueryTEnum.EQ).build());
super.doP.put("search", QParam.builder().k(new String[]{"local_field_name", "external_field_name"}).type(QueryTEnum.EQ).build());
}
}

18
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dto/RequestMappingParam.java Normal file
View File

@@ -0,0 +1,18 @@
package org.nl.wms.base_manage.field_mapping.service.dto;
import lombok.Data;
import org.nl.wms.base_manage.field_mapping.service.dao.BmExternalFieldMapping;
import java.util.List;
/**
* @Description TODO
* @Author Gengby
* @Date 2024/3/8
*/
@Data
public class RequestMappingParam {
private BmExternalFieldMapping bmExternalFieldMapping;
private List<MappingDto> dtos;
}

111
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/impl/BmExternalFieldMappingServiceImpl.java Normal file
View File

@@ -0,0 +1,111 @@
package org.nl.wms.base_manage.field_mapping.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.base_manage.field_mapping.service.IBmExternalFieldMappingService;
import org.nl.wms.base_manage.field_mapping.service.dao.BmExternalFieldMapping;
import org.nl.wms.base_manage.field_mapping.service.dao.mapper.BmExternalFieldMappingMapper;
import org.nl.wms.base_manage.field_mapping.service.dto.MappingDto;
import org.nl.wms.base_manage.field_mapping.service.dto.RequestMappingParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.stream.Collectors;
/**
* <p>
* 同步字段映射表 服务实现类
* </p>
*
* @author generator
* @since 2024-03-06
*/
@Service
public class BmExternalFieldMappingServiceImpl extends ServiceImpl<BmExternalFieldMappingMapper, BmExternalFieldMapping> implements IBmExternalFieldMappingService {
@Autowired(required = false)
private BmExternalFieldMappingMapper mappingMapper;
@Override
public List<Map<String, String>> getTableColumnNames(String tableName) {
return mappingMapper.getTableColumnNames(tableName);
}
@Override
public List<String> getAllTableName() {
List<String> allTableName = mappingMapper.getAllTableName();
List<String> existTableName = this.getExistTableName();
allTableName.removeAll(existTableName);
return allTableName;
}
@Override
public List<String> getExistTableName() {
return mappingMapper.getExistTableName();
}
@Override
public void addRows(RequestMappingParam param) {
BmExternalFieldMapping mapping = param.getBmExternalFieldMapping();
List<MappingDto> dtos = param.getDtos();
Assert.notNull(dtos, "映射关系不能为空!");
Map<String, String> mappingJson = dtos.stream().collect(Collectors.toMap(MappingDto::getExternal_field_name, MappingDto::getLocal_field_name));
mapping.setMapping_json(JSON.toJSONString(mappingJson));
mapping.setId(IdUtil.getStringId());
mapping.setLast_update_id(SecurityUtils.getCurrentUserId());
mapping.setLast_update_name(SecurityUtils.getCurrentNickName());
mapping.setLast_update_time(DateUtil.now());
mappingMapper.insert(mapping);
}
@Transactional(rollbackFor = Exception.class)
@Override
public void updateRows(RequestMappingParam param) {
BmExternalFieldMapping mapping = param.getBmExternalFieldMapping();
LambdaUpdateWrapper<BmExternalFieldMapping> luw = new LambdaUpdateWrapper<>();
luw.eq(BmExternalFieldMapping::getLocal_table_name, mapping.getLocal_table_name());
List<MappingDto> dtos = param.getDtos();
mappingMapper.delete(luw);
if (ObjectUtil.isNotEmpty(dtos)) {
Map<String, String> mappingJson = dtos.stream().collect(Collectors.toMap(MappingDto::getExternal_field_name, MappingDto::getLocal_field_name));
mapping.setMapping_json(JSON.toJSONString(mappingJson));
mapping.setId(IdUtil.getStringId());
mapping.setLast_update_id(SecurityUtils.getCurrentUserId());
mapping.setLast_update_name(SecurityUtils.getCurrentNickName());
mapping.setLast_update_time(DateUtil.now());
mappingMapper.insert(mapping);
}
}
@Override
public BmExternalFieldMapping getTableColumnNamesFromMapping(String table_name) {
LambdaQueryWrapper<BmExternalFieldMapping> lqw = new LambdaQueryWrapper<>();
lqw.eq(BmExternalFieldMapping::getLocal_table_name, table_name);
BmExternalFieldMapping mapping = mappingMapper.selectOne(lqw);
String mapping_json = mapping.getMapping_json();
if (StrUtil.isNotBlank(mapping_json)) {
Map<String, String> map = JSON.parseObject(mapping_json, Map.class);
List<MappingDto> list = new ArrayList<>();
map.forEach((key, value) -> {
MappingDto dto = new MappingDto();
dto.setExternal_field_name(key);
dto.setLocal_field_name(value);
list.add(dto);
});
mapping.setDtos(list);
}
return mapping;
}
}

53
wms_pro/hd/nladmin-system/src/main/resources/groovyFile.groovy
View File

@@ -1,27 +1,26 @@
import com.alibaba.fastjson.JSONObject
import org.nl.wms.product_manage.service.device.dao.PdmBiDevice
def getPoints(List<PdmBiDevice> devices, Map<String, List<PdmBiDevice>> materialCollent, Double inupperlimitQty){
PdmBiDevice device = devices.get(0)
String materialId = device.getMaterial_id();
List<PdmBiDevice> collect = materialCollent.get(materialId);
Double qty = 0.0;
def list = new ArrayList<>();
for (PdmBiDevice o1 : collect) {
if (qty>inupperlimitQty){
return list;
}
def item = new JSONObject()
item.put("device_code",o1.getDevice_code())
item.put("qty",o1.getDeviceinstor_qty());
item.put("weight",o1.getDeviceinstor_weight().doubleValue());
item.put("material_id",materialId);
list.add(item);
if (o1.getIs_artificial()){
return list;
}
qty = qty+o1.getDeviceinstor_qty();
}
return list;
}
//import com.alibaba.fastjson.JSONObject
//
//def getPoints(List<PdmBiDevice> devices, Map<String, List<PdmBiDevice>> materialCollent, Double inupperlimitQty){
//
// PdmBiDevice device = devices.get(0)
// String materialId = device.getMaterial_id();
// List<PdmBiDevice> collect = materialCollent.get(materialId);
// Double qty = 0.0;
// def list = new ArrayList<>();
// for (PdmBiDevice o1 : collect) {
// if (qty>inupperlimitQty){
// return list;
// }
// def item = new JSONObject()
// item.put("device_code",o1.getDevice_code())
// item.put("qty",o1.getDeviceinstor_qty());
// item.put("weight",o1.getDeviceinstor_weight().doubleValue());
// item.put("material_id",materialId);
// list.add(item);
// if (o1.getIs_artificial()){
// return list;
// }
// qty = qty+o1.getDeviceinstor_qty();
// }
// return list;
//}