From 5171a2db361bdf8a44732cbee7d3de70276dbeee Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Mon, 8 Apr 2024 22:44:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A3=85=E6=88=BF=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/WeightListener.java | 17 +- .../service/DataCollectorService.java | 66 +- .../WeightColumnConfigController.java | 54 ++ .../dto/CreateWeightColumnConfigDto.java | 8 + .../dto/UpdateWeightColumnConfigDto.java | 10 + .../dto/WeightColumnConfigDto.java | 8 + .../entity/WeightColumnConfigEntity.java | 17 + .../mapper/WeightColumnConfigMapper.java | 23 + .../WeightColumnConfigRepository.java | 9 + .../service/WeightColumnConfigService.java | 117 ++++ .../dto/WeightDeviceDataDto.java | 282 ++++++++- .../resources/config/weightColumnConfig.json | 597 ++++++++++++++++++ .../dict/enum/weightColumnConfigDict.groovy | 17 + 13 files changed, 1201 insertions(+), 24 deletions(-) create mode 100644 src/main/java/cn/lihongjie/coal/weightColumnConfig/controller/WeightColumnConfigController.java create mode 100644 src/main/java/cn/lihongjie/coal/weightColumnConfig/dto/CreateWeightColumnConfigDto.java create mode 100644 src/main/java/cn/lihongjie/coal/weightColumnConfig/dto/UpdateWeightColumnConfigDto.java create mode 100644 src/main/java/cn/lihongjie/coal/weightColumnConfig/dto/WeightColumnConfigDto.java create mode 100644 src/main/java/cn/lihongjie/coal/weightColumnConfig/entity/WeightColumnConfigEntity.java create mode 100644 src/main/java/cn/lihongjie/coal/weightColumnConfig/mapper/WeightColumnConfigMapper.java create mode 100644 src/main/java/cn/lihongjie/coal/weightColumnConfig/repository/WeightColumnConfigRepository.java create mode 100644 src/main/java/cn/lihongjie/coal/weightColumnConfig/service/WeightColumnConfigService.java create mode 100644 src/main/resources/config/weightColumnConfig.json create mode 100644 src/main/resources/scripts/dict/enum/weightColumnConfigDict.groovy diff --git a/src/main/java/cn/lihongjie/coal/dataCollector/listener/WeightListener.java b/src/main/java/cn/lihongjie/coal/dataCollector/listener/WeightListener.java index b69d7b43..c359cf0f 100644 --- a/src/main/java/cn/lihongjie/coal/dataCollector/listener/WeightListener.java +++ b/src/main/java/cn/lihongjie/coal/dataCollector/listener/WeightListener.java @@ -1,6 +1,5 @@ package cn.lihongjie.coal.dataCollector.listener; -import cn.lihongjie.coal.acDevice.entity.AcDeviceEntity; import cn.lihongjie.coal.acDevice.service.AcDeviceService; import cn.lihongjie.coal.acDeviceData.service.AcDeviceDataService; import cn.lihongjie.coal.dataCollector.entity.DataCollectorEntity; @@ -8,6 +7,8 @@ import cn.lihongjie.coal.dataCollector.service.DataCollectorService; import cn.lihongjie.coal.dataCollectorLog.entity.DataCollectorLogEntity; import cn.lihongjie.coal.dataCollectorLog.service.DataCollectorLogService; import cn.lihongjie.coal.rabbitmq.RabbitMQConfiguration; +import cn.lihongjie.coal.weightDevice.entity.WeightDeviceEntity; +import cn.lihongjie.coal.weightDevice.service.WeightDeviceService; import cn.lihongjie.coal.weightDeviceData.entity.WeightDeviceDataEntity; import cn.lihongjie.coal.weightDeviceData.service.WeightDeviceDataService; @@ -58,7 +59,7 @@ public class WeightListener { @Autowired WeightDeviceDataService weightDeviceDataService; - + @Autowired WeightDeviceService weightDeviceService; @SneakyThrows @RabbitListener( @@ -99,12 +100,12 @@ public class WeightListener { return; } - List devices = - acDeviceService.findAll( - new Specification() { + List devices = + weightDeviceService.findAll( + new Specification() { @Override public Predicate toPredicate( - Root root, + Root root, CriteriaQuery query, CriteriaBuilder criteriaBuilder) { return criteriaBuilder.and( @@ -167,7 +168,9 @@ public class WeightListener { // log.info(x.toPrettyString()); WeightDeviceDataEntity deviceData = new WeightDeviceDataEntity(); - + deviceData.setDevice(device); + deviceData.setOrganizationId(device.getOrganizationId()); + deviceData.setSequenceNumber(toInteger(x.get("序号"))); deviceData.setFlowNumber(toString(x.get("流水号"))); deviceData.setPlateNo(toString(x.get("车号"))); diff --git a/src/main/java/cn/lihongjie/coal/dataCollector/service/DataCollectorService.java b/src/main/java/cn/lihongjie/coal/dataCollector/service/DataCollectorService.java index f5180d2e..f90468fb 100644 --- a/src/main/java/cn/lihongjie/coal/dataCollector/service/DataCollectorService.java +++ b/src/main/java/cn/lihongjie/coal/dataCollector/service/DataCollectorService.java @@ -18,6 +18,7 @@ import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.Nullable; import org.springframework.amqp.core.AmqpAdmin; import org.springframework.amqp.core.Queue; +import org.springframework.amqp.rabbit.connection.CorrelationData; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.convert.ConversionService; @@ -28,6 +29,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.UUID; @Service @@ -57,7 +60,7 @@ public class DataCollectorService public DataCollectorDto create(CreateDataCollectorDto request) { DataCollectorEntity entity = mapper.toEntity(request); - + entity.setAppKey(UUID.randomUUID().toString()); entity.setAppSecret(UUID.randomUUID().toString()); this.repository.save(entity); @@ -67,24 +70,58 @@ public class DataCollectorService return getById(entity.getId()); } + public Object getLocalStatus(String appKey) { - public Object getLocalStatus(String appKey){ - // - // rabbitTemplate.convertSendAndReceive( - // "dataCollector." + appKey, - // (Object) "getLocalStatus", - // new CorrelationData(UUID.randomUUID().toString())); - return null; + var o = rabbitTemplate.convertSendAndReceive( + "dataCollector." + appKey, + Map.of("action", "getLocalStatus")); + new CorrelationData(UUID.randomUUID().toString()); + + + + + return o; } + public void updateLocalStatus(String appKey, List> status) { + + rabbitTemplate.convertSendAndReceive( + "dataCollector." + appKey, + Map.of("action", "updateLocalStatus", "data", status)); + new CorrelationData(UUID.randomUUID().toString()); + + + } + + + public void deleteLocalStatus(String appKey, List keys) { + + rabbitTemplate.convertSendAndReceive( + "dataCollector." + appKey, + Map.of("action", "deleteLocalStatus", "data", keys)); + new CorrelationData(UUID.randomUUID().toString()); + + + } + + + + + + + @Nullable private void createQueue(DataCollectorEntity entity) { - amqpAdmin.declareQueue( + amqpAdmin.declareQueue( new Queue("pms.client." + entity.getAppKey(), true, false, false, new HashMap<>())); amqpAdmin.declareQueue( - new Queue("weight20.client." + entity.getAppKey(), true, false, false, new HashMap<>())); - + new Queue( + "dataCollector.client." + entity.getAppKey(), + true, + false, + false, + new HashMap<>())); } public DataCollectorDto update(UpdateDataCollectorDto request) { @@ -99,8 +136,9 @@ public class DataCollectorService public void delete(IdRequest request) { this.repository.deleteAllById(request.getIds()); } + public void createQueue(IdRequest request) { - this.repository.findAllById(request.getIds()).forEach(this::createQueue); + this.repository.findAllById(request.getIds()).forEach(this::createQueue); } public DataCollectorDto getById(String id) { @@ -123,10 +161,6 @@ public class DataCollectorService public DataCollectorEntity findByAppKey(String appKey) { - return repository.findByAppKey(appKey); - } - - } diff --git a/src/main/java/cn/lihongjie/coal/weightColumnConfig/controller/WeightColumnConfigController.java b/src/main/java/cn/lihongjie/coal/weightColumnConfig/controller/WeightColumnConfigController.java new file mode 100644 index 00000000..936e2b6a --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/weightColumnConfig/controller/WeightColumnConfigController.java @@ -0,0 +1,54 @@ +package cn.lihongjie.coal.weightColumnConfig.controller; + +import cn.lihongjie.coal.annotation.OrgScope; +import cn.lihongjie.coal.annotation.SysLog; +import cn.lihongjie.coal.base.dto.CommonQuery; +import cn.lihongjie.coal.base.dto.IdRequest; +import cn.lihongjie.coal.weightColumnConfig.dto.CreateWeightColumnConfigDto; +import cn.lihongjie.coal.weightColumnConfig.dto.UpdateWeightColumnConfigDto; +import cn.lihongjie.coal.weightColumnConfig.dto.WeightColumnConfigDto; +import cn.lihongjie.coal.weightColumnConfig.service.WeightColumnConfigService; + +import lombok.extern.slf4j.Slf4j; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/weightColumnConfig") +@SysLog(module = "磅房称重字段配置") +@Slf4j +@OrgScope +public class WeightColumnConfigController { + @Autowired private WeightColumnConfigService service; + + @PostMapping("/create") + public WeightColumnConfigDto create(@RequestBody CreateWeightColumnConfigDto request) { + return this.service.create(request); + } + + @PostMapping("/update") + public WeightColumnConfigDto update(@RequestBody UpdateWeightColumnConfigDto request) { + return this.service.update(request); + } + + @PostMapping("/delete") + public Object delete(@RequestBody IdRequest request) { + this.service.delete(request); + return true; + } + + @PostMapping("/getById") + public WeightColumnConfigDto getById(@RequestBody IdRequest request) { + return this.service.getById(request.getId()); + } + + @PostMapping("/list") + public Page list(@RequestBody CommonQuery request) { + return this.service.list(request); + } +} diff --git a/src/main/java/cn/lihongjie/coal/weightColumnConfig/dto/CreateWeightColumnConfigDto.java b/src/main/java/cn/lihongjie/coal/weightColumnConfig/dto/CreateWeightColumnConfigDto.java new file mode 100644 index 00000000..3e51d88d --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/weightColumnConfig/dto/CreateWeightColumnConfigDto.java @@ -0,0 +1,8 @@ +package cn.lihongjie.coal.weightColumnConfig.dto; + +import cn.lihongjie.coal.base.dto.OrgCommonDto; + +import lombok.Data; + +@Data +public class CreateWeightColumnConfigDto extends OrgCommonDto {} diff --git a/src/main/java/cn/lihongjie/coal/weightColumnConfig/dto/UpdateWeightColumnConfigDto.java b/src/main/java/cn/lihongjie/coal/weightColumnConfig/dto/UpdateWeightColumnConfigDto.java new file mode 100644 index 00000000..73143289 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/weightColumnConfig/dto/UpdateWeightColumnConfigDto.java @@ -0,0 +1,10 @@ +package cn.lihongjie.coal.weightColumnConfig.dto; + +import cn.lihongjie.coal.base.dto.OrgCommonDto; + +import lombok.Data; + +@Data +public class UpdateWeightColumnConfigDto extends OrgCommonDto { + private Integer width; +} diff --git a/src/main/java/cn/lihongjie/coal/weightColumnConfig/dto/WeightColumnConfigDto.java b/src/main/java/cn/lihongjie/coal/weightColumnConfig/dto/WeightColumnConfigDto.java new file mode 100644 index 00000000..1fd2117a --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/weightColumnConfig/dto/WeightColumnConfigDto.java @@ -0,0 +1,8 @@ +package cn.lihongjie.coal.weightColumnConfig.dto; + +import cn.lihongjie.coal.base.dto.OrgCommonDto; + +import lombok.Data; + +@Data +public class WeightColumnConfigDto extends OrgCommonDto {} diff --git a/src/main/java/cn/lihongjie/coal/weightColumnConfig/entity/WeightColumnConfigEntity.java b/src/main/java/cn/lihongjie/coal/weightColumnConfig/entity/WeightColumnConfigEntity.java new file mode 100644 index 00000000..7b7112ea --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/weightColumnConfig/entity/WeightColumnConfigEntity.java @@ -0,0 +1,17 @@ +package cn.lihongjie.coal.weightColumnConfig.entity; + +import cn.lihongjie.coal.base.entity.OrgCommonEntity; + +import jakarta.persistence.Entity; + +import lombok.Data; + +@Data +@Entity +public class WeightColumnConfigEntity extends OrgCommonEntity { + + + private Integer width; + + +} diff --git a/src/main/java/cn/lihongjie/coal/weightColumnConfig/mapper/WeightColumnConfigMapper.java b/src/main/java/cn/lihongjie/coal/weightColumnConfig/mapper/WeightColumnConfigMapper.java new file mode 100644 index 00000000..6a3ff21b --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/weightColumnConfig/mapper/WeightColumnConfigMapper.java @@ -0,0 +1,23 @@ +package cn.lihongjie.coal.weightColumnConfig.mapper; + +import cn.lihongjie.coal.base.mapper.BaseMapper; +import cn.lihongjie.coal.base.mapper.CommonEntityMapper; +import cn.lihongjie.coal.base.mapper.CommonMapper; +import cn.lihongjie.coal.weightColumnConfig.dto.CreateWeightColumnConfigDto; +import cn.lihongjie.coal.weightColumnConfig.dto.UpdateWeightColumnConfigDto; +import cn.lihongjie.coal.weightColumnConfig.dto.WeightColumnConfigDto; +import cn.lihongjie.coal.weightColumnConfig.entity.WeightColumnConfigEntity; + +import org.mapstruct.Mapper; +import org.mapstruct.control.DeepClone; + +@Mapper( + componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING, + uses = {CommonMapper.class, CommonEntityMapper.class}, + mappingControl = DeepClone.class) +public interface WeightColumnConfigMapper + extends BaseMapper< + WeightColumnConfigEntity, + WeightColumnConfigDto, + CreateWeightColumnConfigDto, + UpdateWeightColumnConfigDto> {} diff --git a/src/main/java/cn/lihongjie/coal/weightColumnConfig/repository/WeightColumnConfigRepository.java b/src/main/java/cn/lihongjie/coal/weightColumnConfig/repository/WeightColumnConfigRepository.java new file mode 100644 index 00000000..98554bd4 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/weightColumnConfig/repository/WeightColumnConfigRepository.java @@ -0,0 +1,9 @@ +package cn.lihongjie.coal.weightColumnConfig.repository; + +import cn.lihongjie.coal.base.dao.BaseRepository; +import cn.lihongjie.coal.weightColumnConfig.entity.WeightColumnConfigEntity; + +import org.springframework.stereotype.Repository; + +@Repository +public interface WeightColumnConfigRepository extends BaseRepository {} diff --git a/src/main/java/cn/lihongjie/coal/weightColumnConfig/service/WeightColumnConfigService.java b/src/main/java/cn/lihongjie/coal/weightColumnConfig/service/WeightColumnConfigService.java new file mode 100644 index 00000000..965e717f --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/weightColumnConfig/service/WeightColumnConfigService.java @@ -0,0 +1,117 @@ +package cn.lihongjie.coal.weightColumnConfig.service; + +import cn.lihongjie.coal.base.dto.CommonQuery; +import cn.lihongjie.coal.base.dto.IdRequest; +import cn.lihongjie.coal.base.service.BaseService; +import cn.lihongjie.coal.dbFunctions.DbFunctionService; +import cn.lihongjie.coal.weightColumnConfig.dto.CreateWeightColumnConfigDto; +import cn.lihongjie.coal.weightColumnConfig.dto.UpdateWeightColumnConfigDto; +import cn.lihongjie.coal.weightColumnConfig.dto.WeightColumnConfigDto; +import cn.lihongjie.coal.weightColumnConfig.entity.WeightColumnConfigEntity; +import cn.lihongjie.coal.weightColumnConfig.mapper.WeightColumnConfigMapper; +import cn.lihongjie.coal.weightColumnConfig.repository.WeightColumnConfigRepository; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; + +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.convert.ConversionService; +import org.springframework.core.io.ClassPathResource; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.io.InputStream; +import java.util.List; + +@Service +@Slf4j +@Transactional +public class WeightColumnConfigService + extends BaseService { + @Autowired private WeightColumnConfigRepository repository; + + @Autowired private WeightColumnConfigMapper mapper; + + @Autowired private ConversionService conversionService; + + @Autowired private DbFunctionService dbFunctionService; + + public WeightColumnConfigDto create(CreateWeightColumnConfigDto request) { + WeightColumnConfigEntity entity = mapper.toEntity(request); + + this.repository.save(entity); + return getById(entity.getId()); + } + + public WeightColumnConfigDto update(UpdateWeightColumnConfigDto request) { + WeightColumnConfigEntity entity = this.repository.get(request.getId()); + this.mapper.updateEntity(entity, request); + + this.repository.save(entity); + + return getById(entity.getId()); + } + + public void delete(IdRequest request) { + this.repository.deleteAllById(request.getIds()); + } + + public WeightColumnConfigDto getById(String id) { + WeightColumnConfigEntity entity = repository.get(id); + + return mapper.toDto(entity); + } + + public Page list(CommonQuery query) { + Page page = + repository.findAll( + query.specification(conversionService), + PageRequest.of( + query.getPageNo(), + query.getPageSize(), + Sort.by(query.getOrders()))); + + return page.map(this.mapper::toDto); + } + + + @SneakyThrows + public void initDefault(String organizationId) { + + this.repository.deleteByOrganizationId(organizationId); + + + + ClassPathResource classPathResource = new ClassPathResource("/config/weightColumnConfig.json"); + + ObjectMapper mapper = new ObjectMapper(); + mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); + + List data; + + + try (InputStream inputStream = classPathResource.getInputStream()) { + data = + mapper.readValue(inputStream, new TypeReference>() {}); + } + + + data.forEach(x -> x.setOrganizationId(organizationId)); + + this.repository.saveAll(data); + + + + + + + + } +} diff --git a/src/main/java/cn/lihongjie/coal/weightDeviceData/dto/WeightDeviceDataDto.java b/src/main/java/cn/lihongjie/coal/weightDeviceData/dto/WeightDeviceDataDto.java index 80dccb59..5a52a41d 100644 --- a/src/main/java/cn/lihongjie/coal/weightDeviceData/dto/WeightDeviceDataDto.java +++ b/src/main/java/cn/lihongjie/coal/weightDeviceData/dto/WeightDeviceDataDto.java @@ -1,12 +1,292 @@ package cn.lihongjie.coal.weightDeviceData.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; +import cn.lihongjie.coal.weightDevice.dto.WeightDeviceDto; + +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; import lombok.Data; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.Comment; +import org.hibernate.annotations.Formula; + +import java.time.LocalDateTime; + @Data public class WeightDeviceDataDto extends OrgCommonDto { - private String archiveStatus; + @ManyToOne(fetch = FetchType.LAZY) + private WeightDeviceDto device; + @Comment("序号") + private Integer sequenceNumber; + + @Comment("流水号") + private String flowNumber; + + @Comment("车号") + private String plateNo; + + @Comment("过磅类型") + private String weighType; + + @Comment("发货单位") + private String sendOrganization; + + @Comment("收货单位") + private String receiveOrganization; + + @Comment("货名") + private String goods; + + @Comment("规格") + private String specification; + + @Comment("毛重") + private Double mz; + + @Comment("皮重") + private Double pz; + + @Comment("净重") + private Double jz; + + @Comment("扣重") + private Double kz; + + @Comment("实重") + private Double sz; + + @Comment("单价") + private Double price; + + @Comment("金额") + private Double amount; + + @Comment("折方系数") + private Double zfxs; + + @Comment("方量") + private Double fl; + + @Comment("过磅费") + private Double weightFee; + + @Comment("毛重司磅员") + private String mzUser; + + @Comment("皮重司磅员") + private String pzUser; + + @Comment("毛重磅号") + private String mzbh; + + @Comment("皮重磅号") + private String pzbh; + + @Comment("毛重时间") + private LocalDateTime mzTime; + + @Comment("皮重时间") + private LocalDateTime pzTime; + + @Comment("一次过磅时间") + private LocalDateTime ycgbTIme; + + @Comment("二次过磅时间") + private LocalDateTime ecgbTime; + + @Comment("更新人") + private String updateUser; + + @Comment("更新时间") + private LocalDateTime updateTime; + + @Comment("备注") + private String remark; + + @Comment("打印次数") + private Integer printCount; + + @Comment("上传否") + private Integer upload; + + @Comment("备用1") + private String reserve1; + + @Comment("备用2") + private String reserve2; + + @Comment("备用3") + private String reserve3; + + @Comment("备用4") + private String reserve4; + + @Comment("备用5") + private String reserve5; + + @Comment("备用6") + private Double reserve6; + + @Comment("备用7") + private Double reserve7; + + @Comment("备用8") + private Double reserve8; + + @Comment("备用9") + private Double reserve9; + + @Comment("备用10") + private String reserve10; + + @Comment("备用11") + private String reserve11; + + @Comment("备用12") + private String reserve12; + + @Comment("备用13") + private String reserve13; + + @Comment("备用14") + private String reserve14; + + @Comment("备用15") + private Double reserve15; + + @Comment("备用16") + private Double reserve16; + + @Comment("备用17") + private Double reserve17; + + @Comment("备用18") + private Double reserve18; + + @Comment("客户类型") + private Integer clientType; + + @Comment("一次过磅重") + private Double ycgbWeight; + + @Comment("二次过磅重") + private Double ecgbWeight; + + @Comment("b0") + private String b0; + + @Comment("aguid") + private String aguid; + + @Comment("PlanNumber") + private String planNumber; + + @Comment("RecordCreateMode") + private Integer recordCreateMode; + + @Comment("RecordFinish") + private Integer recordFinish; + + @Comment("网价同步时间") + private LocalDateTime netPriceSyncTime; + + @Comment("网价修改人") + private String netPriceModifyUser; + + @Comment("CTime") + private LocalDateTime cTime; + + @Comment("modify_onnet") + private String modifyOnnet; + + @Comment("modify_time") + private LocalDateTime modifyTime; + + @Comment("modify_by") + private String modifyBy; + + @Comment("audit_flag") + private String auditFlag; + + @Comment("audit_time") + private LocalDateTime auditTime; + + @Comment("audit_by") + private String auditBy; + + @Comment("e_upimg") + private String eUpimg; + + @Comment("备用19") + private String reserve19; + + @Comment("备用20") + private String reserve20; + + @Comment("备用21") + private String reserve21; + + @Comment("备用22") + private String reserve22; + + @Comment("备用23") + private String reserve23; + + @Comment("备用24") + private String reserve24; + + @Comment("备用25") + private String reserve25; + + @Comment("备用26") + private String reserve26; + + @Comment("备用27") + private String reserve27; + + @Comment("备用28") + private String reserve28; + + @Comment("driver_info") + private String driverInfo; + + @Comment("HQB_UpImg_G1") + private Integer hqbUpImgG1; + + @Comment("HQB_UpImg_G2") + private Integer hqbUpImgG2; + + @Comment("HQB_UpImg_G3") + private Integer hqbUpImgG3; + + @Comment("HQB_UpImg_G4") + private Integer hqbUpImgG4; + + @Comment("HQB_UpImg_T1") + private Integer hqbUpImgT1; + + @Comment("HQB_UpImg_T2") + private Integer hqbUpImgT2; + + @Comment("HQB_UpImg_T3") + private Integer hqbUpImgT3; + + @Comment("HQB_UpImg_T4") + private Integer hqbUpImgT4; + + @Comment("归档状态") + @ColumnDefault("'0'") + private String archiveStatus = "0"; + + @Formula( + "(select i.name\n" + + "from t_dictionary d,\n" + + " t_dictionary_item i\n" + + "where d.id = i.dictionary_id\n" + + " and d.code = 'archiveStatus'\n" + + " and i.code = archive_status)") private String archiveStatusName; } diff --git a/src/main/resources/config/weightColumnConfig.json b/src/main/resources/config/weightColumnConfig.json new file mode 100644 index 00000000..9ebbff64 --- /dev/null +++ b/src/main/resources/config/weightColumnConfig.json @@ -0,0 +1,597 @@ +[ + { + "name": "流水号", + "code": "flowNumber", + "sortKey": "1", + "status": 1, + "width": "100" + }, + { + "name": "车号", + "code": "plateNo", + "sortKey": "2", + "status": 1, + "width": "100" + }, + { + "name": "过磅类型", + "code": "weighType", + "sortKey": "3", + "status": 1, + "width": "100" + }, + { + "name": "发货单位", + "code": "sendOrganization", + "sortKey": "4", + "status": 1, + "width": "100" + }, + { + "name": "收货单位", + "code": "receiveOrganization", + "sortKey": "5", + "status": 1, + "width": "100" + }, + { + "name": "货名", + "code": "goods", + "sortKey": "6", + "status": 1, + "width": "100" + }, + { + "name": "规格", + "code": "specification", + "sortKey": "7", + "status": 1, + "width": "100" + }, + { + "name": "毛重", + "code": "mz", + "sortKey": "8", + "status": 1, + "width": "100" + }, + { + "name": "皮重", + "code": "pz", + "sortKey": "9", + "status": 1, + "width": "100" + }, + { + "name": "净重", + "code": "jz", + "sortKey": "10", + "status": 1, + "width": "100" + }, + { + "name": "扣重", + "code": "kz", + "sortKey": "11", + "status": 1, + "width": "100" + }, + { + "name": "实重", + "code": "sz", + "sortKey": "12", + "status": 1, + "width": "100" + }, + { + "name": "单价", + "code": "price", + "sortKey": "13", + "status": 1, + "width": "100" + }, + { + "name": "金额", + "code": "amount", + "sortKey": "14", + "status": 1, + "width": "100" + }, + { + "name": "折方系数", + "code": "zfxs", + "sortKey": "15", + "status": 1, + "width": "100" + }, + { + "name": "方量", + "code": "fl", + "sortKey": "16", + "status": 1, + "width": "100" + }, + { + "name": "过磅费", + "code": "weightFee", + "sortKey": "17", + "status": 1, + "width": "100" + }, + { + "name": "毛重司磅员", + "code": "mzUser", + "sortKey": "18", + "status": 1, + "width": "100" + }, + { + "name": "皮重司磅员", + "code": "pzUser", + "sortKey": "19", + "status": 1, + "width": "100" + }, + { + "name": "毛重磅号", + "code": "mzbh", + "sortKey": "20", + "status": 1, + "width": "100" + }, + { + "name": "皮重磅号", + "code": "pzbh", + "sortKey": "21", + "status": 1, + "width": "100" + }, + { + "name": "毛重时间", + "code": "mzTime", + "sortKey": "22", + "status": 1, + "width": "100" + }, + { + "name": "皮重时间", + "code": "pzTime", + "sortKey": "23", + "status": 1, + "width": "100" + }, + { + "name": "一次过磅时间", + "code": "ycgbTIme", + "sortKey": "24", + "status": 1, + "width": "100" + }, + { + "name": "二次过磅时间", + "code": "ecgbTime", + "sortKey": "25", + "status": 1, + "width": "100" + }, + { + "name": "更新人", + "code": "updateUser", + "sortKey": "26", + "status": 1, + "width": "100" + }, + { + "name": "更新时间", + "code": "updateTime", + "sortKey": "27", + "status": 1, + "width": "100" + }, + { + "name": "备注", + "code": "remark", + "sortKey": "28", + "status": 1, + "width": "100" + }, + { + "name": "打印次数", + "code": "printCount", + "sortKey": "29", + "status": 1, + "width": "100" + }, + { + "name": "上传否", + "code": "upload", + "sortKey": "30", + "status": 1, + "width": "100" + }, + { + "name": "备用1", + "code": "reserve1", + "sortKey": "31", + "status": 1, + "width": "100" + }, + { + "name": "备用2", + "code": "reserve2", + "sortKey": "32", + "status": 1, + "width": "100" + }, + { + "name": "备用3", + "code": "reserve3", + "sortKey": "33", + "status": 1, + "width": "100" + }, + { + "name": "备用4", + "code": "reserve4", + "sortKey": "34", + "status": 1, + "width": "100" + }, + { + "name": "备用5", + "code": "reserve5", + "sortKey": "35", + "status": 1, + "width": "100" + }, + { + "name": "备用6", + "code": "reserve6", + "sortKey": "36", + "status": 1, + "width": "100" + }, + { + "name": "备用7", + "code": "reserve7", + "sortKey": "37", + "status": 1, + "width": "100" + }, + { + "name": "备用8", + "code": "reserve8", + "sortKey": "38", + "status": 1, + "width": "100" + }, + { + "name": "备用9", + "code": "reserve9", + "sortKey": "39", + "status": 1, + "width": "100" + }, + { + "name": "备用10", + "code": "reserve10", + "sortKey": "40", + "status": 1, + "width": "100" + }, + { + "name": "备用11", + "code": "reserve11", + "sortKey": "41", + "status": 1, + "width": "100" + }, + { + "name": "备用12", + "code": "reserve12", + "sortKey": "42", + "status": 1, + "width": "100" + }, + { + "name": "备用13", + "code": "reserve13", + "sortKey": "43", + "status": 1, + "width": "100" + }, + { + "name": "备用14", + "code": "reserve14", + "sortKey": "44", + "status": 1, + "width": "100" + }, + { + "name": "备用15", + "code": "reserve15", + "sortKey": "45", + "status": 1, + "width": "100" + }, + { + "name": "备用16", + "code": "reserve16", + "sortKey": "46", + "status": 1, + "width": "100" + }, + { + "name": "备用17", + "code": "reserve17", + "sortKey": "47", + "status": 1, + "width": "100" + }, + { + "name": "备用18", + "code": "reserve18", + "sortKey": "48", + "status": 1, + "width": "100" + }, + { + "name": "客户类型", + "code": "clientType", + "sortKey": "49", + "status": 1, + "width": "100" + }, + { + "name": "一次过磅重", + "code": "ycgbWeight", + "sortKey": "50", + "status": 1, + "width": "100" + }, + { + "name": "二次过磅重", + "code": "ecgbWeight", + "sortKey": "51", + "status": 1, + "width": "100" + }, + { + "name": "b0", + "code": "b0", + "sortKey": "52", + "status": 1, + "width": "100" + }, + { + "name": "aguid", + "code": "aguid", + "sortKey": "53", + "status": 1, + "width": "100" + }, + { + "name": "PlanNumber", + "code": "planNumber", + "sortKey": "54", + "status": 1, + "width": "100" + }, + { + "name": "RecordCreateMode", + "code": "recordCreateMode", + "sortKey": "55", + "status": 1, + "width": "100" + }, + { + "name": "RecordFinish", + "code": "recordFinish", + "sortKey": "56", + "status": 1, + "width": "100" + }, + { + "name": "网价同步时间", + "code": "netPriceSyncTime", + "sortKey": "57", + "status": 1, + "width": "100" + }, + { + "name": "网价修改人", + "code": "netPriceModifyUser", + "sortKey": "58", + "status": 1, + "width": "100" + }, + { + "name": "CTime", + "code": "cTime", + "sortKey": "59", + "status": 1, + "width": "100" + }, + { + "name": "modify_onnet", + "code": "modifyOnnet", + "sortKey": "60", + "status": 1, + "width": "100" + }, + { + "name": "modify_time", + "code": "modifyTime", + "sortKey": "61", + "status": 1, + "width": "100" + }, + { + "name": "modify_by", + "code": "modifyBy", + "sortKey": "62", + "status": 1, + "width": "100" + }, + { + "name": "audit_flag", + "code": "auditFlag", + "sortKey": "63", + "status": 1, + "width": "100" + }, + { + "name": "audit_time", + "code": "auditTime", + "sortKey": "64", + "status": 1, + "width": "100" + }, + { + "name": "audit_by", + "code": "auditBy", + "sortKey": "65", + "status": 1, + "width": "100" + }, + { + "name": "e_upimg", + "code": "eUpimg", + "sortKey": "66", + "status": 1, + "width": "100" + }, + { + "name": "备用19", + "code": "reserve19", + "sortKey": "67", + "status": 1, + "width": "100" + }, + { + "name": "备用20", + "code": "reserve20", + "sortKey": "68", + "status": 1, + "width": "100" + }, + { + "name": "备用21", + "code": "reserve21", + "sortKey": "69", + "status": 1, + "width": "100" + }, + { + "name": "备用22", + "code": "reserve22", + "sortKey": "70", + "status": 1, + "width": "100" + }, + { + "name": "备用23", + "code": "reserve23", + "sortKey": "71", + "status": 1, + "width": "100" + }, + { + "name": "备用24", + "code": "reserve24", + "sortKey": "72", + "status": 1, + "width": "100" + }, + { + "name": "备用25", + "code": "reserve25", + "sortKey": "73", + "status": 1, + "width": "100" + }, + { + "name": "备用26", + "code": "reserve26", + "sortKey": "74", + "status": 1, + "width": "100" + }, + { + "name": "备用27", + "code": "reserve27", + "sortKey": "75", + "status": 1, + "width": "100" + }, + { + "name": "备用28", + "code": "reserve28", + "sortKey": "76", + "status": 1, + "width": "100" + }, + { + "name": "driver_info", + "code": "driverInfo", + "sortKey": "77", + "status": 1, + "width": "100" + }, + { + "name": "HQB_UpImg_G1", + "code": "hqbUpImgG1", + "sortKey": "78", + "status": 1, + "width": "100" + }, + { + "name": "HQB_UpImg_G2", + "code": "hqbUpImgG2", + "sortKey": "79", + "status": 1, + "width": "100" + }, + { + "name": "HQB_UpImg_G3", + "code": "hqbUpImgG3", + "sortKey": "80", + "status": 1, + "width": "100" + }, + { + "name": "HQB_UpImg_G4", + "code": "hqbUpImgG4", + "sortKey": "81", + "status": 1, + "width": "100" + }, + { + "name": "HQB_UpImg_T1", + "code": "hqbUpImgT1", + "sortKey": "82", + "status": 1, + "width": "100" + }, + { + "name": "HQB_UpImg_T2", + "code": "hqbUpImgT2", + "sortKey": "83", + "status": 1, + "width": "100" + }, + { + "name": "HQB_UpImg_T3", + "code": "hqbUpImgT3", + "sortKey": "84", + "status": 1, + "width": "100" + }, + { + "name": "HQB_UpImg_T4", + "code": "hqbUpImgT4", + "sortKey": "85", + "status": 1, + "width": "100" + } +] \ No newline at end of file diff --git a/src/main/resources/scripts/dict/enum/weightColumnConfigDict.groovy b/src/main/resources/scripts/dict/enum/weightColumnConfigDict.groovy new file mode 100644 index 00000000..6c4905fe --- /dev/null +++ b/src/main/resources/scripts/dict/enum/weightColumnConfigDict.groovy @@ -0,0 +1,17 @@ + +package scripts.dict + +import cn.lihongjie.coal.base.dto.CommonQuery +import cn.lihongjie.coal.weightColumnConfig.controller.WeightColumnConfigController +import org.springframework.context.ApplicationContext + +ApplicationContext ioc = ioc + +def controller = ioc.getBean(WeightColumnConfigController.class) + + + + +return controller.list(new CommonQuery()) + +