From c206acfaedc69c390fb67daa81bc686f58a212ef Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 27 十一月 2023 16:12:11 +0800
Subject: [PATCH] 提交配置信息2
---
igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml | 153
igds-warn/igds-warn.iml | 6
igds-recir/target/classes/com/ld/igds/drug/view/Drug.view.xml | 82
igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java | 3
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1301.class | 0
igds-core/src/main/java/com/ld/igds/models/DepotStore.java | 4
igds-web/src/main/resources/static/js/constant.js | 50
igds-web/src/main/resources/templates/index/index-5327.html | 199
igds-protocol-fzzy3/target/classes/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.class | 0
igds-core/src/main/java/com/ld/igds/view/service/HDepotBookStoreService.java | 89
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1306.java | 43
igds-inout/src/main/java/com/ld/igds/m/service/HCreditService.java | 2
igds-core/src/main/java/com/ld/igds/io/impl/NotifyGrainInvokerImpl.java | 3
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1105.class | 0
igds-core/src/main/java/com/ld/igds/file/CoreFileService.java | 19
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/RemoteGrainV2ServiceImpl.java | 22
igds-core/src/main/java/com/ld/igds/view/GranaryPR.java | 8
igds-security/target/classes/com/ld/igds/timer/JobLampService.class | 0
igds-api-inte/target/classes/com/ld/igds/sh/service/impl/HApiShServiceImpl.class | 0
igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java | 17
igds-basic/src/main/java/com/ld/igds/pest/manager/PestManager.java | 4
igds-core/src/main/java/com/ld/igds/view/Depot.view.xml | 7
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1405.java | 20
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1112.class | 0
igds-web/src/main/resources/templates/index/index-5329.html | 224 +
igds-web/src/main/resources/templates/admin/grain/grain-check3.html | 8
igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java | 2
igds-core/src/main/java/com/ld/igds/view/Building.view.xml | 9
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1311.java | 32
igds-security/src/main/java/com/ld/igds/timer/JobLampService.java | 7
igds-api-inte/target/classes/com/ld/igds/three/service/impl/ThreeServiceImpl1001.class | 0
igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java | 47
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1106.java | 18
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1503.class | 0
igds-core/src/main/resources/mapper/SecServiceMapper.xml | 21
igds-web/src/main/resources/READ-INFO.properties | 3
igds-manager/igds-manager.iml | 6
igds-security/target/classes/com/ld/igds/sec/view/SecCamera.view.xml | 165
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1405.class | 0
igds-es/src/main/java/com/ld/igds/es/view/EsData.view.xml | 21
igds-web/src/main/java/com/ld/igds/TestAction.java | 8
igds-core/src/main/java/com/ld/igds/models/MQuality.java | 12
igds-core/src/main/java/com/ld/igds/view/DepotBookStore.view.xml | 387 +
igds-es/src/main/java/com/ld/igds/timer/EsScheduled.java | 2
igds-protocol-fzzy3/target/classes/com/ld/igds/protocol/fzzy/ServerRunner.class | 0
igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml | 95
igds-inout/src/main/java/models/inout.model.xml | 7
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/message/IoMessage.java | 1
igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogService.java | 19
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1104.java | 15
igds-core/src/main/java/com/ld/igds/view/service/HGrainOilShopService.java | 2
igds-inout/src/main/java/com/ld/igds/models/InoutFullCheck.java | 2
igds-inout/src/main/java/com/ld/igds/m/view/Credit.view.xml | 18
igds-inout/src/main/resources/mapper/InoutCheckMapper.xml | 2
igds-core/igds-core.iml | 6
igds-recir/target/classes/com/ld/igds/models/Drug.class | 0
igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml | 165
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1403.java | 16
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1404.class | 0
igds-core/src/main/java/com/ld/igds/models/Depot.java | 4
igds-inout/src/main/java/com/ld/igds/m/service/HInoutCustomerService.java | 8
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1504.java | 22
igds-protocol-zldz/igds-protocol-zldz.iml | 6
igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDetail.view.xml | 90
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1306.class | 0
igds-n2/igds-n2.iml | 6
igds-protocol-block/src/main/java/com/ld/igds/protocol/vlcmedia/VlcMediaService.java | 21
igds-core/src/main/java/com/ld/igds/file/impl/CoreFileServiceImpl.java | 245
igds-api-inte/target/classes/com/ld/igds/sh/util/ApiShUtil.class | 0
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1308.java | 26
igds-quantity/src/main/java/com/ld/igds/io/ServerRunner.java | 3
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1502.class | 0
igds-core/src/main/java/com/ld/igds/view/GrainOilShop.view.xml | 5
igds-core/src/main/java/com/ld/igds/view/service/BuildingService.java | 32
igds-recir/target/classes/com/ld/igds/models/DrugLogDtl.class | 0
igds-quantity/target/classes/com/ld/igds/io/ServerRunner.class | 0
igds-core/src/main/java/com/ld/igds/models/InteGrain5332.java | 98
igds-recir/target/classes/com/ld/igds/models/DrugLogWay.class | 0
igds-api-inte/igds-api-inte.iml | 6
igds-core/src/main/java/com/ld/igds/view/FoodInfo.view.xml | 477 ++
igds-web/src/main/resources/templates/index/index-5303.html | 4
igds-verb/igds-verb.iml | 6
igds-core/src/main/java/com/ld/igds/util/ContextUtil.java | 4
igds-basic/src/main/java/com/ld/igds/timer/zcl/InteGrainScheduled.java | 2
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java | 31
igds-basic/src/main/java/com/ld/igds/pest/view/PestDataPR.java | 12
igds-inout/src/main/java/com/ld/igds/models/InoutSettle.java | 4
igds-api-phone/target/classes/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.class | 0
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1308.class | 0
igds-basic/igds-basic.iml | 6
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1501.java | 23
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1301.java | 34
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1403.class | 0
igds-verb/src/main/java/com/ld/igds/verb/service/HMAreationDataService.java | 61
igds-basic/src/main/java/com/ld/igds/basic/manager/FileManager.java | 17
igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeOut.view.xml | 121
igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java | 27
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1504.class | 0
igds-core/src/main/java/com/ld/igds/models/DepotConf.java | 2
igds-web/src/main/resources/application.yml | 12
igds-web/src/main/resources/static/admin/quantity/quantity.js | 2
igds-api-inte/src/main/java/com/ld/igds/sh/util/ApiShUtil.java | 45
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java | 21
igds-recir/src/main/java/com/ld/igds/drug/view/DrugPR.java | 10
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1202.class | 0
igds-inout/src/main/java/com/ld/igds/m/InoutManageUtil.java | 11
igds-verb/target/classes/com/ld/igds/verb/view/AreationData.view.xml | 397 +
igds-core/src/main/java/com/ld/igds/file/ApplyOrderUploadProcessor.java | 35
igds-security/src/main/java/com/ld/igds/sec/controller/FireController.java | 2
igds-core/src/main/java/com/ld/igds/camera/data/ApiCameraResp.java | 2
igds-manager/src/main/java/com/ld/igds/models/CashFlow.java | 305
igds-manager/src/main/java/com/ld/igds/m/view/FinancePR.java | 3
igds-core/src/main/java/com/ld/igds/check/service/HDicCheckItemService.java | 2
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 3
igds-web/src/main/resources/static/admin/grain/liquid-height.js | 12
igds-basic/src/main/java/com/ld/igds/pest/service/HPestDataService.java | 27
igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java | 33
igds-core/src/main/java/com/ld/igds/view/DepotBookStorePR.java | 56
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1202.java | 26
igds-manager/src/main/java/com/ld/igds/oa/view/Archives.view.xml | 2
igds-protocol-beibo/igds-protocol-beibo.iml | 6
igds-protocol-iot/src/main/java/com/ld/igds/protocol/iot/ServerRunner.java | 5
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1312.class | 0
igds-web/src/main/resources/templates/admin/inout/out-ship-register.html | 11
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java | 29
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1401.class | 0
igds-core/src/main/java/com/ld/igds/util/BytesUtil.java | 67
igds-web/src/main/resources/templates/admin/inout/in-weight.html | 42
igds-manager/src/main/java/com/ld/igds/models/OAStaff.java | 27
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1404.java | 62
igds-core/src/main/java/com/ld/igds/models/SecCamera.java | 19
igds-web/src/main/resources/static/admin/inout/in-weight.js | 89
igds-web/src/main/resources/templates/admin/inout/in-ship-register.html | 18
igds-recir/target/classes/com/ld/igds/drug/view/DrugLogApply.view.xml | 304 +
igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/builder/ObjectCommandBuilder.java | 10
igds-recir/igds-recir.iml | 6
igds-inout/src/main/java/com/ld/igds/models/InoutNoticeIn.java | 8
igds-verb/src/main/java/com/ld/igds/verb/view/AreationData.view.xml | 397 +
igds-quantity/igds-quantity.iml | 6
igds-inout/src/main/java/com/ld/igds/m/service/HPlanManageService.java | 25
igds-web/src/main/resources/application-dev.yml | 14
igds-basic/pom.xml | 2
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/msg/AnalysisService.java | 43
igds-recir/src/main/java/com/ld/igds/drug/service/HDrugService.java | 22
igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java | 2
igds-recir/target/classes/com/ld/igds/models/DrugLogApply.class | 0
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1309.class | 0
igds-web/src/main/resources/static/admin/grain/grainPoint4.js | 5
igds-security/target/classes/com/ld/igds/sec/controller/FireController.class | 0
igds-core/src/main/java/com/ld/igds/models/FoodBrand.java | 61
igds-manager/src/main/java/com/ld/igds/m/view/CashFlow.view.xml | 10
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/ServerRunner.java | 4
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1105.java | 13
igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java | 16
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1310.java | 20
igds-web/pom.xml | 28
igds-web/src/main/resources/static/admin/inout/in-ship-register.js | 139
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1502.java | 33
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1311.class | 0
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShService.java | 2
igds-n2/src/main/java/com/ld/igds/n2/manager/N2AutoManager.java | 12
igds-web/src/main/java/com/ld/igds/web/WebController.java | 12
igds-core/src/main/java/com/ld/igds/view/FoodBrand.view.xml | 276 +
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 87
igds-core/src/main/java/com/ld/igds/models/DepotBookStore.java | 87
igds-protocol-block/igds-protocol-block.iml | 7
igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerRunner.java | 6
igds-web/src/main/resources/static/admin/inout/out-weight.js | 79
igds-inout/igds-inout.iml | 6
igds-parent-pom/igds-parent-pom.iml | 6
igds-web/src/main/resources/static/admin/grain/grainPoint3.js | 62
igds-protocol-sdk/igds-protocol-sdk.iml | 6
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutEventControlManager.java | 58
igds-core/src/main/java/com/ld/igds/models/InteGrain5328.java | 98
igds-recir/target/classes/com/ld/igds/drug/view/DrugPR.class | 0
igds-core/src/main/java/com/ld/igds/view/Granary.view.xml | 13
igds-inout/src/main/resources/mapper/InoutCommonMapper.xml | 268
igds-inout/src/main/java/com/ld/igds/m/dto/NoticeDto.java | 4
igds-databoard/igds-databoard.iml | 6
igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java | 18
igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java | 33
igds-recir/src/main/java/com/ld/igds/drug/view/Drug.view.xml | 82
igds-core/src/main/java/com/ld/igds/models/Building.java | 4
igds-web/src/main/resources/templates/index/index-5326.html | 223 +
igds-api-phone/igds-api-phone.iml | 6
igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.java | 14
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java | 54
igds-basic/src/main/java/com/ld/igds/basic/controller/FileController.java | 194
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1408.java | 20
igds-protocol-bhzn/igds-protocol-bhzn.iml | 6
igds-security/src/main/java/com/ld/igds/sec/controller/PatrolController.java | 2
igds-web/src/main/resources/application-linux.yml | 2
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1304.class | 0
igds-es/src/main/java/com/ld/igds/es/service/HEsService.java | 2
igds-core/src/main/java/com/ld/igds/models/FoodInfo.java | 193
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1309.java | 24
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/task/CommandReSendService.java | 1
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1402.class | 0
igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java | 19
igds-api-phone/target/classes/com/ld/igds/phone/service/impl/ServiceImpl5602.class | 0
igds-inout/src/main/java/com/ld/igds/models/InoutNoticeOut.java | 10
igds-web/src/main/resources/templates/admin/inout/out-weight.html | 26
igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml | 2
igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml | 129
igds-security/igds-security.iml | 6
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1103.class | 0
igds-web/src/main/resources/gas-conf.properties | 3
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java | 26
igds-recir/src/main/java/com/ld/igds/models/DrugLogApply.java | 11
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1201.class | 0
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/msg/builder/CommandBuild.java | 8
igds-inout/src/main/java/com/ld/igds/m/view/PlanManage.view.xml | 12
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1103.java | 4
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1503.java | 27
igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml | 165
igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml | 12
igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml | 15
igds-recir/target/classes/com/ld/igds/models/DrugLog.class | 0
igds-recir/target/classes/com/ld/igds/models/DrugLogPeople.class | 0
igds-recir/target/classes/com/ld/igds/drug/service/HDrugLogApplyService.class | 0
igds-base/.gitignore | 2
igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemotePressureServiceImpl.java | 3
igds-core/src/main/java/com/ld/igds/check/CheckStandard.view.xml | 2
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1102.class | 0
igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java | 6
igds-manager/src/main/java/com/ld/igds/models/Profit.java | 345
igds-manager/src/main/java/com/ld/igds/m/view/Profit.view.xml | 10
igds-core/src/main/java/com/ld/igds/m/ManageUtil.java | 4
igds-protocol-iot/src/main/java/com/ld/igds/protocol/iot/height/analysis/AnalysisHeightService.java | 47
igds-core/src/main/resources/mapper/CommonMapper.xml | 11
igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogApplyService.java | 147
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1310.class | 0
igds-basic/src/main/java/com/ld/igds/gas/manager/GasManager.java | 18
igds-parent-pom/pom.xml | 6
igds-recir/src/main/java/com/ld/igds/models/Drug.java | 4
igds-web/src/main/resources/d7/css/common.css | 16
igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemotePestServiceImpl.java | 3
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java | 19
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java | 9
igds-core/src/main/java/models/igds.model.xml | 23
igds-inout/src/main/resources/mapper/InoutRecordMapper.xml | 18
igds-manager/src/main/java/com/ld/igds/models/AssetsLiability.java | 553 +-
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1201.java | 28
igds-inout/src/main/java/com/ld/igds/inout/dto/WeightBill.java | 4
igds-basic/src/main/java/com/ld/igds/grain/manager/GrainManager.java | 28
igds-web/src/main/resources/logback-spring.xml | 70
igds-core/src/main/java/com/ld/igds/io/constant/ProtocolEnum.java | 4
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1401.java | 35
igds-security/src/main/java/com/ld/igds/sec/service/impl/CoreSecFireServiceImpl.java | 3
igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java | 11
igds-base/src/main/java/com/ld/igds/conf/MyBatisPlusConf.java | 2
igds-web/src/main/resources/static/admin/grain/grain-check1.js | 20
igds-web/src/main/java/com/ld/igds/web/TestController.java | 163
igds-web/src/main/resources/templates/index/index.html | 2
igds-protocol-block/src/main/java/com/ld/igds/protocol/ServerRunner.java | 4
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1501.class | 0
igds-basic/.gitignore | 1
igds-es/igds-es.iml | 6
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController2.java | 18
igds-core/src/main/java/com/ld/igds/view/service/DeviceSerService.java | 2
igds-protocol-fzzy3/igds-protocol-fzzy3.iml | 6
igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml | 304 +
igds-security/src/main/java/com/ld/igds/sec/service/SecurityService.java | 6
igds-verb/target/classes/com/ld/igds/verb/service/HMAreationDataService.class | 0
igds-core/src/main/java/com/ld/igds/sys/service/DicTriggerServiceImpl.java | 4
igds-protocol-block/pom.xml | 1
igds-protocol-block/src/main/java/com/ld/igds/protocol/openapi/OpenApiInoutService.java | 2
igds-web/src/main/resources/static/admin/inout/in-check.js | 21
igds-manager/src/main/java/com/ld/igds/m/service/HFinanceService.java | 58
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1104.class | 0
igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java | 8
igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisGrain.java | 3
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1402.java | 13
igds-web/src/main/resources/verb-conf.properties | 24
igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml | 2
igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java | 2
igds-manager/src/main/java/com/ld/igds/m/view/AssetsLiability.view.xml | 17
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1304.java | 28
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1112.java | 17
igds-inout/src/main/java/com/ld/igds/m/service/HInoutNoticeService.java | 124
igds-web/src/main/resources/templates/admin/inout/in-check.html | 31
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1408.class | 0
igds-security/target/classes/com/ld/igds/sec/service/impl/CoreSecFireServiceImpl.class | 0
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1303.java | 24
igds-web/src/main/resources/static/admin/inout/out-ship-register.js | 110
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1106.class | 0
igds-protocol-fzzy3/target/classes/com/ld/igds/protocol/fzzy/builder/ObjectCommandBuilder.class | 0
igds-recir/target/classes/com/ld/igds/drug/service/HDrugService.class | 0
igds-inout/src/main/java/com/ld/igds/inout/service/HInoutReportService.java | 17
igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml | 627 ++
igds-web/igds-web.iml | 19
igds-web/src/main/resources/templates/admin/home.html | 6
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1303.class | 0
igds-core/src/main/java/com/ld/igds/view/service/HFoodService.java | 125
igds-recir/target/classes/com/ld/igds/drug/view/DrugLog.view.xml | 269 +
igds-base/igds-base.iml | 6
igds-recir/src/main/java/com/ld/igds/models/DrugLog.java | 2
igds-recir/target/classes/com/ld/igds/drug/service/HDrugLogService.class | 0
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/AnalysisService.java | 38
igds-web/src/main/resources/application-fzzy.yml | 80
igds-security/target/classes/com/ld/igds/sec/controller/PatrolController.class | 0
igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml | 269 +
igds-security/target/classes/com/ld/igds/sec/service/SecurityService.class | 0
igds-protocol-iot/igds-protocol-iot.iml | 6
igds-core/src/main/java/com/ld/igds/view/FoodPR.java | 91
/dev/null | 0
igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5602.java | 29
igds-protocol-modbus/igds-protocol-modbus.iml | 6
igds-web/src/main/resources/media.properties | 1
igds-api-inte/src/main/java/com/ld/igds/three/service/impl/ThreeServiceImpl1001.java | 2
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1102.java | 1
igds-web/src/main/resources/static/css/bootstrap.min.css | 1
igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1302.class | 0
313 files changed, 9,371 insertions(+), 3,127 deletions(-)
diff --git a/igds-api-inte/igds-api-inte.iml b/igds-api-inte/igds-api-inte.iml
index 9c028d6..ef824c1 100644
--- a/igds-api-inte/igds-api-inte.iml
+++ b/igds-api-inte/igds-api-inte.iml
@@ -56,14 +56,14 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShService.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShService.java
index 5b718e3..3916944 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShService.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShService.java
@@ -3,8 +3,6 @@
import com.ld.igds.sh.dto.ApiResponse;
import com.ld.igds.sh.param.ApiRequest;
-import java.text.ParseException;
-
/**
* 瀵瑰鎺ュ彛涓氬姟
* @author chen
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1102.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1102.java
index 729db51..e5856ad 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1102.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1102.java
@@ -15,6 +15,7 @@
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1103.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1103.java
index 8eccbd9..4b197b8 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1103.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1103.java
@@ -11,11 +11,13 @@
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
+import com.ld.igds.util.NumberUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -73,7 +75,7 @@
dto.setFdjg(building.getRoof());
dto.setFjjg(building.getRoofTruss());
dto.setDmjg(building.getGround());
- dto.setSjcr("0");
+ dto.setSjcr(building.getStorage() == null ? "0" : NumberUtil.keepPrecision(building.getStorage()/1000,1) + "");
dto.setCwc(building.getLength() == null ? "0" : building.getLength() + "");
dto.setCwk(building.getWidth() == null ? "0" : building.getWidth() + "");
dto.setCwyg(building.getHeight() == null ? "0" : building.getHeight() + "");
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1104.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1104.java
index c710ebf..fd34350 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1104.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1104.java
@@ -1,6 +1,5 @@
package com.ld.igds.sh.service;
-import com.ld.igds.constant.DepotStatus;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.Depot;
import com.ld.igds.models.InteStatusLog;
@@ -13,11 +12,13 @@
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
+import com.ld.igds.util.NumberUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -67,22 +68,22 @@
InteStatusLog addLog;
for (Depot depot : depotList) {
dto = new Dto1104();
- dto.setHwbm(depot.getId());
+ dto.setHwbm(ApiShUtil.getGbDepotId(depot.getId()) + "01");
dto.setHwmc(depot.getName());
dto.setHwqyrq(DateFormatUtils.format((depot.getStoreDate()==null?new Date():depot.getStoreDate()),"yyyy-MM-dd"));
- dto.setHwrl(depot.getStorageReal()==null?"0.0":depot.getStorageReal() + "");
- dto.setCfbh(depot.getId().substring(0,25));
- dto.setHwzt(DepotStatus.getGBCode(depot.getDepotStatus()));
+ dto.setHwrl(depot.getStorageMax()==null?"0.0": NumberUtil.keepPrecision(depot.getStorageMax()/1000,1) + "");
+ dto.setCfbh(ApiShUtil.getGbDepotId(depot.getId()).substring(0,25));
+ dto.setHwzt(apiShUtil.getDepotStatus(depot.getDepotStatus()));
dto.setClfs(depot.getStoreType());
dto.setBgy(depot.getStoreKeeper());
dto.setBgyxm(depot.getStoreKeeperName());
dto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
//鏌ヨ鏃ュ織鐘舵�佽〃锛岃缃搷浣滄爣蹇�
- log = inteStatusLogService.getLogByBizId(companyId, ApiShConst.API_SH_1104 + "_" + depot.getId());
+ log = inteStatusLogService.getLogByBizId(companyId, ApiShConst.API_SH_1104 + "_" + ApiShUtil.getGbDepotId(depot.getId()));
if(null == log){
addLog = new InteStatusLog();
- addLog.setBizId(ApiShConst.API_SH_1104 + "_" + depot.getId());
+ addLog.setBizId(ApiShConst.API_SH_1104 + "_" + ApiShUtil.getGbDepotId(depot.getId()));
addLog.setCompanyId(companyId);
addLog.setBizType(ApiShConst.API_SH_TYPE_BASIC);
addLog.setInterfaceId(ApiShConst.API_SH_1104);
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1105.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1105.java
index f1cd43a..ef04719 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1105.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1105.java
@@ -10,14 +10,17 @@
import com.ld.igds.sh.param.ApiRequest;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
+import com.ld.igds.util.NumberUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -69,10 +72,10 @@
continue;
}
dto = new Dto1105();
- dto.setYgdm(depot.getId());
+ dto.setYgdm(ApiShUtil.getGbDepotId(depot.getId()).substring(0, 25));
dto.setYgmc(depot.getName());
- dto.setKqdm(depot.getId().substring(0, 24));
- dto.setGr(depot.getStorageMax() == null?"0.0":depot.getStorageMax() + "");
+ dto.setKqdm(ApiShUtil.getGbDepotId(depot.getId()).substring(0, 21));
+ dto.setGr(depot.getStorageMax() == null?"0.0": NumberUtil.keepPrecision(depot.getStorageMax()/1000,1) + "");
dto.setJzsj(DateFormatUtils.format((depot.getStoreDate()==null?new Date():depot.getStoreDate()),"yyyy-MM-dd"));
building = hApiShServiceImpl.getBuilding(companyId, depot.getBuildingId());
@@ -84,10 +87,10 @@
dto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
//鏌ヨ鏃ュ織鐘舵�佽〃锛岃缃搷浣滄爣蹇�
- log = inteStatusLogService.getLogByBizId(companyId, ApiShConst.API_SH_1105 + "_" + depot.getId());
+ log = inteStatusLogService.getLogByBizId(companyId, ApiShConst.API_SH_1105 + "_" + ApiShUtil.getGbDepotId(depot.getId()));
if(null == log){
addLog = new InteStatusLog();
- addLog.setBizId(ApiShConst.API_SH_1105 + "_" + depot.getId());
+ addLog.setBizId(ApiShConst.API_SH_1105 + "_" + ApiShUtil.getGbDepotId(depot.getId()));
addLog.setCompanyId(companyId);
addLog.setBizType(ApiShConst.API_SH_TYPE_BASIC);
addLog.setInterfaceId(ApiShConst.API_SH_1105);
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1106.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1106.java
index eb38708..daa67f3 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1106.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1106.java
@@ -11,9 +11,11 @@
import com.ld.igds.sh.param.ApiRequest;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
+import com.ld.igds.util.NumberUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
@@ -71,9 +73,9 @@
continue;
}
dto = new Dto1106();
- dto.setAjdh(depot.getId());
+ dto.setAjdh(ApiShUtil.getGbDepotId(depot.getId()));
dto.setAjmc(depot.getName());
- dto.setCfbh(depot.getId().substring(0, 25));
+ dto.setCfbh(ApiShUtil.getGbDepotId(depot.getId()).substring(0, 25));
building = hApiShServiceImpl.getBuilding(companyId, depot.getBuildingId());
if (null != building) {
@@ -81,17 +83,21 @@
dto.setAjkd(building.getWidth() == null ? "0.0" : building.getWidth() + "");
dto.setAjgd(building.getHeight() == null ? "0.0" : building.getHeight() + "");
}
- dto.setSjcr(depot.getStorageMax() == null ? "0.0" : depot.getStorageMax() + "");
+ dto.setSjcr(depot.getStorageMax() == null ? "0.0" : NumberUtil.keepPrecision(depot.getStorageMax()/1000, 1) + "");
dto.setQyrq(DateFormatUtils.format((depot.getStoreDate() == null ? new Date() : depot.getStoreDate()), "yyyy-MM-dd"));
- dto.setAjzt("1"); //鐜╁ソ
+ if(DepotStatus.STATUS_9.getCode().equals(depot.getDepotStatus())){
+ dto.setAjzt("3"); //闇�澶т慨
+ }else {
+ dto.setAjzt("1"); //鐜╁ソ
+ }
dto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
//鏌ヨ鏃ュ織鐘舵�佽〃锛岃缃搷浣滄爣蹇�
- log = inteStatusLogService.getLogByBizId(companyId, ApiShConst.API_SH_1106 + "_" + depot.getId());
+ log = inteStatusLogService.getLogByBizId(companyId, ApiShConst.API_SH_1106 + "_" + ApiShUtil.getGbDepotId(depot.getId()));
if(null == log){
addLog = new InteStatusLog();
- addLog.setBizId(ApiShConst.API_SH_1106 + "_" + depot.getId());
+ addLog.setBizId(ApiShConst.API_SH_1106 + "_" + ApiShUtil.getGbDepotId(depot.getId()));
addLog.setCompanyId(companyId);
addLog.setBizType(ApiShConst.API_SH_TYPE_BASIC);
addLog.setInterfaceId(ApiShConst.API_SH_1106);
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1112.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1112.java
index fca3b70..518b6e1 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1112.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1112.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.bstek.bdf2.core.model.DefaultDept;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.file.CoreFileService;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.FileInfo;
@@ -23,6 +22,7 @@
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
import java.io.File;
import java.util.ArrayList;
import java.util.Date;
@@ -61,13 +61,16 @@
//鑾峰彇鍗曚綅淇℃伅
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -30);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
- List<FileInfo> listFiles = hApiShServiceImpl.listFiles(companyId, startTime, param.getEndTime());
+ List<FileInfo> listFiles = hApiShServiceImpl.listFiles(companyId, param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (listFiles == null || listFiles.isEmpty()) {
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1201.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1201.java
index 5b26c40..3ceca65 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1201.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1201.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.ld.igds.constant.CheckType;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.CheckItem;
import com.ld.igds.models.InteStatusLog;
@@ -13,6 +12,7 @@
import com.ld.igds.sh.param.BaseParam;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
@@ -57,15 +57,18 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1201);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -30);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ鏁版嵁
- List<MQuality> dataList = hApiShServiceImpl.listQuality(companyId, param.getDepotId(), startTime, param.getEndTime());
+ List<MQuality> dataList = hApiShServiceImpl.listQuality(companyId, param.getDepotId(), param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (dataList == null || dataList.isEmpty()) {
@@ -81,9 +84,9 @@
for (MQuality data : dataList) {
dto = new Dto1201();
dto.setZjbgdbh(data.getId());
- dto.setHwbm(data.getDepotId());
+ dto.setHwbm(ApiShUtil.getGbDepotId(data.getDepotId()) + "01");
dto.setPznm(StringUtils.isEmpty(data.getFoodVariety())?"0":data.getFoodVariety());
- dto.setZznm(data.getDepotId().substring(0, 21));
+ dto.setZznm(ApiShUtil.getGbDepotId(data.getDepotId()).substring(0, 21));
dto.setSkdjbm(StringUtils.isEmpty(data.getFoodLevel())?"0":data.getFoodLevel());
dto.setQysj(DateFormatUtils.format((data.getCheckTime() == null ? new Date() : data.getCheckTime()), "yyyy-MM-dd"));
dto.setRkrq(DateFormatUtils.format((data.getCheckTime() == null ? new Date() : data.getCheckTime()), "yyyy-MM-dd"));
@@ -110,10 +113,9 @@
dto.setShrxm(StringUtils.isEmpty(data.getUser())?"0":data.getUser());
dto.setQyqy(StringUtils.isEmpty(data.getCheckArea())?"0":data.getCheckArea());
dto.setQyrxm(StringUtils.isEmpty(data.getCheckUser())?"0":data.getCheckUser());
- // TODO
-// dto.setYpsl(data.getCheckNum()==null?"0.0":(data.getCheckNum() + ""));
-// dto.setDbsl(StringUtils.isEmpty(data.getCheckRepresent())?"0":data.getCheckRepresent());
-// dto.setYpdj(StringUtils.isEmpty(data.getCheckLevel())?"0":data.getCheckLevel());
+ dto.setYpsl(data.getYpsl()==null?"0.0":(data.getYpsl() + ""));
+ dto.setDbsl(data.getDbsl() == null?"0.0":data.getDbsl() + "");
+ dto.setYpdj(StringUtils.isEmpty(data.getYpdj())?"0":data.getYpdj());
dto.setSfzcccnx(StringUtils.isEmpty(data.getNormalYear())?"0":data.getNormalYear());
dto.setLsxz(StringUtils.isEmpty(data.getFoodLevel())?"0":data.getFoodLevel());
dto.setBgbh(data.getId());
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1202.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1202.java
index 2802703..55365e3 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1202.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1202.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.bstek.bdf2.core.model.DefaultDept;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.CheckItem;
import com.ld.igds.models.InteStatusLog;
@@ -23,7 +22,10 @@
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* 璐ㄦ鏁版嵁鏄庣粏淇℃伅鎺ュ彛
@@ -54,15 +56,18 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1202);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -30);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ璐ㄦ鏁版嵁
- List<MQuality> dataList = hApiShServiceImpl.listQuality(companyId, param.getDepotId(), startTime, param.getEndTime());
+ List<MQuality> dataList = hApiShServiceImpl.listQuality(companyId, param.getDepotId(), param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (dataList == null || dataList.isEmpty()) {
@@ -99,7 +104,10 @@
dto.setZjbgdnm(data.getCheckId() + data.getCompanyId() + data.getStandardId());
dto.setZjbgmxnm(data.getCheckId() + data.getCompanyId() + data.getStandardId());
dto.setJyxmnm(data.getStandardId());
- // dto.setJybz(data.getStandardValue()); TODO
+ if(data.getUpperLimit() == null){
+ data.setUpperLimit(0.0);
+ }
+ dto.setJybz(data.getUpperLimit() + " ~ " + data.getUpperLimit());
dto.setJyjl(StringUtils.isEmpty(data.getRemarks())?"0":data.getRemarks());
dto.setBz(StringUtils.isEmpty(data.getRemarks())?"0":data.getRemarks());
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1301.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1301.java
index c9b9a31..d45f4c0 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1301.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1301.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.ld.igds.constant.FoodVariety;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.Building;
import com.ld.igds.models.InoutNoticeOut;
@@ -13,6 +12,7 @@
import com.ld.igds.sh.param.BaseParam;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
@@ -23,7 +23,10 @@
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* 绮鍑哄簱閫氱煡鍗曟暟鎹帴鍙�
@@ -54,15 +57,18 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1301);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -30);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ鏁版嵁
- List<InoutNoticeOut> noticeOutList = hApiShServiceImpl.listNoticeOut(companyId, param.getDepotId(), startTime, param.getEndTime());
+ List<InoutNoticeOut> noticeOutList = hApiShServiceImpl.listNoticeOut(companyId, param.getDepotId(), param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (noticeOutList == null || noticeOutList.isEmpty()) {
@@ -77,16 +83,16 @@
//灏佽鏁版嵁淇℃伅
for (InoutNoticeOut noticeOut : noticeOutList) {
dto = new Dto1301();
- dto.setZznm(noticeOut.getDepotId().substring(0, 21));
+ dto.setZznm(ApiShUtil.getGbDepotId(noticeOut.getDepotId()).substring(0, 21));
dto.setTzdbh(noticeOut.getId());
dto.setTzdnm(noticeOut.getId());
dto.setKhmc(StringUtils.isEmpty(noticeOut.getCustomerName())?"0":noticeOut.getCustomerName());
dto.setKhnm(StringUtils.isEmpty(noticeOut.getCustomerId())?"0":noticeOut.getCustomerId());
dto.setWlnm(StringUtils.isEmpty(noticeOut.getFoodVariety())?"0":noticeOut.getFoodVariety());
- dto.setWlmc(StringUtils.isEmpty(noticeOut.getFoodVariety())?"0":FoodVariety.getMsg(noticeOut.getFoodVariety()));
+ dto.setWlmc(StringUtils.isEmpty(noticeOut.getFoodVariety())?"0": FoodVariety.getMsg(noticeOut.getFoodVariety()));
dto.setWlbh(StringUtils.isEmpty(noticeOut.getFoodVariety())?"0":noticeOut.getFoodVariety());
- // dto.setWldjnm(StringUtils.isEmpty(noticeOut.getFoodLevel())?"0":noticeOut.getFoodLevel()); TODO
- building = hApiShServiceImpl.getBuilding(companyId, noticeOut.getDepotId().substring(0, 25));
+// dto.setWldjnm(StringUtils.isEmpty(noticeOut.getFoodLevel())?"0":noticeOut.getFoodLevel());
+ building = hApiShServiceImpl.getBuilding(companyId, noticeOut.getDepotId());
if (null != building) {
dto.setCfbh(building.getId());
dto.setCfnm(building.getId());
@@ -94,8 +100,8 @@
dto.setCfbh("0");
dto.setCfnm("0");
}
- dto.setHwbh(noticeOut.getDepotId());
- dto.setHwnm(noticeOut.getDepotId());
+ dto.setHwbh(ApiShUtil.getGbDepotId(noticeOut.getDepotId()) + "01");
+ dto.setHwnm(ApiShUtil.getGbDepotId(noticeOut.getDepotId()) + "01");
dto.setTzdsl(String.valueOf(noticeOut.getTargetNumber()));
dto.setYwrq(DateFormatUtils.format(noticeOut.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
if("NONE".equals(noticeOut.getCompleteStatus())){
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java
index 01af882..56451ac 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java
@@ -1,7 +1,6 @@
package com.ld.igds.sh.service;
import com.alibaba.fastjson.JSONObject;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.InoutNoticeIn;
@@ -14,6 +13,7 @@
import com.ld.igds.sh.param.BaseParam;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
@@ -24,7 +24,10 @@
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* 绮鍏ュ簱淇℃伅鏁版嵁鎺ュ彛
@@ -55,15 +58,18 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1302);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -30);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ鏁版嵁
- List<InoutRecord> inoutRecords = hApiShServiceImpl.listInoutRecord(companyId, param.getDepotId(), startTime, param.getEndTime(), InoutConstant.TYPE_IN);
+ List<InoutRecord> inoutRecords = hApiShServiceImpl.listInoutRecord(companyId, param.getDepotId(), param.getStartTime(), param.getEndTime(), InoutConstant.TYPE_IN);
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (inoutRecords == null || inoutRecords.isEmpty()) {
@@ -80,7 +86,7 @@
for (InoutRecord inoutRecord : inoutRecords) {
dto = new Dto1302();
dto.setYwdh("14" + inoutRecord.getId().substring(4, 14));
- dto.setHwbm(inoutRecord.getDepotId());
+ dto.setHwbm(ApiShUtil.getGbDepotId(inoutRecord.getDepotId()) + "01");
dto.setYwrq(DateFormatUtils.format(inoutRecord.getCompleteTime(),"yyyy-MM-dd HH:mm:ss"));
dto.setCyr(StringUtils.isEmpty(inoutRecord.getUserName())?"0":inoutRecord.getUserName());
@@ -98,7 +104,7 @@
dto.setMzjlsj(DateFormatUtils.format(inoutRecord.getFullWeightTime(),"yyyy-MM-dd HH:mm:ss"));
dto.setPz(inoutRecord.getEmptyWeight() + "");
dto.setPzjlsj(DateFormatUtils.format(inoutRecord.getEmptyWeightTime(),"yyyy-MM-dd HH:mm:ss"));
- // dto.setZjkl(inoutRecord.getDeSum() + ""); TODO
+ dto.setZjkl(inoutRecord.getDeCheck() + "");
dto.setJz(inoutRecord.getSettleWeight() + "");
dto.setCmsj(DateFormatUtils.format(inoutRecord.getCompleteTime(),"yyyy-MM-dd HH:mm:ss"));
dto.setCmqrmgryxm(StringUtils.isEmpty(inoutRecord.getCompleteUser())?"0":inoutRecord.getCompleteUser());
@@ -115,9 +121,10 @@
}
dto.setDjmgryxm(StringUtils.isEmpty(inoutRecord.getRegisterUser())?"0":inoutRecord.getRegisterUser());
dto.setRkdnm(StringUtils.isEmpty(inoutRecord.getNoticeId())?"0":inoutRecord.getNoticeId());
- dto.setZznm(inoutRecord.getDepotId().substring(0, 21));
+ dto.setZznm(ApiShUtil.getGbDepotId(inoutRecord.getDepotId()).substring(0, 21));
dto.setSxh(inoutRecord.getId().substring(10));
- if(InoutConstant.RECORD_STATUS_DEL.equals(inoutRecord.getRecordStatus())){
+ if(InoutConstant.RECORD_STATUS_DEL.equals(inoutRecord.getRecordStatus()) ||
+ "ERROR".equals(inoutRecord.getRecordStatus())){
dto.setDjzt("4"); //宸蹭綔搴�
}else {
dto.setDjzt("2"); //鍏ュ簱瀹屾垚
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1303.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1303.java
index c3638ca..8959659 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1303.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1303.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.ld.igds.constant.CheckType;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.CheckItem;
@@ -14,6 +13,7 @@
import com.ld.igds.sh.param.BaseParam;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
@@ -24,7 +24,10 @@
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* 绮鍏ュ簱妫�楠屼俊鎭暟鎹帴鍙�
@@ -55,16 +58,19 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1303);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -30);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ鍏ュ簱鏁版嵁
List<InoutRecord> inoutRecords = hApiShServiceImpl.listInoutRecord(companyId,
- param.getDepotId(), startTime, param.getEndTime(), InoutConstant.TYPE_IN);
+ param.getDepotId(), param.getStartTime(), param.getEndTime(), InoutConstant.TYPE_IN);
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (inoutRecords == null || inoutRecords.isEmpty()) {
@@ -79,7 +85,7 @@
for (InoutRecord inoutRecord : inoutRecords) {
dto = new Dto1303();
dto.setQydbh("14" + inoutRecord.getCheckId().substring(2));
- dto.setHwbm(inoutRecord.getDepotId());
+ dto.setHwbm(ApiShUtil.getGbDepotId(inoutRecord.getDepotId()) + "01");
dto.setYpbm("14" + inoutRecord.getCheckId().substring(2));
dto.setQysj(DateFormatUtils.format(inoutRecord.getEmptyWeightTime(),"yyyy-MM-dd HH:mm:ss"));
dto.setQyrxm(StringUtils.isEmpty(inoutRecord.getCheckUser())?"0":inoutRecord.getCheckUser());
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1304.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1304.java
index fc5278e..099ae42 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1304.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1304.java
@@ -1,7 +1,6 @@
package com.ld.igds.sh.service;
import com.alibaba.fastjson.JSONObject;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.InoutNoticeIn;
@@ -14,6 +13,7 @@
import com.ld.igds.sh.param.BaseParam;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
@@ -24,7 +24,10 @@
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* 绮姣斿搴撶粨绠椾俊鎭暟鎹帴鍙�
@@ -55,15 +58,18 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1304);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -30);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ鏁版嵁
- List<InoutSettle> settleList = hApiShServiceImpl.listInoutSettle(companyId, param.getDepotId(), startTime, param.getEndTime(), InoutConstant.TYPE_IN);
+ List<InoutSettle> settleList = hApiShServiceImpl.listInoutSettle(companyId, param.getDepotId(), param.getStartTime(), param.getEndTime(), InoutConstant.TYPE_IN);
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (settleList == null || settleList.isEmpty()) {
@@ -82,8 +88,8 @@
dto.setJsdbm(settle.getId());
inoutRecord = hApiShServiceImpl.getInoutRecord(companyId, settle.getId());
if(null != inoutRecord){
- dto.setHwbm(inoutRecord.getDepotId());
- dto.setZznm(inoutRecord.getDepotId().substring(0, 21));
+ dto.setHwbm(ApiShUtil.getGbDepotId(inoutRecord.getDepotId()) + "01");
+ dto.setZznm(ApiShUtil.getGbDepotId(inoutRecord.getDepotId()).substring(0, 21));
}else {
dto.setHwbm("0");
dto.setZznm("0");
@@ -100,7 +106,7 @@
dto.setJsje(String.valueOf(settle.getPayMoney()));
dto.setJssj(DateFormatUtils.format(settle.getPayTime()==null?new Date():settle.getPayTime(),"yyyy-MM-dd HH:mm:ss"));
dto.setJsfs(StringUtils.isEmpty(settle.getPayType())?"0":settle.getPayType());
- // dto.setSkr(StringUtils.isEmpty(settle.getCustomerName())?"0":settle.getCustomerName()); TODO
+ dto.setSkr(StringUtils.isEmpty(settle.getPayee())?"0":settle.getPayee());
dto.setYhkh(StringUtils.isEmpty(settle.getBankNum())?"0":settle.getBankNum());
dto.setSgjsdnm(settle.getId());
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1306.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1306.java
index 092e910..7e29cdf 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1306.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1306.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.ld.igds.constant.FoodVariety;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.InoutNoticeOut;
@@ -15,6 +14,7 @@
import com.ld.igds.sh.param.BaseParam;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
@@ -25,7 +25,10 @@
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* 绮鍑哄簱淇℃伅鏁版嵁鎺ュ彛
@@ -56,15 +59,18 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1306);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -30);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ鏁版嵁
- List<InoutRecord> inoutRecords = hApiShServiceImpl.listInoutRecord(companyId, param.getDepotId(), startTime, param.getEndTime(), InoutConstant.TYPE_OUT);
+ List<InoutRecord> inoutRecords = hApiShServiceImpl.listInoutRecord(companyId, param.getDepotId(), param.getStartTime(), param.getEndTime(), InoutConstant.TYPE_OUT);
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (inoutRecords == null || inoutRecords.isEmpty()) {
@@ -81,7 +87,7 @@
for (InoutRecord inoutRecord : inoutRecords) {
dto = new Dto1306();
dto.setYwdh("14" + inoutRecord.getId().substring(4, 14));
- dto.setHwbm(inoutRecord.getDepotId());
+ dto.setHwbm(ApiShUtil.getGbDepotId(inoutRecord.getDepotId()) + "01");
dto.setCktzdh(inoutRecord.getNoticeId());
dto.setYwlx("1");
dto.setYwrq(DateFormatUtils.format(inoutRecord.getCompleteTime(),"yyyy-MM-dd HH:mm:ss"));
@@ -113,10 +119,11 @@
dto.setDjmgryxm(StringUtils.isEmpty(inoutRecord.getFoodVariety())?"0":inoutRecord.getRegisterUser());
dto.setCmqrmgryxm(StringUtils.isEmpty(inoutRecord.getCompleteUser())?"0":inoutRecord.getCompleteUser());
dto.setNm(inoutRecord.getId());
- dto.setZznm(inoutRecord.getDepotId().substring(0, 21));
+ dto.setZznm(ApiShUtil.getGbDepotId(inoutRecord.getDepotId()).substring(0, 21));
dto.setDjbh(inoutRecord.getId());
dto.setSxh(inoutRecord.getId().substring(10));
- if(InoutConstant.RECORD_STATUS_DEL.equals(inoutRecord.getRecordStatus()) ){
+ if(InoutConstant.RECORD_STATUS_DEL.equals(inoutRecord.getRecordStatus()) ||
+ "ERROR".equals(inoutRecord.getRecordStatus())){
dto.setDjzt("4"); //宸蹭綔搴�
}else {
dto.setDjzt("2"); //鍑哄簱瀹屾垚
@@ -136,7 +143,7 @@
dto.setLrfs("0");
dto.setTzdbh(StringUtils.isEmpty(inoutRecord.getNoticeId())?"0":inoutRecord.getNoticeId());
dto.setTzdnm(StringUtils.isEmpty(inoutRecord.getNoticeId())?"0":inoutRecord.getNoticeId());
- dto.setWlmc(StringUtils.isEmpty(inoutRecord.getFoodVariety())?"0":FoodVariety.getMsg(inoutRecord.getFoodVariety()));
+ dto.setWlmc(StringUtils.isEmpty(inoutRecord.getFoodVariety())?"0": FoodVariety.getMsg(inoutRecord.getFoodVariety()));
dto.setWlnm(StringUtils.isEmpty(inoutRecord.getFoodVariety())?"0":inoutRecord.getFoodVariety());
dto.setWlbh(StringUtils.isEmpty(inoutRecord.getFoodVariety())?"0":inoutRecord.getFoodVariety());
dto.setDz(StringUtils.isEmpty(inoutRecord.getUserAddress())?"0":inoutRecord.getUserAddress());
@@ -150,12 +157,12 @@
dto.setJzqj(DateFormatUtils.format(inoutRecord.getCompleteTime(),"yyyy-MM-dd HH:mm:ss"));
dto.setNx(StringUtils.isEmpty(inoutRecord.getFoodYear())?"0":inoutRecord.getFoodYear());
dto.setKcxznm(StringUtils.isEmpty(inoutRecord.getFoodType())?"0":inoutRecord.getFoodType());
- dto.setApclcf(inoutRecord.getDepotId());
- dto.setApclhw(inoutRecord.getDepotId());
- dto.setSjclcf(inoutRecord.getDepotId());
- dto.setSjclcfnm(inoutRecord.getDepotId());
- dto.setSjclhw(inoutRecord.getDepotId());
- dto.setSjclhwnm(inoutRecord.getDepotId());
+ dto.setApclcf(ApiShUtil.getGbDepotId(inoutRecord.getDepotId()));
+ dto.setApclhw(ApiShUtil.getGbDepotId(inoutRecord.getDepotId()));
+ dto.setSjclcf(ApiShUtil.getGbDepotId(inoutRecord.getDepotId()));
+ dto.setSjclcfnm(ApiShUtil.getGbDepotId(inoutRecord.getDepotId()));
+ dto.setSjclhw(ApiShUtil.getGbDepotId(inoutRecord.getDepotId()));
+ dto.setSjclhwnm(ApiShUtil.getGbDepotId(inoutRecord.getDepotId()));
dto.setBgy(StringUtils.isEmpty(inoutRecord.getHandleUser())?"0":inoutRecord.getHandleUser());
dto.setQtkl(inoutRecord.getDeOther() + "");
dto.setLhnd(StringUtils.isEmpty(inoutRecord.getFoodYear())?"0":inoutRecord.getFoodYear());
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1308.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1308.java
index 479a906..b742a6d 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1308.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1308.java
@@ -1,7 +1,6 @@
package com.ld.igds.sh.service;
import com.alibaba.fastjson.JSONObject;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.InoutNoticeOut;
@@ -14,6 +13,7 @@
import com.ld.igds.sh.param.BaseParam;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
@@ -24,7 +24,10 @@
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* 绮鍑哄簱缁撶畻淇℃伅鏁版嵁鎺ュ彛
@@ -55,15 +58,18 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1308);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -30);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ鏁版嵁
- List<InoutSettle> settleList = hApiShServiceImpl.listInoutSettle(companyId, param.getDepotId(), startTime, param.getEndTime(), InoutConstant.TYPE_OUT);
+ List<InoutSettle> settleList = hApiShServiceImpl.listInoutSettle(companyId, param.getDepotId(), param.getStartTime(), param.getEndTime(), InoutConstant.TYPE_OUT);
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (settleList == null || settleList.isEmpty()) {
@@ -97,7 +103,7 @@
dto.setFkr(settle.getPayUser());
inoutRecord = hApiShServiceImpl.getInoutRecord(companyId, settle.getId());
if(null != inoutRecord){
- dto.setZznm(inoutRecord.getDepotId().substring(0, 21));
+ dto.setZznm(ApiShUtil.getGbDepotId(inoutRecord.getDepotId()).substring(0, 21));
}else {
dto.setZznm("0");
}
@@ -107,7 +113,7 @@
dto.setJsyxm(StringUtils.isEmpty(settle.getPayUser())?"0":settle.getPayUser());
dto.setShrxm(StringUtils.isEmpty(settle.getPayUser())?"0":settle.getPayUser());
dto.setShsj(DateFormatUtils.format(settle.getPayTime(),"yyyy-MM-dd HH:mm:ss"));
- // dto.setKhmc(StringUtils.isEmpty(settle.getCustomerName())?"0":settle.getCustomerName()); TODO
+ dto.setKhmc(StringUtils.isEmpty(settle.getPayee())?"0":settle.getPayee());
dto.setZdrxm(StringUtils.isEmpty(settle.getPayUser())?"0":settle.getPayUser());
dto.setZdsj(DateFormatUtils.format(settle.getPayTime(),"yyyy-MM-dd HH:mm:ss"));
dto.setJsfsmc(StringUtils.isEmpty(settle.getPayType())?"0":settle.getPayType());
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1309.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1309.java
index 879eb26..4fa6473 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1309.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1309.java
@@ -2,16 +2,16 @@
import com.alibaba.fastjson.JSONObject;
import com.bstek.bdf2.core.model.DefaultDept;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
-import com.ld.igds.models.InteStatusLog;
import com.ld.igds.models.InoutStockChange;
+import com.ld.igds.models.InteStatusLog;
import com.ld.igds.sh.dto.ApiResponse;
import com.ld.igds.sh.dto.Dto1309;
import com.ld.igds.sh.param.ApiRequest;
import com.ld.igds.sh.param.BaseParam;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.sys.service.SysDeptService;
@@ -23,6 +23,7 @@
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -61,15 +62,18 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1309);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -30);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ鏁版嵁
- List<InoutStockChange> dataList = hApiShServiceImpl.listStockChange(companyId, param.getDepotId(), startTime, param.getEndTime());
+ List<InoutStockChange> dataList = hApiShServiceImpl.listStockChange(companyId, param.getDepotId(), param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (dataList == null || dataList.isEmpty()) {
@@ -97,8 +101,8 @@
dto.setDcdw(dept.getName());
}
dto.setPzbm(StringUtils.isEmpty(data.getPlanCode())?"0":data.getFoodVariety());
- dto.setDchwbm(StringUtils.isEmpty(data.getDepotIdOut())?"0":data.getDepotIdOut());
- dto.setDrhwbm(StringUtils.isEmpty(data.getDepotIdIn())?"0":data.getDepotIdIn());
+ dto.setDchwbm(StringUtils.isEmpty(data.getDepotIdOut())?"0": ApiShUtil.getGbDepotId(data.getDepotIdOut()) + "01");
+ dto.setDrhwbm(StringUtils.isEmpty(data.getDepotIdIn())?"0":ApiShUtil.getGbDepotId(data.getDepotIdIn()) + "01");
dto.setDcrq(DateFormatUtils.format((data.getChangeDate()==null?new Date():data.getChangeDate()),"yyyy-MM-dd"));
dto.setDcsl(data.getNumber()==null?"0.0":data.getNumber() + "");
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1310.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1310.java
index 63c8ebe..18eee88 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1310.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1310.java
@@ -11,6 +11,7 @@
import com.ld.igds.sh.param.ApiRequest;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
@@ -20,7 +21,10 @@
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* 绮搴撳瓨鏁版嵁鎺ュ彛
@@ -68,7 +72,7 @@
DicArea dicArea;
for (Depot depot : depotList) {
dto = new Dto1310();
- dto.setHwbm(depot.getId());
+ dto.setHwbm(ApiShUtil.getGbDepotId(depot.getId()) + "01");
dto.setLspzbm(StringUtils.isEmpty(depot.getFoodVariety())?"0":depot.getFoodVariety());
dto.setLsxzbm(StringUtils.isEmpty(depot.getFoodType())?"0":depot.getFoodType());
dto.setDjbm(StringUtils.isEmpty(depot.getFoodLevel())?"0":depot.getFoodLevel());
@@ -77,7 +81,7 @@
dicArea = areaService.listDicAreaByName(depot.getFoodLocation());
dto.setCd(dicArea == null ? "310114": dicArea.getCode());
dto.setGoodscode(dicArea == null ? "310114": dicArea.getCode());
- dto.setLqgsdwbm(depot.getId().substring(0,18));
+ dto.setLqgsdwbm(ApiShUtil.getGbDepotId(depot.getId()).substring(0,18));
dto.setGlfs("01");
dto.setScdd("1");
dto.setClfs(StringUtils.isEmpty(depot.getStoreType())?"1":depot.getStoreType());
@@ -99,9 +103,9 @@
dto.setSjsl(depot.getStorageReal()==null?"0.0":depot.getStorageReal() + "");
dto.setJjsl(depot.getStorageReal()==null?"0.0":depot.getStorageReal() + "");
- dto.setNm(depot.getId().substring(0, 21));
- dto.setZznm(depot.getId().substring(0, 21));
- dto.setPzmc(StringUtils.isEmpty(depot.getFoodVariety())?"0":FoodVariety.getMsg(depot.getFoodVariety()));
+ dto.setNm(ApiShUtil.getGbDepotId(depot.getId()).substring(0, 21));
+ dto.setZznm(ApiShUtil.getGbDepotId(depot.getId()).substring(0, 21));
+ dto.setPzmc(StringUtils.isEmpty(depot.getFoodVariety())?"0": FoodVariety.getMsg(depot.getFoodVariety()));
dto.setPznm(StringUtils.isEmpty(depot.getFoodVariety())?"0":depot.getFoodVariety());
building = hApiShServiceImpl.getBuilding(companyId, depot.getId());
if(building != null){
@@ -110,10 +114,10 @@
dto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
//鏌ヨ鏃ュ織鐘舵�佽〃锛岃缃搷浣滄爣蹇�
- log = inteStatusLogService.getLogByBizId(companyId, ApiShConst.API_SH_1310 + "_" + depot.getId());
+ log = inteStatusLogService.getLogByBizId(companyId, ApiShConst.API_SH_1310 + "_" + ApiShUtil.getGbDepotId(depot.getId()));
if(null == log){
addLog = new InteStatusLog();
- addLog.setBizId(ApiShConst.API_SH_1310 + "_" + depot.getId());
+ addLog.setBizId(ApiShConst.API_SH_1310 + "_" + ApiShUtil.getGbDepotId(depot.getId()));
addLog.setCompanyId(companyId);
addLog.setBizType(ApiShConst.API_SH_TYPE_INOUT);
addLog.setInterfaceId(ApiShConst.API_SH_1310);
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1311.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1311.java
index 072bb42..beeec7e 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1311.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1311.java
@@ -1,16 +1,16 @@
package com.ld.igds.sh.service;
import com.alibaba.fastjson.JSONObject;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
-import com.ld.igds.models.InteStatusLog;
import com.ld.igds.models.InoutLossOver;
+import com.ld.igds.models.InteStatusLog;
import com.ld.igds.sh.dto.ApiResponse;
import com.ld.igds.sh.dto.Dto1311;
import com.ld.igds.sh.param.ApiRequest;
import com.ld.igds.sh.param.BaseParam;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
@@ -21,8 +21,9 @@
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* 鎹熸孩鍗曟暟鎹帴鍙�
@@ -53,16 +54,19 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1311);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -30);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ鏁版嵁
List<InoutLossOver> dataList = hApiShServiceImpl.listLossOver(companyId,
- param.getDepotId(), startTime, param.getEndTime());
+ param.getDepotId(), param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (dataList == null || dataList.isEmpty()) {
@@ -77,7 +81,7 @@
for (InoutLossOver data : dataList) {
dto1311 = new Dto1311();
dto1311.setSydbh(data.getId());
- dto1311.setHwbm(data.getDepotId());
+ dto1311.setHwbm(ApiShUtil.getGbDepotId(data.getDepotId()) + "01");
dto1311.setYwrq(DateFormatUtils.format((data.getSubmitTime() == null ? new Date() : data.getSubmitTime()), "yyyy-MM-dd"));
dto1311.setSylx("3");
if ("LOSS".equals(data.getType())) {
@@ -96,10 +100,10 @@
dto1311.setRksj(DateFormatUtils.format((data.getSubmitTime() == null ? new Date() : data.getSubmitTime()), "yyyy-MM-dd HH:mm:ss"));
dto1311.setSyyy(StringUtils.isEmpty(data.getRemark()) ? "0" : data.getRemark());
- dto1311.setNm(data.getDepotId().substring(0, 21));
- dto1311.setZznm(data.getDepotId().substring(0, 21));
+ dto1311.setNm(ApiShUtil.getGbDepotId(data.getDepotId()).substring(0, 21));
+ dto1311.setZznm(ApiShUtil.getGbDepotId(data.getDepotId()).substring(0, 21));
dto1311.setSydjdbh(data.getId());
- // dto1311.setWlbh(StringUtils.isEmpty(data.getFoodVariety()) ? "0" : data.getFoodVariety()); TODO
+// dto1311.setWlbh(StringUtils.isEmpty(data.getFoodVariety()) ? "0" : data.getFoodVariety());
dto1311.setRknx(DateFormatUtils.format((data.getSubmitTime() == null ? new Date() : data.getSubmitTime()), "yyyy"));
dto1311.setNx(DateFormatUtils.format((data.getSubmitTime() == null ? new Date() : data.getSubmitTime()), "yyyy"));
dto1311.setLrsj(DateFormatUtils.format((data.getSubmitTime() == null ? new Date() : data.getSubmitTime()), "yyyy-MM-dd HH:mm:ss"));
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java
index 4c49d9c..6cf14c2 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java
@@ -1,7 +1,6 @@
package com.ld.igds.sh.service;
import com.alibaba.fastjson.JSONObject;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.InoutVarietyChange;
import com.ld.igds.models.InteStatusLog;
@@ -11,20 +10,20 @@
import com.ld.igds.sh.param.BaseParam;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.RedisUtil;
-
import lombok.extern.slf4j.Slf4j;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* 绮鎬ц川杞彉鏁版嵁鎺ュ彛
@@ -55,16 +54,19 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1312);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -30);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ娓╂箍搴︿俊鎭紝鍗崇伯鎯呬俊鎭�
List<InoutVarietyChange> dataList = hApiShServiceImpl.listFoodVarietyChange(companyId,
- param.getDepotId(), startTime, param.getEndTime());
+ param.getDepotId(), param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (dataList == null || dataList.isEmpty()) {
@@ -79,7 +81,7 @@
for (InoutVarietyChange variety : dataList) {
dto1312 = new Dto1312();
dto1312.setXzzbdbh(variety.getId());
- dto1312.setHwbm(variety.getDepotId());
+ dto1312.setHwbm(ApiShUtil.getGbDepotId(variety.getDepotId()) + "01");
dto1312.setLssl(String.valueOf(variety.getNumber()));
dto1312.setHzsl(String.valueOf(variety.getChangeNumber()));
dto1312.setBzwh(StringUtils.isEmpty(variety.getApprovalId())?"0":variety.getApprovalId());
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1401.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1401.java
index 84d45a6..2296440 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1401.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1401.java
@@ -1,7 +1,6 @@
package com.ld.igds.sh.service;
import com.alibaba.fastjson.JSONObject;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.Grain;
import com.ld.igds.models.InteStatusLog;
@@ -11,10 +10,10 @@
import com.ld.igds.sh.param.BaseParam;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
-import com.ld.igds.util.DateUtil;
import com.ld.igds.util.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -23,9 +22,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
/**
* 娓╂箍搴︽娴嬫帴鍙�
@@ -56,16 +56,19 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1401);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -30);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ娓╂箍搴︿俊鎭紝鍗崇伯鎯呬俊鎭�
List<Grain> dataList = hApiShServiceImpl.listGrain(companyId,
- param.getDepotId(), startTime, param.getEndTime());
+ param.getDepotId(), param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (dataList == null || dataList.isEmpty()) {
@@ -80,10 +83,10 @@
//灏佽鏁版嵁淇℃伅
for (Grain grain : dataList) {
dto1401 = new Dto1401();
- dto1401.setLqjcbm(grain.getDepotId() + grain.getBatchId());
+ dto1401.setLqjcbm(ApiShUtil.getGbDepotId(grain.getDepotId()) + grain.getBatchId());
dto1401.setJcsj(DateFormatUtils.format(grain.getReceiveDate(), "yyyy-MM-dd HH:mm:ss"));
- dto1401.setHwbm(grain.getDepotId());
+ dto1401.setHwbm(ApiShUtil.getGbDepotId(grain.getDepotId()) + "01");
dto1401.setCfww(String.valueOf(grain.getTempOut()));
dto1401.setCfws(String.valueOf(grain.getHumidityOut()));
dto1401.setCfnw(String.valueOf(grain.getTempIn()));
@@ -96,9 +99,9 @@
} else {
dto1401.setLswdzjh(getPointList2(grain.getPoints(), grain.getCable(), grain.getCableCir()));
}
- dto1401.setNm(grain.getDepotId().substring(0, 21));
- dto1401.setZznm(grain.getDepotId().substring(0, 21));
- dto1401.setCfnm(grain.getDepotId().substring(0, 21));
+ dto1401.setNm(ApiShUtil.getGbDepotId(grain.getDepotId()).substring(0, 21));
+ dto1401.setZznm(ApiShUtil.getGbDepotId(grain.getDepotId()).substring(0, 21));
+ dto1401.setCfnm(ApiShUtil.getGbDepotId(grain.getDepotId()).substring(0, 25));
dto1401.setDqwd(String.valueOf(grain.getTempOut()));
dto1401.setDqsd(String.valueOf(grain.getHumidityOut()));
dto1401.setCnwd(String.valueOf(grain.getTempIn()));
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1402.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1402.java
index 05df914..4f59230 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1402.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1402.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.ld.igds.log.service.InteStatusLogService;
-import com.ld.igds.models.Building;
import com.ld.igds.models.DepotConf;
import com.ld.igds.models.InteStatusLog;
import com.ld.igds.sh.dto.ApiResponse;
@@ -11,6 +10,7 @@
import com.ld.igds.sh.param.BaseParam;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
@@ -18,6 +18,7 @@
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -64,10 +65,10 @@
//灏佽鏁版嵁淇℃伅
for (DepotConf depotConf : dataList) {
dto1402 = new Dto1402();
- dto1402.setNm(depotConf.getDepotId().substring(0, 21));
- dto1402.setZznm(depotConf.getDepotId().substring(0, 21));
- dto1402.setCfnm(depotConf.getDepotId());
- dto1402.setCfbh(depotConf.getDepotId());
+ dto1402.setNm(ApiShUtil.getGbDepotId(depotConf.getDepotId()).substring(0, 21));
+ dto1402.setZznm(ApiShUtil.getGbDepotId(depotConf.getDepotId()).substring(0, 21));
+ dto1402.setCfnm(ApiShUtil.getGbDepotId(depotConf.getDepotId()).substring(0, 25));
+ dto1402.setCfbh(ApiShUtil.getGbDepotId(depotConf.getDepotId()));
String cableRule = depotConf.getCableRule();
String[] split = cableRule.split("-");
dto1402.setDlcs(split[0]);
@@ -96,7 +97,7 @@
log = inteStatusLogService.getLogByBizId(companyId, ApiShConst.API_SH_1402 + "_" + depotConf.getCompanyId() + depotConf.getDepotId());
if(null == log){
addLog = new InteStatusLog();
- addLog.setBizId(ApiShConst.API_SH_1402 + "_" + depotConf.getCompanyId() + depotConf.getDepotId());
+ addLog.setBizId(ApiShConst.API_SH_1402 + "_" + depotConf.getCompanyId() + ApiShUtil.getGbDepotId(depotConf.getDepotId()));
addLog.setCompanyId(companyId);
addLog.setBizType(ApiShConst.API_SH_TYPE_TASK);
addLog.setInterfaceId(ApiShConst.API_SH_1402);
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1403.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1403.java
index a4e572b..6160009 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1403.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1403.java
@@ -1,7 +1,6 @@
package com.ld.igds.sh.service;
import com.alibaba.fastjson.JSONObject;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.Building;
import com.ld.igds.models.InteStatusLog;
@@ -56,16 +55,19 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1403);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -30);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ閫氶淇℃伅
List<MAreationData> dataList = hApiShServiceImpl.listAreationData(companyId,
- param.getDepotId(), startTime, param.getEndTime());
+ param.getDepotId(), param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (dataList == null || dataList.isEmpty()) {
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1404.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1404.java
index bfa3aaa..0862f16 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1404.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1404.java
@@ -1,7 +1,6 @@
package com.ld.igds.sh.service;
import com.alibaba.fastjson.JSONObject;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.DrugLog;
import com.ld.igds.models.InteStatusLog;
@@ -11,6 +10,7 @@
import com.ld.igds.sh.param.BaseParam;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
@@ -41,7 +41,6 @@
private InteStatusLogService inteStatusLogService;
@Autowired
private RedisUtil redisUtil;
-
@Override
public String getInterfaceId() {
return ApiShConst.API_SH_1404;
@@ -56,16 +55,19 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1404);
- Date startTime = (Date) redisUtil.get(key);
- if (null == startTime) {
- startTime = DateUtils.addDays(param.getEndTime(), -30);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ鐔忚捀浣滀笟淇℃伅
List<DrugLog> dataList = hApiShServiceImpl.listDrugLog(companyId,
- param.getDepotId(), startTime, param.getEndTime());
+ param.getDepotId(), param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (dataList == null || dataList.isEmpty()) {
@@ -79,31 +81,31 @@
//灏佽鏁版嵁淇℃伅
for (DrugLog data : dataList) {
dto = new Dto1404();
- dto.setXzzybm(data.getDepotId().substring(0, 25) + data.getId());
- dto.setCfdm(data.getDepotId().substring(0, 25));
- dto.setXzkssj(DateFormatUtils.format(data.getStart() == null ? (new Date()) : data.getStart(), "yyyy-MM-dd"));
- dto.setXzjssj(DateFormatUtils.format(data.getEnd() == null ? (new Date()) : data.getEnd(), "yyyy-MM-dd"));
- dto.setHcjcdh(StringUtils.isEmpty(data.getPestBatchId()) ? "0" : data.getPestBatchId());
- dto.setDjcxz(data.getNum() == null ? "0" : data.getNum() + "");
- dto.setCgxzfs(StringUtils.isEmpty(data.getMode()) ? "0" : data.getMode());
- dto.setHlxzfs(StringUtils.isEmpty(data.getRecirMode()) ? "0" : data.getRecirMode());
- dto.setYjmc(StringUtils.isEmpty(data.getDrugName()) ? "0" : data.getDrugName());
- dto.setNd(data.getConcentration() == null ? "0" : data.getConcentration() + "");
- dto.setLddwyyl(data.getGrainDose() == null ? "0" : data.getGrainDose() + "");
- dto.setKjdwyyl(data.getSpaceDose() == null ? "0" : data.getSpaceDose() + "");
- dto.setZyyl(data.getDose() == null ? "0" : data.getDose() + "");
- dto.setSqrq(DateFormatUtils.format(data.getVentilateTime() == null ? (new Date()) : data.getVentilateTime(), "yyyy-MM-dd"));
- dto.setSqff(StringUtils.isEmpty(data.getVentilateMethod()) ? "0" : data.getVentilateMethod());
- dto.setSqjsslhqnd(data.getAfterPh3() == null ? "0.0" : data.getAfterPh3() + "");
- dto.setXzxgpj(StringUtils.isEmpty(data.getEvaluate()) ? "0" : data.getEvaluate());
- dto.setCzsjff(StringUtils.isEmpty(data.getCzsjff()) ? "0" : data.getCzsjff());
- dto.setCzclcs(StringUtils.isEmpty(data.getCzclcs()) ? "0" : data.getCzclcs());
-// dto.setXzzyry(StringUtils.isEmpty(data.getUser())?"0":data.getUser());
+ dto.setXzzybm(ApiShUtil.getGbDepotId(data.getDepotId()).substring(0, 25) + data.getId());
+ dto.setCfdm(ApiShUtil.getGbDepotId(data.getDepotId()).substring(0, 25));
+ dto.setXzkssj(DateFormatUtils.format(data.getStart()==null?(new Date()):data.getStart(),"yyyy-MM-dd"));
+ dto.setXzjssj(DateFormatUtils.format(data.getEnd()==null?(new Date()):data.getEnd(),"yyyy-MM-dd"));
+ dto.setHcjcdh(StringUtils.isEmpty(data.getPestBatchId())?"0":data.getPestBatchId());
+ dto.setDjcxz(data.getNum()==null?"0":data.getNum() + "");
+ dto.setCgxzfs(StringUtils.isEmpty(data.getMode())?"0":data.getMode());
+ dto.setHlxzfs(StringUtils.isEmpty(data.getRecirMode())?"0":data.getRecirMode());
+ dto.setYjmc(StringUtils.isEmpty(data.getDrugName())?"0":data.getDrugName());
+ dto.setNd(data.getConcentration()==null?"0":data.getConcentration() + "");
+ dto.setLddwyyl(data.getGrainDose()==null?"0":data.getGrainDose()+"");
+ dto.setKjdwyyl(data.getSpaceDose()==null?"0":data.getSpaceDose()+"");
+ dto.setZyyl(data.getDose()==null?"0":data.getDose()+"");
+ dto.setSqrq(DateFormatUtils.format(data.getVentilateTime()==null?(new Date()):data.getVentilateTime(),"yyyy-MM-dd"));
+ dto.setSqff(StringUtils.isEmpty(data.getVentilateMethod())?"0":data.getVentilateMethod());
+ dto.setSqjsslhqnd(data.getAfterPh3()==null?"0.0":data.getAfterPh3() + "");
+ dto.setXzxgpj(StringUtils.isEmpty(data.getEvaluate())?"0":data.getEvaluate());
+ dto.setCzsjff(StringUtils.isEmpty(data.getCzsjff())?"0":data.getCzsjff());
+ dto.setCzclcs(StringUtils.isEmpty(data.getCzclcs())?"0":data.getCzclcs());
+ dto.setXzzyry(StringUtils.isEmpty(data.getUser())?"0":data.getUser());
dto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
//鏌ヨ鏃ュ織鐘舵�佽〃锛岃缃搷浣滄爣蹇�
log = inteStatusLogService.getLogByBizId(companyId, ApiShConst.API_SH_1404 + "_" + data.getId());
- if (null == log) {
+ if(null == log){
addLog = new InteStatusLog();
addLog.setBizId(ApiShConst.API_SH_1404 + "_" + data.getId());
addLog.setCompanyId(companyId);
@@ -113,7 +115,7 @@
addLog.setStatus(ApiShConst.API_SH_STATUS_SUCCESS);
inteStatusLogService.addInteStatusLog(addLog);
- } else {
+ }else {
dto.setCzbz(ApiShConst.API_SH_U);
}
list.add(dto);
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1405.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1405.java
index e15c65d..ce8ec9e 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1405.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1405.java
@@ -1,7 +1,6 @@
package com.ld.igds.sh.service;
import com.alibaba.fastjson.JSONObject;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.InteStatusLog;
import com.ld.igds.models.Pest;
@@ -11,6 +10,7 @@
import com.ld.igds.sh.param.BaseParam;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
@@ -21,6 +21,7 @@
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -54,16 +55,19 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1405);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -100);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ铏妫�娴嬩俊鎭�
List<Pest> dataList = hApiShServiceImpl.listPest(companyId,
- param.getDepotId(), startTime, param.getEndTime());
+ param.getDepotId(), param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (dataList == null || dataList.isEmpty()) {
@@ -79,7 +83,7 @@
dto = new Dto1405();
dto.setHcjcdh(data.getBatchId());
dto.setJcsj(DateFormatUtils.format(data.getReceiveDate(),"yyyy-MM-dd HH:mm:ss"));
- dto.setHwdm(data.getDepotId());
+ dto.setHwdm(ApiShUtil.getGbDepotId(data.getDepotId()) + "01");
dto.setJchcff(StringUtils.isEmpty(data.getMethod())?"0":data.getMethod());
dto.setFsbw(StringUtils.isEmpty(data.getPosition())?"0":data.getPosition());
dto.setHczl(StringUtils.isEmpty(data.getPestType())?"0":data.getPestType());
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1408.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1408.java
index 6bfe1de..68e75e2 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1408.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1408.java
@@ -1,7 +1,6 @@
package com.ld.igds.sh.service;
import com.alibaba.fastjson.JSONObject;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.Gas;
import com.ld.igds.models.InteStatusLog;
@@ -11,6 +10,7 @@
import com.ld.igds.sh.param.BaseParam;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
@@ -20,6 +20,7 @@
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -53,16 +54,19 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1408);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -100);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ姘斾綋淇℃伅
List<Gas> dataList = hApiShServiceImpl.listGas(companyId,
- param.getDepotId(), startTime, param.getEndTime());
+ param.getDepotId(), param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (dataList == null || dataList.isEmpty()) {
@@ -78,7 +82,7 @@
dto = new Dto1408();
dto.setQtndjcdh(data.getBatchId());
dto.setJcsj(DateFormatUtils.format(data.getReceiveDate(), "yyyy-MM-dd HH:mm:ss"));
- dto.setHwdm(data.getDepotId());
+ dto.setHwdm(ApiShUtil.getGbDepotId(data.getDepotId()) + "01");
dto.setYqhlzjh(getPointByType(data.getPoints(), 2));
dto.setLhqndzjh(getPointByType(data.getPoints(), 3));
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1501.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1501.java
index 211165d..3edc5a7 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1501.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1501.java
@@ -1,11 +1,10 @@
package com.ld.igds.sh.service;
import com.alibaba.fastjson.JSONObject;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.m.InoutManageUtil;
-import com.ld.igds.models.InteStatusLog;
import com.ld.igds.models.InoutPlan;
+import com.ld.igds.models.InteStatusLog;
import com.ld.igds.sh.dto.ApiResponse;
import com.ld.igds.sh.dto.Dto1501;
import com.ld.igds.sh.param.ApiRequest;
@@ -22,8 +21,9 @@
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* 杞崲璁″垝淇℃伅鏁版嵁鎺ュ彛
@@ -54,16 +54,19 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1501);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -100);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ璁″垝淇℃伅
List<InoutPlan> dataList = hApiShServiceImpl.listPlan(companyId,
- InoutManageUtil.PLAN_TYPE_3, startTime, param.getEndTime());
+ InoutManageUtil.PLAN_TYPE_3, param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if(dataList == null || dataList.isEmpty()){
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1502.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1502.java
index ec87b3c..ac24ecc 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1502.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1502.java
@@ -2,21 +2,22 @@
import com.alibaba.fastjson.JSONObject;
import com.bstek.bdf2.core.model.DefaultDept;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.m.InoutManageUtil;
-import com.ld.igds.models.InteStatusLog;
import com.ld.igds.models.InoutPlan;
import com.ld.igds.models.InoutPlanDetail;
+import com.ld.igds.models.InteStatusLog;
import com.ld.igds.sh.dto.ApiResponse;
import com.ld.igds.sh.dto.Dto1502;
import com.ld.igds.sh.param.ApiRequest;
import com.ld.igds.sh.param.BaseParam;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
+import com.ld.igds.util.NumberUtil;
import com.ld.igds.util.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -24,7 +25,10 @@
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* 杞崲璁″垝鏄庣粏淇℃伅鏁版嵁鎺ュ彛
@@ -55,16 +59,19 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1502);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -100);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ杞崲璁″垝淇℃伅
List<InoutPlan> planList = hApiShServiceImpl.listPlan(companyId,
- InoutManageUtil.PLAN_TYPE_3, startTime, param.getEndTime());
+ InoutManageUtil.PLAN_TYPE_3, param.getStartTime(), param.getEndTime());
if (planList == null || planList.isEmpty()) {
return RespUtil.error(RespCodeEnum.CODE_2000.getCode(), request);
}
@@ -99,15 +106,15 @@
dto1502.setDjbm(StringUtils.isEmpty(planDetail.getFoodLevel())?"0":planDetail.getFoodLevel());
dto1502.setLsxzbm(StringUtils.isEmpty(planDetail.getFoodType())?"0":planDetail.getFoodType());
dto1502.setShnd(StringUtils.isEmpty(planDetail.getYear())?"0":planDetail.getYear());
- dto1502.setLhhwdm(StringUtils.isEmpty(planDetail.getDepotId())?"0":planDetail.getDepotId());
- dto1502.setLhsl(planDetail.getPlanNum()==null?"0.0":planDetail.getPlanNum()+"");
+ dto1502.setLhhwdm(StringUtils.isEmpty(ApiShUtil.getGbDepotId(planDetail.getDepotId()))?"0":ApiShUtil.getGbDepotId(planDetail.getDepotId()));
+ dto1502.setLhsl(planDetail.getPlanNum()==null?"0.0": NumberUtil.keepPrecision(planDetail.getPlanNum(),1)+"");
dto1502.setLhlx(StringUtils.isEmpty(planDetail.getType())?"0":planDetail.getType());
dto1502.setJhkq(dept.getCode());
if("1".equals(planDetail.getType())){
- dto1502.setLcsl(planDetail.getPlanNum() + "");
+ dto1502.setLcsl(NumberUtil.keepPrecision(planDetail.getPlanNum(),1) + "");
}
if("2".equals(planDetail.getType())){
- dto1502.setLrsl(planDetail.getPlanNum() + "");
+ dto1502.setLrsl(NumberUtil.keepPrecision(planDetail.getPlanNum(),1) + "");
}
dto1502.setZznm(dept.getCode());
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1503.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1503.java
index 734fa74..3ea1403 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1503.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1503.java
@@ -2,10 +2,9 @@
import com.alibaba.fastjson.JSONObject;
import com.bstek.bdf2.core.model.DefaultDept;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
-import com.ld.igds.models.InteStatusLog;
import com.ld.igds.models.InoutContract;
+import com.ld.igds.models.InteStatusLog;
import com.ld.igds.sh.dto.ApiResponse;
import com.ld.igds.sh.dto.Dto1503;
import com.ld.igds.sh.param.ApiRequest;
@@ -22,8 +21,9 @@
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* 鍚堝悓淇℃伅鏁版嵁鎺ュ彛
@@ -38,8 +38,6 @@
private HApiShServiceImpl hApiShServiceImpl;
@Autowired
private InteStatusLogService inteStatusLogService;
- @Autowired
- private RedisUtil redisUtil;
@Override
public String getInterfaceId() {
return ApiShConst.API_SH_1503;
@@ -55,16 +53,19 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1503);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -100);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ鍚堝悓淇℃伅
List<InoutContract> dataList = hApiShServiceImpl.listContract(companyId,
- startTime, param.getEndTime());
+ param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if(dataList == null || dataList.isEmpty()){
@@ -96,7 +97,7 @@
dto1503.setQddd(StringUtils.isEmpty(contract.getSignAddress())?"0":contract.getSignAddress());
if(contract.getPrice() != null){
- dto1503.setHtdj(String.valueOf(contract.getPrice()));
+ dto1503.setHtdj(String.valueOf(contract.getPrice()*1000));
}
if(contract.getMoney() != null){
dto1503.setHtzje(String.valueOf(contract.getMoney()));
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1504.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1504.java
index d78f304..de8f234 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1504.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1504.java
@@ -2,10 +2,9 @@
import com.alibaba.fastjson.JSONObject;
import com.bstek.bdf2.core.model.DefaultDept;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
-import com.ld.igds.models.InteStatusLog;
import com.ld.igds.models.InoutContract;
+import com.ld.igds.models.InteStatusLog;
import com.ld.igds.sh.dto.ApiResponse;
import com.ld.igds.sh.dto.Dto1504;
import com.ld.igds.sh.param.ApiRequest;
@@ -15,14 +14,12 @@
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
-import com.ld.igds.util.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
/**
@@ -38,8 +35,6 @@
private HApiShServiceImpl hApiShServiceImpl;
@Autowired
private InteStatusLogService inteStatusLogService;
- @Autowired
- private RedisUtil redisUtil;
@Override
public String getInterfaceId() {
return ApiShConst.API_SH_1504;
@@ -55,16 +50,19 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1504);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -100);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ鍚堝悓淇℃伅
List<InoutContract> dataList = hApiShServiceImpl.listContract(companyId,
- startTime, param.getEndTime());
+ param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if(dataList == null || dataList.isEmpty()){
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java
index 437a53e..e560332 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java
@@ -7,6 +7,7 @@
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
import org.springframework.stereotype.Component;
+
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -289,6 +290,7 @@
args.put("companyId", companyId);
args.put("progress", InoutConstant.PROGRESS_RECORD);
args.put("recordStatus1", InoutConstant.RECORD_STATUS_DEL);
+ args.put("recordStatus2", "ERROR");
if(StringUtils.isNotEmpty(depotId)){
hql += " and depotId =:depotId";
@@ -804,6 +806,7 @@
args.put("companyId", companyId);
args.put("progress", InoutConstant.PROGRESS_RECORD);
args.put("recordStatus1", InoutConstant.RECORD_STATUS_DEL);
+ args.put("recordStatus2", "ERROR");
if(null != startTime){
hql += " and registerTime >:startTime";
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/util/ApiShUtil.java b/igds-api-inte/src/main/java/com/ld/igds/sh/util/ApiShUtil.java
index 88a5464..10cd8fe 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/util/ApiShUtil.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/util/ApiShUtil.java
@@ -15,6 +15,51 @@
@Component
public class ApiShUtil {
+ /**
+ * 浠撳簱鐘舵�佽浆涓鸿揣浣嶇姸鎬�
+ * @param depotStatus
+ * @return
+ */
+ public String getDepotStatus(String depotStatus){
+ if(DepotStatus.STATUS_1.getCode().equals(depotStatus)){
+ return "1";
+ }
+ if(DepotStatus.STATUS_3.getCode().equals(depotStatus)){
+ return "3";
+ }
+ if(DepotStatus.STATUS_2.getCode().equals(depotStatus)){
+ return "2";
+ }
+ if(DepotStatus.STATUS_4.getCode().equals(depotStatus)){
+ return "4";
+ }
+ return "9";
+ }
+
+ public static String getGbDepotId(String depotId){
+ switch (depotId) {
+ case "0P01":
+ return "91310114703439394M0020001001";
+ case "0P02":
+ return "91310114703439394M0020002001";
+ case "0P03":
+ return "91310114703439394M0020003001";
+ case "0P04":
+ return "91310114703439394M0020004001";
+ case "0P05":
+ return "91310114703439394M0020005001";
+ case "0P06":
+ return "91310114703439394M0020006001";
+ case "0P07":
+ return "91310114703439394M0020007001";
+ case "0P08":
+ return "91310114703439394M0020005001";
+ case "0P09":
+ return "91310114703439394M0020006001";
+ default:
+ return depotId;
+ }
+ }
/**
* 鑾峰彇鍥剧墖鐨勪簩杩涘埗娴�
diff --git a/igds-api-inte/src/main/java/com/ld/igds/three/service/impl/ThreeServiceImpl1001.java b/igds-api-inte/src/main/java/com/ld/igds/three/service/impl/ThreeServiceImpl1001.java
index d0cb7ee..c975486 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/three/service/impl/ThreeServiceImpl1001.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/three/service/impl/ThreeServiceImpl1001.java
@@ -99,7 +99,7 @@
return ThreeRespUtil.error(ThreeCodeEnum.CODE_1111, "鏈煡璇㈠埌姝id鐨勯厤缃俊鎭紝璇疯仈绯荤鐞嗗憳锛�", req);
}
List<Depot> depotList = threeMapper.getDepotList(req.getCompanyId(), req.getDeptId(), threeConf.getDepotId());
- if(list.size() > 0){
+ if(null != depotList && depotList.size() > 0){
data1001 = new Data1001();
data1001.setUid(threeConf.getUid());
data1001.setDepotName(depotList.get(0).getName());
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1102.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1102.class
index 90d7d12..2ca31c3 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1102.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1102.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1103.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1103.class
index b1d61af..a05a625 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1103.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1103.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1104.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1104.class
index 229fd7e..e0cd5b0 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1104.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1104.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1105.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1105.class
index bce6413..a376e2c 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1105.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1105.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1106.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1106.class
index 5671bcf..c197956 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1106.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1106.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1112.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1112.class
index 41e6608..0bc448b 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1112.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1112.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1201.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1201.class
index 6fd375e..9fc3468 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1201.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1201.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1202.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1202.class
index e82e5fd..72d7431 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1202.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1202.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1301.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1301.class
index 5c4dc6a..a8a6aa1 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1301.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1301.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1302.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1302.class
index ae9b869..53909af 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1302.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1302.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1303.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1303.class
index 7516b97..f9696be 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1303.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1303.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1304.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1304.class
index b0a28f6..402109e 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1304.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1304.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1306.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1306.class
index c54db92..bb43d0c 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1306.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1306.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1308.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1308.class
index 570f4bb..4488360 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1308.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1308.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1309.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1309.class
index e9aea6f..8383ebd 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1309.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1309.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1310.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1310.class
index 664dc1e..6e289c0 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1310.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1310.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1311.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1311.class
index 60070bb..21f1375 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1311.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1311.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1312.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1312.class
index 4e9a88e..7bfb7c4 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1312.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1312.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1401.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1401.class
index 7e4d16a..a3b46a8 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1401.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1401.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1402.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1402.class
index 3ece312..e2089ea 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1402.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1402.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1403.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1403.class
index b30e5a0..03005fb 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1403.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1403.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1404.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1404.class
index d50edbd..b8e2684 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1404.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1404.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1405.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1405.class
index 3db3cdc..26614c1 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1405.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1405.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1408.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1408.class
index 7a2d40a..f3d4ea7 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1408.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1408.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1501.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1501.class
index 98bdd4a..acf17ed 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1501.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1501.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1502.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1502.class
index 90eb3e0..fc8db15 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1502.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1502.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1503.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1503.class
index 50e7a58..da4d7ca 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1503.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1503.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1504.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1504.class
index c81bb6c..07cdf5a 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1504.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/ApiShServiceImpl1504.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/service/impl/HApiShServiceImpl.class b/igds-api-inte/target/classes/com/ld/igds/sh/service/impl/HApiShServiceImpl.class
index c95302f..5af4baa 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/service/impl/HApiShServiceImpl.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/service/impl/HApiShServiceImpl.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/sh/util/ApiShUtil.class b/igds-api-inte/target/classes/com/ld/igds/sh/util/ApiShUtil.class
index 0e3a98a..3aa485d 100644
--- a/igds-api-inte/target/classes/com/ld/igds/sh/util/ApiShUtil.class
+++ b/igds-api-inte/target/classes/com/ld/igds/sh/util/ApiShUtil.class
Binary files differ
diff --git a/igds-api-inte/target/classes/com/ld/igds/three/service/impl/ThreeServiceImpl1001.class b/igds-api-inte/target/classes/com/ld/igds/three/service/impl/ThreeServiceImpl1001.class
index eeca253..c80f4fd 100644
--- a/igds-api-inte/target/classes/com/ld/igds/three/service/impl/ThreeServiceImpl1001.class
+++ b/igds-api-inte/target/classes/com/ld/igds/three/service/impl/ThreeServiceImpl1001.class
Binary files differ
diff --git a/igds-api-phone/igds-api-phone.iml b/igds-api-phone/igds-api-phone.iml
index 1d4e8dc..8ece4d5 100644
--- a/igds-api-phone/igds-api-phone.iml
+++ b/igds-api-phone/igds-api-phone.iml
@@ -54,14 +54,14 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.13.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.13.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5602.java b/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5602.java
index 8119ced..70e5b76 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5602.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5602.java
@@ -12,6 +12,7 @@
import com.ld.igds.phone.service.PhoneService;
import com.ld.igds.phone.util.PhoneRespUtil;
import com.ld.igds.sec.dto.SecCameraDto;
+import com.ld.igds.sec.service.CoreSecCameraService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -26,6 +27,8 @@
@Autowired
private SecManager securityManager;
+ @Autowired
+ private CoreSecCameraService secCameraService;
@Override
public String getInterfaceId() {
@@ -43,19 +46,23 @@
if(param == null || StringUtils.isEmpty(param.getCameraId()) || StringUtils.isEmpty(param.getPlayType())){
return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"鍙傛暟寮傚父锛岃閲嶈瘯锛�");
}
- // 鏍规嵁id鑾峰彇璁惧淇℃伅
-// SecCameraDto camera = securityManager.getCameraById(authUser.getCompanyId(), param.getCameraId(), true);
- SecCameraDto cameraParam = new SecCameraDto();
- cameraParam.setId(param.getCameraId());
- cameraParam.setCompanyId(authUser.getCompanyId());
- SecCameraDto camera = securityManager.getPlayAddr(cameraParam);
-
- if (camera == null) {
- return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"鏈煡璇㈠埌鐩稿叧璁惧锛�");
+ if (CameraUtil.PLAY_TYPE_DEFAULT.equals(param.getPlayType())) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"绯荤粺鏈厤缃綋鍓嶆憚鍍忓ご鎾斁鏂瑰紡锛屼笉鎵ц棰勮");
}
- if (CameraUtil.PLAY_TYPE_DEFAULT.equals(camera.getPlayType())) {
- return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"绯荤粺鏈厤缃綋鍓嶆憚鍍忓ご鎾斁鏂瑰紡锛屼笉鎵ц棰勮");
+ //鑾峰彇璁惧淇℃伅
+ SecCameraDto camera = secCameraService.getCameraById(authUser.getCompanyId(), param.getCameraId());
+ if(null == camera){
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"鏈煡璇㈠埌鐩稿叧璁惧锛�");
+ }
+ if(StringUtils.isNotEmpty(camera.getPhoneAddr())){
+ camera.setPlayAddr(camera.getPhoneAddr());
+ return PhoneRespUtil.success(camera, req);
+ }
+
+ camera = securityManager.getPlayAddr(camera);
+ if (camera == null) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"鏈煡璇㈠埌鐩稿叧璁惧锛�");
}
return PhoneRespUtil.success(camera, req);
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java
index 1ac4a38..875f00a 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java
@@ -12,6 +12,7 @@
import com.ld.igds.phone35.util.PhoneRespUtil;
import com.ld.igds.sec.dto.SecCameraDto;
import com.ld.igds.sec.manager.SecManager;
+import com.ld.igds.sec.service.CoreSecCameraService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -25,12 +26,14 @@
public class Phone35ServiceImpl5605 implements Phone35Service {
@Autowired
private SecManager securityManager;
-
+ @Autowired
+ private CoreSecCameraService secCameraService;
@Override
public String getInterfaceId() {
return Phone35Constant.API_PHONE_5605;
}
+ @SuppressWarnings("unchecked")
@Override
public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
//杞寲瀵硅薄
@@ -42,20 +45,24 @@
if (StringUtils.isEmpty(param.getId())) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
}
- //鍙傛暟楠岃瘉
if (CameraUtil.PLAY_TYPE_DEFAULT.equals(param.getPlayType())) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1007, "绯荤粺鏈厤缃綋鍓嶆憚鍍忓ご鎾斁鏂瑰紡锛屼笉鎵ц棰勮");
}
- SecCameraDto cameraParam = new SecCameraDto();
- cameraParam.setId(param.getId());
- cameraParam.setCompanyId(phone35AuthUser.getCompanyId());
- SecCameraDto camera = securityManager.getPlayAddr(cameraParam);
-
+ //鑾峰彇璁惧淇℃伅
+ SecCameraDto camera = secCameraService.getCameraById(phone35AuthUser.getCompanyId(), param.getId());
if (camera == null) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1007, "鏈煡璇㈠埌鐩稿叧璁惧锛�");
}
+ if(StringUtils.isNotEmpty(camera.getPhoneAddr())){
+ camera.setPlayAddr(camera.getPhoneAddr());
+ return PhoneRespUtil.success(camera, req);
+ }
+ camera = securityManager.getPlayAddr(camera);
+ if (camera == null) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"鏈煡璇㈠埌鐩稿叧璁惧锛�");
+ }
return PhoneRespUtil.success(camera, req);
}
diff --git a/igds-api-phone/target/classes/com/ld/igds/phone/service/impl/ServiceImpl5602.class b/igds-api-phone/target/classes/com/ld/igds/phone/service/impl/ServiceImpl5602.class
index f77d769..cdd5a33 100644
--- a/igds-api-phone/target/classes/com/ld/igds/phone/service/impl/ServiceImpl5602.class
+++ b/igds-api-phone/target/classes/com/ld/igds/phone/service/impl/ServiceImpl5602.class
Binary files differ
diff --git a/igds-api-phone/target/classes/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.class b/igds-api-phone/target/classes/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.class
index 754e60e..8e36e31 100644
--- a/igds-api-phone/target/classes/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.class
+++ b/igds-api-phone/target/classes/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.class
Binary files differ
diff --git a/igds-base/.gitignore b/igds-base/.gitignore
index e91d5c4..9c1822d 100644
--- a/igds-base/.gitignore
+++ b/igds-base/.gitignore
@@ -1,3 +1,5 @@
/target/
/target/
/target/
+/target/
+/target/
diff --git a/igds-base/igds-base.iml b/igds-base/igds-base.iml
index c187f3f..3f53e9a 100644
--- a/igds-base/igds-base.iml
+++ b/igds-base/igds-base.iml
@@ -55,9 +55,6 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
@@ -79,6 +76,9 @@
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.17.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.3.17.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-base/src/main/java/com/ld/igds/conf/MyBatisPlusConf.java b/igds-base/src/main/java/com/ld/igds/conf/MyBatisPlusConf.java
index 8c699b8..38557aa 100644
--- a/igds-base/src/main/java/com/ld/igds/conf/MyBatisPlusConf.java
+++ b/igds-base/src/main/java/com/ld/igds/conf/MyBatisPlusConf.java
@@ -196,7 +196,7 @@
*/
public static void main(String[] args) {
try {
- String password = "";
+ String password = "Fzzy@#$%5432..K";
System.out.println("鏄庢枃瀵嗙爜: " + password);
//绉侀挜
String privateKey = DEFAULT_PRIVATE_KEY_STRING;
diff --git a/igds-basic/.gitignore b/igds-basic/.gitignore
index e91d5c4..b49c563 100644
--- a/igds-basic/.gitignore
+++ b/igds-basic/.gitignore
@@ -1,3 +1,4 @@
/target/
/target/
/target/
+/target/
diff --git a/igds-basic/igds-basic.iml b/igds-basic/igds-basic.iml
index 5480255..8e45e16 100644
--- a/igds-basic/igds-basic.iml
+++ b/igds-basic/igds-basic.iml
@@ -52,9 +52,6 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
@@ -76,6 +73,9 @@
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.17.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.3.17.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-basic/pom.xml b/igds-basic/pom.xml
index 4d0366d..4997d48 100644
--- a/igds-basic/pom.xml
+++ b/igds-basic/pom.xml
@@ -10,6 +10,7 @@
<groupId>com.ld.igds</groupId>
<artifactId>igds-parent-pom</artifactId>
<version>4.0.0-RELEASE</version>
+ <relativePath>../igds-parent-pom/pom.xml</relativePath>
</parent>
<dependencies>
@@ -35,7 +36,6 @@
</dependencyManagement>
<build>
-
<resources>
<resource>
<directory>src/main/java</directory>
diff --git a/igds-basic/src/main/java/com/ld/igds/basic/controller/FileController.java b/igds-basic/src/main/java/com/ld/igds/basic/controller/FileController.java
index 7ba2429..1ce6b66 100644
--- a/igds-basic/src/main/java/com/ld/igds/basic/controller/FileController.java
+++ b/igds-basic/src/main/java/com/ld/igds/basic/controller/FileController.java
@@ -2,16 +2,20 @@
import com.ld.igds.basic.manager.FileManager;
import com.ld.igds.data.PageResponse;
+
import lombok.extern.slf4j.Slf4j;
+
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import java.io.*;
import java.net.URLEncoder;
@@ -25,81 +29,145 @@
@RequestMapping("basic/file")
public class FileController {
- @Autowired
- private FileManager fileManager;
+ @Autowired
+ private FileManager fileManager;
- /**
- * 闀夸紶 鍑哄叆搴撳浘鐗�
- *
- * @param file
- * @param request
- * @return
- * @throws IOException
- */
- @RequestMapping("/update-file")
- public PageResponse<String> updateAreationPos(
- @RequestParam(value = "file", required = true) MultipartFile file,
- HttpServletRequest request) throws IOException {
+ /**
+ * 闀夸紶 鍑哄叆搴撳浘鐗�
+ *
+ * @param file
+ * @param request
+ * @return
+ * @throws IOException
+ */
+ @RequestMapping("/update-file")
+ public PageResponse<String> updateAreationPos(
+ @RequestParam(value = "file", required = true) MultipartFile file,
+ HttpServletRequest request) throws IOException {
- String plateNum = request.getParameter("plateNum");
+ String plateNum = request.getParameter("plateNum");
- return fileManager.upLoadInoutImg(file, plateNum);
- }
+ return fileManager.upLoadInoutImg(file, plateNum);
+ }
+ /**
+ * 涓嬭浇浠庝复鏃剁洰褰曚笅杞斤紝闇�瑕侀」鐩悕绉板拰褰撳墠缁勭粐
+ *
+ * @param request
+ * @return
+ * @throws IOException
+ */
+ @RequestMapping("/download-temp")
+ public int downloadTemp(
+ @RequestParam(value = "fileName", required = false) String fileName,
+ @RequestParam(value = "companyId", required = false) String companyId,
+ HttpServletRequest request, HttpServletResponse response)
+ throws IOException {
- /**
- * 涓嬭浇浠庝复鏃剁洰褰曚笅杞斤紝闇�瑕侀」鐩悕绉板拰褰撳墠缁勭粐
- *
- * @param request
- * @return
- * @throws IOException
- */
- @RequestMapping("/download-temp")
- public int downloadTemp(
- @RequestParam(value = "fileName", required = false) String fileName,
- @RequestParam(value = "companyId", required = false) String companyId,
- HttpServletRequest request, HttpServletResponse response) throws IOException {
+ if (StringUtils.isEmpty(fileName) || StringUtils.isEmpty(companyId)) {
+ response.sendError(404, "缂哄皯涓嬭浇鍙傛暟鏉′欢锛屾棤娉曟墽琛屼笅杞姐��");
+ return 404;
+ }
+ File file = fileManager.getTempFilePath(fileName, companyId);
- if (StringUtils.isEmpty(fileName) || StringUtils.isEmpty(companyId)) {
- response.sendError(404, "缂哄皯涓嬭浇鍙傛暟鏉′欢锛屾棤娉曟墽琛屼笅杞姐��");
- return 404;
- }
- File file = fileManager.getTempFilePath(fileName, companyId);
+ if (!file.exists()) {
+ response.sendError(404, "娌℃湁鑾峰彇鍒伴渶瑕佷笅杞界殑鏂囦欢锛屽彲鑳藉凡琚垹闄�");
+ return 404;
+ }
- if (!file.exists()) {
- response.sendError(404, "娌℃湁鑾峰彇鍒伴渶瑕佷笅杞界殑鏂囦欢锛屽彲鑳藉凡琚垹闄�");
- return 404;
- }
+ response.setContentType("application/octet-stream");
+ response.setHeader("content-type", "application/octet-stream");
+ response.setHeader("Content-Length", String.valueOf(file.length()));
+ response.setHeader("Content-Disposition", "attachment;fileName="
+ + URLEncoder.encode(fileName, "utf8"));
+ byte[] buffer = new byte[1024];
+ OutputStream os;
+ try (FileInputStream fis = new FileInputStream(file);
+ BufferedInputStream bis = new BufferedInputStream(fis)) {
+ os = response.getOutputStream();
+ int i = bis.read(buffer);
+ while (i != -1) {
+ os.write(buffer);
+ i = bis.read(buffer);
+ }
- response.setContentType("application/octet-stream");
- response.setHeader("content-type", "application/octet-stream");
- response.setHeader("Content-Length", String.valueOf(file.length()));
- response.setHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode(fileName, "utf8"));
- byte[] buffer = new byte[1024];
+ fis.close();
+ bis.close();
+ os.close();
+ os.flush();
+ } catch (Exception e) {
+ response.sendError(500, "鏂囦欢涓嬭浇鍑洪敊锛�" + e.getMessage());
- OutputStream os;
- try (FileInputStream fis = new FileInputStream(file);
- BufferedInputStream bis = new BufferedInputStream(fis)) {
- os = response.getOutputStream();
- int i = bis.read(buffer);
- while (i != -1) {
- os.write(buffer);
- i = bis.read(buffer);
- }
+ log.error("------------鏂囦欢涓嬭浇澶辫触--{}", e);
+ return 500;
+ }
- fis.close();
- bis.close();
- os.close();
- os.flush();
- } catch (Exception e) {
- response.sendError(500, "鏂囦欢涓嬭浇鍑洪敊锛�" + e.getMessage());
+ return 200;
+ }
- log.error("------------鏂囦欢涓嬭浇澶辫触--{}", e);
- return 500;
- }
+ /**
+ * 鏂囦欢娴佽幏鍙栧浘鐗囨樉绀哄埌椤甸潰--閽堝浠撳唴鎶撴媿
+ *
+ * @param fileName
+ * @param timeStr
+ * 鎶撴媿鐨勫勾鏈堟棩鏃跺垎绉� yyyyMMdd
+ * @param response
+ * @return
+ * @throws IOException
+ */
+ @RequestMapping(value = "/get-snap-depot", method = RequestMethod.GET, produces = { "application/vnd.ms-excel;charset=UTF-8" })
+ public String getDepotSnap(String fileName, String timeStr,
+ HttpServletResponse response) throws IOException {
- return 200;
- }
+ // 璁剧疆杩斿洖鍐呭鏍煎紡
+ response.setContentType("image/jpeg/jpg/png/gif/bmp/tiff/svg");
+
+ String filePath;
+ // 鍒涘缓涓�涓緭鍏ユ祦
+ InputStream in = null;
+ // 鍒涘缓杈撳嚭娴�
+ OutputStream os = null;
+ try {
+ if (null == fileName || null == timeStr) {
+ filePath = fileManager.getFailImg();
+ }else{
+ filePath = fileManager.getSnapFilePath(fileName, timeStr);
+
+ File file = new File(filePath);
+
+ if(file.exists()){
+ log.debug("----鎶撴媿鍥剧墖鍦板潃-------{}", filePath);
+ }else{
+ filePath = fileManager.getFailImg();
+ log.debug("----鏈幏鍙栧埌鍥剧焊锛岄粯璁ゅ湴鍧�-------{}", filePath);
+ }
+ }
+
+ // 鐢ㄨ鏂囦欢鍒涘缓涓�涓緭鍏ユ祦
+ in = new FileInputStream(filePath);
+ // 鍒涘缓杈撳嚭娴�
+ os = response.getOutputStream();
+ byte[] b = new byte[1024];
+ while (in.read(b) != -1) {
+ os.write(b);
+ }
+ in.close();
+ os.close();
+
+ return null;
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ } finally {
+ if (null != in) {
+ in.close();
+ }
+ if (null != os) {
+ os.close();
+ }
+ }
+ }
}
diff --git a/igds-basic/src/main/java/com/ld/igds/basic/manager/FileManager.java b/igds-basic/src/main/java/com/ld/igds/basic/manager/FileManager.java
index 2be929e..671ff63 100644
--- a/igds-basic/src/main/java/com/ld/igds/basic/manager/FileManager.java
+++ b/igds-basic/src/main/java/com/ld/igds/basic/manager/FileManager.java
@@ -5,13 +5,17 @@
import com.ld.igds.file.CoreFileService;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.FilesUtil;
+
import lombok.extern.slf4j.Slf4j;
+
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
@@ -160,4 +164,17 @@
String path = filesUtil.getTempPath(companyId) + "/" + fileName;
return new File(path);
}
+
+ public String getSnapFilePath(String fileName, String dateStr) {
+ return fileService.getSnapFilePath(dateStr) + "/" + fileName;
+ }
+
+ public String getFailImg() throws IOException {
+
+ String failImg = "static/images/img-fail.jpg";
+
+ ClassPathResource readFile = new ClassPathResource(failImg);
+
+ return readFile.getFile().getAbsolutePath();
+ }
}
diff --git a/igds-basic/src/main/java/com/ld/igds/gas/manager/GasManager.java b/igds-basic/src/main/java/com/ld/igds/gas/manager/GasManager.java
index 6b758ff..00e7ace 100644
--- a/igds-basic/src/main/java/com/ld/igds/gas/manager/GasManager.java
+++ b/igds-basic/src/main/java/com/ld/igds/gas/manager/GasManager.java
@@ -204,9 +204,12 @@
DepotConf depotConf = coreCommonService.getCacheDepotConf(
param.getCompanyId(), param.getDepotId());
- // 鑾峰彇鍒嗘満淇℃伅
- DeviceSer deviceSer = coreSerService.getCacheSer(param.getCompanyId(),
- depotConf.getGasSer());
+ // 榛樿鑾峰彇绮儏鍒嗘満淇℃伅
+ DeviceSer deviceSer = coreSerService.getCacheSer(param.getCompanyId(), depotConf.getGrainSer());
+ // 鑻ユ皵浣撳垎鏈洪厤缃笉涓虹┖锛屽垯鑾峰彇姘斾綋鐨勫垎鏈�
+ if(StringUtils.isNotEmpty(depotConf.getGasSer())){
+ deviceSer = coreSerService.getCacheSer(param.getCompanyId(), depotConf.getGasSer());
+ }
CheckGasRequest request = new CheckGasRequest();
request.setDepotId(param.getDepotId());
@@ -259,9 +262,12 @@
DepotConf depotConf = coreCommonService.getCacheDepotConf(
param.getCompanyId(), param.getDepotId());
- // 鑾峰彇鍒嗘満淇℃伅
- DeviceSer deviceSer = coreSerService.getCacheSer(param.getCompanyId(),
- depotConf.getGasSer());
+ // 榛樿鑾峰彇绮儏鍒嗘満淇℃伅
+ DeviceSer deviceSer = coreSerService.getCacheSer(param.getCompanyId(), depotConf.getGrainSer());
+ // 鑻ユ皵浣撳垎鏈洪厤缃笉涓虹┖锛屽垯鑾峰彇姘斾綋鐨勫垎鏈�
+ if(StringUtils.isNotEmpty(depotConf.getGasSer())){
+ deviceSer = coreSerService.getCacheSer(param.getCompanyId(), depotConf.getGasSer());
+ }
CheckGasRequest request = new CheckGasRequest();
request.setDepotId(param.getDepotId());
diff --git a/igds-basic/src/main/java/com/ld/igds/grain/manager/GrainManager.java b/igds-basic/src/main/java/com/ld/igds/grain/manager/GrainManager.java
index fffbd03..9a4c37a 100644
--- a/igds-basic/src/main/java/com/ld/igds/grain/manager/GrainManager.java
+++ b/igds-basic/src/main/java/com/ld/igds/grain/manager/GrainManager.java
@@ -22,18 +22,13 @@
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
import com.ld.igds.util.DecimalUtil;
-import com.ld.igds.util.FilesUtil;
import com.ld.igds.view.service.BuildingService;
-
import lombok.extern.slf4j.Slf4j;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
import java.text.Collator;
import java.util.*;
import java.util.concurrent.ExecutorService;
@@ -67,8 +62,6 @@
private BuildingService buildingService;
@Autowired
private GrainExportBuilder grainExportBuilder;
- @Resource
- private FilesUtil filesUtil;
/**
* 鏍规嵁鍙傛暟鑾峰彇绮儏鏁版嵁淇℃伅
@@ -810,15 +803,19 @@
GrainData grainData;
Building building;
String height;
- Double length;
+ //鐩村緞
+ Double diameter;
Double bulkWeight;
Double storage = 0.0;
+ Double volume = 0.0;
+ Double deVolume;
for (Depot depot : depotList) {
//鑾峰彇浠撴埧淇℃伅锛岃缃缓绛戦珮搴�
height = null;
//鑾峰彇浠撴埧鐩村緞
- length = 0.0;
+ diameter = 0.0;
+ deVolume = 0.0;
//瀹归噸
bulkWeight = depot.getBulkWeight();
grainData = coreGrainService.listLiquidHeight(companyId, depot.getId());
@@ -833,7 +830,10 @@
height = building.getHeight() + "";
}
if (null != building.getLength()) {
- length = building.getLength();
+ diameter = building.getLength();
+ }
+ if (null != building.getDeVolume()) {
+ deVolume = building.getDeVolume();
}
}
}
@@ -842,7 +842,13 @@
grainData.setDepotHeight(height);
if (null != bulkWeight && StringUtils.isNotEmpty(grainData.getOilHeight())) {
Double oilHeight = Double.valueOf(grainData.getOilHeight());
- storage = 3.14 * Math.pow(length / 2, 2) * oilHeight * bulkWeight;
+ //璁＄畻浣撶Н
+ volume = 3.14159 * Math.pow(diameter / 2, 2) * oilHeight;
+ if(volume > 0){
+ volume = volume - deVolume;
+ }
+
+ storage = volume * bulkWeight;
}
grainData.setStorage(storage);
diff --git a/igds-basic/src/main/java/com/ld/igds/pest/manager/PestManager.java b/igds-basic/src/main/java/com/ld/igds/pest/manager/PestManager.java
index 239b707..b6f567f 100644
--- a/igds-basic/src/main/java/com/ld/igds/pest/manager/PestManager.java
+++ b/igds-basic/src/main/java/com/ld/igds/pest/manager/PestManager.java
@@ -247,6 +247,10 @@
// 鑾峰彇鍒嗘満淇℃伅
DeviceSer deviceSer = coreSerService.getCacheSer(param.getCompanyId(),
depotConf.getGrainSer());
+ // 鑻ヨ櫕瀹冲垎鏈洪厤缃笉涓虹┖锛屽垯鑾峰彇铏鐨勫垎鏈�
+ if(StringUtils.isNotEmpty(depotConf.getPestSer())){
+ deviceSer = coreSerService.getCacheSer(param.getCompanyId(), depotConf.getPestSer());
+ }
CheckPestRequest request = new CheckPestRequest();
request.setDepotId(param.getDepotId());
diff --git a/igds-basic/src/main/java/com/ld/igds/pest/service/HPestDataService.java b/igds-basic/src/main/java/com/ld/igds/pest/service/HPestDataService.java
index 3684625..1914fb9 100644
--- a/igds-basic/src/main/java/com/ld/igds/pest/service/HPestDataService.java
+++ b/igds-basic/src/main/java/com/ld/igds/pest/service/HPestDataService.java
@@ -19,7 +19,7 @@
import com.ld.igds.util.DateUtil;
/**
- *
+ *
* @author: andy.jia
* @description:
* @version:
@@ -34,7 +34,7 @@
if (null == parameter) {
parameter = new HashMap<String, Object>();
}
-
+
Map<String, Object> args = new HashMap<String, Object>();
// 榛樿鑾峰彇6涓湀鐨勬暟鎹俊鎭�
@@ -65,12 +65,33 @@
}
String countHql = "select count(*) " + hql;
- hql += " order by batchId desc";
+ hql += " order by receiveDate desc";
this.pagingQuery(page, hql, countHql, args);
}
+ public void getData(Page<PestData> page, Map<String, Object> parameter) throws Exception {
+ if (null == parameter) {
+ parameter = new HashMap<String, Object>();
+ }
+
+ Map<String, Object> args = new HashMap<String, Object>();
+
+ String hql = " from " + Pest.class.getName() + " where 1=1 ";
+
+ String arg = (String) parameter.get("depotId");
+ if (StringUtils.isNotEmpty(arg)) {
+ hql += " and depotId = :depotId";
+ args.put("depotId", arg);
+ }
+
+
+ String countHql = "select count(*) " + hql;
+ hql += " order by receiveDate desc";
+
+ this.pagingQuery(page, hql, countHql, args);
+ }
public void pageData(Page<Pest> page, Map<String, Object> param)
throws Exception {
diff --git a/igds-basic/src/main/java/com/ld/igds/pest/view/PestDataPR.java b/igds-basic/src/main/java/com/ld/igds/pest/view/PestDataPR.java
index eb0eb0d..8c258c6 100644
--- a/igds-basic/src/main/java/com/ld/igds/pest/view/PestDataPR.java
+++ b/igds-basic/src/main/java/com/ld/igds/pest/view/PestDataPR.java
@@ -78,6 +78,18 @@
pestDataService.getDataReport(page,parameter);
}
+ /**
+ * pestDataPR#getData
+ * 鏍规嵁鏉′欢鍒嗛〉鑾峰彇铏鏁版嵁淇℃伅
+ * @param page
+ * @param parameter
+ * @throws Exception
+ */
+ @DataProvider
+ public void getData(Page<PestData> page,Map<String,Object> parameter)throws Exception{
+ pestDataService.getData(page,parameter);
+ }
+
/**
* 妫�鏌ヨ櫕瀹虫柟娉�
diff --git a/igds-basic/src/main/java/com/ld/igds/timer/ThScheduled.java b/igds-basic/src/main/java/com/ld/igds/timer/ThScheduled.java
deleted file mode 100644
index 19f78e6..0000000
--- a/igds-basic/src/main/java/com/ld/igds/timer/ThScheduled.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.ld.igds.timer;
-
-import com.bstek.bdf2.core.model.DefaultCompany;
-import com.ld.igds.common.CoreCommonService;
-import com.ld.igds.view.manager.TempManager;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 绮儏绠＄悊妯″潡鐨勫畾鏃跺櫒閰嶇疆锛�
- * 1銆佹瘡闂撮殧1涓皬鏃惰幏鍙栦笅鎵�鏈夊垎鏈洪厤缃殑娓╂箍搴︿俊鎭�
- */
-@Slf4j
-@Component(ThScheduled.BEAN_ID)
-public class ThScheduled {
-
- public static final String BEAN_ID = "basic.grainScheduled";
-
- @Resource
- private TempManager thManager;
-
- @Resource
- private CoreCommonService coreCommonService;
-
-
- /**
- * 姣忓皬鏃舵墽琛屼竴娆★紝鎵ц鏃堕棿涓烘瘡涓皬鏃剁殑绗竴绉�
- * 2022骞�6鏈�27鏃� 11:05:31 淇敼涓�20 鍒嗛挓鎵ц涓�娆�
- */
- @Scheduled(cron = "0 0/20 * * * ?")
- public void scheduled() {
- List<DefaultCompany> list = coreCommonService.getCompanyList();
- if (null == list || list.isEmpty()) return;
-
- for (DefaultCompany company : list) {
- doExe(company.getId());
- try {
- Thread.sleep(500);
- } catch (Exception e) {
- e.getStackTrace();
- }
- }
-
- }
-
-
- public void doExe(String companyId) {
- log.info("===================绯荤粺瀹氭椂鑾峰彇鍒嗘満涓嬬殑娓╂箍搴︿俊鎭�-{}=======================", companyId);
- thManager.scheduledCheck(companyId);
- }
-}
diff --git a/igds-basic/src/main/java/com/ld/igds/timer/WeatherScheduled.java b/igds-basic/src/main/java/com/ld/igds/timer/WeatherScheduled.java
deleted file mode 100644
index 699c094..0000000
--- a/igds-basic/src/main/java/com/ld/igds/timer/WeatherScheduled.java
+++ /dev/null
@@ -1,353 +0,0 @@
-package com.ld.igds.timer;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.ld.igds.constant.Constant;
-import com.ld.igds.constant.RedisConst;
-import com.ld.igds.data.ConfigData;
-import com.ld.igds.io.constant.ProtocolEnum;
-import com.ld.igds.models.WeatherConf;
-import com.ld.igds.models.WeatherInfo;
-import com.ld.igds.timer.rk.RkData;
-import com.ld.igds.timer.rk.RkDto;
-import com.ld.igds.timer.rk.RkResult;
-import com.ld.igds.util.HttpUtils;
-import com.ld.igds.util.RedisUtil;
-import com.ld.igds.weather.CoreWeatherService;
-import com.ld.igds.weather.WeatherUtil;
-import com.ld.igds.weather.notify.NotifyWeatherService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
-import javax.annotation.Resource;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author: andy.jia
- * @description: 姘旇薄淇℃伅鑾峰彇瀹氭椂鍣�
- * @version: <p>
- * <p>
- * 椋庢鑷磋繙璐拱澶栫綉姘旇薄鏈嶅姟锛�
- * 姘旇薄鏈嶅姟锛歨ttp://www.yiketianqi.com/
- *
- *
- * <p> 寤哄ぇ浠佺鐨�4G鍗忚
- */
-@Slf4j
-@Component
-public class WeatherScheduled {
-
- @Resource(name = NotifyWeatherService.BEAN_ID)
- private NotifyWeatherService notifyService;
-
- @Resource(name = CoreWeatherService.BEAN_ID)
- private CoreWeatherService weatherService;
-
- @Autowired
- private ConfigData configData;
- @Autowired
- private RedisUtil redisUtil;
- @Autowired
- private RestTemplate restTemplate;
-
- public static String DEFAULT_URL = "https://v0.yiketianqi.com/api?unescape=1&version=v61&appid=49421971&appsecret=JmJE48Fv&cityid={cityid}";
- public static String DEFAULT_APP_ID = "49421971";
- public static String DEFAULT_APP_SECRET = "JmJE48Fv";
-
- /**
- * 寤哄ぇ浠佺4G骞冲彴缂撳瓨key
- */
- public static String RK_WEATHER_V30_4G = "RK_WEATHER_V30_4G";
-
-
- /**
- * 瀹氭椂鑾峰彇姘旇薄淇℃伅锛岃娉ㄦ剰锛岀敱浜庢皵璞℃敮鎸佸缃戝拰鑷畾涔夋皵璞＄珯锛岀郴缁熼粯璁ゅ彧鎵ц鍏朵腑涓�绉嶆柟寮�
- */
- @Scheduled(cron = "0 0/30 * * * ?")
- public void scheduled() {
-
- log.info("===========================绯荤粺瀹氭椂鑾疯幏鍙栨皵璞′俊鎭�======================");
-
- // 鑾峰彇姘旇薄淇℃伅閰嶇疆
- List<WeatherConf> list = weatherService.getConfData(null, null);
-
- if (null == list || list.isEmpty()) return;
-
- Date date = new Date();
-
- for (WeatherConf conf : list) {
-
- if (null == conf.getWanTag()) conf.setWanTag(Constant.YN_N);
- if (null == conf.getProtocol()) conf.setProtocol(ProtocolEnum.TCP_DEFAULT.getCode());
-
-
- //璋冪敤椋庢鑷磋繙榛樿澶栫綉姘旇薄
- if (Constant.YN_Y.equals(conf.getWanTag())) {
- getWeatherByWeb(date, conf);
- continue;
- }
-
- //璋冪敤寤哄ぇ浠佺鐨勬皵璞�
- if (ProtocolEnum.RK_WEATHER_V30.getCode().equals(conf.getProtocol())) {
- getWeatherByRkV30(date, conf);
- continue;
- }
-
-
- }
- }
-
- /**
- * 绯荤粺璋冪敤椋庢鑷磋繙璐拱鐨勫缃戝ぉ姘旀皵璞″崗璁�
- *
- * @param date
- * @param conf
- * @return
- */
- public WeatherInfo getWeatherByWeb(Date date, WeatherConf conf) {
-
- if (StringUtils.isEmpty(conf.getCityId())) return null;
-
- try {
-
- if (null != configData.getWeatherPath()) {
- DEFAULT_URL = configData.getWeatherPath();
- }
-
- String url = DEFAULT_URL.replace("{cityid}", conf.getCityId())
- .replace("{appid}", DEFAULT_APP_ID)
- .replace("{appsecret}", DEFAULT_APP_SECRET);
-
- log.info("姘旇薄璋冪敤鑾峰彇-url = {}", url);
-
- String result = HttpUtils.doGet(url);
- if (null == result) {
- log.error("褰撳墠澶栫綉鑾峰彇姘旇薄淇℃伅澶辫触鈥︹��");
- return null;
- }
-
- WeatherWebDto dto = JSON.parseObject(result, WeatherWebDto.class);
-
- if (StringUtils.isNoneEmpty(dto.getErrcode())) {
- log.error("褰撳墠澶栫綉鑾峰彇姘旇薄淇℃伅寮傚父:{}", dto.getErrmsg());
- return null;
- }
- log.info("姘旇薄杩斿洖缁撴灉={}", dto.toString());
-
- WeatherInfo info = new WeatherInfo();
- info.setId(WeatherUtil.buildWeatherId(conf.getDeptId(), date));
- info.setAirLevel(dto.getAir_level());
- info.setCompanyId(conf.getCompanyId());
- info.setDeptId(conf.getDeptId());
- info.setHumidity(dto.getHumidity());
- info.setPm25(dto.getAir_pm25());
- info.setPressure(dto.getPressure());
- info.setSource(WeatherUtil.SOURCE_02);
- info.setTemp(dto.getTem());
- info.setWeather(dto.getWea());
- info.setWindDirection(dto.getWin());
- info.setWindSpeed(dto.getWin_speed());
- info.setWindMeter(dto.getWin_meter());
- info.setCity(dto.getCity());
- info.setUpdateTime(date);
-
- notifyService.notify(info);
- return info;
- } catch (Exception e) {
- log.error("姘旇薄淇℃伅鑾峰彇寮傚父:{}", e.getMessage(), e);
- }
- return null;
- }
-
- /**
- * 鏍规嵁寤哄ぇ浠佺浜慥30鍗忚鑾峰彇姘旇薄淇℃伅
- *
- * @param date
- * @param conf
- */
- private void getWeatherByRkV30(Date date, WeatherConf conf) {
-
- //鑻ョ敤鎴枫�佸瘑鐮併�両P鍦板潃鏈変竴涓虹┖鍒欒繑鍥�
- if(StringUtils.isEmpty(conf.getAccount())
- || StringUtils.isEmpty(conf.getPassword())
- || StringUtils.isEmpty(conf.getIp())){
- return;
- }
-
- //鑾峰彇韬唤璁よ瘉token
- String token = getToken(conf);
-
- //璁剧疆璇锋眰澶村弬鏁�
- HttpHeaders httpHeaders = new HttpHeaders();
- httpHeaders.set("authorization", token);
-
- String url = conf.getIp() + "/api/data/getRealTimeData";
- restTemplate.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
- HttpEntity<String> ans = restTemplate.exchange(url, HttpMethod.GET,
- new HttpEntity<>(null, httpHeaders), String.class);
- String body = ans.getBody();
- log.debug("-----褰撳墠寤哄ぇ浠佺骞冲彴鑾峰彇姘旇薄淇℃伅-----锛岃繑鍥炴暟鎹�={}", body);
- RkResult response = JSONObject.parseObject(body, RkResult.class);
- if(StringUtils.isEmpty(response.getCode()) || !"1000".equals(response.getCode())){
- log.error("褰撳墠寤哄ぇ浠佺骞冲彴鑾峰彇姘旇薄淇℃伅澶辫触......");
- return;
- }
- List<JSONObject> result = JSON.parseArray(JSONObject.toJSONString(response.getData()), JSONObject.class);
-
- JSONArray lists = (JSONArray)result.get(0).get("dataItem");
- List<RkDto> list = JSON.parseArray(JSONObject.toJSONString(lists), RkDto.class);
- if(null == list || list.isEmpty()){
- return;
- }
- WeatherInfo info = new WeatherInfo();
- info.setId(WeatherUtil.buildWeatherId(conf.getDeptId(), date));
- info.setCompanyId(conf.getCompanyId());
- info.setDeptId(conf.getDeptId());
- info.setSource(WeatherUtil.SOURCE_01);
-
- List<RkData> dataList;
- List<RkData> weatherList = new ArrayList<>();
- //鏍规嵁鍦板潃鍒ゆ柇閫夐」
- for (RkDto rkDto : list) {
- //娓╂箍搴�
- if("11".equals(rkDto.getNodeId())){
- dataList = rkDto.getRegisterItem();
- for (RkData rkData : dataList) {
- //娓╁害
- if("1".equals(rkData.getRegisterId())){
- info.setTemp(rkData.getData());
- }
- //婀垮害
- if("2".equals(rkData.getRegisterId())){
- info.setHumidity(rkData.getData());
- }
- }
- }
- //椋庡姏椋庨��
- if("1".equals(rkDto.getNodeId())){
- dataList = rkDto.getRegisterItem();
- for (RkData rkData : dataList) {
- //椋庡姏
- if("1".equals(rkData.getRegisterId())){
- info.setWindSpeed(rkData.getData() + "绾�");
- }
- //椋庨��
- if("2".equals(rkData.getRegisterId())){
- info.setWindMeter(rkData.getData());
- }
- }
- }
- //椋庡悜
- if("2".equals(rkDto.getNodeId())){
- dataList = rkDto.getRegisterItem();
- for (RkData rkData : dataList) {
- //椋庡悜
- if("1".equals(rkData.getRegisterId())){
- info.setWindDirection(rkData.getData());
- }
- }
- }
- //澶ф皵鍘�
- if("14".equals(rkDto.getNodeId())){
- dataList = rkDto.getRegisterItem();
- for (RkData rkData : dataList) {
- //澶ф皵鍘�
- if("2".equals(rkData.getRegisterId())){
- info.setPressure(rkData.getData());
- }
- }
- }
- //闆ㄩ噺
- if("21".equals(rkDto.getNodeId())){
- dataList = rkDto.getRegisterItem();
- for (RkData rkData : dataList) {
-// //鐬椂闆ㄩ噺
-// if("1".equals(rkData.getRegisterId())){
-// info.setRainfall(rkData.getData());
-// }
- //褰撳墠闆ㄩ噺
- if("2".equals(rkData.getRegisterId())){
- info.setRainfall(rkData.getData());
- }
- }
- }
- //鏈夋棤闆ㄩ洩
- if("16".equals(rkDto.getNodeId())){
- weatherList = rkDto.getRegisterItem();
- }
- }
- for (RkData rkData : weatherList) {
- //澶╂皵
- if("1".equals(rkData.getRegisterId())){
- info.setWeather(rkData.getData());
- //鏈夐洦闆椂鍒ゆ柇褰撳墠闆ㄩ噺
- if("鏈夐洦闆�".equals(rkData.getData())){
- Double rainfall = Double.valueOf(info.getRainfall());
- if(rainfall <= 10){
- info.setWeather("灏忛洦");
- }
- if(rainfall > 10 && rainfall <= 25){
- info.setWeather("涓洦");
- }
- if(rainfall > 25 && rainfall <= 50){
- info.setWeather("澶ч洦");
- }
- if(rainfall > 50){
- info.setWeather("鏆撮洦");
- }
- }
- }
- }
- info.setUpdateTime(date);
- info.setCity(conf.getCity());
- notifyService.notify(info);
- }
-
- /**
- * 鑾峰彇韬唤璁よ瘉鐨勬巿鏉僡ccessToken
- * @param conf
- * @return
- */
- private String getToken(WeatherConf conf) {
- //榛樿鍏堜粠缂撳瓨鑾峰彇
- String key = RedisConst.buildKey(conf.getCompanyId(), RK_WEATHER_V30_4G, conf.getAccount());
- String token = (String) redisUtil.get(key);
-
- //鑻ョ紦瀛樿幏鍙栦负绌猴紝鍒欓�氳繃鎺ュ彛鑾峰彇token
- if (null == token) {
- String url = conf.getIp() + "/api/getToken?loginName=" + conf.getAccount() + "&password=" + conf.getPassword();
- RkResult response = restTemplate.getForObject(url, RkResult.class);
- if (null == response) {
- log.error("褰撳墠寤哄ぇ浠佺骞冲彴鑾峰彇韬唤璁よ瘉淇℃伅澶辫触...");
- return null;
- }
- log.info("鑾峰彇鐨勮韩浠借璇佷俊鎭�={}", response);
-
- if(StringUtils.isEmpty(response.getCode()) || !"1000".equals(response.getCode())){
- log.error("褰撳墠寤哄ぇ浠佺骞冲彴鑾峰彇韬唤璁よ瘉淇℃伅澶辫触......");
- return null;
- }
- JSONObject result = JSON.parseObject(JSONObject.toJSONString(response.getData()));
- if (null == result) {
- return null;
- }
- token = (String) result.get("token");
-
- //灏唗oken瀛樺叆缂撳瓨,
- redisUtil.set(key, token, 2*60*60);
- }
- return token;
- }
-
-}
diff --git a/igds-basic/src/main/java/com/ld/igds/timer/zcl/InteGrainScheduled.java b/igds-basic/src/main/java/com/ld/igds/timer/zcl/InteGrainScheduled.java
index 1755853..d6f3938 100644
--- a/igds-basic/src/main/java/com/ld/igds/timer/zcl/InteGrainScheduled.java
+++ b/igds-basic/src/main/java/com/ld/igds/timer/zcl/InteGrainScheduled.java
@@ -25,7 +25,7 @@
@Component
public class InteGrainScheduled {
- public static String COMPANY_IDS = "4003,5307,5311,5315";
+ public static String COMPANY_IDS = "4003,5307,5311,5315,5328,5332";
@Autowired
private CoreGrainService grainService;
diff --git a/igds-core/igds-core.iml b/igds-core/igds-core.iml
index eee735e..0eedab7 100644
--- a/igds-core/igds-core.iml
+++ b/igds-core/igds-core.iml
@@ -55,9 +55,6 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
@@ -79,6 +76,9 @@
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.17.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.3.17.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-core/src/main/java/com/ld/igds/camera/data/ApiCameraResp.java b/igds-core/src/main/java/com/ld/igds/camera/data/ApiCameraResp.java
index ee2bad9..87ea49c 100644
--- a/igds-core/src/main/java/com/ld/igds/camera/data/ApiCameraResp.java
+++ b/igds-core/src/main/java/com/ld/igds/camera/data/ApiCameraResp.java
@@ -13,6 +13,8 @@
private String msg;
+ private String fileName;
+
/**
* 鎾斁鍦板潃
*/
diff --git a/igds-core/src/main/java/com/ld/igds/check/CheckStandard.view.xml b/igds-core/src/main/java/com/ld/igds/check/CheckStandard.view.xml
index b152e22..d84f9a1 100644
--- a/igds-core/src/main/java/com/ld/igds/check/CheckStandard.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/check/CheckStandard.view.xml
@@ -436,7 +436,7 @@
</Container>
</CustomDropDown>
<ListDropDown id="listSymbol">
- <Property name="items">>=,<=,=</Property>
+ <Property name="items">>=,<=,==</Property>
</ListDropDown>
</View>
</ViewConfig>
diff --git a/igds-core/src/main/java/com/ld/igds/check/service/HDicCheckItemService.java b/igds-core/src/main/java/com/ld/igds/check/service/HDicCheckItemService.java
index 42e520d..90d828b 100644
--- a/igds-core/src/main/java/com/ld/igds/check/service/HDicCheckItemService.java
+++ b/igds-core/src/main/java/com/ld/igds/check/service/HDicCheckItemService.java
@@ -25,7 +25,7 @@
args.put("companyId", ContextUtil.getCompanyId());
if(null != param){
String str = (String) param.get("key");
- if (StringUtils.isNoneEmpty(str)) {
+ if (StringUtils.isNotEmpty(str)) {
hql += " and (name like :name or code like:code)";
args.put("name", "%" + str + "%");
args.put("code", "%" + str + "%");
diff --git a/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java b/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java
index fca817d..ef48505 100644
--- a/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java
@@ -70,7 +70,7 @@
item = new CheckItemData();
BeanUtils.copyProperties(data, item);
item.setCheckId(checkId);
- if (data.getUpperLimit() > 0.0 && StringUtils.isNotEmpty(data.getOperaSymbol())) {
+ if (null != data.getUpperLimit() && data.getUpperLimit() > 0.0 && StringUtils.isNotEmpty(data.getOperaSymbol())) {
item.setOperaSymbolValue(data.getOperaSymbol() + " " + data.getUpperLimit());
}
result.add(item);
diff --git a/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java b/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
index 3cc6230..666bfd7 100644
--- a/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
@@ -157,7 +157,7 @@
List<DepotConf> data = getCacheDepotConf(companyId);
if (null == data) return null;
- return data.stream().filter(item -> (serId.equals(item.getGrainSer()) || serId.equals(item.getGasSer()) || serId.equals(item.getEsSer()) ))
+ return data.stream().filter(item -> (serId.equals(item.getGrainSer()) || serId.equals(item.getGasSer()) || serId.equals(item.getEsSer())))
.findAny().orElse(null);
}
@@ -195,6 +195,7 @@
List<DepotSerData> listAll = (List<DepotSerData>) redisUtil.get(key);
if (null == listAll || listAll.isEmpty()) {
log.error("娌℃湁鑾峰彇鍒颁粨搴撲笌鍒嗘満鐨勫叧绯绘暟鎹紝璇疯仈绯荤鐞嗗憳锛�");
+ return null;
}
Map<String, DepotSerData> tempMap = new HashMap<>();
@@ -321,6 +322,9 @@
public void addDepotStore(DepotStore store, boolean updateDepot) {
if (null == store.getUpdateDate()) store.setUpdateDate(new Date());
if (null == store.getId()) store.setId(ContextUtil.getUUID());
+ if (null == store.getManageType() || "".equals(store.getManageType())) {
+ store.setManageType("01");
+ }
commonMapper.addDepotStore(store);
diff --git a/igds-core/src/main/java/com/ld/igds/file/ApplyOrderUploadProcessor.java b/igds-core/src/main/java/com/ld/igds/file/ApplyOrderUploadProcessor.java
index 165a5f0..86b0930 100644
--- a/igds-core/src/main/java/com/ld/igds/file/ApplyOrderUploadProcessor.java
+++ b/igds-core/src/main/java/com/ld/igds/file/ApplyOrderUploadProcessor.java
@@ -64,6 +64,41 @@
}
/**
+ * applyOrderUploadProcessor#uploadFile
+ * 鍒ゆ柇鏄惁涓婁紶
+ *
+ * @param file
+ * @param parameter
+ * @return fileId 鏂版枃浠禝D鍖呭惈鏂囦欢鍚庣紑
+ */
+ @FileResolver
+ public String uploadFile(UploadFile file, Map<String, Object> parameter) {
+ String fileId = null;
+ String mark = (String) parameter.get("mark");
+ if ("NO_UPLOAD".equals(mark)) {
+ return null;
+ }
+ try {
+
+ String basePath = fileService.getCommonFilePath(null);
+
+ fileId = ContextUtil.getTimeId(1000)
+ + file.getFileName().substring(
+ file.getFileName().lastIndexOf("."));
+
+ file.transferTo(new File(basePath + fileId));
+
+ } catch (IllegalStateException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ return fileId;
+ }
+
+
+ /**
* applyOrderUploadProcessor#downloadApplyOrderFile 鏂囦欢涓嬭浇
*
* @param parameter
diff --git a/igds-core/src/main/java/com/ld/igds/file/CoreFileService.java b/igds-core/src/main/java/com/ld/igds/file/CoreFileService.java
index 15d5fb1..381f6c7 100644
--- a/igds-core/src/main/java/com/ld/igds/file/CoreFileService.java
+++ b/igds-core/src/main/java/com/ld/igds/file/CoreFileService.java
@@ -39,6 +39,25 @@
*/
public String getInoutFilePath(Date date);
+
+ /**
+ * 鏍规嵁鏃堕棿鑾峰彇绯荤粺閰嶇疆鐨勪粨鍐呰棰戞姄鎷嶈矾寰�
+ * 绯荤粺闄勪欢璺緞浠yyyMM涓虹洰褰曡繘琛屽垝鍒�
+ *
+ * @param date
+ * @return
+ */
+ public String getSnapFilePath(Date date);
+
+ /**
+ * 鏍规嵁鏃堕棿鑾峰彇绯荤粺閰嶇疆鐨勪粨鍐呰棰戞姄鎷嶈矾寰�
+ * 绯荤粺闄勪欢璺緞浠yyyMM涓虹洰褰曡繘琛屽垝鍒�
+ *
+ * @param date
+ * @return
+ */
+ public String getSnapFilePath(String date);
+
/**
* 鏍规嵁鏃堕棿鑾峰彇绯荤粺閰嶇疆鐨勯檮浠惰矾寰勫湴鍧�
* 绯荤粺闄勪欢璺緞浠yyyMM涓虹洰褰曡繘琛屽垝鍒�
diff --git a/igds-core/src/main/java/com/ld/igds/file/impl/CoreFileServiceImpl.java b/igds-core/src/main/java/com/ld/igds/file/impl/CoreFileServiceImpl.java
index cb4a302..29ced86 100644
--- a/igds-core/src/main/java/com/ld/igds/file/impl/CoreFileServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/file/impl/CoreFileServiceImpl.java
@@ -21,136 +21,163 @@
@Component
public class CoreFileServiceImpl implements CoreFileService {
- @Autowired
- private FileServiceMapper fileServiceMapper;
+ @Autowired
+ private FileServiceMapper fileServiceMapper;
- @Autowired
- private ConfigData configData;
+ @Autowired
+ private ConfigData configData;
- @Override
- public String getInoutFilePath(Date date) {
- if (null == date) date = new Date();
- String basePath = configData.getFilePath() + "INOUT/" + DateFormatUtils.format(date, "yyyyMM") + "/";
- File file = new File(basePath);
- if (!file.exists()) {
- file.mkdirs();
- }
- return basePath;
- }
+ @Override
+ public String getInoutFilePath(Date date) {
+ if (null == date) date = new Date();
+ String basePath = configData.getFilePath() + "INOUT/" + DateFormatUtils.format(date, "yyyyMM") + "/";
+ File file = new File(basePath);
+ if (!file.exists()) {
+ file.mkdirs();
+ }
+ return basePath;
+ }
- @Override
- public String getCommonFilePath(Date date) {
- if (null == date)
- date = new Date();
+ @Override
+ public String getSnapFilePath(Date date) {
+ if (null == date) date = new Date();
+ String basePath = configData.getFilePath() + "SNAP/" + DateFormatUtils.format(date, "yyyyMM") + "/";
+ File file = new File(basePath);
+ if (!file.exists()) {
+ file.mkdirs();
+ }
+ return basePath;
+ }
+
+ @Override
+ public String getSnapFilePath(String dateStr) {
+ if (null == dateStr) return null;
+
+ if(dateStr.length()>6) dateStr = dateStr.substring(0, 6);
+
+ String basePath = configData.getFilePath() + "SNAP/" + dateStr+ "/";
+ File file = new File(basePath);
+ if (!file.exists()) {
+ file.mkdirs();
+ }
+ return basePath;
+ }
- String basePath = configData.getFilePath() + "COMMON/" + DateFormatUtils.format(date, "yyyyMM") + "/";
+ @Override
+ public String getCommonFilePath(Date date) {
+ if (null == date)
+ date = new Date();
- File file = new File(basePath);
- if (!file.exists()) {
- file.mkdirs();
- }
- return basePath;
- }
+ String basePath = configData.getFilePath() + "COMMON/" + DateFormatUtils.format(date, "yyyyMM") + "/";
- @Override
- public String getTempFilePath() {
+ File file = new File(basePath);
+ if (!file.exists()) {
+ file.mkdirs();
+ }
+ return basePath;
+ }
- String basePath = configData.getFilePath() + "TEMP/";
- File file = new File(basePath);
- if (!file.exists()) {
- file.mkdirs();
- }
- return basePath;
- }
+ @Override
+ public String getTempFilePath() {
- @Override
- public void baseImg2Disk(String basePath, String fileName, String imgData) {
- Base64Util.generateImage(imgData, basePath + fileName);
- }
+ String basePath = configData.getFilePath() + "TEMP/";
+ File file = new File(basePath);
+ if (!file.exists()) {
+ file.mkdirs();
+ }
+ return basePath;
+ }
- @Override
- public void addRecord(FileData fileData) {
- fileServiceMapper.addFile(fileData);
- }
+ @Override
+ public void baseImg2Disk(String basePath, String fileName, String imgData) {
+ Base64Util.generateImage(imgData, basePath + fileName);
+ }
- @Override
- public void saveInoutFiles(List<FileData> files, String companyId,
- String bizId, String bizTag) throws Exception, SQLException {
+ @Override
+ public void addRecord(FileData fileData) {
+ fileServiceMapper.addFile(fileData);
+ }
- if (null == files || files.size() == 0) return;
+ @Override
+ public void saveInoutFiles(List<FileData> files, String companyId,
+ String bizId, String bizTag) throws Exception, SQLException {
- for (FileData data : files) {
- // 濡傛灉娌℃湁闄勪欢鍚嶇О锛屽垯涓嶄繚瀛橀檮浠朵俊鎭�
- if (StringUtils.isEmpty(data.getFileName())) {
- continue;
- }
- data.setCreateTime(new Date());
- data.setBizId(bizId);
- data.setBizTag(bizTag);
- data.setCompanyId(companyId);
- data.setFileId(ContextUtil.getUUID());
- fileServiceMapper.addFile(data);
- }
- }
+ if (null == files || files.size() == 0) return;
- @Override
- public List<FileData> listFile(String companyId, String bizId) {
- if (StringUtils.isEmpty(companyId)) {
- companyId = ContextUtil.getDefaultCompanyId();
- }
+ for (FileData data : files) {
+ // 濡傛灉娌℃湁闄勪欢鍚嶇О锛屽垯涓嶄繚瀛橀檮浠朵俊鎭�
+ if (StringUtils.isEmpty(data.getFileName())) {
+ continue;
+ }
+ data.setCreateTime(new Date());
+ data.setBizId(bizId);
+ if (StringUtils.isNotEmpty(bizTag)) {
+ data.setBizTag(bizTag);
+ }
+ data.setCompanyId(companyId);
+ data.setFileId(ContextUtil.getUUID());
+ fileServiceMapper.addFile(data);
+ }
+ }
- if (StringUtils.isEmpty(bizId))
- return null;
+ @Override
+ public List<FileData> listFile(String companyId, String bizId) {
+ if (StringUtils.isEmpty(companyId)) {
+ companyId = ContextUtil.getDefaultCompanyId();
+ }
- List<FileData> listFile = fileServiceMapper.listFile(companyId, bizId);
+ if (StringUtils.isEmpty(bizId))
+ return null;
- if (null == listFile || listFile.isEmpty())
- return null;
+ List<FileData> listFile = fileServiceMapper.listFile(companyId, bizId);
- return listFile;
- }
+ if (null == listFile || listFile.isEmpty())
+ return null;
- @Override
- public void delFile(String fileId) {
- fileServiceMapper.delFile(fileId);
- }
+ return listFile;
+ }
+
+ @Override
+ public void delFile(String fileId) {
+ fileServiceMapper.delFile(fileId);
+ }
- @Override
- public void saveFiles(List<FileInfo> files, String bizId, String bizTag) {
- if (null == files || files.size() == 0){
- return;
- }
- FileData fileData = null;
- for (FileInfo data : files) {
- if (StringUtils.isEmpty(data.getFileName())) {
- continue;
- }
- if (StringUtils.isNotEmpty(data.getBizId())) {
- continue;
- }
- if (null == data.getCreateTime()) {
- data.setCreateTime(new Date());
- }
- if (null == data.getBizTag()) {
- data.setBizTag(bizTag);
- }
+ @Override
+ public void saveFiles(List<FileInfo> files, String bizId, String bizTag) {
+ if (null == files || files.size() == 0) {
+ return;
+ }
+ FileData fileData = null;
+ for (FileInfo data : files) {
+ if (StringUtils.isEmpty(data.getFileName())) {
+ continue;
+ }
+ if (StringUtils.isNotEmpty(data.getBizId())) {
+ continue;
+ }
+ if (null == data.getCreateTime()) {
+ data.setCreateTime(new Date());
+ }
+ if (null == data.getBizTag()) {
+ data.setBizTag(bizTag);
+ }
- data.setBizId(bizId);
- data.setCompanyId(ContextUtil.getCompanyId());
+ data.setBizId(bizId);
+ data.setCompanyId(ContextUtil.getCompanyId());
- if (null == data.getFileId()) {
- data.setFileId(ContextUtil.getUUID());
- }
+ if (null == data.getFileId()) {
+ data.setFileId(ContextUtil.getUUID());
+ }
- fileData = new FileData();
- fileData.setFileId(data.getFileId());
- fileData.setBizId(data.getBizId());
- fileData.setBizTag(data.getBizTag());
- fileData.setCompanyId(data.getCompanyId());
- fileData.setFileName(data.getFileName());
- fileData.setCreateTime(data.getCreateTime());
- fileServiceMapper.addFile(fileData);
- }
- }
+ fileData = new FileData();
+ fileData.setFileId(data.getFileId());
+ fileData.setBizId(data.getBizId());
+ fileData.setBizTag(data.getBizTag());
+ fileData.setCompanyId(data.getCompanyId());
+ fileData.setFileName(data.getFileName());
+ fileData.setCreateTime(data.getCreateTime());
+ fileServiceMapper.addFile(fileData);
+ }
+ }
}
diff --git a/igds-core/src/main/java/com/ld/igds/io/constant/ProtocolEnum.java b/igds-core/src/main/java/com/ld/igds/io/constant/ProtocolEnum.java
index d22bf75..d26e761 100644
--- a/igds-core/src/main/java/com/ld/igds/io/constant/ProtocolEnum.java
+++ b/igds-core/src/main/java/com/ld/igds/io/constant/ProtocolEnum.java
@@ -32,8 +32,10 @@
TCP_BHZH_VERB_V2("TCP_BHZH_VERB_V2", "閭︽捣鎺у埗鏌滄櫤鑳芥湁绾跨増V2"),
TCP_BHZH_INOUT_V1("TCP_BHZH_INOUT_V1", "閭︽捣鏅鸿兘鍑哄叆搴撴帶鍒跺櫒鍗忚"),
TCP_BEIBO_GRAIN_V1("TCP_BEIBO_GRAIN_V1", "璐濆崥绮儏鍒嗘満鏈嶅姟绔崗璁�"),
+ TCP_ES_DLT645_V1("TCP_ES_DLT645_V1", "DL/T 645澶氬姛鑳界數琛ㄥ崗璁�"),
FZZY_OPENAPI_HTTP("FZZY_OPENAPI_HTTP", "椋庢鑷磋繙API-HTTP鍗忚"),
- TCP_MODBUS("TCP_MODBUS", "Modbus-TCP鍗忚");
+ TCP_MODBUS("TCP_MODBUS", "Modbus-TCP鍗忚"),
+ TCP_SHYB_LED_BX06("TCP_SHYB_LED_BX06", "涓婃捣浠伴偊LED-BX06鍗忚");
private String code;
diff --git a/igds-core/src/main/java/com/ld/igds/io/impl/NotifyGrainInvokerImpl.java b/igds-core/src/main/java/com/ld/igds/io/impl/NotifyGrainInvokerImpl.java
index d1e6b01..d983a89 100644
--- a/igds-core/src/main/java/com/ld/igds/io/impl/NotifyGrainInvokerImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/io/impl/NotifyGrainInvokerImpl.java
@@ -154,6 +154,9 @@
// 浠庣紦瀛樹腑鑾峰彇褰撳墠鐨勫娓╁害澶栭儴婀垮害
private Grain addWeatherInfo(Grain grain) {
+ if(grain.getHumidityOut() != null && grain.getTempOut() != null){
+ return grain;
+ }
WeatherInfo weatherInfo = weatherService.getCacheWeather(grain.getCompanyId());
Double tOut = -100.0, hOut = -100.0;
if (null != weatherInfo) {
diff --git a/igds-core/src/main/java/com/ld/igds/m/ManageUtil.java b/igds-core/src/main/java/com/ld/igds/m/ManageUtil.java
index 043199d..fc76448 100644
--- a/igds-core/src/main/java/com/ld/igds/m/ManageUtil.java
+++ b/igds-core/src/main/java/com/ld/igds/m/ManageUtil.java
@@ -17,8 +17,8 @@
*
* @param checkType
*/
- public static String createQualityId(String checkType) {
- return "ZJ_" + checkType + DateFormatUtils.format(new Date(), "yyyyMMddHHmmss");
+ public static String createQualityId(String checkType, Date jcsj) {
+ return "ZJ_" + checkType + DateFormatUtils.format(jcsj, "yyyyMMddHHmmss");
}
}
diff --git a/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml b/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
index 3359796..647835a 100644
--- a/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
@@ -46,17 +46,6 @@
</Property>
<Property name="label">绮绛夌骇</Property>
</PropertyDef>
- <PropertyDef name="foodType">
- <Property name="label">绮鎬ц川</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="foodLocation">
- <Property name="label">绮浜у湴</Property>
- </PropertyDef>
<PropertyDef name="type">
<Property name="label">妫�楠岀被鍒�</Property>
<Property name="mapping">
@@ -81,29 +70,34 @@
<PropertyDef name="time">
<Property name="label">妫�楠屾椂闂�</Property>
<Property name="dataType">Date</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="result">
<Property name="label">妫�楠岀粨璁�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="checkArea">
<Property name="label">鎵︽牱鍖哄煙</Property>
</PropertyDef>
<PropertyDef name="checkUser">
<Property name="label">鎵︽牱浜�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="ypsl">
<Property name="label">鏍峰搧鏁伴噺</Property>
<Property name="dataType">Double</Property>
<Property name="displayFormat">0.## KG</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="checkTime">
<Property name="label">鎵︽牱鏃堕棿</Property>
<Property name="dataType">Date</Property>
</PropertyDef>
<PropertyDef name="dbsl">
- <Property name="label">鏍峰搧浠ｈ〃鏁伴噺</Property>
+ <Property name="label">浠ｈ〃鏁伴噺</Property>
<Property name="dataType">Double</Property>
<Property name="displayFormat">0.## KG</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="ypdj">
<Property name="label">鏍峰搧绛夌骇</Property>
@@ -112,6 +106,7 @@
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="normalYear">
<Property name="label">姝ｅ父瀛樺偍骞撮檺</Property>
@@ -142,10 +137,12 @@
<PropertyDef name="unit">
<Property></Property>
<Property name="label">妫�楠屽崟浣�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="zblb">
<Property></Property>
<Property name="label">鎸囨爣绫诲埆</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="qfrq">
<Property name="dataType">Date</Property>
@@ -158,6 +155,7 @@
<PropertyDef name="shrxm">
<Property></Property>
<Property name="label">瀹℃牳浜哄鍚�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="qydbh">
<Property></Property>
@@ -174,6 +172,10 @@
<PropertyDef name="updateTime">
<Property name="dataType">Date</Property>
<Property name="label">鏁版嵁鏇存柊鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="spaqzbsfhg">
+ <Property></Property>
+ <Property name="label">椋熷搧鏄惁鍚堟牸</Property>
</PropertyDef>
<Reference name="checkItems">
<Property name="dataProvider">checkStandardPR#listCheckItemsByParam</Property>
@@ -804,33 +806,6 @@
<Property name="property">ypdj</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
- <Property name="name">normalYear</Property>
- <Property name="property">normalYear</Property>
- <Editor>
- <RadioGroup>
- <RadioButton>
- <Property name="text">鍚�</Property>
- <Property name="value">0</Property>
- </RadioButton>
- <RadioButton>
- <Property name="text">鏄�</Property>
- <Property name="value">1</Property>
- </RadioButton>
- </RadioGroup>
- </Editor>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">zblb</Property>
- <Property name="property">zblb</Property>
- <Editor>
- <TagEditor>
- <Property name="textSeperator">#</Property>
- <Property name="availableTagsDataSet">dsMetrics</Property>
- <Property name="availableTagsDataPath">.name</Property>
- </TagEditor>
- </Editor>
- </AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:1">
<Property name="name">result</Property>
<Property name="property">result</Property>
@@ -848,6 +823,48 @@
<Property name="color">blue</Property>
</Property>
</Label>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">zblb</Property>
+ <Property name="property">zblb</Property>
+ <Editor>
+ <TagEditor>
+ <Property name="textSeperator">#</Property>
+ <Property name="availableTagsDataSet">dsMetrics</Property>
+ <Property name="availableTagsDataPath">.name</Property>
+ </TagEditor>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">normalYear</Property>
+ <Property name="property">normalYear</Property>
+ <Editor>
+ <RadioGroup>
+ <RadioButton>
+ <Property name="text">鍚�</Property>
+ <Property name="value">0</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="text">鏄�</Property>
+ <Property name="value">1</Property>
+ </RadioButton>
+ </RadioGroup>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qydbh</Property>
+ <Property name="property">qydbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ypbh</Property>
+ <Property name="property">ypbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">spaqzbsfhg</Property>
+ <Property name="property">spaqzbsfhg</Property>
+ <Editor/>
+ </AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">remark</Property>
<Property name="property">remark</Property>
diff --git a/igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java b/igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java
index 9b7272b..63588b7 100644
--- a/igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java
+++ b/igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java
@@ -118,7 +118,7 @@
public void saveQuality(MQuality data) {
String id = "";
if (StringUtils.isEmpty(data.getId())) {
- id = ManageUtil.createQualityId(data.getType());
+ id = ManageUtil.createQualityId(data.getType(), data.getTime());
}
qualityManageService.saveQuality(id, data);
diff --git a/igds-core/src/main/java/com/ld/igds/models/Building.java b/igds-core/src/main/java/com/ld/igds/models/Building.java
index a46af0b..5680532 100644
--- a/igds-core/src/main/java/com/ld/igds/models/Building.java
+++ b/igds-core/src/main/java/com/ld/igds/models/Building.java
@@ -72,6 +72,10 @@
@PropertyDef(label = "绛掍粨浣撶Н", description = "鍗曚綅锛氱珛鏂圭背")
private Double volume;
+ @Column(name = "DE_VOLUME_", precision = 16, scale = 2)
+ @PropertyDef(label = "鎵ｉ櫎浣撶Н", description = "鍗曚綅锛氱珛鏂圭背")
+ private Double deVolume;
+
@Column(name = "DOOR_NUM_")
@PropertyDef(label = "浠撻棬鏁�")
private Integer doorNum;
diff --git a/igds-core/src/main/java/com/ld/igds/models/Depot.java b/igds-core/src/main/java/com/ld/igds/models/Depot.java
index 3467c9b..9d9041a 100644
--- a/igds-core/src/main/java/com/ld/igds/models/Depot.java
+++ b/igds-core/src/main/java/com/ld/igds/models/Depot.java
@@ -135,6 +135,10 @@
@PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
private Date updateTime;
+ @Column(name = "BH_ID_", length = 50)
+ @PropertyDef(label = "閭︽捣绮儏鍒嗘満浠撳簱缂栫爜")
+ private String bhId;
+
// ------------鍏朵粬灞炴�т俊鎭�------------//
@Transient
@PropertyDef(label = "绮鍝佺")
diff --git a/igds-core/src/main/java/com/ld/igds/models/DepotBookStore.java b/igds-core/src/main/java/com/ld/igds/models/DepotBookStore.java
new file mode 100644
index 0000000..ff2ecaf
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/models/DepotBookStore.java
@@ -0,0 +1,87 @@
+package com.ld.igds.models;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author: YYC
+ * @Description:璐﹂潰搴撳瓨
+ * @DateTime: 2023/10/20 14:07
+ *
+ * 鎸変粨搴撹繘琛岀粺璁★紝姣忎釜鏈堜綆缁熻涓�娆�(鍥犱笂娴峰競璐﹂潰搴撳瓨鎺ュ彛涓烘寜璐т綅缁熻)
+ **/
+@Data
+@Entity
+@Table(name = "D_DEPOT_BOOK_STORE")
+public class DepotBookStore implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -5548540780391804729L;
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 20)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String deptId;
+
+ @Column(name = "DEPOT_ID_", length = 30)
+ @PropertyDef(label = "浠撳簱缂栫爜")
+ private String depotId;
+
+ @Column(name = "lspzdm", length = 7)
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ private String lspzdm;
+
+ @Column(name = "nd", length = 4)
+ @PropertyDef(label = "骞村害")
+ private String nd;
+
+ @Column(name = "yf", length = 2)
+ @PropertyDef(label = "鏈堜唤")
+ private String yf;
+
+ @Column(name = "qcsl", precision = 20, scale = 3)
+ @PropertyDef(label = "鏈熷垵鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
+ private Double qcsl = 0.0;
+
+ @Column(name = "bqsrsl", precision = 20, scale = 3)
+ @PropertyDef(label = "鏈湡鏀跺叆鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
+ private Double bqsrsl = 0.0;
+
+ @Column(name = "bqzcsl", precision = 20, scale = 3)
+ @PropertyDef(label = "鏈湡鏀嚭鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
+ private Double bqzcsl = 0.0;
+
+ @Column(name = "qmye", precision = 20, scale = 3)
+ @PropertyDef(label = "鏈熸湯鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
+ private Double qmye = 0.0;
+
+ @Column(name = "yjbz")
+ @PropertyDef(label = "鏈堢粨鏍囧織", description = "0锛氭湀缁擄紱1 鏈湀缁�")
+ private Integer yjbz;
+
+ @Column(name = "ywrq")
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "涓氬姟鏃ユ湡")
+ private Date ywrq;
+
+ @Column(name = "zhgxsj")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date zhgxsj;
+
+}
diff --git a/igds-core/src/main/java/com/ld/igds/models/DepotConf.java b/igds-core/src/main/java/com/ld/igds/models/DepotConf.java
index 18e7618..4839449 100644
--- a/igds-core/src/main/java/com/ld/igds/models/DepotConf.java
+++ b/igds-core/src/main/java/com/ld/igds/models/DepotConf.java
@@ -48,7 +48,7 @@
private String gasSer;
@Column(name = "PEST_SER_", length = 40)
- @PropertyDef(label = "姘斾綋鍒嗘満")
+ @PropertyDef(label = "铏鍒嗘満")
private String pestSer;
@Column(name = "VERB_SER_", length = 40)
diff --git a/igds-core/src/main/java/com/ld/igds/models/DepotStore.java b/igds-core/src/main/java/com/ld/igds/models/DepotStore.java
index 79f4529..1478a45 100644
--- a/igds-core/src/main/java/com/ld/igds/models/DepotStore.java
+++ b/igds-core/src/main/java/com/ld/igds/models/DepotStore.java
@@ -119,6 +119,10 @@
@PropertyDef(label = "淇敼浜�")
private String updateUser;
+ @PropertyDef(label = "绮潈褰掑睘鍗曚綅浠ｇ爜")
+ @Column(name = "lqgsdwdm", length = 18)
+ private String lqgsdwdm;
+
@Column(name = "UPDATE_DATE_")
@PropertyDef(label = "淇敼鏃堕棿")
diff --git a/igds-core/src/main/java/com/ld/igds/models/FoodBrand.java b/igds-core/src/main/java/com/ld/igds/models/FoodBrand.java
new file mode 100644
index 0000000..7580c26
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/models/FoodBrand.java
@@ -0,0 +1,61 @@
+package com.ld.igds.models;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Desc: 鍓鍝佺墝淇℃伅
+ * @author: czt
+ * @update-time: 2023/09/14
+ */
+@Data
+@Entity
+@Table(name = "D_FOOD_BRAND")
+public class FoodBrand implements Serializable {
+
+ private static final long serialVersionUID = 9157617424050247565L;
+
+ @Id
+ @PropertyDef(label = "鍔犲伐浼佷笟缂栧彿")
+ @Column(name = "jljgqybh", length = 28)
+ private String jljgqybh;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @PropertyDef(label = "鍔犲伐浼佷笟鍚嶇О")
+ @Column(name = "jljgqymc", length = 100)
+ private String jljgqymc;
+
+ @PropertyDef(label = "鍐涚伯鍝佺墝鍚嶇О")
+ @Column(name = "jlppmc", length = 25)
+ private String jlppmc;
+
+ @PropertyDef(label = "鍐涚伯鍝佺墝绠�绉�")
+ @Column(name = "jlppmcjc", length = 50)
+ private String jlppmcjc;
+
+ @PropertyDef(label = "鏄惁鏈夋晥")
+ @Column(name = "sfyx", length = 50)
+ private String sfyx;
+
+ @PropertyDef(label = "澶囨敞")
+ @Column(name = "bz", length = 200)
+ private String bz;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/igds-core/src/main/java/com/ld/igds/models/FoodInfo.java b/igds-core/src/main/java/com/ld/igds/models/FoodInfo.java
new file mode 100644
index 0000000..c7acc08
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/models/FoodInfo.java
@@ -0,0 +1,193 @@
+package com.ld.igds.models;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Desc: 鍓浜у搧淇℃伅
+ * @author: czt
+ * @update-time: 2023/09/14
+ */
+@Data
+@Entity
+@Table(name = "D_FOOD_INFO")
+public class FoodInfo implements Serializable {
+
+ private static final long serialVersionUID = 9157617424050247565L;
+
+ @Id
+ @PropertyDef(label = "浜у搧缂栧彿")
+ @Column(name = "cpbh", length = 28)
+ private String cpbh;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @PropertyDef(label = "鍔犲伐浼佷笟缂栧彿")
+ @Column(name = "jljgqybh", length = 100)
+ private String jljgqybh;
+
+ @PropertyDef(label = "鍝佺墝ID")
+ @Column(name = "jlppid", length = 25)
+ private String jlppid;
+
+ @PropertyDef(label = "鍝佺墝鍚嶇О")
+ @Column(name = "jlppmc", length = 50)
+ private String jlppmc;
+
+ @PropertyDef(label = "鍝佺缂栧彿")
+ @Column(name = "lspzbm", length = 50)
+ private String lspzbm;
+
+ @PropertyDef(label = "浜у搧鍚嶇О")
+ @Column(name = "cpmc", length = 50)
+ private String cpmc;
+
+ @PropertyDef(label = "浜у搧绛夌骇")
+ @Column(name = "pzdj", length = 50)
+ private String pzdj;
+
+ @PropertyDef(label = "璁￠噺鍗曚綅缂栧彿")
+ @Column(name = "jldwbm", length = 50)
+ private String jldwbm;
+
+ @PropertyDef(label = "璁￠噺鍗曚綅鍚嶇О")
+ @Column(name = "jldwmc", length = 50)
+ private String jldwmc;
+
+ @PropertyDef(label = "鍖呰鏂瑰紡缂栫爜")
+ @Column(name = "bzfsbm", length = 50)
+ private String bzfsbm;
+
+ @PropertyDef(label = "鍖呰鏂瑰紡鍚嶇О")
+ @Column(name = "bzfsmc", length = 50)
+ private String bzfsmc;
+
+ @PropertyDef(label = "鍖呰瑙勬牸")
+ @Column(name = "bzgg", length = 50)
+ private String bzgg;
+
+ @PropertyDef(label = "璁℃暟瑙勬牸")
+ @Column(name = "hsgg", length = 50)
+ private String hsgg;
+
+ @PropertyDef(label = "鐢熶骇鍘傚")
+ @Column(name = "sccj", length = 50)
+ private String sccj;
+
+ @PropertyDef(label = "浜у搧绫诲瀷")
+ @Column(name = "cplx", length = 50)
+ private String cplx;
+
+ @PropertyDef(label = "淇濊川鏈�")
+ @Column(name = "bzq")
+ private Date bzq;
+
+ @PropertyDef(label = "浜у湴")
+ @Column(name = "cd", length = 50)
+ private String cd;
+
+ @PropertyDef(label = "鐢熶骇鏃ユ湡")
+ @Column(name = "scrq")
+ private Date scrq;
+
+ @PropertyDef(label = "鑱旂郴浜�")
+ @Column(name = "lxr", length = 50)
+ private String lxr;
+
+ @PropertyDef(label = "鐢佃瘽")
+ @Column(name = "dh", length = 50)
+ private String dh;
+
+ @PropertyDef(label = "浼犵湡")
+ @Column(name = "cz", length = 50)
+ private String cz;
+
+ @PropertyDef(label = "閭")
+ @Column(name = "email", length = 50)
+ private String email;
+
+ @PropertyDef(label = "QQ")
+ @Column(name = "qq", length = 50)
+ private String qq;
+
+ @PropertyDef(label = "浼佷笟姒傚喌")
+ @Column(name = "qygk", length = 50)
+ private String qygk;
+
+ @PropertyDef(label = "浜у搧浠嬬粛")
+ @Column(name = "cpjs", length = 50)
+ private String cpjs;
+
+ @PropertyDef(label = "钀ヤ笟鎵х収")
+ @Column(name = "yyzz", length = 50)
+ private String yyzz;
+
+ @PropertyDef(label = "缁勭粐鏈烘瀯浠ｇ爜璇�")
+ @Column(name = "zzjgdmz", length = 50)
+ private String zzjgdmz;
+
+ @PropertyDef(label = "绋庡姟鐧昏璇�")
+ @Column(name = "swdjz", length = 50)
+ private String swdjz;
+
+ @PropertyDef(label = "椋熷搧娴侀�氳鍙瘉")
+ @Column(name = "spltxkz", length = 50)
+ private String spltxkz;
+
+ @PropertyDef(label = "涓�鑸撼绋庝汉璧勬牸璇佹槑")
+ @Column(name = "ybnsrzgz", length = 50)
+ private String ybnsrzgz;
+
+ @PropertyDef(label = "甯傚啗渚涗腑蹇冨鏍告剰瑙�")
+ @Column(name = "sjgzx", length = 50)
+ private String sjgzx;
+
+ @PropertyDef(label = "鍐涚伯鏈嶅姟鏈夐檺鍏徃瀹℃牳鎰忚")
+ @Column(name = "jlfwgs", length = 50)
+ private String jlfwgs;
+
+ @PropertyDef(label = "鐪佸啗渚涗腑蹇冩剰瑙�")
+ @Column(name = "sjgzxyj", length = 50)
+ private String sjgzxyj;
+
+ @PropertyDef(label = "鍗曚环")
+ @Column(name = "dj", length = 50)
+ private String dj;
+
+ @PropertyDef(label = "鐢熶骇璁稿彲璇佸彿")
+ @Column(name = "scxkz", length = 50)
+ private String scxkz;
+
+ @PropertyDef(label = "鍔犲伐宸ヨ壓")
+ @Column(name = "jggy", length = 50)
+ private String jggy;
+
+ @PropertyDef(label = "璐ㄩ噺淇℃伅")
+ @Column(name = "zlxx", length = 50)
+ private String zlxx;
+
+ @PropertyDef(label = "钀ュ吇淇℃伅")
+ @Column(name = "yyxx", length = 50)
+ private String yyxx;
+
+ @PropertyDef(label = "澶囨敞")
+ @Column(name = "bz", length = 200)
+ private String bz;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/igds-core/src/main/java/com/ld/igds/models/InteGrain5328.java b/igds-core/src/main/java/com/ld/igds/models/InteGrain5328.java
new file mode 100644
index 0000000..f5d8c4e
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/models/InteGrain5328.java
@@ -0,0 +1,98 @@
+
+package com.ld.igds.models;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @Desc: 骞胯タ鏉ュ
+ * @author: czt
+ * @update-time: 2023/10/19
+ */
+@Data
+@Entity
+@Table(name = "INTE_GRAIN_5328")
+public class InteGrain5328 implements Serializable {
+
+
+ private static final long serialVersionUID = 1L;
+ @Id
+ @Column(name = "UUID_", length = 40)
+ @PropertyDef(label = "UUID")
+ private String uuid;
+
+ @Column(name = "BATCH_ID_", length = 40)
+ @PropertyDef(label = "鎵规")
+ private String batchId;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜", description = "")
+ private String companyId;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "鎵�灞炰粨搴�", description = "浠撳簱缂栧彿")
+ private String depotId;
+
+ @Column(name = "DEPOT_NAME_", length = 40)
+ @PropertyDef(label = "鎵�灞炰粨搴撳悕绉�", description = "浠撳簱缂栧彿鍚嶇О")
+ private String depotName;
+
+ @Column(name = "RECEIVE_DATE_")
+ @PropertyDef(label = "鎺ユ敹鏃堕棿", description = "")
+ private Date receiveDate;
+
+ @Column(name = "HUMIDITY_IN_")
+ @PropertyDef(label = "浠撳唴婀垮害", description = "")
+ private Double humidityIn;
+
+ @Column(name = "TEMP_IN_")
+ @PropertyDef(label = "浠撳唴娓╁害", description = "")
+ private Double tempIn;
+
+ @Column(name = "HUMIDITY_OUT_")
+ @PropertyDef(label = "浠撳婀垮害", description = "")
+ private Double humidityOut;
+
+ @Column(name = "TEMP_OUT_")
+ @PropertyDef(label = "浠撳娓╁害", description = "")
+ private Double tempOut;
+
+ @Column(name = "TEMP_LIST_", length = 5000)
+ @PropertyDef(label = "娓╁害鍒楄〃 鐢�,闅斿紑姣忎釜鐐�", description = "")
+ private String tempList;
+
+ @Column(name = "CABLE_", length = 20)
+ @PropertyDef(label = "甯冪嚎瑙勫垯")
+ private String cable;
+
+ @Column(name = "CABLE_CIR_", length = 20)
+ @PropertyDef(label = "甯冪嚎瑙勫垯")
+ private String cableCir;
+
+ @Column(name = "CHECK_USER_", length = 30)
+ @PropertyDef(label = "妫�娴嬩汉")
+ private String checkUser;
+
+ @Column(name = "REMARK_", length = 100)
+ @PropertyDef(label = "妫�娴嬭鏄�")
+ private String remark;
+
+ @Column(name = "WEATHER_", length = 10)
+ @PropertyDef(label = "澶╂皵")
+ private String weather;
+
+
+ public InteGrain5328() {
+ }
+
+
+}
+
diff --git a/igds-core/src/main/java/com/ld/igds/models/InteGrain5332.java b/igds-core/src/main/java/com/ld/igds/models/InteGrain5332.java
new file mode 100644
index 0000000..a4895c1
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/models/InteGrain5332.java
@@ -0,0 +1,98 @@
+
+package com.ld.igds.models;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @Desc: 姣曡妭澶ф柟瀵瑰鎺ュ彛
+ * @author: czt
+ * @update-time: 2023/10/19
+ */
+@Data
+@Entity
+@Table(name = "INTE_GRAIN_5332")
+public class InteGrain5332 implements Serializable {
+
+
+ private static final long serialVersionUID = 1L;
+ @Id
+ @Column(name = "UUID_", length = 40)
+ @PropertyDef(label = "UUID")
+ private String uuid;
+
+ @Column(name = "BATCH_ID_", length = 40)
+ @PropertyDef(label = "鎵规")
+ private String batchId;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜", description = "")
+ private String companyId;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "鎵�灞炰粨搴�", description = "浠撳簱缂栧彿")
+ private String depotId;
+
+ @Column(name = "DEPOT_NAME_", length = 40)
+ @PropertyDef(label = "鎵�灞炰粨搴撳悕绉�", description = "浠撳簱缂栧彿鍚嶇О")
+ private String depotName;
+
+ @Column(name = "RECEIVE_DATE_")
+ @PropertyDef(label = "鎺ユ敹鏃堕棿", description = "")
+ private Date receiveDate;
+
+ @Column(name = "HUMIDITY_IN_")
+ @PropertyDef(label = "浠撳唴婀垮害", description = "")
+ private Double humidityIn;
+
+ @Column(name = "TEMP_IN_")
+ @PropertyDef(label = "浠撳唴娓╁害", description = "")
+ private Double tempIn;
+
+ @Column(name = "HUMIDITY_OUT_")
+ @PropertyDef(label = "浠撳婀垮害", description = "")
+ private Double humidityOut;
+
+ @Column(name = "TEMP_OUT_")
+ @PropertyDef(label = "浠撳娓╁害", description = "")
+ private Double tempOut;
+
+ @Column(name = "TEMP_LIST_", length = 5000)
+ @PropertyDef(label = "娓╁害鍒楄〃 鐢�,闅斿紑姣忎釜鐐�", description = "")
+ private String tempList;
+
+ @Column(name = "CABLE_", length = 20)
+ @PropertyDef(label = "甯冪嚎瑙勫垯")
+ private String cable;
+
+ @Column(name = "CABLE_CIR_", length = 20)
+ @PropertyDef(label = "甯冪嚎瑙勫垯")
+ private String cableCir;
+
+ @Column(name = "CHECK_USER_", length = 30)
+ @PropertyDef(label = "妫�娴嬩汉")
+ private String checkUser;
+
+ @Column(name = "REMARK_", length = 100)
+ @PropertyDef(label = "妫�娴嬭鏄�")
+ private String remark;
+
+ @Column(name = "WEATHER_", length = 10)
+ @PropertyDef(label = "澶╂皵")
+ private String weather;
+
+
+ public InteGrain5332() {
+ }
+
+
+}
+
diff --git a/igds-core/src/main/java/com/ld/igds/models/MQuality.java b/igds-core/src/main/java/com/ld/igds/models/MQuality.java
index 6ee6f21..49176be 100644
--- a/igds-core/src/main/java/com/ld/igds/models/MQuality.java
+++ b/igds-core/src/main/java/com/ld/igds/models/MQuality.java
@@ -59,13 +59,13 @@
@PropertyDef(label = "妫�楠屾椂闂�")
private Date time;
- @Column(name = "USER_", length = 50)
- @PropertyDef(label = "妫�楠屼汉", description = "妫�楠屼汉鍛樺鍚嶏紝鑻ユ湁澶氫釜淇濈鍛�")
- private String user;
-
@Column(name = "UNIT_", length = 50)
@PropertyDef(label = "妫�楠屽崟浣�")
private String unit;
+
+ @Column(name = "USER_", length = 50)
+ @PropertyDef(label = "妫�楠屼汉", description = "妫�楠屼汉鍛樺鍚嶏紝鑻ユ湁澶氫釜淇濈鍛�")
+ private String user;
@Column(name = "STANDARD_", length = 4)
@PropertyDef(label = "妫�楠屼緷鎹�", description = "1-鍥芥爣锛�0-鍏朵粬")
@@ -80,6 +80,10 @@
@PropertyDef(label = "妫�楠岀粨璁�", description = "1銆佽川閲忔寚鏍囧～鍐�/杈炬爣/涓嶈揪鏍� 2銆佸偍瀛樺搧璐ㄦ寚鏍囧～鍐欌�滃疁瀛樷�濄�佽交搴︿笉瀹滃瓨鈥濄�佲�滈噸搴︿笉瀹滃瓨鈥�3銆侀鍝佸畨鍏ㄦ寚鏍囧～鍐欌�滃悎鏍尖�濄�佷笉鍚堟牸鈥� 澶氶」鎸囨爣鏃朵互#鍒嗛殧锛屼緥濡傦細杈炬爣|缁煎悎鍒ゅ畾#瀹滃瓨#鍚堟牸 ")
private String result;
+ @Column(name = "spaqzbsfhg", length = 40)
+ @PropertyDef(label = "椋熷搧瀹夊叏鎸囨爣鏄惁鍚堟牸", description = "0-涓嶅悎鏍硷紝1-鍚堟牸")
+ private String spaqzbsfhg;
+
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "绛惧彂鏃ユ湡")
@Column(name = "qfrq")
diff --git a/igds-core/src/main/java/com/ld/igds/models/SecCamera.java b/igds-core/src/main/java/com/ld/igds/models/SecCamera.java
index ea10760..1b49e25 100644
--- a/igds-core/src/main/java/com/ld/igds/models/SecCamera.java
+++ b/igds-core/src/main/java/com/ld/igds/models/SecCamera.java
@@ -3,6 +3,7 @@
import com.bstek.dorado.annotation.PropertyDef;
import com.ld.igds.constant.Constant;
import lombok.Data;
+
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
@@ -42,7 +43,7 @@
@Column(name = "TYPE_", length = 10)
@PropertyDef(label = "璁惧绫诲瀷")
private String type;
-
+
@Column(name = "PLAY_TYPE_", length = 40)
@PropertyDef(label = "鎾斁鏂瑰紡")
private String playType;
@@ -50,6 +51,14 @@
@Column(name = "SNAP_TYPE_", length = 25)
@PropertyDef(label = "鎶撴媿鏂瑰紡")
private String snapType;
+
+ @Column(name = "spjklx", length = 1)
+ @PropertyDef(label = "瑙嗛鐩戞帶绫诲瀷")
+ private String spjklx;
+
+ @Column(name = "spdwlx", length = 2)
+ @PropertyDef(label = "瑙嗛鐐逛綅绫诲瀷")
+ private String spdwlx;
@Column(name = "NAME_", length = 50)
@PropertyDef(label = "鍚嶇О")
@@ -87,16 +96,20 @@
@PropertyDef(label = "娴佸獟浣撳湴鍧�")
private String mediaAddr;
+ @Column(name = "PHONE_ADDR_", length = 100)
+ @PropertyDef(label = "鎵嬫満鐩存挱鍦板潃")
+ private String phoneAddr;
+
@Column(name = "REMARK_", length = 300)
@PropertyDef(label = "澶囨敞")
private String remark;
@PropertyDef(label = "椤甸潰涓殑鍧愭爣")
- @Column(name = "POS_X_",updatable = false)
+ @Column(name = "POS_X_", updatable = false)
private double posX;
@PropertyDef(label = "椤甸潰涓殑鍧愭爣")
- @Column(name = "POS_Y_",updatable = false)
+ @Column(name = "POS_Y_", updatable = false)
private double posY;
@Column(name = "SCREEN_SHOW_", length = 1)
diff --git a/igds-core/src/main/java/com/ld/igds/sys/service/DicTriggerServiceImpl.java b/igds-core/src/main/java/com/ld/igds/sys/service/DicTriggerServiceImpl.java
index 3ebf403..1b3f8b3 100644
--- a/igds-core/src/main/java/com/ld/igds/sys/service/DicTriggerServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/sys/service/DicTriggerServiceImpl.java
@@ -190,12 +190,12 @@
if (null != parameter) {
String str = (String) parameter.get("parentCode");
- if (StringUtils.isNoneEmpty(str)) {
+ if (StringUtils.isNotEmpty(str)) {
hql += " and parentCode =:parentCode ";
args.put("parentCode", str);
}
str = (String) parameter.get("key");
- if (StringUtils.isNoneEmpty(str)) {
+ if (StringUtils.isNotEmpty(str)) {
hql += " and (name like :name or code like:code) ";
args.put("name", "%" + str + "%");
args.put("code", "%" + str + "%");
diff --git a/igds-core/src/main/java/com/ld/igds/util/BytesUtil.java b/igds-core/src/main/java/com/ld/igds/util/BytesUtil.java
index ef8863e..bdd061b 100644
--- a/igds-core/src/main/java/com/ld/igds/util/BytesUtil.java
+++ b/igds-core/src/main/java/com/ld/igds/util/BytesUtil.java
@@ -2,6 +2,8 @@
import java.math.BigInteger;
+import static org.apache.poi.hssf.util.HSSFColor.LIGHT_CORNFLOWER_BLUE.hexString;
+
public class BytesUtil {
public static String byteToHex(byte b) {
@@ -190,6 +192,62 @@
return rsBinStr;
}
+ public static String hexString2binaryString(String hexString, int num) {
+ //16杩涘埗杞�10杩涘埗
+ BigInteger sint = new BigInteger(hexString, num);
+ //10杩涘埗杞�2杩涘埗
+ String str = sint.toString(2);
+ if(str.length() < num){
+ for (int i = str.length(); i < num; i++) {
+ str = "0" + str;
+ }
+ }
+ return str;
+ }
+
+ /**
+ * 浜岃繘鍒惰ˉ鐮侊細鍙栧弽鍙ｅ姞1
+ * @param str
+ * @return
+ */
+ public static Integer twoToString(String str) {
+ String two = "";
+ System.out.println(str);
+ String[] split = str.split("");
+ for (int i = 0;i< split.length;i++){
+ if("1".equals(split[i])){
+ two += "0";
+ }else if("0".equals(split[i])){
+ two += "1";
+ }
+ }
+ System.out.println(two);
+ return biannary2Decimal(two) + 1;
+ }
+
+ /**
+ * 灏嗕簩杩涘埗杞崲涓�10杩涘埗
+ * @param binStr
+ * @return
+ */
+ public static Integer biannary2Decimal(String binStr){
+
+ Integer sum = 0;
+ int len = binStr.length();
+
+ for (int i=1;i<=len;i++){
+ //绗琲浣� 鐨勬暟瀛椾负锛�
+ int dt = Integer.parseInt(binStr.substring(i-1,i));
+ sum+=(int)Math.pow(2,len-i)*dt;
+ }
+ return sum;
+ }
+
+ public static void main(String[] args) {
+ String s = hexString2binaryString("21E9", 16);
+ System.out.println(s);
+ }
+
/**
* 涓嶈冻width涓瓧鑺傚搴︽椂锛屽墠闈㈣ˉ0鑷硍idth*8
*
@@ -362,15 +420,6 @@
nSum = nSum * nValue;
}
return nSum;
- }
-
- public static void main(String[] args) {
-
- String hex = "<END>";
- byte[] attr = hex.getBytes();
-
- hex = bytesToString(attr);
-
}
/**
diff --git a/igds-core/src/main/java/com/ld/igds/util/ContextUtil.java b/igds-core/src/main/java/com/ld/igds/util/ContextUtil.java
index 487a8a9..16819aa 100644
--- a/igds-core/src/main/java/com/ld/igds/util/ContextUtil.java
+++ b/igds-core/src/main/java/com/ld/igds/util/ContextUtil.java
@@ -8,7 +8,7 @@
import com.ld.igds.constant.GrainFrequence;
import com.ld.igds.data.ConfigData;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang3.RandomUtils;
+import org.apache.commons.lang.math.RandomUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import java.util.*;
@@ -52,7 +52,7 @@
}
public static String getTimeId(int random) {
- return DateFormatUtils.format(new Date(), "yyyyMMddHHmmss") + "_" + RandomUtils.nextInt(0, random);
+ return DateFormatUtils.format(new Date(), "yyyyMMddHHmmss") + RandomUtils.nextInt(random);
}
/**
diff --git a/igds-core/src/main/java/com/ld/igds/view/Building.view.xml b/igds-core/src/main/java/com/ld/igds/view/Building.view.xml
index 2a4c0c3..b42c9b7 100644
--- a/igds-core/src/main/java/com/ld/igds/view/Building.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/view/Building.view.xml
@@ -83,6 +83,10 @@
<Property name="property">height</Property>
<Property name="align">center</Property>
</DataColumn>
+ <DataColumn name="diameter">
+ <Property name="property">diameter</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
<DataColumn>
<Property name="property">ground</Property>
<Property name="name">ground</Property>
@@ -226,6 +230,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">deVolume</Property>
+ <Property name="property">deVolume</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">doorNum</Property>
<Property name="property">doorNum</Property>
<Editor/>
diff --git a/igds-core/src/main/java/com/ld/igds/view/Depot.view.xml b/igds-core/src/main/java/com/ld/igds/view/Depot.view.xml
index a015b3c..947023b 100644
--- a/igds-core/src/main/java/com/ld/igds/view/Depot.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/view/Depot.view.xml
@@ -436,11 +436,16 @@
<Property name="trigger">ddFoodOrigin</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:3">
+ <AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">remark</Property>
<Property name="property">remark</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bhId</Property>
+ <Property name="property">bhId</Property>
+ <Editor/>
+ </AutoFormElement>
<Label layoutConstraint="colSpan:3">
<Property name="text">璇存槑锛氬偍澶囩伯璐ㄦ淇℃伅浼氭牴鎹川閲忕鐞� 鑷姩鍚屾鏇存柊</Property>
<Property name="style">
diff --git a/igds-core/src/main/java/com/ld/igds/view/DepotBookStore.view.xml b/igds-core/src/main/java/com/ld/igds/view/DepotBookStore.view.xml
new file mode 100644
index 0000000..a6417dc
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/view/DepotBookStore.view.xml
@@ -0,0 +1,387 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <Property name="creationType">com.ld.igds.models.DepotBookStore</Property>
+ <PropertyDef name="id">
+ <Property></Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property></Property>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="deptId">
+ <Property></Property>
+ <Property name="label">鎵�灞炲垎搴�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="depotId">
+ <Property></Property>
+ <Property name="label">鎵�灞炰粨搴�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="lspzdm">
+ <Property></Property>
+ <Property name="label">绮鍝佺</Property>
+ <Property name="required">true</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="nd">
+ <Property></Property>
+ <Property name="label">骞村害</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="yf">
+ <Property></Property>
+ <Property name="label">鏈堜唤</Property>
+ <Property name="required">true</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="qcsl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鏈熷垵鏁伴噺</Property>
+ <Property name="required">true</Property>
+ <Property name="displayFormat">#,##0 KG</Property>
+ </PropertyDef>
+ <PropertyDef name="bqsrsl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鏈湡鏀跺叆鏁伴噺</Property>
+ <Property name="required">true</Property>
+ <Property name="displayFormat">#,##0 KG</Property>
+ </PropertyDef>
+ <PropertyDef name="bqzcsl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鏈湡鏀嚭鏁伴噺</Property>
+ <Property name="required">true</Property>
+ <Property name="displayFormat">#,##0 KG</Property>
+ </PropertyDef>
+ <PropertyDef name="qmye">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鏈熸湯鏁伴噺</Property>
+ <Property name="required">true</Property>
+ <Property name="displayFormat">#,##0 KG</Property>
+ </PropertyDef>
+ <PropertyDef name="yjbz">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">鏈堢粨鏍囧織</Property>
+ <Property name="required">true</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">0</Property>
+ <Property name="value">鏈堢粨</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">鏈湀缁�</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="ywrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">涓氬姟鏃ユ湡</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="zhgxsj">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtParam">
+ <PropertyDef name="foodVariety">
+ <Property name="label">绮鍝佺</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="year">
+ <Property name="label">骞村害</Property>
+ </PropertyDef>
+ </DataType>
+ </Model>
+ <View layout="padding:5;regionPadding:5">
+ <Property name="packages">font-awesome,css-common</Property>
+ <DataSet id="dsMain">
+ <Property name="dataType">[dtMain]</Property>
+ <Property name="dataProvider">depotBookStorePR#pageList</Property>
+ <Property name="pageSize">15</Property>
+ </DataSet>
+ <DataSet id="dsParam">
+ <ClientEvent name="onReady">self.insert({})
+</ClientEvent>
+ <Property name="dataType">[dtParam]</Property>
+ </DataSet>
+ <Container layout="regionPadding:10" layoutConstraint="top">
+ <Property name="exClassName">bg-color</Property>
+ <Property name="height">55</Property>
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").insert();
+view.get("#dialogMain").show();</ClientEvent>
+ <Property name="exClassName">btn-normal</Property>
+ <Property name="iconClass">fa fa-plus</Property>
+ <Property name="caption">鏂板</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var dialog= view.get("#dsMain.data:#");
+if(dialog){
+ view.get("#dialogMain").show();
+}else{
+ $alert("璇烽�変腑闇�瑕佷慨鏀圭殑鏁版嵁")
+}</ClientEvent>
+ <Property name="caption">缂栬緫</Property>
+ <Property name="exClassName">btn-warm</Property>
+ <Property name="iconClass">fa fa-pencil</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var cur = view.get("#dsMain.data:#");
+if(!cur) return;
+view.get("#ajaxDel").set("parameter",cur).execute(function(result){
+ if(result){
+ $alert(result);
+ return;
+ }else{
+ cur.remove();
+ }
+});</ClientEvent>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-pencil</Property>
+ <Property name="caption">鍒犻櫎</Property>
+ </Button>
+ </Container>
+ <Container>
+ <AutoForm>
+ <Property name="dataSet">dsParam</Property>
+ <Property name="cols">*,*,*,*</Property>
+ <AutoFormElement>
+ <Property name="name">foodVariety</Property>
+ <Property name="property">foodVariety</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">year</Property>
+ <Property name="property">year</Property>
+ <Property name="trigger">defaultYearDropDown</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Container layout="regionPadding:10">
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var param = view.get("#dsParam.data:#");
+view.get("#dsMain").set("parameter",param).flushAsync();</ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="exClassName">btn-normal</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsParam").insert({})</ClientEvent>
+ <Property name="caption">閲嶇疆</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ </Container>
+ </AutoForm>
+ <DataGrid id="dgMain">
+ <ClientEvent name="onDataRowDoubleClick">view.get("#dialogMain").show();</ClientEvent>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="readOnly">true</Property>
+ <RowNumColumn/>
+ <DataColumn name="depotId">
+ <Property name="property">depotId</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="lspzdm">
+ <Property name="property">lspzdm</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="nd">
+ <Property name="property">nd</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="yf">
+ <Property name="property">yf</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="qcsl">
+ <Property name="property">qcsl</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="bqsrsl">
+ <Property name="property">bqsrsl</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="bqzcsl">
+ <Property name="property">bqzcsl</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="qmye">
+ <Property name="property">qmye</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="yjbz">
+ <Property name="property">yjbz</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="zhgxsj">
+ <Property name="property">zhgxsj</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
+ <ToolBar layoutConstraint="bottom">
+ <Fill/>
+ <DataPilot>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="itemCodes">pageSize,pages</Property>
+ </DataPilot>
+ </ToolBar>
+ </Container>
+ <Dialog id="dialogMain">
+ <Property name="caption">搴撳瓨淇℃伅</Property>
+ <Property name="width">800</Property>
+ <Property name="closeable">false</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+view.get("#uaAction").execute(function(result){
+ if(result){
+ $alert(result);
+ }else{
+ self.get("parent").hide();
+ }
+});</ClientEvent>
+ <Property name="caption">淇濆瓨</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ <Property name="exClassName">btn-normal</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">view.get("#dsMain.data:#").cancel();
+self.get("parent").hide();</ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ <Property name="exClassName">btn-warn</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="readOnly">false</Property>
+ <Property name="labelSeparator"> : </Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="cols">*,*</Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lspzdm</Property>
+ <Property name="property">lspzdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">nd</Property>
+ <Property name="property">nd</Property>
+ <Property name="trigger">defaultYearDropDown</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yf</Property>
+ <Property name="property">yf</Property>
+ <Property name="trigger">monthDropDown1</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qcsl</Property>
+ <Property name="property">qcsl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bqsrsl</Property>
+ <Property name="property">bqsrsl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bqzcsl</Property>
+ <Property name="property">bqzcsl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qmye</Property>
+ <Property name="property">qmye</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yjbz</Property>
+ <Property name="property">yjbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ywrq</Property>
+ <Property name="property">ywrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zhgxsj</Property>
+ <Property name="property">zhgxsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <UpdateAction id="uaAction">
+ <Property name="successMessage">鎵ц鎴愬姛!</Property>
+ <Property name="dataResolver">depotBookStorePR#saveData</Property>
+ <UpdateItem>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">[#current]</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxDel">
+ <Property name="confirmMessage">纭畾瑕佸垹闄ゅ悧锛�</Property>
+ <Property name="service">depotBookStorePR#delData</Property>
+ </AjaxAction>
+ <MonthDropDown id="monthDropDown1">
+ <ClientEvent name="onClose">var date = arg.selectedValue+1;
+if(date<10){
+ arg.selectedValue="0"+date
+}else if(date>=10){
+ arg.selectedValue=date
+}
+</ClientEvent>
+ </MonthDropDown>
+ </View>
+</ViewConfig>
diff --git a/igds-core/src/main/java/com/ld/igds/view/DepotBookStorePR.java b/igds-core/src/main/java/com/ld/igds/view/DepotBookStorePR.java
new file mode 100644
index 0000000..6738f03
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/view/DepotBookStorePR.java
@@ -0,0 +1,56 @@
+package com.ld.igds.view;
+
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.bstek.dorado.data.provider.Page;
+import com.ld.igds.models.DepotBookStore;
+import com.ld.igds.view.service.HDepotBookStoreService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @Author: YYC
+ * @Description:
+ * @DateTime: 2023/10/20 18:37
+ **/
+@Component
+public class DepotBookStorePR {
+ @Autowired
+ private HDepotBookStoreService bookStoreService;
+
+ /**
+ * depotBookStorePR#pageList
+ *
+ * @param page
+ * @param param
+ * @throws Exception
+ */
+ @DataProvider
+ public void pageList(Page<DepotBookStore> page, Map<String, Object> param) throws Exception {
+ bookStoreService.listBookStore(page, param);
+ }
+
+ /**
+ * depotBookStorePR#saveData
+ *
+ * @param data
+ */
+ @DataResolver
+ public void saveData(DepotBookStore data) {
+ bookStoreService.saveData(data);
+ }
+
+ /**
+ * depotBookStorePR#delData
+ *
+ * @param data
+ */
+ @Expose
+ public void delData(DepotBookStore data) {
+ bookStoreService.delData(data);
+ }
+
+}
diff --git a/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml b/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml
index 6b30a9d..591ede9 100644
--- a/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml
@@ -152,6 +152,7 @@
<Property name="labelAlign">right</Property>
<Property name="cols">*,*</Property>
<Property name="labelWidth">120</Property>
+ <Property name="height">85%</Property>
<AutoFormElement>
<Property name="name">depotId</Property>
<Property name="property">depotId</Property>
@@ -187,16 +188,15 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">lqgsdwdm</Property>
+ <Property name="property">lqgsdwdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">manageType</Property>
<Property name="property">manageType</Property>
<Editor/>
</AutoFormElement>
- <Label>
- <Property name="style">
- <Property name="color">red</Property>
- <Property name="font-size">12px</Property>
- </Property>
- </Label>
<AutoFormElement>
<Property name="name">foodYear</Property>
<Property name="property">foodYear</Property>
diff --git a/igds-core/src/main/java/com/ld/igds/view/FoodBrand.view.xml b/igds-core/src/main/java/com/ld/igds/view/FoodBrand.view.xml
new file mode 100644
index 0000000..52b90dd
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/view/FoodBrand.view.xml
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <Property name="creationType">com.ld.igds.models.FoodBrand</Property>
+ <PropertyDef name="jljgqybh">
+ <Property></Property>
+ <Property name="label">鍔犲伐浼佷笟缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property></Property>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="deptId">
+ <Property></Property>
+ <Property name="label">鎵�灞炲垎搴�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="jljgqymc">
+ <Property></Property>
+ <Property name="label">鍔犲伐浼佷笟鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="jlppmc">
+ <Property name="label">鍐涚伯鍝佺墝鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="jlppmcjc">
+ <Property name="label">鍐涚伯鍝佺墝绠�绉�</Property>
+ </PropertyDef>
+ <PropertyDef name="sfyx">
+ <Property name="label">鏄惁鏈夋晥</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="code">鏄�</Property>
+ <Property name="name">鏄�</Property>
+ </Entity>
+ <Entity>
+ <Property name="code">鍚�</Property>
+ <Property name="name">鍚�</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="bz">
+ <Property></Property>
+ <Property name="label">澶囨敞</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鏁版嵁鏇存柊鏃堕棿</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtParam">
+ <PropertyDef name="jljgqymc">
+ <Property name="label">浼佷笟鍚嶇О</Property>
+ </PropertyDef>
+ </DataType>
+ </Model>
+ <View layout="regionPadding:10">
+ <ClientEvent name="onReady">view.get("#dsParam").insert({});</ClientEvent>
+ <Property name="packages">font-awesome,css-common</Property>
+ <DataSet id="dsMain">
+ <Property name="dataProvider">foodPR#pageFoodBrand</Property>
+ <Property name="dataType">[dtMain]</Property>
+ <Property name="pageSize">15</Property>
+ </DataSet>
+ <DataSet id="dsParam">
+ <Property name="dataType">dtParam</Property>
+ </DataSet>
+ <Container layout="regionPadding:10" layoutConstraint="top">
+ <Property name="exClassName">bg-color</Property>
+ <Property name="height">55</Property>
+ <Property name="contentOverflow">hidden</Property>
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").insert();
+view.get("#dialogMain").show();</ClientEvent>
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn-normal</Property>
+ <Property name="iconClass">fa fa-plus</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var dialog= view.get("#dialogMain");
+dialog.show();</ClientEvent>
+ <Property name="caption">缂栬緫</Property>
+ <Property name="exClassName">btn-warm</Property>
+ <Property name="iconClass">fa fa-pencil</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var cur = view.get("#dsMain.data:#");
+if(!cur) return;
+view.get("#ajaxDel").set("parameter",cur).execute(function(result){
+ if(result){
+ $alert(result);
+ return;
+ }else{
+ cur.remove();
+ }
+});</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-trash-o</Property>
+ </Button>
+ </Container>
+ <Container layout="regionPadding:10" layoutConstraint="center">
+ <Property name="exClassName">bg-color</Property>
+ <AutoForm>
+ <Property name="dataSet">dsParam</Property>
+ <Property name="cols">*,*,*,*</Property>
+ <AutoFormElement>
+ <Property name="name">jljgqymc</Property>
+ <Property name="property">jljgqymc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Container layout="regionPadding:10">
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var param = view.get("#dsParam.data");
+view.get("#dsMain").set("parameter",param).flushAsync();</ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="exClassName">btn-normal</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsParam").flushAsync();</ClientEvent>
+ <Property name="caption">閲嶇疆</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ </Container>
+ </AutoForm>
+ <DataGrid id="dgMain">
+ <ClientEvent name="onDataRowDoubleClick">var dialog= view.get("#dialogMain");
+dialog.show();</ClientEvent>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="readOnly">true</Property>
+ <RowNumColumn/>
+ <DataColumn name="jljgqybh">
+ <Property name="property">jljgqybh</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="jljgqymc">
+ <Property name="property">jljgqymc</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="jlppmc">
+ <Property name="property">jlppmc</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="jlppmcjc">
+ <Property name="property">jlppmcjc</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="sfyx">
+ <Property name="property">sfyx</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="bz">
+ <Property name="property">bz</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="updateTime">
+ <Property name="property">updateTime</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Container layoutConstraint="bottom">
+ <Property name="exClassName">bg-color</Property>
+ <DataPilot layoutConstraint="right">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="itemCodes">pageSize,pages</Property>
+ </DataPilot>
+ </Container>
+ <Dialog id="dialogMain">
+ <Property name="closeable">false</Property>
+ <Property name="caption">鍓鍝佺墝淇℃伅</Property>
+ <Property name="width">60%</Property>
+ <Property name="iconClass">fa fa-tasks</Property>
+ <Buttons>
+ <Button id="btnOk">
+ <ClientEvent name="onClick">view.get("#uaSave").execute(function(result){
+ if(result){
+ $alert(result);
+ }else{
+ $notify("淇濆瓨鎴愬姛锛侊紒");
+ view.get("#dialogMain").hide();
+ }
+});</ClientEvent>
+ <Property name="caption">纭畾</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">view.get("#dsMain.data:#").cancel();
+self.get("parent").hide();</ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelWidth">150</Property>
+ <AutoFormElement>
+ <Property name="name">jljgqybh</Property>
+ <Property name="property">jljgqybh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jljgqymc</Property>
+ <Property name="property">jljgqymc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jlppmc</Property>
+ <Property name="property">jlppmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jlppmcjc</Property>
+ <Property name="property">jlppmcjc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfyx</Property>
+ <Property name="property">sfyx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bz</Property>
+ <Property name="property">bz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <UpdateAction id="uaSave">
+ <Property name="dataResolver">foodPR#saveFoodBrand</Property>
+ <Property name="successMessage">鏁版嵁淇濆瓨瀹屾垚锛�</Property>
+ <UpdateItem>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="validateData">false</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxDel">
+ <Property name="service">foodPR#delFoodBrand</Property>
+ <Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property>
+ </AjaxAction>
+ </View>
+</ViewConfig>
diff --git a/igds-core/src/main/java/com/ld/igds/view/FoodInfo.view.xml b/igds-core/src/main/java/com/ld/igds/view/FoodInfo.view.xml
new file mode 100644
index 0000000..70f5837
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/view/FoodInfo.view.xml
@@ -0,0 +1,477 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <Property name="creationType">com.ld.igds.models.FoodInfo</Property>
+ <PropertyDef name="cpbh">
+ <Property></Property>
+ <Property name="label">浜у搧缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property></Property>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="deptId">
+ <Property></Property>
+ <Property name="label">鎵�灞炲垎搴�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="jljgqybh">
+ <Property></Property>
+ <Property name="label">鍔犲伐浼佷笟缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="jlppid">
+ <Property name="label">鍝佺墝ID</Property>
+ </PropertyDef>
+ <PropertyDef name="jlppmc">
+ <Property name="label">鍝佺墝鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="lspzbm">
+ <Property name="label">鍝佺鍚嶇О</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="cpmc">
+ <Property name="label">浜у搧鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="pzdj">
+ <Property name="label">浜у搧绛夌骇</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#triggerFoodLevel").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="jldwbm">
+ <Property name="label">璁￠噺鍗曚綅缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="jldwmc">
+ <Property name="label">璁￠噺鍗曚綅鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="bzfsbm">
+ <Property name="label">鍖呰鏂瑰紡缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="bzfsmc">
+ <Property></Property>
+ <Property name="label">鍖呰鏂瑰紡鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="bzgg">
+ <Property></Property>
+ <Property name="label">鍖呰瑙勬牸</Property>
+ </PropertyDef>
+ <PropertyDef name="hsgg">
+ <Property></Property>
+ <Property name="label">璁℃暟瑙勬牸</Property>
+ </PropertyDef>
+ <PropertyDef name="sccj">
+ <Property></Property>
+ <Property name="label">鐢熶骇鍘傚</Property>
+ </PropertyDef>
+ <PropertyDef name="cplx">
+ <Property></Property>
+ <Property name="label">浜у搧绫诲瀷</Property>
+ </PropertyDef>
+ <PropertyDef name="bzq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">淇濊川鏈�</Property>
+ </PropertyDef>
+ <PropertyDef name="cd">
+ <Property></Property>
+ <Property name="label">浜у湴</Property>
+ </PropertyDef>
+ <PropertyDef name="scrq">
+ <Property></Property>
+ <Property name="label">鐢熶骇鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="lxr">
+ <Property></Property>
+ <Property name="label">鑱旂郴浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="dh">
+ <Property></Property>
+ <Property name="label">鐢佃瘽</Property>
+ </PropertyDef>
+ <PropertyDef name="cz">
+ <Property></Property>
+ <Property name="label">浼犵湡</Property>
+ </PropertyDef>
+ <PropertyDef name="email">
+ <Property></Property>
+ <Property name="label">閭</Property>
+ </PropertyDef>
+ <PropertyDef name="qq">
+ <Property></Property>
+ <Property name="label">QQ</Property>
+ </PropertyDef>
+ <PropertyDef name="qygk">
+ <Property></Property>
+ <Property name="label">浼佷笟姒傚喌</Property>
+ </PropertyDef>
+ <PropertyDef name="cpjs">
+ <Property></Property>
+ <Property name="label">浜у搧浠嬬粛</Property>
+ </PropertyDef>
+ <PropertyDef name="dj">
+ <Property></Property>
+ <Property name="label">鍗曚环</Property>
+ </PropertyDef>
+ <PropertyDef name="jggy">
+ <Property></Property>
+ <Property name="label">鍔犲伐宸ヨ壓</Property>
+ </PropertyDef>
+ <PropertyDef name="zlxx">
+ <Property></Property>
+ <Property name="label">璐ㄩ噺淇℃伅</Property>
+ </PropertyDef>
+ <PropertyDef name="yyxx">
+ <Property></Property>
+ <Property name="label">钀ュ吇淇℃伅</Property>
+ </PropertyDef>
+ <PropertyDef name="bz">
+ <Property></Property>
+ <Property name="label">澶囨敞</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鏁版嵁鏇存柊鏃堕棿</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtParam">
+ <PropertyDef name="cpmc">
+ <Property name="label">浜у搧鍚嶇О</Property>
+ </PropertyDef>
+ </DataType>
+ </Model>
+ <View layout="regionPadding:10">
+ <ClientEvent name="onReady">view.get("#dsParam").insert({});</ClientEvent>
+ <Property name="packages">font-awesome,css-common</Property>
+ <DataSet id="dsMain">
+ <Property name="dataProvider">foodPR#pageFoodInfo</Property>
+ <Property name="dataType">[dtMain]</Property>
+ <Property name="pageSize">15</Property>
+ </DataSet>
+ <DataSet id="dsParam">
+ <Property name="dataType">dtParam</Property>
+ </DataSet>
+ <Container layout="regionPadding:10" layoutConstraint="top">
+ <Property name="exClassName">bg-color</Property>
+ <Property name="height">55</Property>
+ <Property name="contentOverflow">hidden</Property>
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").insert();
+view.get("#dialogMain").show();</ClientEvent>
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn-normal</Property>
+ <Property name="iconClass">fa fa-plus</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var dialog= view.get("#dialogMain");
+dialog.show();</ClientEvent>
+ <Property name="caption">缂栬緫</Property>
+ <Property name="exClassName">btn-warm</Property>
+ <Property name="iconClass">fa fa-pencil</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var cur = view.get("#dsMain.data:#");
+if(!cur) return;
+view.get("#ajaxDel").set("parameter",cur).execute(function(result){
+ if(result){
+ $alert(result);
+ return;
+ }else{
+ cur.remove();
+ }
+});</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-trash-o</Property>
+ </Button>
+ </Container>
+ <Container layout="regionPadding:10" layoutConstraint="center">
+ <Property name="exClassName">bg-color</Property>
+ <AutoForm>
+ <Property name="dataSet">dsParam</Property>
+ <Property name="cols">*,*,*,*</Property>
+ <AutoFormElement>
+ <Property name="name">cpmc</Property>
+ <Property name="property">cpmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Container layout="regionPadding:10">
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var param = view.get("#dsParam.data");
+view.get("#dsMain").set("parameter",param).flushAsync();</ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="exClassName">btn-normal</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsParam").flushAsync();</ClientEvent>
+ <Property name="caption">閲嶇疆</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ </Container>
+ </AutoForm>
+ <DataGrid id="dgMain">
+ <ClientEvent name="onDataRowDoubleClick">var dialog= view.get("#dialogMain");
+dialog.show();</ClientEvent>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="readOnly">true</Property>
+ <RowNumColumn/>
+ <DataColumn name="cpmc">
+ <Property name="property">cpmc</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="pzdj">
+ <Property name="property">pzdj</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="lspzbm">
+ <Property name="property">lspzbm</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="jlppmc">
+ <Property name="property">jlppmc</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="bz">
+ <Property name="property">bz</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="updateTime">
+ <Property name="property">updateTime</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Container layoutConstraint="bottom">
+ <Property name="exClassName">bg-color</Property>
+ <DataPilot layoutConstraint="right">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="itemCodes">pageSize,pages</Property>
+ </DataPilot>
+ </Container>
+ <Dialog id="dialogMain">
+ <Property name="closeable">false</Property>
+ <Property name="caption">鍓浜у搧淇℃伅</Property>
+ <Property name="width">60%</Property>
+ <Property name="iconClass">fa fa-tasks</Property>
+ <Buttons>
+ <Button id="btnOk">
+ <ClientEvent name="onClick">view.get("#uaSave").execute(function(result){
+ if(result){
+ $alert(result);
+ }else{
+ $notify("淇濆瓨鎴愬姛锛侊紒");
+ view.get("#dialogMain").hide();
+ }
+});</ClientEvent>
+ <Property name="caption">纭畾</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">view.get("#dsMain.data:#").cancel();
+self.get("parent").hide();</ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelWidth">150</Property>
+ <AutoFormElement>
+ <Property name="name">cpbh</Property>
+ <Property name="property">cpbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jljgqybh</Property>
+ <Property name="property">jljgqybh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jlppid</Property>
+ <Property name="property">jlppid</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jlppmc</Property>
+ <Property name="property">jlppmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lspzbm</Property>
+ <Property name="property">lspzbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cpmc</Property>
+ <Property name="property">cpmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">pzdj</Property>
+ <Property name="property">pzdj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jldwbm</Property>
+ <Property name="property">jldwbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jldwmc</Property>
+ <Property name="property">jldwmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bzfsbm</Property>
+ <Property name="property">bzfsbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bzfsmc</Property>
+ <Property name="property">bzfsmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bzgg</Property>
+ <Property name="property">bzgg</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">hsgg</Property>
+ <Property name="property">hsgg</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sccj</Property>
+ <Property name="property">sccj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cplx</Property>
+ <Property name="property">cplx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bzq</Property>
+ <Property name="property">bzq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cd</Property>
+ <Property name="property">cd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">scrq</Property>
+ <Property name="property">scrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lxr</Property>
+ <Property name="property">lxr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dh</Property>
+ <Property name="property">dh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cz</Property>
+ <Property name="property">cz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">email</Property>
+ <Property name="property">email</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qq</Property>
+ <Property name="property">qq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qygk</Property>
+ <Property name="property">qygk</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cpjs</Property>
+ <Property name="property">cpjs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dj</Property>
+ <Property name="property">dj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jggy</Property>
+ <Property name="property">jggy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zlxx</Property>
+ <Property name="property">zlxx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yyxx</Property>
+ <Property name="property">yyxx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bz</Property>
+ <Property name="property">bz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <UpdateAction id="uaSave">
+ <Property name="dataResolver">foodPR#saveFoodInfo</Property>
+ <Property name="successMessage">鏁版嵁淇濆瓨瀹屾垚锛�</Property>
+ <UpdateItem>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="validateData">false</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxDel">
+ <Property name="service">foodPR#delFoodInfo</Property>
+ <Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property>
+ </AjaxAction>
+ </View>
+</ViewConfig>
diff --git a/igds-core/src/main/java/com/ld/igds/view/FoodPR.java b/igds-core/src/main/java/com/ld/igds/view/FoodPR.java
new file mode 100644
index 0000000..f151f08
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/view/FoodPR.java
@@ -0,0 +1,91 @@
+package com.ld.igds.view;
+
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.bstek.dorado.data.provider.Page;
+import com.ld.igds.models.FoodBrand;
+import com.ld.igds.models.FoodInfo;
+import com.ld.igds.view.service.HFoodService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.util.Map;
+
+@Component
+public class FoodPR {
+
+ @Autowired
+ private HFoodService foodService;
+
+ /**
+ * foodPR#pageFoodBrand
+ *
+ * @param page
+ * @param param
+ * @throws Exception
+ */
+ @DataProvider
+ public void pageFoodBrand(Page<FoodBrand> page, Map<String, Object> param)
+ throws Exception {
+ foodService.pageFoodBrand(page, param);
+ }
+
+ /**
+ * foodPR#delFoodBrand
+ *
+ * @param data
+ * @throws Exception
+ */
+ @Expose
+ public String delFoodBrand(FoodBrand data) throws Exception {
+ return foodService.delFoodBrand(data);
+ }
+
+ /**
+ * foodPR#saveFoodBrand 鏂板鎴栬�呬慨鏀�
+ *
+ * @param data
+ * @throws Exception
+ */
+ @DataResolver
+ public String saveFoodBrand(FoodBrand data) throws Exception {
+ foodService.saveFoodBrand(data);
+ return "";
+ }
+
+ /**
+ * foodPR#pageFoodInfo
+ *
+ * @param page
+ * @param param
+ * @throws Exception
+ */
+ @DataProvider
+ public void pageFoodInfo(Page<FoodInfo> page, Map<String, Object> param)
+ throws Exception {
+ foodService.pageFoodInfo(page, param);
+ }
+
+ /**
+ * foodPR#delFoodInfo
+ *
+ * @param data
+ * @throws Exception
+ */
+ @Expose
+ public String delFoodInfo(FoodInfo data) throws Exception {
+ return foodService.delFoodInfo(data);
+ }
+
+ /**
+ * foodPR#saveFoodInfo 鏂板鎴栬�呬慨鏀�
+ *
+ * @param data
+ * @throws Exception
+ */
+ @DataResolver
+ public String saveFoodInfo(FoodInfo data) throws Exception {
+ foodService.saveFoodInfo(data);
+ return "";
+ }
+}
diff --git a/igds-core/src/main/java/com/ld/igds/view/GrainOilShop.view.xml b/igds-core/src/main/java/com/ld/igds/view/GrainOilShop.view.xml
index 7728679..614b343 100644
--- a/igds-core/src/main/java/com/ld/igds/view/GrainOilShop.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/view/GrainOilShop.view.xml
@@ -16,6 +16,11 @@
<PropertyDef name="deptId">
<Property></Property>
<Property name="label">鎵�灞炲垎搴�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="lydmc">
<Property></Property>
diff --git a/igds-core/src/main/java/com/ld/igds/view/Granary.view.xml b/igds-core/src/main/java/com/ld/igds/view/Granary.view.xml
index 1e5df6d..74eafb8 100644
--- a/igds-core/src/main/java/com/ld/igds/view/Granary.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/view/Granary.view.xml
@@ -104,14 +104,6 @@
</PropertyDef>
</DataType>
<DataType name="dtParam">
- <PropertyDef name="depotId">
- <Property name="label">鎵�灞炰粨搴�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("buildingPR#getCacheBuilding").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
<PropertyDef name="name">
<Property name="label">寤掗棿鍚嶇О</Property>
</PropertyDef>
@@ -170,11 +162,6 @@
<AutoForm>
<Property name="dataSet">dsParam</Property>
<Property name="cols">*,*,*,*</Property>
- <AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Editor/>
- </AutoFormElement>
<AutoFormElement>
<Property name="name">name</Property>
<Property name="property">name</Property>
diff --git a/igds-core/src/main/java/com/ld/igds/view/GranaryPR.java b/igds-core/src/main/java/com/ld/igds/view/GranaryPR.java
index 81310e9..6dc435d 100644
--- a/igds-core/src/main/java/com/ld/igds/view/GranaryPR.java
+++ b/igds-core/src/main/java/com/ld/igds/view/GranaryPR.java
@@ -5,10 +5,12 @@
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.models.Granary;
+import com.ld.igds.util.ContextUtil;
import com.ld.igds.view.service.HGranaryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -32,6 +34,12 @@
@DataProvider
public void pageGranary(Page<Granary> page, Map<String, Object> param)
throws Exception {
+ if(null == param){
+ param = new HashMap<>();
+ }
+ if(null == param.get("deptId")){
+ param.put("deptId", ContextUtil.subDeptId(null));
+ }
granaryService.pageData(page, param);
}
diff --git a/igds-core/src/main/java/com/ld/igds/view/service/BuildingService.java b/igds-core/src/main/java/com/ld/igds/view/service/BuildingService.java
index 93ec27d..33a9b22 100644
--- a/igds-core/src/main/java/com/ld/igds/view/service/BuildingService.java
+++ b/igds-core/src/main/java/com/ld/igds/view/service/BuildingService.java
@@ -9,7 +9,6 @@
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.bstek.dorado.data.entity.EntityState;
import com.bstek.dorado.data.entity.EntityUtils;
@@ -26,6 +25,8 @@
@Component
public class BuildingService extends HibernateDao {
+ String BEAN_ID = "core.buildingService";
+
@Autowired
private RedisUtil redisUtil;
@@ -34,7 +35,7 @@
String hql = " from " + Building.class.getName()
+ " where companyId=:companyId ";
if (null == parameter) {
- parameter = new HashMap<String, Object>();
+ parameter = new HashMap<>();
}
String companyId = (String) parameter.get("companyId");
@@ -44,7 +45,7 @@
parameter.put("companyId", companyId);
String deptId = (String) parameter.get("deptId");
- if(StringUtils.isNoneEmpty(deptId)){
+ if(StringUtils.isNotEmpty(deptId)){
hql += " and deptId=:deptId ";
parameter.put("deptId", deptId);
}
@@ -111,7 +112,7 @@
}
@SuppressWarnings("unchecked")
- public List<Building> getCacheBuilding(String companyId,String deptId) {
+ public List<Building> getCacheBuilding(String companyId, String deptId) {
if(StringUtils.isEmpty(companyId)){
companyId = ContextUtil.getCompanyId();
}
@@ -127,10 +128,31 @@
}
if(null == deptId) return result;
-
+
return result.stream().filter(item -> item.getDeptId().equals(deptId))
.collect(Collectors.toList());
}
+
+ @SuppressWarnings("unchecked")
+ public Building getCacheBuilding(String companyId, String deptId, String buildingId) {
+ if(StringUtils.isEmpty(companyId)){
+ companyId = ContextUtil.getCompanyId();
+ }
+
+ List<Building> result = getCacheBuilding(companyId, deptId);
+
+ if (null == result) {
+ refreshCache(companyId);
+
+ return null;
+ }
+ for (Building building : result) {
+ if(buildingId.equals(building.getId())){
+ return building;
+ }
+ }
+ return null;
+ }
public void refreshCache(String companyId) {
diff --git a/igds-core/src/main/java/com/ld/igds/view/service/DeviceSerService.java b/igds-core/src/main/java/com/ld/igds/view/service/DeviceSerService.java
index 2442e8f..07caffb 100644
--- a/igds-core/src/main/java/com/ld/igds/view/service/DeviceSerService.java
+++ b/igds-core/src/main/java/com/ld/igds/view/service/DeviceSerService.java
@@ -68,7 +68,7 @@
companyId = ContextUtil.getCompanyId();
String hql = " from " + DeviceSer.class.getName()
- + " where companyId=:companyId order by id + 0";
+ + " where companyId=:companyId order by type,id + 0";
Map<String, Object> param = new HashMap<String, Object>();
param.put("companyId", companyId);
diff --git a/igds-core/src/main/java/com/ld/igds/view/service/HDepotBookStoreService.java b/igds-core/src/main/java/com/ld/igds/view/service/HDepotBookStoreService.java
new file mode 100644
index 0000000..dd0350f
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/view/service/HDepotBookStoreService.java
@@ -0,0 +1,89 @@
+package com.ld.igds.view.service;
+
+import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
+import com.bstek.dorado.data.provider.Page;
+import com.ld.igds.models.DepotBookStore;
+import com.ld.igds.util.ContextUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.Session;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author: YYC
+ * @Description:璐﹂潰搴撳瓨
+ * @DateTime: 2023/10/20 14:56
+ **/
+@Component
+public class HDepotBookStoreService extends HibernateDao {
+
+
+ public void listBookStore(Page<DepotBookStore> page, Map<String, Object> param) throws Exception {
+ StringBuffer hql = new StringBuffer();
+ hql.append(" from " + DepotBookStore.class.getName() + " where companyId =:companyId and deptId =:deptId ");
+ Map<String, Object> args = new HashMap<>();
+ args.put("companyId", ContextUtil.getCompanyId());
+ args.put("deptId", ContextUtil.subDeptId(null));
+
+ if (null != param) {
+ buildHql(hql, param, args);
+ }
+ String count = "select count(*) " + hql.toString();
+ hql.append(" order by zhgxsj desc");
+ this.pagingQuery(page, hql.toString(), count, args);
+
+ }
+
+ public void saveData(DepotBookStore data) {
+ data.setZhgxsj(new Date());
+ Session session = this.getSessionFactory().openSession();
+ try {
+ if (null == data.getId()) {
+ data.setId(ContextUtil.getUUID());
+ data.setDeptId(ContextUtil.subDeptId(null));
+ data.setCompanyId(ContextUtil.getCompanyId());
+ session.save(data);
+ } else {
+ session.update(data);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ session.flush();
+ session.close();
+ }
+ }
+
+
+ public void delData(DepotBookStore data) {
+ Session session = this.getSessionFactory().openSession();
+ try {
+ if (null != data.getId()) {
+ session.delete(data);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ session.flush();
+ session.close();
+ }
+ }
+
+
+ public void buildHql(StringBuffer hql, Map<String, Object> param, Map<String, Object> args) {
+ String str = (String) param.get("foodVariety");
+ if (StringUtils.isNotEmpty(str)) {
+ hql.append(" and lspzdm =:foodVariety");
+ args.put("foodVariety", str);
+ }
+ Integer year = (Integer) param.get("year");
+ if (null != year) {
+ hql.append(" and nd =:year");
+ args.put("year", String.valueOf(year));
+ }
+ }
+}
diff --git a/igds-core/src/main/java/com/ld/igds/view/service/HFoodService.java b/igds-core/src/main/java/com/ld/igds/view/service/HFoodService.java
new file mode 100644
index 0000000..e963ca0
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/view/service/HFoodService.java
@@ -0,0 +1,125 @@
+package com.ld.igds.view.service;
+
+import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
+import com.bstek.dorado.data.provider.Page;
+import com.ld.igds.models.FoodBrand;
+import com.ld.igds.models.FoodInfo;
+import com.ld.igds.util.ContextUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.Session;
+import org.springframework.stereotype.Component;
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class HFoodService extends HibernateDao {
+
+
+ public void pageFoodBrand(Page<FoodBrand> page, Map<String, Object> param)
+ throws Exception {
+ String hql = " from " + FoodBrand.class.getName()
+ + " where companyId=:companyId";
+
+ Map<String, Object> args = new HashMap<String, Object>();
+ args.put("companyId", ContextUtil.getCompanyId());
+
+ if (null != param) {
+
+ String str = (String) param.get("name");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and jljgqymc like:name";
+ args.put("name", "%" + str + "%");
+ }
+
+ }
+
+ String count = "select count(*) " + hql;
+
+ hql += " order by updateTime desc";
+
+ this.pagingQuery(page, hql, count, args);
+
+ }
+
+ public String saveFoodBrand(FoodBrand data) {
+
+ Session session = this.getSessionFactory().openSession();
+ try {
+ if (null == data.getDeptId()) {
+ data.setDeptId(ContextUtil.subDeptId(null));
+ }
+ data.setCompanyId(ContextUtil.getCompanyId());
+ session.saveOrUpdate(data);
+ } finally {
+ session.flush();
+ session.close();
+ }
+ return null;
+ }
+
+ public String delFoodBrand(FoodBrand data) {
+ Session session = this.getSessionFactory().openSession();
+ try {
+ session.delete(data);
+ } finally {
+ session.flush();
+ session.close();
+ }
+ return null;
+ }
+
+ public void pageFoodInfo(Page<FoodInfo> page, Map<String, Object> param)
+ throws Exception {
+ String hql = " from " + FoodInfo.class.getName()
+ + " where companyId=:companyId";
+
+ Map<String, Object> args = new HashMap<String, Object>();
+ args.put("companyId", ContextUtil.getCompanyId());
+
+ if (null != param) {
+
+ String str = (String) param.get("name");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and cpmc like:name";
+ args.put("name", "%" + str + "%");
+ }
+
+ }
+
+ String count = "select count(*) " + hql;
+
+ hql += " order by updateTime desc";
+
+ this.pagingQuery(page, hql, count, args);
+
+ }
+
+ public String saveFoodInfo(FoodInfo data) {
+
+ Session session = this.getSessionFactory().openSession();
+ try {
+ if (null == data.getDeptId()) {
+ data.setDeptId(ContextUtil.subDeptId(null));
+ }
+ data.setCompanyId(ContextUtil.getCompanyId());
+ session.saveOrUpdate(data);
+ } finally {
+ session.flush();
+ session.close();
+ }
+ return null;
+ }
+
+ public String delFoodInfo(FoodInfo data) {
+ Session session = this.getSessionFactory().openSession();
+ try {
+ session.delete(data);
+ } finally {
+ session.flush();
+ session.close();
+ }
+ return null;
+ }
+
+
+}
diff --git a/igds-core/src/main/java/com/ld/igds/view/service/HGrainOilShopService.java b/igds-core/src/main/java/com/ld/igds/view/service/HGrainOilShopService.java
index 03999c5..c01143b 100644
--- a/igds-core/src/main/java/com/ld/igds/view/service/HGrainOilShopService.java
+++ b/igds-core/src/main/java/com/ld/igds/view/service/HGrainOilShopService.java
@@ -22,7 +22,7 @@
public void pageData(Page<GrainOilShop> page, Map<String, Object> param)
throws Exception {
- String hql = " from " + Granary.class.getName()
+ String hql = " from " + GrainOilShop.class.getName()
+ " where companyId=:companyId";
Map<String, Object> args = new HashMap<String, Object>();
diff --git a/igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java b/igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java
index ea68d32..da60f04 100644
--- a/igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java
+++ b/igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java
@@ -7,7 +7,6 @@
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
import org.springframework.stereotype.Component;
-
import java.util.HashMap;
import java.util.Map;
@@ -24,27 +23,29 @@
throws Exception {
String hql = " from " + Granary.class.getName()
+ " where companyId=:companyId";
-
+ if (null == param) {
+ param = new HashMap<>();
+ }
+ String companyId = (String) param.get("companyId");
+ if (StringUtils.isEmpty(companyId)) {
+ companyId = ContextUtil.getCompanyId();
+ }
Map<String, Object> args = new HashMap<String, Object>();
- args.put("companyId", ContextUtil.getCompanyId());
+ args.put("companyId", companyId);
- if (null != param) {
+ String str = (String) param.get("deptId");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and deptId =:deptId";
+ args.put("deptId", str);
+ }
- String str = (String) param.get("depotId");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and cfbh =:depotId";
- args.put("depotId", str);
- }
- str = (String) param.get("name");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and ajmc like:name";
- args.put("name", "%" + str + "%");
- }
-
+ str = (String) param.get("name");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and ajmc like:name";
+ args.put("name", "%" + str + "%");
}
String count = "select count(*) " + hql;
-
hql += " order by updateTime desc";
this.pagingQuery(page, hql, count, args);
diff --git a/igds-core/src/main/java/models/igds.model.xml b/igds-core/src/main/java/models/igds.model.xml
index 8cc3fe8..5115af7 100644
--- a/igds-core/src/main/java/models/igds.model.xml
+++ b/igds-core/src/main/java/models/igds.model.xml
@@ -97,13 +97,18 @@
<Property name="displayFormat">0.00 绫�</Property>
</PropertyDef>
<PropertyDef name="diameter">
- <Property name="label">绛掍粨鐩村緞</Property>
- <Property name="displayFormat">0.00 绫�</Property>
+ <Property name="label">绛掍粨/娌圭綈鐩村緞</Property>
+ <Property name="displayFormat">0.000 绫�</Property>
<Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="volume">
<Property name="label">绛掍粨浣撶Н</Property>
- <Property name="displayFormat">0.00 绔嬫柟绫�</Property>
+ <Property name="displayFormat">0.000 绔嬫柟绫�</Property>
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="deVolume">
+ <Property name="label">鎵ｉ櫎浣撶Н</Property>
+ <Property name="displayFormat">0.000 绔嬫柟绫�</Property>
<Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="doorNum">
@@ -317,6 +322,10 @@
<Property></Property>
<Property name="label">鍥借鐮�</Property>
</PropertyDef>
+ <PropertyDef name="bhId">
+ <Property></Property>
+ <Property name="label">鍒嗘満浠撳簱缂栫爜</Property>
+ </PropertyDef>
</DataType>
<DataType name="dtDepotStore">
<Property name="creationType">com.ld.igds.models.DepotStore</Property>
@@ -498,6 +507,10 @@
</PropertyDef>
<PropertyDef name="createDate">
<Property name="dataType">Date</Property>
+ </PropertyDef>
+ <PropertyDef name="lqgsdwdm">
+ <Property/>
+ <Property name="label">绮潈鍗曚綅浠ｇ爜</Property>
</PropertyDef>
</DataType>
<DataType name="dtDevice">
@@ -954,7 +967,7 @@
</Property>
</PropertyDef>
<PropertyDef name="pestSer">
- <Property/>
+ <Property></Property>
<Property name="label">姘斾綋鍒嗘満</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("deviceSerPR#getAllSerCache").getResult()}</Property>
@@ -963,7 +976,7 @@
</Property>
</PropertyDef>
<PropertyDef name="verbSer">
- <Property/>
+ <Property></Property>
<Property name="label">閫氶鍒嗘満</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("deviceSerPR#getAllSerCache").getResult()}</Property>
diff --git a/igds-core/src/main/resources/mapper/CommonMapper.xml b/igds-core/src/main/resources/mapper/CommonMapper.xml
index a31668c..252a215 100644
--- a/igds-core/src/main/resources/mapper/CommonMapper.xml
+++ b/igds-core/src/main/resources/mapper/CommonMapper.xml
@@ -58,7 +58,8 @@
GRAIN_VOLUME_ as grainVolume,
UPDATE_USER_ as updateUser,
UPDATE_DATE_ as updateDate,
- CREATE_DATE_ as createDate
+ CREATE_DATE_ as createDate,
+ lqgsdwdm as lqgsdwdm
from D_DEPOT_STORE
where DEPOT_ID_ = #{depotId}
ORDER BY CREATE_DATE_ DESC
@@ -89,7 +90,9 @@
REMARK_,
UPDATE_USER_,
UPDATE_DATE_,
- CREATE_DATE_
+ CREATE_DATE_,
+ lqgsdwdm,
+ MANAGE_TYPE_
) values(
#{data.id},
#{data.companyId},
@@ -111,7 +114,9 @@
#{data.remark},
#{data.updateUser},
#{data.updateDate},
- #{data.createDate}
+ #{data.createDate},
+ #{data.lqgsdwdm},
+ #{data.manageType}
)
</insert>
diff --git a/igds-core/src/main/resources/mapper/SecServiceMapper.xml b/igds-core/src/main/resources/mapper/SecServiceMapper.xml
index 54c1ba8..3a18c75 100644
--- a/igds-core/src/main/resources/mapper/SecServiceMapper.xml
+++ b/igds-core/src/main/resources/mapper/SecServiceMapper.xml
@@ -8,23 +8,30 @@
<sql id="DATA_COLUMN">
ID_ as id,
+ SN_ AS sn,
COMPANY_ID_ as companyId,
DEPT_ID_ as deptId,
- NAME_ AS name,
- LOGIN_ID_
- AS loginId,
- PWD_ AS pwd,
- BRAND_ AS brand,
TYPE_ AS type,
PLAY_TYPE_ AS playType,
- SN_ AS sn,
+ SNAP_TYPE_ AS snapType,
+ spjklx AS spjklx,
+ spdwlx AS spdwlx,
+ NAME_ AS name,
+ LOGIN_ID_ AS loginId,
+ PWD_ AS pwd,
IP_IN_ AS ipIn,
PORT_IN_C_ AS portInC,
PORT_IN_V_ AS portInV,
CHAN_NUM_ AS chanNum,
+ BRAND_ AS brand,
MEDIA_ADDR_ AS mediaAddr,
+ PHONE_ADDR_ AS phoneAddr,
+ REMARK_ AS remark,
POS_X_ AS posX,
- POS_Y_ AS posY
+ POS_Y_ AS posY,
+ SCREEN_SHOW_ AS screenShow,
+ SNAP_TAG_ AS snapTag,
+ UPDATE_TIME_ AS updateTime
</sql>
<!-- 鏇存柊璁惧浣嶇疆 -->
diff --git a/igds-databoard/igds-databoard.iml b/igds-databoard/igds-databoard.iml
index d60abcc..814fbf6 100644
--- a/igds-databoard/igds-databoard.iml
+++ b/igds-databoard/igds-databoard.iml
@@ -53,14 +53,14 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-es/igds-es.iml b/igds-es/igds-es.iml
index 294d45e..f7b7fd8 100644
--- a/igds-es/igds-es.iml
+++ b/igds-es/igds-es.iml
@@ -56,14 +56,14 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-es/src/main/java/com/ld/igds/es/service/HEsService.java b/igds-es/src/main/java/com/ld/igds/es/service/HEsService.java
index c96e4fe..90e55c4 100644
--- a/igds-es/src/main/java/com/ld/igds/es/service/HEsService.java
+++ b/igds-es/src/main/java/com/ld/igds/es/service/HEsService.java
@@ -75,7 +75,7 @@
Date end = (Date) param.get("end");
if(null != end){
- start = DateUtil.getNextZero(end);
+ end = DateUtil.getNextZero(end);
hql += " and updateTime <:end ";
args.put("end", end);
}
diff --git a/igds-es/src/main/java/com/ld/igds/es/view/EsData.view.xml b/igds-es/src/main/java/com/ld/igds/es/view/EsData.view.xml
index e5e0152..07c0f92 100644
--- a/igds-es/src/main/java/com/ld/igds/es/view/EsData.view.xml
+++ b/igds-es/src/main/java/com/ld/igds/es/view/EsData.view.xml
@@ -255,11 +255,6 @@
<Property name="property">deviceName</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="updateTime">
- <Property name="property">updateTime</Property>
- <Property name="align">center</Property>
- <Property name="width">130</Property>
- </DataColumn>
<ColumnGroup>
<Property name="caption">涓夌浉鐢靛帇</Property>
<DataColumn name="ua">
@@ -296,21 +291,11 @@
<Property name="caption">C鐩�</Property>
</DataColumn>
</ColumnGroup>
- <DataColumn name="f">
- <Property name="property">f</Property>
- <Property name="align">center</Property>
- <Property name="width">60</Property>
- </DataColumn>
<ColumnGroup>
<Property name="caption">鐢佃兘锛堢數琛ㄥ�硷級</Property>
<DataColumn name="ep">
<Property name="property">ep</Property>
<Property name="caption">鏈夊姛</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="eq">
- <Property name="property">eq</Property>
- <Property name="caption">鏃犲姛</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="es">
@@ -319,10 +304,10 @@
<Property name="caption">鎬荤數鑳�</Property>
</DataColumn>
</ColumnGroup>
- <DataColumn name="esInc">
- <Property name="property">esInc</Property>
+ <DataColumn name="updateTime">
+ <Property name="property">updateTime</Property>
<Property name="align">center</Property>
- <Property name="caption">灏忔椂鐢ㄨ兘</Property>
+ <Property name="width">150</Property>
</DataColumn>
</DataGrid>
</Container>
diff --git a/igds-es/src/main/java/com/ld/igds/timer/EsScheduled.java b/igds-es/src/main/java/com/ld/igds/timer/EsScheduled.java
index 9726084..c641108 100644
--- a/igds-es/src/main/java/com/ld/igds/timer/EsScheduled.java
+++ b/igds-es/src/main/java/com/ld/igds/timer/EsScheduled.java
@@ -53,6 +53,8 @@
doExe(null);
}
+
+
/**
* 澶у睆椤甸潰鑳借�椾俊鎭帹閫侊紝姣忓ぉ鏃╀笂9鐐规洿鏂板苟鎺ㄩ��
*/
diff --git a/igds-inout/igds-inout.iml b/igds-inout/igds-inout.iml
index f954d8e..4f9a56d 100644
--- a/igds-inout/igds-inout.iml
+++ b/igds-inout/igds-inout.iml
@@ -56,14 +56,14 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java b/igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java
index 318f665..f9040d8 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java
@@ -72,6 +72,10 @@
public static String IN_WEIGHT_5308 = "<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type'content='text/html;charset=UTF-8'><title>鍏ュ簱杩囩鍗�</title><style>body{text-align:center;padding:10px}.tit{margin:10px;font-size:24px;font-family:'瀹嬩綋';padding-top:15px;}.div-tit{padding-top:10px}table{width:100%;border-right:1px solid;border-bottom:1px solid;font-size:14px}table td{border-left:1px solid;border-top:1px solid;height:38px}.sp1{width:33%;float:left;padding-bottom:10px}.sp2{width:25%;float:left;text-align:center}</style></head><body><h1 class='tit'>billTitle</h1><div class='div-tit'><span class='sp1'>鐧昏鏃堕棿锛歳egisterTime</span><span class='sp1'>瀹屾垚鏃堕棿锛歝ompleteTime</span><span class='sp1'>鍏ュ簱鍗曞彿锛歴erId</span></div><table cellspacing='0'cellpadding='0'><tr><td width='12.5%'>鍙戣揣鍗曚綅</td><td colspan='3'width='37.5%'>customerName</td><td width='12.5%'>鏀惰揣鍗曚綅</td><td colspan='3'width='37.5%'>deptName</td></tr><tr><td width='12.5%'>鎵胯繍浜�</td><td width='12.5%'>driverName</td><td width='12.5%'>绮鍝佺</td><td width='12.5%'>foodVariety</td><td width='12.5%'>鍏ュ簱浠撳簱</td><td width='12.5%'>depotName</td><td width='12.5%'>绮浜у湴</td><td width='12.5%'>foodLocation</td></tr><tr><td>鎵胯繍杞︾墝</td><td>plateNum</td><td>姣涢噸(KG)</td><td>fullWeight</td><td>鐨噸(KG)</td><td>emptyWeight</td><td>鍑�閲�(KG)</td><td>netWeight</td></tr><tr><td>姘村垎鎵ｉ噺(KG)</td><td>deWet</td><td>鏉傝川鎵ｉ噸(KG)</td><td>deImpurity</td><td>鍊间粨鎵ｉ噸(KG)</td><td>deHandle</td><td>鍏朵粬鎵ｉ噸(KG)</td><td>deOther</td></tr><tr><td>澶囨敞</td><td colspan='3'>remark</td><td>鎬绘墸閲�(KG)</td><td>deSum</td><td>缁撶畻閲嶉噺(KG)</td><td>settleWeight</td></tr></table><div class='div-tit'><span class='sp2'>鍙哥鍛橈細</span><span class='sp2'>鐩戠鍛橈細</span><span class='sp2'>缁撶畻鍛橈細</span><span class='sp2'>棰嗘浜猴細</span></div></body></html>";
/**
+ * 浣涘北甯傜鍩庡尯鍏ュ簱杩囩鍗�
+ */
+ public static String IN_WEIGHT_5329 = "<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type' content='text/html;charset=UTF-8'><title>鍏ュ簱杩囩鍗�</title><style>body {text-align: center;padding: 10px} .tit {margin: 10px;font-size: 24px;font-family: '瀹嬩綋';padding-top: 15px} .div-tit {padding-top: 10px} table {width: 100%;border-right: 1px solid;border-bottom: 1px solid;font-size: 14px} table td {border-left: 1px solid;border-top: 1px solid;height: 38px} .sp1 {width: 50%;float: left;padding-bottom: 10px} .sp2 {width: 50%;float: left;text-align: center}</style></head><body><h1 class='tit'>浣涘北甯傜鍩庡尯绮浜т笟鍥叆搴撶鐮佸崟</h1><div id=\\\"print_main\\\" class='div-tit'><span class='sp1'>瀹屾垚鏃堕棿锛�<a>completeTime</a></span><span class='sp1'>鍗曞彿锛歴erId</span></div><table cellspacing='0' cellpadding='0'><tr><td width='12.5%'>鍙戣揣鍗曚綅</td><td colspan='3' width='37.5%'>customerName</td><td width='12.5%'>鏀惰揣鍗曚綅</td><td colspan='3' `width`='37.5%'>deptName</td></tr><tr><td width='12.5%'>鎵胯繍浜�</td><td width='12.5%'>driverName</td><td width='12.5%'>绮鍝佺</td><td width='12.5%'>foodVariety</td><td width='12.5%'>瑁呭嵏浠撳簱</td><td width='12.5%'>depotName</td><td width='12.5%'>绮浜у湴</td><td width='12.5%'>foodLocation</td></tr><tr><td>鎵胯繍杞︾墝</td><td>plateNum</td><td>姣涢噸(KG)</td><td>fullWeight</td><td>鐨噸(KG)</td><td>emptyWeight</td><td>鍑�閲�(KG)</td><td>netWeight</td></tr><tr><td>璐ㄦ缁撴灉</td><td>checkStatus</td><td>鍖呰鎵ｉ噸(KG)</td><td>dePackage</td><td>鍏ュ簱閲嶉噺(KG)</td><td>recordWeight</td><td>缁撶畻閲嶉噺(KG)</td><td>settleWeight</td></tr><tr><td>鐧昏鏃堕棿</td><td colspan=\"3\">registerTime</td><td>瀹屾垚鏃堕棿</td><td colspan=\"3\">completeTime</td></tr><tr><td>澶囨敞</td><td colspan='7'>remark</td></tr></table><div class='div-tit'><span class='sp2'>鍙哥鍛橈細</span></span><span class='sp2'>鎵胯繍浜猴細</span></div></br><div style=\"padding-top: 10px\"><span></span></div><div style=\"text-align: left;font-size: 12px\"><span>娉細</span></div><div style=\"text-align: left;font-size: 12px\"><span>1.鍑�閲�=姣涢噸-鐨噸锛涜川妫�澧炴墸閲嶆牴鎹川妫�璇︾粏濉啓锛�</span></div><div style=\"text-align: left;font-size: 12px\"><span>2.鍏ュ簱閲嶉噺=鍑�閲�-鎵ｉ噸锛涚粨绠楅噸閲�=鍏ュ簱閲嶉噺+璐ㄦ澧為噸锛�</span></div><div style=\"text-align: left;font-size: 12px\"><span>3.鐧借仈锛堝瓨鏍癸級锛岀孩鑱旓紙璁拌处锛夛紝榛勮仈锛堝鎴蜂繚鐣欙級</span></div></body></html>";
+ /**
* 鏈濋槼鍌ㄥ搴撳叆搴撴墦鍗板崟
*/
public static String IN_WEIGHT_5317 = "<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type'content='text/html;charset=UTF-8'><title>鍏ュ簱杩囩鍗�</title><style>body{text-align:center;padding:10px}.tit{margin:10px;font-size:24px;font-family:'瀹嬩綋';padding-top:15px}.div-tit{padding-top:10px}table{width:100%;border-right:1px solid;border-bottom:1px solid;font-size:14px}table td{border-left:1px solid;border-top:1px solid;height:38px}.sp1{width:33%;float:left;padding-bottom:10px}.sp2{width:33%;float:left;text-align:center}</style></head><body><h1 class='tit'>billTitle</h1><div class='div-tit'><span class='sp1'>鐧昏鏃堕棿锛歳egisterTime</span><span class='sp1'>瀹屾垚鏃堕棿锛歝ompleteTime</span><span class='sp1'>鍗曞彿锛歴erId</span></div><table cellspacing='0'cellpadding='0'><tr><td>鍙戣揣鍗曚綅</td><td>customerName</td><td colspan='2'>鏀惰揣鍗曚綅</td><td>deptName</td></tr><tr><td>绮鍝佺</td><td>foodVariety</td><td colspan='2'>瑁呭嵏浠撳簱</td><td>depotName</td></tr><tr><td width='12.5%'>绮浜у湴</td><td width='37.5%'>foodLocation</td><td rowspan=\"5\"width='3.75%'style=\"writing-mode: tb;\">鎵胯繍浜轰俊鎭�</td><td width='8.75%'>鍙告満濮撳悕</td><td width='37.5%'>driverName</td></tr><tr><td>姣涢噸(KG)</td><td>fullWeight</td><td>杞﹁埞鍙�</td><td>plateNum</td></tr><tr><td>鐨噸(KG)</td><td>emptyWeight</td><td>韬唤璇佸彿</td><td>userNumberId</td></tr><tr><td>鍑�閲�(KG)</td><td>netWeight</td><td>鑱旂郴鐢佃瘽</td><td>userContact</td></tr><tr><td>缁撶畻閲嶉噺(KG)</td><td>settleWeight</td><td>浣忓潃</td><td>userAddress</td></tr><tr><td>澶囨敞</td><td colspan='6'>remark</td></tr></table><div class='div-tit'><span class='sp2'>鍙哥鍛橈細</span><span class='sp2'>淇濈鍛橈細</span><span class='sp2'>鎵胯繍浜猴細</span></div></body></html>";
@@ -150,7 +154,7 @@
* 涓规１鍑哄簱绉伴噸鍗�
*/
- public static String OUT_WEIGHT_5012 = "<html xmlns:o=\"urn:schemas-microsoft-com:office:office\"\n" +
+ public static String OUT_WEIGHT_5012 = "<html xmlns:o=\"urn:schemas-microsoft-com:office:office\"\n" +
"xmlns:x=\"urn:schemas-microsoft-com:office:excel\"\n" +
"xmlns=\"http://www.w3.org/TR/REC-html40\">\n" +
"\n" +
@@ -628,7 +632,7 @@
/**
* 涓规１鍏ュ簱绉伴噸鍗�
*/
- public static String IN_WEIGHT_5012 = "<html xmlns:o=\"urn:schemas-microsoft-com:office:office\"\n" +
+ public static String IN_WEIGHT_5012 = "<html xmlns:o=\"urn:schemas-microsoft-com:office:office\"\n" +
"xmlns:x=\"urn:schemas-microsoft-com:office:excel\"\n" +
"xmlns=\"http://www.w3.org/TR/REC-html40\">\n" +
"\n" +
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
index f82095f..6c34071 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
@@ -197,6 +197,10 @@
Constant.TRIGGER_PARENT_FOOD_VARIETY, user.getCompanyId());
view.addObject("listFoodVariety", listFoodVariety);
+ // 绮鎬ц川涓嬫媺妗�
+ List<DicTrigger> listFoodType = inoutCommonManager.getDicTrigger(Constant.TRIGGER_PARENT_FOOD_TYPE, user.getCompanyId());
+ view.addObject("listFoodType", listFoodType);
+
// 绮绛夌骇涓嬫媺妗�
List<DicTrigger> listFoodLevel = inoutCommonManager.getDicTrigger(
Constant.TRIGGER_PARENT_FOOD_LEVEL, user.getCompanyId());
@@ -288,7 +292,7 @@
view.addObject("cardDto", conf);
//绉伴噸椤甸潰鍒濆鍖�
- inoutManager.initInoutWeight(listInoutConf,sort);
+ inoutManager.initInoutWeight(listInoutConf, sort);
view.setViewName("admin/inout/in-weight");
return view;
@@ -696,6 +700,7 @@
/**
* 鏍规嵁璐ㄦ鍗曞彿鑾峰彇鍑哄叆搴撲俊鎭�
+ *
* @param param
* @return
*/
@@ -715,7 +720,7 @@
*/
@RequestMapping("/submit-checkItem")
@Transactional
- public PageResponse<InoutCheckData> submitCheckItem(@RequestBody InoutCheckData data)throws Exception {
+ public PageResponse<InoutCheckData> submitCheckItem(@RequestBody InoutCheckData data) throws Exception {
return inoutManager.submitCheckData(data);
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController2.java b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController2.java
index 956f9d5..302bea3 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController2.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController2.java
@@ -110,6 +110,24 @@
}
/**
+ * 鍑哄叆搴撴祦绋嬩腑鐨勫疄鏃舵暟鎹紝鍊艰幏鍙栨祦绋嬩腑鐨勬暟鎹�
+ *
+ * @param param 鍖呭惈type鍜宒eptId涓や釜鍙傛暟
+ * @return
+ */
+ @RequestMapping("/list-only-progress")
+ public PageResponse<List<InoutData>> listOnlyProgress(@RequestBody InoutParam param) {
+ IUser user = ContextUtil.getLoginUser();
+ if (StringUtils.isEmpty(param.getDeptId())) {
+ param.setDeptId(ContextUtil.subDeptId(user));
+ }
+ if (StringUtils.isEmpty(param.getCompanyId())) {
+ param.setCompanyId(user.getCompanyId());
+ }
+ return inoutManager2.listOnlyProgress(param);
+ }
+
+ /**
* 鍏ュ簱绠�鏄撴搷浣滈〉闈�
*
* @param sort 琛ㄧず浣跨敤鐨勫嚭鍏ュ簱璁惧閰嶅鍙凤紝涓嶄紶閫掗粯璁や负1
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java b/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java
index ca05916..d18dd78 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java
@@ -46,6 +46,8 @@
private String depotId;
//绮鍝佺
private String foodVariety;
+ //绮鍝佺
+ private String foodType;
//璐ㄦ鍗曞彿
private String checkId;
//鍗曚环
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/dto/WeightBill.java b/igds-inout/src/main/java/com/ld/igds/inout/dto/WeightBill.java
index 36894db..b0ccaf7 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/dto/WeightBill.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/dto/WeightBill.java
@@ -65,6 +65,8 @@
private double deCheck = 0.0;
//璐ㄦ澧為噸
private double addCheck = 0.0;
+ //鍖呰鎵ｉ噸
+ private double dePackage = 0.0;
//璐ㄦ缁撴灉
private String checkStatus;
//鍏ュ簱閲嶉噺
@@ -94,6 +96,6 @@
//澶囨敞
private String remark = "";
//淇濈鍛�
- private String handleUser;
+ private String handleUser = "";
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutEventControlManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutEventControlManager.java
index 7732e83..f4e8329 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutEventControlManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutEventControlManager.java
@@ -126,27 +126,7 @@
}
- /**
- * @param param
- * @return
- */
-// public String noticeWeightDone(ApiInoutData param) {
-// //鑾峰彇绉伴噸涓绘帶鍣ㄩ厤缃�
-// InoutConf conf = getWeightGateway(param.getCompanyId(), param.getDeptId(), param.getSort());
-//
-// if (null == conf) {
-// return "绉伴噸涓绘帶鏈厤缃紝鏀寔澶辫触";
-// }
-//
-// ApiInoutData apiData = new ApiInoutData(conf);
-// apiData.setPlateNum(param.getPlateNum());
-// apiData.setTime(new Date());
-//
-// ApiInoutService inoutApiService = apiInoutManager.getApiService(conf.getProtocol());
-//
-// // return inoutApiService.noticeWeightDone(apiData); TODO
-// return null;
-// }
+
/**
* 鍑哄叆搴撴姄鎷�
@@ -276,6 +256,10 @@
req.setPlayType(conf.getPlayType());
req.setSerSn(null == snapSer ? null : snapSer.getSn());
req.setBizId(param.getBizId());
+ //鑻ヤ负鍑哄叆搴撶О閲嶆姄鎷嶏紝鍒欎笉浼犻�掍笟鍔′富閿�傚湪鍑哄叆搴撲笟鍔℃彁浜ゆ椂淇濆瓨鏂囦欢淇℃伅
+ if(InoutConstant.PROGRESS_WEIGHT_TAG.equals(conf.getInoutProgress())){
+ req.setBizId(null);
+ }
req.setCameraName(conf.getName());
req.setMediaAddr(CameraUtil.updateMediaAddr(conf.getMediaAddr(), conf.getLoginId(),
@@ -389,6 +373,24 @@
return null;
}
+ /**
+ * @Desc: 鑾峰彇绉伴噸缃戝叧璁惧
+ * @author: Andy
+ * @update-time: 2022/11/26
+ */
+ public InoutConf getLedConf(String companyId, String deptId, String sort) {
+ if (null == sort) sort = "1";
+ List<InoutConf> list = inoutCommonService.getCacheInoutConf(companyId, deptId);
+ if (null == list || list.isEmpty()) return null;
+
+ for (InoutConf conf : list) {
+ if (InoutConstant.CONF_TYPE_40.equals(conf.getType()) && sort.equals(conf.getSort())) {
+ return conf;
+ }
+ }
+ return null;
+ }
+
/**
* 琚姩鏀跺埌杞︾墝璇嗗埆缁撴灉锛屼簨浠�
@@ -484,6 +486,18 @@
*/
@Async
public void onInoutWeight(InoutData data, String curProgress, String nextProgress) {
+ ApiInoutData apiData;
+ //閫氱煡鍖栭獙灞�
+ //鑾峰彇LED灞忛厤缃俊鎭�
+ InoutConf ledConf = this.getLedConf(data.getCompanyId(), data.getDeptId(), null);
+ if(null != ledConf){
+ apiData = new ApiInoutData(ledConf);
+ apiData.setTime(new Date());
+ apiData.setDeviceCode(InoutApiConstant.DEVICE_CODE_6001);
+ ApiInoutService inoutApiService = apiInoutManager.getApiService(ledConf.getProtocol());
+ inoutApiService.noticeLed(apiData, data);
+ }
+
//鑾峰彇鍦扮鎺у埗鍣�
InoutConf conf = this.getWeightGateway(data.getCompanyId(), data.getDeptId(), null);
if (null == conf) {
@@ -491,7 +505,7 @@
}
//1銆侀�氱煡绉伴噸鏄剧ず灞忥紝璁惧缂栧彿6001
- ApiInoutData apiData = new ApiInoutData(conf);
+ apiData = new ApiInoutData(conf);
apiData.setTime(new Date());
apiData.setDeviceCode(InoutApiConstant.DEVICE_CODE_6001);
ApiInoutService inoutApiService = apiInoutManager.getApiService(conf.getProtocol());
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
index ebba267..f225331 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -114,7 +114,7 @@
result = inoutService.inoutProgressQuery(param);
if (null == result) {
return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
- "绯荤粺涓烘煡璇㈠埌鎵ц涓殑杞﹁締淇℃伅", null);
+ "绯荤粺鏈煡璇㈠埌鎵ц涓殑杞﹁締淇℃伅", null);
}
// 濡傛灉娌℃湁娴佺▼鏉′欢璇存槑涓嶉渶瑕佸仛鍒ゆ柇锛岀洿鎺ヨ繑鍥�
@@ -214,35 +214,6 @@
return data;
}
- private InoutData updateFiles(InoutData data) throws Exception {
- List<FileData> files = data.getFiles();
- if (null == files) {
- return data;
- }
-
- for (FileData fileData : files) {
- fileData.setFileId(ContextUtil.getUUID());
- fileData.setCompanyId(data.getCompanyId());
- fileData.setBizId(data.getId());
- if ("HANDLE".equals(fileData.getBizTag())) {
- if (data.getEmptyWeightTime().before(data.getFullWeightTime())) {
- fileData.setCreateTime(DateUtils.addMinutes(data.getFullWeightTime(), -20));
- } else {
- fileData.setCreateTime(DateUtils.addMinutes(data.getEmptyWeightTime(), -20));
- }
- }
- if ("WEIGHT_EMPTY".equals(fileData.getBizTag())) {
- fileData.setCreateTime(data.getEmptyWeightTime());
- }
- if ("WEIGHT_FULL".equals(fileData.getBizTag())) {
- fileData.setCreateTime(data.getFullWeightTime());
- }
- coreFileService.addRecord(fileData);
- }
-
- return data;
- }
-
/**
* 浠庣紦瀛樹腑鑾峰彇涓嬩竴娴佺▼
*
@@ -285,7 +256,9 @@
}
if (InoutConstant.PROGRESS_CHECK.equals(data.getProgress())) {
- data.setCheckUser(ContextUtil.getLoginUserCName());
+ if (StringUtils.isEmpty(data.getCheckUser())) {
+ data.setCheckUser(ContextUtil.getLoginUserCName());
+ }
data.setProgress(nextProgress);
return data;
}
@@ -426,11 +399,22 @@
}
String loginUser = ContextUtil.getLoginUserCName();
- data.setRegisterUser(loginUser);
- data.setFullWeightUser(loginUser);
- data.setEmptyWeightUser(loginUser);
- data.setHandleUser(loginUser);
- data.setCompleteUser(loginUser);
+ if (StringUtils.isEmpty(data.getRegisterUser())) {
+ data.setRegisterUser(loginUser);
+ }
+ if (StringUtils.isEmpty(data.getFullWeightUser())) {
+ data.setFullWeightUser(loginUser);
+ }
+ if (StringUtils.isEmpty(data.getEmptyWeightUser())) {
+ data.setEmptyWeightUser(loginUser);
+ }
+ if (StringUtils.isEmpty(data.getHandleUser())) {
+ data.setHandleUser(loginUser);
+ }
+ if (StringUtils.isEmpty(data.getCompleteUser())) {
+ data.setCompleteUser(loginUser);
+ }
+
if (null == data.getCompleteTime()) {
data.setCompleteTime(new Date());
}
@@ -443,7 +427,7 @@
if (null == data.getIntelCard()) {
data.setIntelCard(data.getUserId());
}
- if (null != data.getCheckItems()) {
+ if (null != data.getCheckItems() && StringUtils.isEmpty(data.getCheckUser())) {
data.setCheckUser(loginUser);
}
@@ -485,15 +469,14 @@
}
}
-
+ data.setRemarks("");
//鍏堜繚瀛樹富琛紝鍚庢墽琛屽瓙琛�
inoutService.insertData(data);
if (InoutConstant.TYPE_IN.equals(data.getType())) {
this.updateCheckItems(data, true);
}
- this.updateFiles(data);
-
+ fileService.saveInoutFiles(data.getFiles(), data.getCompanyId(), data.getId(), null);
return null;
}
@@ -541,9 +524,9 @@
data = inoutService.inoutQueryById(param);
- if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
- return "娴佺▼缁撴潫鐨勬暟鎹笉鏀寔寮傚父澶勭悊锛�";
- }
+// if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
+// return "娴佺▼缁撴潫鐨勬暟鎹笉鏀寔寮傚父澶勭悊锛�";
+// }
if (InoutConstant.RECORD_STATUS_DEL.equals(data.getRecordStatus())) {
return "褰撳墠淇℃伅宸插仛寮傚父澶勭悊锛屼笉鏀寔閲嶅鎵ц锛�";
}
@@ -644,7 +627,7 @@
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
"鎻愮ず锛氬綋鍓嶅簱鍖烘湭閰嶇疆鍑哄叆搴撴祦绋嬩俊鎭紝璇疯仈绯荤鐞嗗憳", data);
}
-
+ List<FileData> files = data.getFiles();
// 鑾峰彇涓嬩竴涓祦绋嬬姸鎬�
String curProgress = data.getProgress();
String nextProgress = getNextProgress(curProgress, data.getType(),
@@ -658,8 +641,10 @@
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg, data);
}
- // 鎵ц闄勪欢淇℃伅
- fileService.saveInoutFiles(data.getFiles(), data.getCompanyId(), data.getId(), curProgress);
+ if (null != files && files.size() > 0) {
+ // 鎵ц闄勪欢淇℃伅
+ fileService.saveInoutFiles(files, data.getCompanyId(), data.getId(), curProgress);
+ }
//鐧昏瀹屾垚浜嬩欢
inoutEventControl.onInoutRegister(data);
@@ -676,7 +661,7 @@
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
"鎻愮ず锛氬綋鍓嶇郴缁熶腑娴佺▼閰嶇疆寮傚父锛岃鑱旂郴绠＄悊鍛�", data);
}
-
+ List<FileData> files = data.getFiles();
// 鑾峰彇涓嬩竴涓祦绋嬬姸鎬�
String curProgress = data.getProgress();
String nextProgress = getNextProgress(curProgress, data.getType(),
@@ -694,8 +679,10 @@
data);
}
- // 鎵ц闄勪欢淇℃伅
- fileService.saveInoutFiles(data.getFiles(), data.getCompanyId(), data.getId(), curProgress);
+ if (null != files && files.size() > 0) {
+ // 鎵ц闄勪欢淇℃伅
+ fileService.saveInoutFiles(files, data.getCompanyId(), data.getId(), curProgress);
+ }
// 绉伴噸瀹屾垚浜嬩欢
inoutEventControl.onInoutWeight(data, curProgress, nextProgress);
@@ -890,6 +877,7 @@
curData.setCheckTime(new Date());
data.setCheckTime(new Date());
}
+ curData.setCheckUser(data.getCheckUser());
curData.setCheckStatus(data.getCheckStatus());
curData.setFoodYear(data.getFoodYear());
@@ -913,6 +901,7 @@
curData.setCheckItems(data.getCheckItems());
curData.setCheckTime(data.getCheckTime());
curData.setDepotId(data.getDepotId());
+ curData.setFoodType(data.getFoodType());
if (StringUtils.isEmpty(data.getCheckUser())) {
curData.setCheckUser(ContextUtil.getLoginUserCName());
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java
index c90ac15..8a29e9d 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java
@@ -15,6 +15,7 @@
import com.ld.igds.inout.dto.InoutParam;
import com.ld.igds.inout.dto.InoutRecordItemData;
import com.ld.igds.inout.dto.InoutRecordItemParam;
+import com.ld.igds.inout.mapper.InoutRecordMapper;
import com.ld.igds.inout.service.InoutRecordItemService;
import com.ld.igds.inout.service.InoutService;
import com.ld.igds.m.dto.NoticeParam;
@@ -28,6 +29,7 @@
import com.ld.igds.util.DateUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -59,6 +61,8 @@
private InoutCommonService inoutManagerService;
@Resource
private HInoutCarConfService carConfService;
+ @Autowired
+ private InoutRecordMapper inoutMapper;
/**
* 鍑哄叆搴撴祦绋嬩腑鐨勫疄鏃舵暟鎹紝鐩存帴浠庣紦瀛樹腑鑾峰彇
@@ -83,6 +87,26 @@
result.put("listProgress", listProgress);
result.put("listComplete", listComplete);
+ return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц瀹屾垚", result);
+ }
+
+ public PageResponse<List<InoutData>> listOnlyProgress(InoutParam param) {
+
+ String type = param.getType();
+ //褰撳墠娴佺▼涓�
+ List<InoutData> listProgress = inoutService.getListInoutCache(param.getDeptId());
+ List<InoutData> result = new ArrayList<>();
+ if (null == listProgress || listProgress.isEmpty()) {
+ return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц瀹屾垚", result);
+ }
+
+ if (null == type) {
+ return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц瀹屾垚", result);
+ }
+
+ for (InoutData data : listProgress) {
+ if (data.getType().equals(type)) result.add(data);
+ }
return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц瀹屾垚", result);
}
@@ -226,6 +250,9 @@
// 璋冪敤淇濆瓨鏂规硶鎵ц
if (null == data.getIntelCard()) {
data.setIntelCard(data.getUserId());
+ }
+ if (null == data.getRegisterTime()) {
+ data.setRegisterTime(new Date());
}
msg = inoutService.insertData(data);
@@ -475,6 +502,12 @@
if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
//璇存槑娴佺▼宸茬粨鏉燂紝閲嶆柊缁熻鏁伴噺
inoutRecordItemService.updateNumByInoutItem(data.getRecordId());
+ InoutParam param = new InoutParam();
+ param.setId(data.getRecordId());
+ param.setType(data.getType());
+ param.setCompanyId(data.getCompanyId());
+ InoutData completeData = inoutMapper.inoutQueryById(param);
+ inoutService.updateInoutCache(completeData);
return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), null, data);
} else {
@@ -539,7 +572,6 @@
data.setDepotId(item.getDepotId());
}
if (data.getDepotId().equals(item.getDepotId())) {
-
inoutParam.setId(data.getRecordId());
} else {
String newId = data.getRecordId() + temp;
@@ -573,11 +605,15 @@
map.put(inoutParam.getId(), inoutParam);
}
InoutParam par;
+ InoutData dat;
for (String key : map.keySet()) {
par = map.get(key);
if (par != null) {
+ dat = new InoutData();
//鏇存柊娴佹按鏁版嵁(鍖呭惈閲嶉噺淇℃伅浠ュ強娴佺▼杩涘害淇℃伅)
inoutService.toComplete(par);
+ BeanUtils.copyProperties(par, dat);
+ inoutService.updateData(dat);
// //鏇存柊浠撳簱搴撳瓨
// if (InoutConstant.TYPE_IN.equals(par.getType())) {
@@ -591,7 +627,8 @@
// }
}
}
-
+ InoutData completeData = inoutMapper.inoutQueryById(inoutParam);
+ inoutService.updateInoutCache(completeData);
return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), null, data);
}
@@ -644,6 +681,13 @@
if (null == list || list.isEmpty()) {
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "鏌ヨ缁撴灉涓虹┖锛�");
}
+ for (InoutNoticeIn inoutNoticeIn : list) {
+ Depot cacheDepot = coreCommonService.getCacheDepot(inoutNoticeIn.getCompanyId(), inoutNoticeIn.getDepotId());
+ if (null == cacheDepot) {
+ continue;
+ }
+ inoutNoticeIn.setDepotName(cacheDepot.getName());
+ }
return new PageResponse<>(RespCodeEnum.CODE_0000, list);
}
@@ -670,8 +714,8 @@
//鑾峰彇浠撳簱淇℃伅
List<Depot> depotList = coreCommonService.getCacheDepotList(param.getCompanyId(), param.getDeptId());
- Map<String,String> map = new HashMap<>();
- if(depotList != null && depotList.size() > 0){
+ Map<String, String> map = new HashMap<>();
+ if (depotList != null && depotList.size() > 0) {
for (Depot depot : depotList) {
map.put(depot.getId(), depot.getName());
}
@@ -679,7 +723,7 @@
//璧嬪�间粨搴撳悕绉�
for (InoutNoticeOut inoutNoticeOut : list) {
- if(map.get(inoutNoticeOut.getDepotId()) != null){
+ if (map.get(inoutNoticeOut.getDepotId()) != null) {
inoutNoticeOut.setDepotName(map.get(inoutNoticeOut.getDepotId()));
}
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
index 757202e..6ae860d 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
@@ -93,6 +93,10 @@
htmlStr = InoutBill.IN_WEIGHT_5012;
}
+ if ("5329".equals(data.getCompanyId())) {
+ htmlStr = InoutBill.IN_WEIGHT_5329;
+ }
+
htmlStr = htmlStr.replace("billTitle", bill.getBillTitle());
htmlStr = htmlStr.replace("registerTime", bill.getRegisterTime());
@@ -133,6 +137,7 @@
htmlStr = htmlStr.replace("settleWeight",
new DecimalFormat("0").format(bill.getSettleWeight()));
+ htmlStr = htmlStr.replace("dePackage", bill.getDePackage() + "");
htmlStr = htmlStr.replace("deHandle", bill.getDeHandle() + "");
htmlStr = htmlStr.replace("deOther", bill.getDeOther() + "");
htmlStr = htmlStr.replace("price", bill.getPrice());
@@ -241,7 +246,7 @@
htmlStr = htmlStr.replace("settleWeight",
new DecimalFormat("0").format(bill.getSettleWeight()));
htmlStr = htmlStr.replace("deHandle", bill.getDeHandle() + "");
- htmlStr = htmlStr.replace("handleUser", bill.getHandleUser());
+
htmlStr = htmlStr.replace("deSum", bill.getDeSum() + "");
htmlStr = htmlStr.replace("deOther", bill.getDeOther() + "");
htmlStr = htmlStr.replace("price", bill.getPrice());
@@ -249,18 +254,21 @@
htmlStr = htmlStr.replace("wet", bill.getWet() + "");
htmlStr = htmlStr.replace("impurity", bill.getImpurity() + "");
- htmlStr = htmlStr.replace("unitName", bill.getUnitName());
+ htmlStr = htmlStr.replace("unitName", getValue(bill.getUnitName()));
htmlStr = htmlStr.replace("time", bill.getRegisterTime());
htmlStr = htmlStr.replace("handleStart", "");
htmlStr = htmlStr.replace("handleEnd", "");
- htmlStr = htmlStr.replaceAll("weightUser",
- bill.getWeightUser() == null ? "" : bill.getWeightUser());
- htmlStr = htmlStr.replaceAll("handleUser",
- bill.getHandleUser() == null ? "" : bill.getHandleUser());
- htmlStr = htmlStr.replaceAll("keeperName",
- bill.getKeeperUser() == null ? "" : bill.getKeeperUser());
+ htmlStr = htmlStr.replaceAll("weightUser", getValue(bill.getWeightUser()));
+ htmlStr = htmlStr.replace("handleUser", getValue(bill.getHandleUser()));
+ htmlStr = htmlStr.replaceAll("keeperName", getValue(bill.getKeeperUser()));
return htmlStr;
+ }
+
+
+ public String getValue(String value) {
+ if (null == value) return "";
+ return value;
}
/**
@@ -355,14 +363,15 @@
data.setSettleMoney(NumberUtil.keepPrecision(data.getPrice() * data.getRecordWeight(), 2));
}
}
+ bill.setDePackage(data.getDePackage());
bill.setSettleMoney(data.getSettleMoney() == null ? "" : data.getSettleMoney() + "");
bill.setRemark(data.getRemarks() == null ? "" : data.getRemarks());
bill.setDeSum(data.getDeCheck() + data.getDeOther() + data.getDeHandle() + data.getDePackage());
- if(InoutConstant.TYPE_IN.equals(data.getType())){
+ if (InoutConstant.TYPE_IN.equals(data.getType())) {
bill.setWeightUser(data.getFullWeightUser());
}
- if(InoutConstant.TYPE_OUT.equals(data.getType())){
+ if (InoutConstant.TYPE_OUT.equals(data.getType())) {
bill.setWeightUser(data.getEmptyWeightUser());
}
bill.setHandleUser(data.getHandleUser());
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/service/HInoutReportService.java b/igds-inout/src/main/java/com/ld/igds/inout/service/HInoutReportService.java
index 3083052..57eadbb 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/service/HInoutReportService.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/service/HInoutReportService.java
@@ -6,6 +6,7 @@
import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
+
import java.util.*;
@Component
@@ -18,7 +19,7 @@
String hql = " from " + InoutRecord.class.getName()
+ " where companyId=:companyId ";
- Map<String, Object> args = new HashMap<String, Object>();
+ Map<String, Object> args = new HashMap<>();
args.put("companyId", ContextUtil.getCompanyId());
if (null != param) {
@@ -38,20 +39,14 @@
if (StringUtils.isNotEmpty(str)) {
hql += " and type=:type ";
args.put("type", str);
- }
-
- str = (String) param.get("type");
- if (StringUtils.isEmpty(str)) {
+ }else{
hql += " and type <> 'LOSS' and type <> 'OVER'";
- } else {
- hql += " and type=:type ";
- args.put("type", str);
}
- str = (String) param.get("customerId");
+ str = (String) param.get("noticeId");
if (StringUtils.isNotEmpty(str)) {
- hql += " and customerId=:customerId ";
- args.put("customerId", str);
+ hql += " and noticeId=:noticeId ";
+ args.put("noticeId", str);
}
str = (String) param.get("progress");
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
index 2a878c5..2ece18d 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
@@ -317,6 +317,9 @@
if (null == data.getEmptyWeightTime()) {
data.setEmptyWeightTime(new Date());
}
+ if (null == data.getFullWeightTime()) {
+ data.setFullWeightTime(new Date());
+ }
//璋冩暣鏃堕棿宸�
if (InoutConstant.TYPE_IN.equals(data.getType())) {
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
index dd23a2f..9b2fa2e 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
@@ -14,6 +14,7 @@
</PropertyDef>
<PropertyDef name="userId">
<Property name="label">韬唤璇佸彿</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="noticeId">
<Property name="label">閫氱煡鍗曞彿</Property>
@@ -22,6 +23,15 @@
<Property name="dataType">Double</Property>
<Property name="label">绮瀹氫环</Property>
<Property name="required">false</Property>
+ </PropertyDef>
+ <PropertyDef name="foodType">
+ <Property name="label">绮鎬ц川</Property>
+ <Property name="required">true</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property>
+ </Property>
</PropertyDef>
<Reference name="checkItems">
<Property name="parameter">
@@ -608,6 +618,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">foodType</Property>
+ <Property name="property">foodType</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">sampleUser</Property>
<Property name="property">sampleUser</Property>
<Editor/>
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml
index 74a5668..b13381f 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml
@@ -1162,6 +1162,81 @@
<Property name="titleName">鍗曟嵁鍒楄〃</Property>
<Property name="dataScope">currentPage</Property>
</Export2ReportAction>
+ <CustomDropDown id="ddNotice">
+ <Property name="minHeight">400</Property>
+ <Property name="assignmentMap">noticeId=id,customerName=customerName</Property>
+ <Property name="minWidth">1000</Property>
+ <Property name="autoOpen">true</Property>
+ <Container layout="regionPadding:5">
+ <DataSet id="dsNotice">
+ <Property name="dataProvider">inoutNoticePR#queryNoticeByKey</Property>
+ <Property name="parameter">
+ <Entity>
+ <Property name="type">${request.getParameter('type')}</Property>
+ </Entity>
+ </Property>
+ <Property name="dataType">[dtNoticeDto]</Property>
+ </DataSet>
+ <Container layout="hbox regionPadding:5">
+ <TextEditor id="key3">
+ <Property name="blankText"> -- 瀹㈡埛鍚嶇О鎴栫紪鐮� --</Property>
+ <Property name="width">200</Property>
+ </TextEditor>
+ <Button>
+ <ClientEvent name="onClick">var key = view.get("#key3.value");
+var type = "${request.getParameter('type')}";
+view.get("#dsNotice").set("parameter",{key: key,type: type}).flushAsync();</ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var data = view.get("#dsNotice.data:#");
+if(data){
+ view.get("#ddNotice").close(data.toJSON());
+}</ClientEvent>
+ <Property name="iconClass">fa fa-check</Property>
+ <Property name="caption">纭畾</Property>
+ </Button>
+ </Container>
+ <DataGrid>
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsNotice.data:#");
+if(data){
+ view.get("#ddNotice").close(data.toJSON());
+}</ClientEvent>
+ <Property name="dataSet">dsNotice</Property>
+ <Property name="readOnly">true</Property>
+ <DataColumn name="name">
+ <Property name="property">name</Property>
+ <Property name="align">center</Property>
+ <Property name="width">100</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">customerName</Property>
+ <Property name="align">center</Property>
+ <Property name="name">customerName</Property>
+ <Property name="width">240</Property>
+ </DataColumn>
+ <DataColumn name="foodVariety">
+ <Property name="property">foodVariety</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="year">
+ <Property name="property">year</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="depotId">
+ <Property name="property">depotId</Property>
+ <Property name="align">center</Property>
+ <Property name="width">180</Property>
+ </DataColumn>
+ <DataColumn name="contractName">
+ <Property name="property">contractName</Property>
+ <Property name="align">center</Property>
+ <Property name="width">300</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ </CustomDropDown>
<CustomDropDown id="ddDicArea">
<Property name="minHeight">500</Property>
<Property name="minWidth">500</Property>
@@ -1221,60 +1296,6 @@
<DataPilot layoutConstraint="bottom">
<Property name="dataSet">dsDicArea</Property>
</DataPilot>
- </Container>
- </CustomDropDown>
- <CustomDropDown id="ddNotice">
- <Property name="minHeight">400</Property>
- <Property name="assignmentMap">noticeId=id,customerName=customerName</Property>
- <Property name="minWidth">500</Property>
- <Property name="autoOpen">true</Property>
- <Container layout="regionPadding:5">
- <DataSet id="dsNotice">
- <Property name="dataProvider">inoutNoticePR#queryNoticeByKey</Property>
- <Property name="parameter">
- <Entity>
- <Property name="type">${request.getParameter('type')}</Property>
- </Entity>
- </Property>
- <Property name="dataType">[dtNoticeDto]</Property>
- </DataSet>
- <Container layout="hbox regionPadding:5">
- <TextEditor id="key3">
- <Property name="blankText"> -- 瀹㈡埛鍚嶇О鎴栫紪鐮� --</Property>
- <Property name="width">200</Property>
- </TextEditor>
- <Button>
- <ClientEvent name="onClick">var key = view.get("#key3.value");
-var type = "${request.getParameter('type')}";
-view.get("#dsNotice").set("parameter",{key: key,type: type}).flushAsync();</ClientEvent>
- <Property name="caption">鏌ヨ</Property>
- <Property name="iconClass">fa fa-search</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">var data = view.get("#dsNotice.data:#");
-if(data){
- view.get("#ddNotice").close(data.toJSON());
-}</ClientEvent>
- <Property name="iconClass">fa fa-check</Property>
- <Property name="caption">纭畾</Property>
- </Button>
- </Container>
- <DataGrid>
- <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsNotice.data:#");
-if(data){
- view.get("#ddNotice").close(data.toJSON());
-}</ClientEvent>
- <Property name="dataSet">dsNotice</Property>
- <Property name="readOnly">true</Property>
- <DataColumn>
- <Property name="property">customerName</Property>
- <Property name="align">center</Property>
- <Property name="name">customerName</Property>
- </DataColumn>
- <DataColumn name="name">
- <Property name="property">name</Property>
- </DataColumn>
- </DataGrid>
</Container>
</CustomDropDown>
<YearDropDown id="yearDropDown"/>
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDetail.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDetail.view.xml
index 784f6c1..edb1af7 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDetail.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDetail.view.xml
@@ -19,7 +19,7 @@
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
- <PropertyDef name="customerId">
+ <PropertyDef name="noticeId">
<Property></Property>
<Property name="label">鍙戣揣鍗曚綅</Property>
</PropertyDef>
@@ -112,12 +112,6 @@
<Property name="labelWidth">100</Property>
<Property name="labelAlign">right</Property>
<AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Property name="trigger">autoMappingDropDown2</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">type</Property>
<Property name="property">type</Property>
<Editor/>
@@ -125,8 +119,14 @@
<AutoFormElement>
<Property name="name">customerName</Property>
<Property name="property">customerName</Property>
- <Property name="trigger">ddCustomer</Property>
+ <Property name="trigger">ddNotice</Property>
<Property name="editable">false</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Property name="trigger">autoMappingDropDown2</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -375,5 +375,79 @@
</DataGrid>
</Container>
</CustomDropDown>
+ <CustomDropDown id="ddNotice">
+ <ClientEvent name="onOpen">var data = view.get("#dsQuery.data");
+var type = data.get("type");
+if(type){
+ view.get("#dsNotice").set("parameter",{type: type}).flushAsync();
+}else{
+ $alert("璇峰厛閫夋嫨鍑哄叆搴撶被鍨�")
+}
+</ClientEvent>
+ <Property name="minHeight">400</Property>
+ <Property name="assignmentMap">noticeId=id,customerName=customerName</Property>
+ <Property name="minWidth">1000</Property>
+ <Property name="autoOpen">true</Property>
+ <Container layout="regionPadding:5">
+ <DataSet id="dsNotice">
+ <Property name="dataProvider">inoutNoticePR#queryNoticeByKey</Property>
+ <Property name="dataType">[dtNoticeDto]</Property>
+ <Property name="parameter"/>
+ </DataSet>
+ <Container layout="hbox regionPadding:5">
+ <TextEditor id="key3">
+ <Property name="blankText"> -- 瀹㈡埛鍚嶇О鎴栫紪鐮� --</Property>
+ <Property name="width">200</Property>
+ </TextEditor>
+ <Button>
+ <ClientEvent name="onClick">var key = view.get("#key3.value");
+var type = "${request.getParameter('type')}";
+view.get("#dsNotice").set("parameter",{key: key,type: type}).flushAsync();</ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var data = view.get("#dsNotice.data:#");
+if(data){
+ view.get("#ddNotice").close(data.toJSON());
+}</ClientEvent>
+ <Property name="iconClass">fa fa-check</Property>
+ <Property name="caption">纭畾</Property>
+ </Button>
+ </Container>
+ <DataGrid>
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsNotice.data:#");
+if(data){
+ view.get("#ddNotice").close(data.toJSON());
+}</ClientEvent>
+ <Property name="dataSet">dsNotice</Property>
+ <Property name="readOnly">true</Property>
+ <DataColumn name="name">
+ <Property name="property">name</Property>
+ <Property name="align">center</Property>
+ <Property name="width">100</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">customerName</Property>
+ <Property name="align">center</Property>
+ <Property name="name">customerName</Property>
+ <Property name="width">240</Property>
+ </DataColumn>
+ <DataColumn name="foodVariety">
+ <Property name="property">foodVariety</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="year">
+ <Property name="property">year</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="contractName">
+ <Property name="property">contractName</Property>
+ <Property name="align">center</Property>
+ <Property name="width">300</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ </CustomDropDown>
</View>
</ViewConfig>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/InoutManageUtil.java b/igds-inout/src/main/java/com/ld/igds/m/InoutManageUtil.java
index de2ae06..8290f96 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/InoutManageUtil.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/InoutManageUtil.java
@@ -102,9 +102,14 @@
public static String createPlanId(String type, String year, List<InoutPlan> list) {
String index = "001";
if (list != null && list.size() > 0) {
- String[] arr = list.get(0).getId().split("_");
- int temp = Integer.valueOf(arr[2]) + 1;
- index = temp + "";
+ int temp = 0;
+ for (InoutPlan inoutPlan : list) {
+ String[] arr = inoutPlan.getId().split("_");
+ if(Integer.valueOf(arr[2]) > temp){
+ temp = Integer.valueOf(arr[2]);
+ }
+ }
+ index = temp + 1 + "";
}
if (index.length() == 1) {
index = "00" + index;
diff --git a/igds-inout/src/main/java/com/ld/igds/m/dto/NoticeDto.java b/igds-inout/src/main/java/com/ld/igds/m/dto/NoticeDto.java
index c8ee446..2f65d75 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/dto/NoticeDto.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/dto/NoticeDto.java
@@ -71,12 +71,12 @@
/**
* 鐩爣鏁伴噺
*/
- private double targetNumber = 0.0;
+ private Double targetNumber = 0.0;
/**
* 瀹屾垚鏁伴噺
*/
- private double completeNumber = 0.0;
+ private Double completeNumber = 0.0;
/**
* 瀹屾垚鏃堕棿
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HCreditService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HCreditService.java
index b41fa21..849abb7 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HCreditService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HCreditService.java
@@ -37,7 +37,7 @@
args.put("customerName", "%" + str + "%");
}
}
- hql += " order by zhgxsj";
+ hql += " order by updateTime";
return this.query(hql,args);
}
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HInoutCustomerService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HInoutCustomerService.java
index 82a32c9..87ce558 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HInoutCustomerService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HInoutCustomerService.java
@@ -29,25 +29,25 @@
if (null != parameter) {
String str = (String) parameter.get("id");
- if (StringUtils.isNoneEmpty(str)) {
+ if (StringUtils.isNotEmpty(str)) {
hql += " and id like:id";
args.put("id", "%" + str + "%");
}
str = (String) parameter.get("type");
- if (StringUtils.isNoneEmpty(str)) {
+ if (StringUtils.isNotEmpty(str)) {
hql += " and type =:type";
args.put("type", str);
}
str = (String) parameter.get("name");
- if (StringUtils.isNoneEmpty(str)) {
+ if (StringUtils.isNotEmpty(str)) {
hql += " and name like:name";
args.put("name", "%" + str + "%");
}
str = (String) parameter.get("key");
- if (StringUtils.isNoneEmpty(str)) {
+ if (StringUtils.isNotEmpty(str)) {
hql += " and (name like:name or id like:id) ";
args.put("name", "%" + str + "%");
args.put("id", "%" + str + "%");
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HInoutNoticeService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HInoutNoticeService.java
index 21f6ab5..39d1c17 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HInoutNoticeService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HInoutNoticeService.java
@@ -27,23 +27,18 @@
public void pageQueryIn(Page<InoutNoticeIn> page, Map<String, Object> param) throws Exception {
String hql = " from " + InoutNoticeIn.class.getName()
- + " where companyId =:companyId";
+ + " where companyId =:companyId and deptId =:deptId";
Map<String, Object> args = new HashMap<String, Object>();
args.put("companyId", ContextUtil.getCompanyId());
+ args.put("deptId", ContextUtil.subDeptId(null));
Object year = param.get("year");
if (year == null) {
param.put("year", DateFormatUtils.format(new Date(), "yyyy"));
}
- String str = (String) param.get("deptId");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and deptId =:deptId";
- args.put("deptId", str);
- }
-
- str = (String) param.get("id");
+ String str = (String) param.get("id");
if (StringUtils.isNotEmpty(str)) {
hql += " and id=:id";
args.put("id", str);
@@ -86,30 +81,31 @@
public String saveOrUpdateIn(InoutNoticeIn data) {
- //鏂板鍏ュ簱閫氱煡鍗曟椂锛岄渶瑕佽繘琛屽敮涓�鎬у垽鏂�傚嵆淇濊瘉鍗曚綅銆佺伯椋熷搧绉嶃�佸勾浠藉敮涓�锛屼笖涓嶅瓨鍦ㄦ湭瀹屾垚鐘舵�佺殑鍗曞瓙銆�
- if (Constant.YN_Y.equals(data.getTag())) {
- data.setCompanyId(ContextUtil.getCompanyId());
-
- NoticeParam param = new NoticeParam();
- param.setCompanyId(data.getCompanyId());
- param.setDeptId(data.getDeptId());
- param.setCustomerId(data.getCustomerId());
- param.setFoodVariety(data.getFoodVariety());
- param.setYear(data.getYear());
- //鑻ユ湁鍚堝悓淇℃伅锛屾坊鍔犲悎鍚屼俊鎭�
- if (StringUtils.isNotEmpty(data.getContractId())) {
- param.setContractId(data.getContractId());
- }
- //鑻ユ湁璁″垝淇℃伅锛屾坊鍔犺鍒掍俊鎭�
- if (StringUtils.isNotEmpty(data.getPlanId())) {
- param.setPlanId(data.getPlanId());
- }
- param.setCompleteStatus(InoutConstant.COMPLETE_STATUS_NONE);
- Integer integer = inoutManagerService.queryNoticeIn(param);
- if (integer > 0) {
- return "鏂板鐨勫叆搴撻�氱煡鍗曞凡瀛樺湪锛屼笉鑳藉啀娆℃柊澧烇紝璇锋牳鏌ワ紒";
- }
- }
+ //2023-09-02绂佺敤锛屽師鍥狅細鍚屼竴涓敤鎴锋湁澶氫釜鍚堝悓锛屽氨瀵艰嚧鏈夊涓�氱煡鍗�
+// //鏂板鍏ュ簱閫氱煡鍗曟椂锛岄渶瑕佽繘琛屽敮涓�鎬у垽鏂�傚嵆淇濊瘉鍗曚綅銆佺伯椋熷搧绉嶃�佸勾浠藉敮涓�锛屼笖涓嶅瓨鍦ㄦ湭瀹屾垚鐘舵�佺殑鍗曞瓙銆�
+// if (Constant.YN_Y.equals(data.getTag())) {
+// data.setCompanyId(ContextUtil.getCompanyId());
+//
+// NoticeParam param = new NoticeParam();
+// param.setCompanyId(data.getCompanyId());
+// param.setDeptId(data.getDeptId());
+// param.setCustomerId(data.getCustomerId());
+// param.setFoodVariety(data.getFoodVariety());
+// param.setYear(data.getYear());
+// //鑻ユ湁鍚堝悓淇℃伅锛屾坊鍔犲悎鍚屼俊鎭�
+// if (StringUtils.isNotEmpty(data.getContractId())) {
+// param.setContractId(data.getContractId());
+// }
+// //鑻ユ湁璁″垝淇℃伅锛屾坊鍔犺鍒掍俊鎭�
+// if (StringUtils.isNotEmpty(data.getPlanId())) {
+// param.setPlanId(data.getPlanId());
+// }
+// param.setCompleteStatus(InoutConstant.COMPLETE_STATUS_NONE);
+// Integer integer = inoutManagerService.queryNoticeIn(param);
+// if (integer > 0) {
+// return "鏂板鐨勫叆搴撻�氱煡鍗曞凡瀛樺湪锛屼笉鑳藉啀娆℃柊澧烇紝璇锋牳鏌ワ紒";
+// }
+// }
Session session = this.getSessionFactory().openSession();
@@ -143,23 +139,18 @@
public void pageQueryOut(Page<InoutNoticeOut> page, Map<String, Object> param) throws Exception {
String hql = " from " + InoutNoticeOut.class.getName()
- + " where companyId =:companyId";
+ + " where companyId =:companyId and deptId =:deptId";
Map<String, Object> args = new HashMap<String, Object>();
args.put("companyId", ContextUtil.getCompanyId());
+ args.put("deptId", ContextUtil.subDeptId(null));
Object year = param.get("year");
if (year == null) {
param.put("year", DateFormatUtils.format(new Date(), "yyyy"));
}
- String str = (String) param.get("deptId");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and deptId =:deptId";
- args.put("deptId", str);
- }
-
- str = (String) param.get("id");
+ String str = (String) param.get("id");
if (StringUtils.isNotEmpty(str)) {
hql += " and id =:id";
args.put("id", str);
@@ -202,31 +193,32 @@
public String saveOrUpdateOut(InoutNoticeOut data) {
- //鏂板鍑哄簱閫氱煡鍗曟椂锛岄渶瑕佽繘琛屽敮涓�鎬у垽鏂�傚嵆淇濊瘉鍗曚綅銆佷粨搴撱�佺伯椋熷搧绉嶃�佸勾浠藉敮涓�锛屼笖涓嶅瓨鍦ㄦ湭瀹屾垚鐘舵�佺殑鍗曞瓙銆�
- if (Constant.YN_Y.equals(data.getTag())) {
- data.setCompanyId(ContextUtil.getCompanyId());
- NoticeParam param = new NoticeParam();
- param.setCompanyId(data.getCompanyId());
- param.setDeptId(data.getDeptId());
-
- param.setCustomerId(data.getCustomerId());
- param.setDepotId(data.getDepotId());
- param.setFoodVariety(data.getFoodVariety());
- param.setYear(data.getYear());
- //鑻ユ湁鍚堝悓淇℃伅锛屾坊鍔犲悎鍚屼俊鎭�
- if (StringUtils.isNotEmpty(data.getContractId())) {
- param.setContractId(data.getContractId());
- }
- //鑻ユ湁璁″垝淇℃伅锛屾坊鍔犺鍒掍俊鎭�
- if (StringUtils.isNotEmpty(data.getPlanId())) {
- param.setPlanId(data.getPlanId());
- }
- param.setCompleteStatus(InoutConstant.COMPLETE_STATUS_NONE);
- Integer integer = inoutManagerService.queryNoticeOut(param);
- if (integer > 0) {
- return "鏂板鐨勫嚭搴撻�氱煡鍗曞凡瀛樺湪锛屼笉鑳藉啀娆℃柊澧烇紝璇锋牳鏌ワ紒";
- }
- }
+ //2023-09-02 鏆傛椂绂佺敤閫氱煡鍗曞敮涓�鎬у垽鏂紝鍘熷洜锛氬悓涓�涓崟浣嶆湁澶氫釜鍚堝悓锛屽氨鏈夊涓�氱煡鍗�
+// //鏂板鍑哄簱閫氱煡鍗曟椂锛岄渶瑕佽繘琛屽敮涓�鎬у垽鏂�傚嵆淇濊瘉鍗曚綅銆佷粨搴撱�佺伯椋熷搧绉嶃�佸勾浠藉敮涓�锛屼笖涓嶅瓨鍦ㄦ湭瀹屾垚鐘舵�佺殑鍗曞瓙銆�
+// if (Constant.YN_Y.equals(data.getTag())) {
+// data.setCompanyId(ContextUtil.getCompanyId());
+// NoticeParam param = new NoticeParam();
+// param.setCompanyId(data.getCompanyId());
+// param.setDeptId(data.getDeptId());
+//
+// param.setCustomerId(data.getCustomerId());
+// param.setDepotId(data.getDepotId());
+// param.setFoodVariety(data.getFoodVariety());
+// param.setYear(data.getYear());
+// //鑻ユ湁鍚堝悓淇℃伅锛屾坊鍔犲悎鍚屼俊鎭�
+// if (StringUtils.isNotEmpty(data.getContractId())) {
+// param.setContractId(data.getContractId());
+// }
+// //鑻ユ湁璁″垝淇℃伅锛屾坊鍔犺鍒掍俊鎭�
+// if (StringUtils.isNotEmpty(data.getPlanId())) {
+// param.setPlanId(data.getPlanId());
+// }
+// param.setCompleteStatus(InoutConstant.COMPLETE_STATUS_NONE);
+// Integer integer = inoutManagerService.queryNoticeOut(param);
+// if (integer > 0) {
+// return "鏂板鐨勫嚭搴撻�氱煡鍗曞凡瀛樺湪锛屼笉鑳藉啀娆℃柊澧烇紝璇锋牳鏌ワ紒";
+// }
+// }
Session session = this.getSessionFactory().openSession();
try {
@@ -303,7 +295,7 @@
}
str = (String) parameter.get("key");
- if (StringUtils.isNoneEmpty(str)) {
+ if (StringUtils.isNotEmpty(str)) {
hql += " and (name like:name or customerName like:customerName) ";
args.put("name", "%" + str + "%");
args.put("customerName", "%" + str + "%");
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HPlanManageService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HPlanManageService.java
index a72adf1..4bdc6d4 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HPlanManageService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HPlanManageService.java
@@ -179,15 +179,36 @@
public List<InoutPlan> getPlanId(InoutPlan plan) {
String hql = " from " + InoutPlan.class.getName()
- + " where companyId =:companyId and deptId =:deptId and year =:year";
+ + " where companyId =:companyId and year =:year";
Map<String, Object> args = new HashMap<String, Object>();
args.put("companyId", plan.getCompanyId());
- args.put("deptId", plan.getDeptId());
args.put("year", plan.getYear());
hql += " order by createTime desc";
return this.query(hql, args);
}
+
+ public void pagePlanDetail(Page<InoutPlanDetail> page, Map<String, Object> param)
+ throws Exception {
+ String hql = " from " + InoutPlanDetail.class.getName()
+ + " where 1=1 ";
+
+ Map<String, Object> args = new HashMap<String, Object>();
+
+ if (null != param) {
+ String str = (String) param.get("key");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and year like :year ";
+ args.put("year", "%" + str + "%");
+ }
+ }
+
+ String count = "select count(*) " + hql;
+
+ hql += " order by updateTime desc";
+
+ this.pagingQuery(page, hql, count, args);
+ }
}
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml
index 6932e76..9285318 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml
@@ -448,6 +448,8 @@
<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
if(data){
view.get("#dialogMain").show();
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷慨鏀圭殑鏁版嵁锛�");
}</ClientEvent>
<Property name="caption">淇敼</Property>
<Property name="iconClass">fa fa-pencil</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/Credit.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/Credit.view.xml
index 95bd3f6..57bbb25 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/Credit.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/Credit.view.xml
@@ -43,13 +43,13 @@
<Property name="label">璇勫畾骞翠唤</Property>
<Property name="required">false</Property>
</PropertyDef>
- <PropertyDef name="zhgxsj">
- <Property name="dataType">DateTime</Property>
- <Property name="label">鏇存柊鏃堕棿</Property>
- </PropertyDef>
<PropertyDef name="pddw">
<Property></Property>
<Property name="label">璇勫畾鍗曚綅</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鏁版嵁鏇存柊鏃堕棿</Property>
</PropertyDef>
</DataType>
</Model>
@@ -130,10 +130,8 @@
<Property name="align">center</Property>
<Property name="name">pddw</Property>
</DataColumn>
- <DataColumn>
- <Property name="property">zhgxsj</Property>
- <Property name="align">center</Property>
- <Property name="name">zhgxsj</Property>
+ <DataColumn name="updateTime">
+ <Property name="property">updateTime</Property>
</DataColumn>
</DataGrid>
</Container>
@@ -205,8 +203,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">zhgxsj</Property>
- <Property name="property">zhgxsj</Property>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml
index 6a4c300..8361674 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml
@@ -16,17 +16,17 @@
<PropertyDef name="deptId">
<Property></Property>
<Property name="label">鎵�灞炲垎搴�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
<Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="planId">
<Property></Property>
<Property name="label">鎵�灞炶鍒�</Property>
<Property name="required">false</Property>
- <Property name="mapping">
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- <Property name="mapValues">${dorado.getDataProvider("planManagePR#listPlan").getResult()}</Property>
- </Property>
</PropertyDef>
<PropertyDef name="planName">
<Property></Property>
@@ -68,6 +68,15 @@
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
+ <PropertyDef name="depotId">
+ <Property></Property>
+ <Property name="label">瑁呭嵏浠撳簱</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
<PropertyDef name="foodVariety">
<Property></Property>
<Property name="label">绮鍝佺</Property>
@@ -84,13 +93,13 @@
<Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="targetNumber">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="displayFormat">#,##0.00 kG</Property>
<Property name="required">true</Property>
<Property name="label">璁″垝鏁伴噺</Property>
</PropertyDef>
<PropertyDef name="completeNumber">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">瀹屾垚鏁伴噺</Property>
<Property name="displayFormat">#,##0.00 kG</Property>
</PropertyDef>
@@ -176,65 +185,69 @@
</PropertyDef>
</DataType>
<DataType name="dtPlan">
- <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
+ <Property name="creationType">com.ld.igds.models.InoutPlanDetail</Property>
<PropertyDef name="id">
<Property></Property>
+ <Property name="label">璁″垝鏄庣粏鍙�</Property>
+ </PropertyDef>
+ <PropertyDef name="planId">
<Property name="label">璁″垝缂栫爜</Property>
</PropertyDef>
- <PropertyDef name="referenceNumber">
- <Property name="label">璁″垝鏂囧彿</Property>
- </PropertyDef>
- <PropertyDef name="companyId">
+ <PropertyDef name="foodVariety">
<Property></Property>
- <Property name="label">缁勭粐缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="deptId">
- <Property></Property>
- <Property name="label">鎵�灞炲垎搴�</Property>
+ <Property name="label">绮鍝佺</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="type">
- <Property></Property>
- <Property name="label">璁″垝绫诲瀷</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("planManagePR#triggerPlanType").getResult()}</Property>
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
- <PropertyDef name="name">
+ <PropertyDef name="foodType">
<Property></Property>
- <Property name="label">璁″垝鍚嶇О</Property>
- <Property name="required">true</Property>
+ <Property name="label">绮鎬ц川</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="foodLevel">
+ <Property></Property>
+ <Property name="label">绮绛夌骇</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="year">
<Property></Property>
- <Property name="label">骞翠唤</Property>
- <Property name="required">true</Property>
+ <Property name="label">鏀惰幏骞村害</Property>
</PropertyDef>
- <PropertyDef name="beginTime">
- <Property name="dataType">Date</Property>
- <Property name="label">寮�濮嬫椂闂�</Property>
- </PropertyDef>
- <PropertyDef name="endTime">
- <Property name="dataType">Date</Property>
- <Property name="label">鎴鏃堕棿</Property>
- </PropertyDef>
- <PropertyDef name="createUser">
+ <PropertyDef name="depotId">
<Property></Property>
- <Property name="label">鍒涘缓浜�</Property>
+ <Property name="label">浠撳簱</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
- <PropertyDef name="createTime">
- <Property name="dataType">Date</Property>
- <Property name="label">鍒涘缓鏃堕棿</Property>
+ <PropertyDef name="planNum">
+ <Property name="dataType">Double</Property>
+ <Property name="label">璁″垝鏁伴噺</Property>
</PropertyDef>
- <PropertyDef name="remark">
+ <PropertyDef name="type">
+ <Property name="label">璁″垝绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("planManagePR#triggerPlanTurn").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
<Property></Property>
- <Property name="label">澶囨敞璇存槑</Property>
+ <Property name="label">鏇存柊鏃堕棿</Property>
</PropertyDef>
</DataType>
<DataType name="dtContract">
@@ -586,6 +599,11 @@
<Property name="name">customerName</Property>
<Property name="align">center</Property>
</DataColumn>
+ <DataColumn name="depotId">
+ <Property name="property">depotId</Property>
+ <Property name="align">center</Property>
+ <Property name="width">150</Property>
+ </DataColumn>
<DataColumn name="foodVariety">
<Property name="property">foodVariety</Property>
<Property name="align">center</Property>
@@ -720,8 +738,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">planId</Property>
- <Property name="property">planId</Property>
+ <Property name="name">planName</Property>
+ <Property name="property">planName</Property>
<Property name="trigger">ddPlan</Property>
<Editor/>
</AutoFormElement>
@@ -756,6 +774,11 @@
<AutoFormElement>
<Property name="name">completeStatus</Property>
<Property name="property">completeStatus</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
@@ -874,19 +897,19 @@
</AjaxAction>
<CustomDropDown id="ddPlan">
<Property name="minHeight">317</Property>
- <Property name="assignmentMap">planId=id,planName=name</Property>
+ <Property name="assignmentMap">planId=id,planName=planId</Property>
<Property name="minWidth">550</Property>
<Property name="autoOpen">false</Property>
<Container layout="regionPadding:5">
<DataSet id="dsPlan">
- <Property name="dataProvider">planManagePR#pagePlan</Property>
+ <Property name="dataProvider">planManagePR#pagePlanDetail</Property>
<Property name="dataType">[dtPlan]</Property>
<Property name="parameter"></Property>
<Property name="pageSize">5</Property>
</DataSet>
<Container layout="hbox regionPadding:5">
<TextEditor id="key2">
- <Property name="blankText"> -- 璁″垝鍚嶇О鎴栬�呰鍒掓枃鍙� --</Property>
+ <Property name="blankText"> -- 骞翠唤 --</Property>
<Property name="width">200</Property>
</TextEditor>
<Button>
@@ -912,33 +935,35 @@
<Property name="dataSet">dsPlan</Property>
<Property name="readOnly">true</Property>
<DataColumn>
- <Property name="property">id</Property>
+ <Property name="property">planId</Property>
<Property name="width">100</Property>
<Property name="align">center</Property>
- <Property name="name">id</Property>
+ <Property name="name">planId</Property>
<Property name="visible">false</Property>
</DataColumn>
- <DataColumn name="name">
+ <DataColumn name="depotId">
<ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
arg.processDefault = true;</ClientEvent>
- <Property name="property">name</Property>
+ <Property name="property">depotId</Property>
<Property name="align">center</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">referenceNumber</Property>
- <Property name="width">200</Property>
- <Property name="align">center</Property>
- <Property name="name">referenceNumber</Property>
</DataColumn>
<DataColumn>
<Property name="property">year</Property>
- <Property name="width">80</Property>
<Property name="align">center</Property>
<Property name="name">year</Property>
</DataColumn>
<DataColumn>
+ <Property name="property">planNum</Property>
+ <Property name="align">center</Property>
+ <Property name="name">planNum</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">foodVariety</Property>
+ <Property name="align">center</Property>
+ <Property name="name">foodVariety</Property>
+ </DataColumn>
+ <DataColumn>
<Property name="property">type</Property>
- <Property name="width">80</Property>
<Property name="align">center</Property>
<Property name="name">type</Property>
</DataColumn>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeOut.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeOut.view.xml
index 1c979bd..1c4e9a7 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeOut.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeOut.view.xml
@@ -18,7 +18,7 @@
</PropertyDef>
<PropertyDef name="deptId">
<Property></Property>
- <Property name="label">搴撳尯缂栫爜</Property>
+ <Property name="label">鎵�灞炲垎搴�</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
<Property name="keyProperty">id</Property>
@@ -214,65 +214,69 @@
</PropertyDef>
</DataType>
<DataType name="dtPlan">
- <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
+ <Property name="creationType">com.ld.igds.models.InoutPlanDetail</Property>
<PropertyDef name="id">
<Property></Property>
+ <Property name="label">璁″垝鏄庣粏鍙�</Property>
+ </PropertyDef>
+ <PropertyDef name="planId">
<Property name="label">璁″垝缂栫爜</Property>
</PropertyDef>
- <PropertyDef name="referenceNumber">
- <Property name="label">璁″垝鏂囧彿</Property>
- </PropertyDef>
- <PropertyDef name="companyId">
+ <PropertyDef name="foodVariety">
<Property></Property>
- <Property name="label">缁勭粐缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="deptId">
- <Property></Property>
- <Property name="label">鎵�灞炲垎搴�</Property>
+ <Property name="label">绮鍝佺</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="type">
- <Property></Property>
- <Property name="label">璁″垝绫诲瀷</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("planManagePR#triggerPlanType").getResult()}</Property>
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
- <PropertyDef name="name">
+ <PropertyDef name="foodType">
<Property></Property>
- <Property name="label">璁″垝鍚嶇О</Property>
- <Property name="required">true</Property>
+ <Property name="label">绮鎬ц川</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="foodLevel">
+ <Property></Property>
+ <Property name="label">绮绛夌骇</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="year">
<Property></Property>
- <Property name="label">骞翠唤</Property>
- <Property name="required">true</Property>
+ <Property name="label">鏀惰幏骞村害</Property>
</PropertyDef>
- <PropertyDef name="beginTime">
- <Property name="dataType">Date</Property>
- <Property name="label">寮�濮嬫椂闂�</Property>
- </PropertyDef>
- <PropertyDef name="endTime">
- <Property name="dataType">Date</Property>
- <Property name="label">鎴鏃堕棿</Property>
- </PropertyDef>
- <PropertyDef name="createUser">
+ <PropertyDef name="depotId">
<Property></Property>
- <Property name="label">鍒涘缓浜�</Property>
+ <Property name="label">浠撳簱</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
- <PropertyDef name="createTime">
- <Property name="dataType">Date</Property>
- <Property name="label">鍒涘缓鏃堕棿</Property>
+ <PropertyDef name="planNum">
+ <Property name="dataType">Double</Property>
+ <Property name="label">璁″垝鏁伴噺</Property>
</PropertyDef>
- <PropertyDef name="remark">
+ <PropertyDef name="type">
+ <Property name="label">璁″垝绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("planManagePR#triggerPlanTurn").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
<Property></Property>
- <Property name="label">澶囨敞璇存槑</Property>
+ <Property name="label">鏇存柊鏃堕棿</Property>
</PropertyDef>
</DataType>
<DataType name="dtContract">
@@ -938,19 +942,19 @@
</AjaxAction>
<CustomDropDown id="ddPlan">
<Property name="minHeight">317</Property>
- <Property name="assignmentMap">planId=id,planName=name</Property>
+ <Property name="assignmentMap">planId=id,planName=planId</Property>
<Property name="minWidth">550</Property>
<Property name="autoOpen">false</Property>
<Container layout="regionPadding:5">
<DataSet id="dsPlan">
- <Property name="dataProvider">planManagePR#pagePlan</Property>
+ <Property name="dataProvider">planManagePR#pagePlanDetail</Property>
<Property name="dataType">[dtPlan]</Property>
<Property name="parameter"></Property>
<Property name="pageSize">5</Property>
</DataSet>
<Container layout="hbox regionPadding:5">
<TextEditor id="key2">
- <Property name="blankText"> -- 璁″垝鍚嶇О鎴栬�呰鍒掓枃鍙� --</Property>
+ <Property name="blankText"> -- 骞翠唤 --</Property>
<Property name="width">200</Property>
</TextEditor>
<Button>
@@ -976,34 +980,39 @@
<Property name="dataSet">dsPlan</Property>
<Property name="readOnly">true</Property>
<DataColumn>
- <Property name="property">id</Property>
+ <Property name="property">planId</Property>
<Property name="width">100</Property>
<Property name="align">center</Property>
- <Property name="name">id</Property>
+ <Property name="name">planId</Property>
<Property name="visible">false</Property>
</DataColumn>
- <DataColumn name="name">
+ <DataColumn name="depotId">
<ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
arg.processDefault = true;</ClientEvent>
- <Property name="property">name</Property>
+ <Property name="property">depotId</Property>
<Property name="align">center</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">referenceNumber</Property>
- <Property name="width">200</Property>
- <Property name="align">center</Property>
- <Property name="name">referenceNumber</Property>
</DataColumn>
<DataColumn>
<Property name="property">year</Property>
- <Property name="width">80</Property>
+ <Property name="width">200</Property>
<Property name="align">center</Property>
<Property name="name">year</Property>
</DataColumn>
<DataColumn>
- <Property name="property">type</Property>
+ <Property name="property">planNum</Property>
<Property name="width">80</Property>
<Property name="align">center</Property>
+ <Property name="name">planNum</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">foodVariety</Property>
+ <Property name="width">80</Property>
+ <Property name="align">center</Property>
+ <Property name="name">foodVariety</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">type</Property>
+ <Property name="align">center</Property>
<Property name="name">type</Property>
</DataColumn>
</DataGrid>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage.view.xml
index 750038c..fc77fa0 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage.view.xml
@@ -114,6 +114,7 @@
<PropertyDef name="year">
<Property></Property>
<Property name="label">骞翠唤</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="type">
<Property></Property>
@@ -137,6 +138,7 @@
<PropertyDef name="foodType">
<Property></Property>
<Property name="label">绮鎬ц川</Property>
+ <Property name="required">true</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property>
<Property name="keyProperty">code</Property>
@@ -146,6 +148,7 @@
<PropertyDef name="foodLevel">
<Property></Property>
<Property name="label">绮绛夌骇</Property>
+ <Property name="required">true</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}</Property>
<Property name="keyProperty">code</Property>
@@ -156,6 +159,7 @@
<Property name="dataType">Double</Property>
<Property name="label">鏁伴噺</Property>
<Property name="displayFormat">#.0 KG</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="updateTime">
<Property name="dataType">Date</Property>
@@ -246,6 +250,8 @@
<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
if(data){
view.get("#dialogMain").show();
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷慨鏀圭殑鏁版嵁锛�");
}</ClientEvent>
<Property name="caption">璋冩暣</Property>
<Property name="exClassName">btn-warm</Property>
@@ -571,6 +577,12 @@
<Property name="name">foodLevel</Property>
</DataColumn>
<DataColumn>
+ <Property name="property">year</Property>
+ <Property name="align">center</Property>
+ <Property name="name">year</Property>
+ <Property name="trigger">yearDropDown1</Property>
+ </DataColumn>
+ <DataColumn>
<Property name="property">type</Property>
<Property name="align">center</Property>
<Property name="name">type</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java
index 586c83b..5ffabaa 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java
@@ -157,6 +157,23 @@
return service.listPlanDetail(planId);
}
+
+ /**
+ * 鑾峰彇璁″垝鍒楄〃
+ * planManagePR#pagePlanDetail
+ *
+ * @param page
+ * @param param
+ * @throws Exception
+ */
+ @DataProvider
+ public void pagePlanDetail(Page<InoutPlanDetail> page, Map<String, Object> param) throws Exception {
+ if (null == param) {
+ param = new HashMap<String, Object>();
+ }
+ service.pagePlanDetail(page, param);
+ }
+
/**
* 淇濆瓨璁″垝
* planManagePR#savePlan
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
index feb02bb..f12dc0e 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
@@ -168,6 +168,8 @@
<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
if(data){
view.get("#dialogMain").show();
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷慨鏀圭殑鏁版嵁锛�");
}</ClientEvent>
<Property name="caption">璋冩暣</Property>
<Property name="exClassName">btn-warm</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutFullCheck.java b/igds-inout/src/main/java/com/ld/igds/models/InoutFullCheck.java
index a8a3a9a..f420d4a 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutFullCheck.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutFullCheck.java
@@ -56,7 +56,7 @@
@Column(name = "COMPLETE_NUM_", precision = 16, scale = 2)
@PropertyDef(label = "瀹屾垚鏁伴噺", description = "鍗曚綅锛氬惃锛岀郴缁熻嚜鍔ㄥ悎璁�")
- private double completeNumber = 0.0;
+ private Double completeNumber = 0.0;
@Column(name = "AUDIT_USER_", length = 50)
@PropertyDef(label = "瀹℃牳浜�")
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeIn.java b/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeIn.java
index 8607980..a3eedc6 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeIn.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeIn.java
@@ -42,6 +42,10 @@
@PropertyDef(label = "璁″垝鏄庣粏鍙�", description = "閽堝杞崲绮蹇呭～")
private String planId;
+ @Column(name = "PLAN_NAME_", length = 40)
+ @PropertyDef(label = "璁″垝缂栫爜", description = "閽堝杞崲绮蹇呭～")
+ private String planName;
+
@Column(name = "CONTRACT_ID_", length = 40)
@PropertyDef(label = "鍚堝悓缂栫爜", description = "閽堝杞崲绮蹇呭～")
private String contractId;
@@ -76,11 +80,11 @@
@Column(name = "TARGET_NUMBER_")
@PropertyDef(label = "鐩爣鏁伴噺", description = "鍗曚綅锛氬惃锛屾墜鍔ㄥ～鎶�")
- private double targetNumber = 0.0;
+ private Double targetNumber = 0.0;
@Column(name = "COMPLETE_NUMBER_")
@PropertyDef(label = "瀹屾垚鏁伴噺", description = "鍗曚綅锛氬惃锛岀郴缁熻嚜鍔ㄥ悎璁�")
- private double completeNumber = 0.0;
+ private Double completeNumber = 0.0;
@Column(name = "AUDIT_STATUS_", length = 10)
@PropertyDef(label = "瀹℃牳鐘舵��", description = "涓哄鏍革紝瀹℃牳閫氳繃锛屾嫆鎺�")
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeOut.java b/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeOut.java
index 3c66321..e3c7c20 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeOut.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeOut.java
@@ -53,9 +53,9 @@
@PropertyDef(label = "鍚堝悓鍚嶇О", description = "閽堝杞崲绮蹇呭～")
private String contractName;
-// @Column(name = "PLAN_NAME_", length = 50)
-// @PropertyDef(label = "璁″垝鍚嶇О")
-// private String planName;
+ @Column(name = "PLAN_NAME_", length = 50)
+ @PropertyDef(label = "璁″垝鍚嶇О")
+ private String planName;
@Column(name = "DEPOT_ID_", length = 50)
@PropertyDef(label = "鐩爣浠撳簱")
@@ -83,11 +83,11 @@
@Column(name = "TARGET_NUMBER_")
@PropertyDef(label = "鐩爣鏁伴噺", description = "鍗曚綅锛欿G锛屾墜鍔ㄥ～鎶�")
- private double targetNumber = 0.0;
+ private Double targetNumber = 0.0;
@Column(name = "COMPLETE_NUMBER_")
@PropertyDef(label = "瀹屾垚鏁伴噺", description = "鍗曚綅锛欿G锛岀郴缁熻嚜鍔ㄥ悎璁�")
- private double completeNumber = 0.0;
+ private Double completeNumber = 0.0;
@Column(name = "AUDIT_STATUS_", length = 10)
@PropertyDef(label = "瀹℃牳鐘舵��", description = "涓哄鏍革紝瀹℃牳閫氳繃锛屾嫆鎺�")
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutSettle.java b/igds-inout/src/main/java/com/ld/igds/models/InoutSettle.java
index b92102a..10693a3 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutSettle.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutSettle.java
@@ -82,7 +82,7 @@
@PropertyDef(label = "閾惰琛屽埆浠ｇ爜")
private String bankCategory;
- @Column(name = "BANK_CODE_", length = 20)
+ @Column(name = "BANK_CODE_", length = 40)
@PropertyDef(label = "寮�鎴疯鍙�")
private String bankCode;
@@ -90,7 +90,7 @@
@PropertyDef(label = "寮�鎴疯鍚嶇О")
private String bank;
- @Column(name = "BANK_NUM_", length = 20)
+ @Column(name = "BANK_NUM_", length = 40)
@PropertyDef(label = "閾惰璐﹀彿")
private String bankNum;
diff --git a/igds-inout/src/main/java/models/inout.model.xml b/igds-inout/src/main/java/models/inout.model.xml
index 0ca54b0..919101c 100644
--- a/igds-inout/src/main/java/models/inout.model.xml
+++ b/igds-inout/src/main/java/models/inout.model.xml
@@ -78,6 +78,7 @@
<Property name="valueProperty">name</Property>
<Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="khlx">
<Property></Property>
@@ -87,10 +88,12 @@
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="khbh">
<Property></Property>
<Property name="label">瀹㈡埛缂栫爜</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="fddbr">
<Property></Property>
@@ -600,10 +603,10 @@
<Property name="label">骞翠唤</Property>
</PropertyDef>
<PropertyDef name="targetNumber">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="completeNumber">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="completeTime">
<Property name="dataType">Date</Property>
diff --git a/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml b/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
index 29ed5d6..2bcd325 100644
--- a/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
@@ -80,6 +80,7 @@
CHECK_STATUS_ AS checkStatus,
REMARKS_ AS remarks,
FOOD_YEAR_ AS foodYear,
+ FOOD_TYPE_ AS foodType,
IF(ISNULL(SAMPLE_TIME_),'NONE','SAMPLE') AS sampleStatus
from
D_INOUT_RECORD
@@ -115,6 +116,7 @@
<if test="data.foodLevel != null">FOOD_LEVEL_ = #{data.foodLevel},</if>
<if test="data.foodYear != null">FOOD_YEAR_ = #{data.foodYear},</if>
<if test="data.foodVariety != null">FOOD_VARIETY_ = #{data.foodVariety},</if>
+ <if test="data.foodType != null">FOOD_Type_ = #{data.foodType},</if>
<if test="data.deCheck != null">DE_CHECK_ = #{data.deCheck},</if>
<if test="data.addCheck != null">ADD_CHECK_ = #{data.addCheck},</if>
<if test="data.price != null">PRICE_ = #{data.price},</if>
diff --git a/igds-inout/src/main/resources/mapper/InoutCommonMapper.xml b/igds-inout/src/main/resources/mapper/InoutCommonMapper.xml
index c4b1b4a..72000e4 100644
--- a/igds-inout/src/main/resources/mapper/InoutCommonMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutCommonMapper.xml
@@ -42,11 +42,11 @@
<!-- 鏍规嵁ip鍜岀鍙ｆ洿鏂板嚭鍏ュ簱璁惧鐘舵�� -->
<update id="updateInoutConfStatus">
- update D_INOUT_CONF
- set STATUS_ = #{status}
- where IP_ = #{ip}
- and PORT_ = #{port}
- </update>
+ update D_INOUT_CONF
+ set STATUS_ = #{status}
+ where IP_ = #{ip}
+ and PORT_ = #{port}
+ </update>
<!-- 鏍规嵁鍙傛暟鑾峰彇寰�鏉ュ崟浣� -->
<select id="listCustomer" parameterType="com.ld.igds.inout.dto.InoutParam"
@@ -142,11 +142,11 @@
<!-- 鑾峰彇缂栫爜鏈�澶х殑鍗曚綅 -->
<select id="getMaxCustomerId" parameterType="java.lang.String"
resultType="java.lang.String">
- select ID_ from D_INOUT_CUSTOMER
- where
- COMPANY_ID_ = #{companyId}
- order by ID_ DESC limit 1
- </select>
+ select ID_
+ from D_INOUT_CUSTOMER
+ where COMPANY_ID_ = #{companyId}
+ order by ID_ DESC limit 1
+ </select>
<!-- 鑾峰彇鍏ュ簱閫氱煡鍗曚俊鎭� -->
<select id="listNoticeIn" parameterType="com.ld.igds.m.dto.NoticeParam"
@@ -156,7 +156,6 @@
COMPANY_ID_ as companyId,
DEPT_ID_ as deptId,
PLAN_ID_ as planId,
- PLAN_NAME_ as planName,
CONTRACT_ID_ as contractId,
CONTRACT_NAME_ as contractName,
NAME_ as name,
@@ -173,6 +172,7 @@
CREATE_TIME_ as createTime,
CREATE_USER_ as createUser,
COMPLETE_TIME_ as completeTime,
+ DEPOT_ID_ as depotId,
REMARK_ as remark
from
D_INOUT_NOTICE_IN
@@ -198,51 +198,47 @@
<!-- 鏂板鍏ュ簱閫氱煡鍗� -->
<insert id="addNoticeIn" parameterType="com.ld.igds.models.InoutNoticeIn">
- insert into
- D_INOUT_NOTICE_IN (
- ID_,
- COMPANY_ID_,
- DEPT_ID_,
- PLAN_ID_,
- CONTRACT_ID_,
- NAME_,
- CUSTOMER_ID_,
- CUSTOMER_NAME_,
- UNIT_NAME_,
- FOOD_VARIETY_,
- YEAR_,
- TARGET_NUMBER_,
- COMPLETE_NUMBER_,
- AUDIT_STATUS_,
- AUDIT_USER_,
- COMPLETE_STATUS_,
- CREATE_TIME_,
- CREATE_USER_,
- UPDATE_TIME_,
- REMARK_
- )values (
- #{param.id},
- #{param.companyId},
- #{param.deptId},
- #{param.planId},
- #{param.contractId},
- #{param.name},
- #{param.customerId},
- #{param.customerName},
- #{param.unitName},
- #{param.foodVariety},
- #{param.year},
- #{param.targetNumber},
- #{param.completeNumber},
- #{param.auditStatus},
- #{param.auditUser},
- #{param.completeStatus},
- #{param.createTime},
- #{param.createUser},
- #{param.updateTime},
- #{param.remark}
- )
- </insert>
+ insert into D_INOUT_NOTICE_IN (ID_,
+ COMPANY_ID_,
+ DEPT_ID_,
+ PLAN_ID_,
+ CONTRACT_ID_,
+ NAME_,
+ CUSTOMER_ID_,
+ CUSTOMER_NAME_,
+ UNIT_NAME_,
+ FOOD_VARIETY_,
+ YEAR_,
+ TARGET_NUMBER_,
+ COMPLETE_NUMBER_,
+ AUDIT_STATUS_,
+ AUDIT_USER_,
+ COMPLETE_STATUS_,
+ CREATE_TIME_,
+ CREATE_USER_,
+ UPDATE_TIME_,
+ REMARK_)
+ values (#{param.id},
+ #{param.companyId},
+ #{param.deptId},
+ #{param.planId},
+ #{param.contractId},
+ #{param.name},
+ #{param.customerId},
+ #{param.customerName},
+ #{param.unitName},
+ #{param.foodVariety},
+ #{param.year},
+ #{param.targetNumber},
+ #{param.completeNumber},
+ #{param.auditStatus},
+ #{param.auditUser},
+ #{param.completeStatus},
+ #{param.createTime},
+ #{param.createUser},
+ #{param.updateTime},
+ #{param.remark})
+ </insert>
<!--鏇存柊鍏ュ簱閫氱煡鍗�-->
<update id="updateNoticeIn" parameterType="com.ld.igds.m.dto.NoticeInData">
@@ -267,18 +263,17 @@
<!-- 鑾峰彇鎵�鏈夋湭瀹屾垚鐘舵�佸叆搴撻�氱煡鍗� -->
<select id="getUnComNoticeIn" resultType="com.ld.igds.models.InoutNoticeIn">
- select
- ID_ as id,
- COMPANY_ID_ as companyId,
- DEPT_ID_ as deptId,
- PLAN_ID_ as planId,
- CONTRACT_ID_ as contractId,
- NAME_ as name,
- CUSTOMER_ID_ as customerId,
- CUSTOMER_NAME_ as customerName,
- UNIT_NAME_ as unitName,
- FOOD_VARIETY_ as foodVariety,
- YEAR_ as year,
+ select ID_ as id,
+ COMPANY_ID_ as companyId,
+ DEPT_ID_ as deptId,
+ PLAN_ID_ as planId,
+ CONTRACT_ID_ as contractId,
+ NAME_ as name,
+ CUSTOMER_ID_ as customerId,
+ CUSTOMER_NAME_ as customerName,
+ UNIT_NAME_ as unitName,
+ FOOD_VARIETY_ as foodVariety,
+ YEAR_ as year,
TARGET_NUMBER_ as targetNumber,
COMPLETE_NUMBER_ as completeNumber,
AUDIT_STATUS_ as auditStatus,
@@ -288,36 +283,34 @@
CREATE_USER_ as createUser,
COMPLETE_TIME_ as completeTime,
REMARK_ as remark
- from
- D_INOUT_NOTICE_IN
- where
- COMPLETE_STATUS_ = 'NONE'
- and COMPANY_ID_ = #{companyId}
- </select>
+ from
+ D_INOUT_NOTICE_IN
+ where
+ COMPLETE_STATUS_ = 'NONE'
+ and COMPANY_ID_ = #{companyId}
+ </select>
<!-- 閲嶆柊璁＄畻鍏ュ簱閫氱煡鍗曞畬鎴愰噺 -->
<update id="reSumNoticeInComplete" parameterType="com.ld.igds.m.dto.NoticeParam">
- update D_INOUT_NOTICE_IN t,(
- SELECT
- r.CUSTOMER_ID_,
- r.FOOD_VARIETY_,
- r.NOTICE_ID_,
- sum(r.RECORD_WEIGHT_) as COMPLETE_NUMBER_
- from d_inout_record r
- where r.COMPANY_ID_ = #{param.companyId}
- and r.DEPT_ID_ = #{param.deptId}
- and r.CUSTOMER_ID_ = #{param.customerId}
- and r.FOOD_VARIETY_ = #{param.foodVariety}
- and r.NOTICE_ID_ = #{param.id}
- and r.RECORD_STATUS_ != 'DEL'
- and r.RECORD_STATUS_ != 'ERROR'
- GROUP BY r.FOOD_VARIETY_
- ) b
- SET t.COMPLETE_NUMBER_ = b.COMPLETE_NUMBER_
- WHERE t.CUSTOMER_ID_ = b.CUSTOMER_ID_
- AND t.FOOD_VARIETY_ = b.FOOD_VARIETY_
- AND t.ID_ = b.NOTICE_ID_
- </update>
+ update D_INOUT_NOTICE_IN t,(
+ SELECT
+ r.FOOD_VARIETY_,
+ r.NOTICE_ID_,
+ sum(r.RECORD_WEIGHT_) as COMPLETE_NUMBER_
+ from d_inout_record r
+ where r.COMPANY_ID_ = #{param.companyId}
+ and r.DEPT_ID_ = #{param.deptId}
+ and r.FOOD_VARIETY_ = #{param.foodVariety}
+ and r.NOTICE_ID_ = #{param.id}
+ and r.RECORD_STATUS_ != 'DEL'
+ and r.RECORD_STATUS_ != 'ERROR'
+ GROUP BY r.FOOD_VARIETY_
+ ) b
+ SET t.COMPLETE_NUMBER_ = b.COMPLETE_NUMBER_
+ WHERE
+ t.FOOD_VARIETY_ = b.FOOD_VARIETY_
+ AND t.ID_ = b.NOTICE_ID_
+ </update>
<!-- 鏍规嵁鍙傛暟鏌ヨ鍑哄簱閫氱煡鍗� -->
<select id="queryNoticeOut" resultType="int" parameterType="com.ld.igds.m.dto.NoticeParam">
@@ -387,7 +380,6 @@
COMPANY_ID_ as companyId,
DEPT_ID_ as deptId,
PLAN_ID_ as planId,
- PLAN_NAME_ as planName,
CONTRACT_ID_ as contractId,
CONTRACT_NAME_ as contractName,
NAME_ as name,
@@ -437,21 +429,20 @@
<!-- 鑾峰彇鎵�鏈夋湭瀹屾垚鐘舵�佸嚭搴撻�氱煡鍗� -->
<select id="getUnComNoticeOut" resultType="com.ld.igds.models.InoutNoticeOut">
- select
- ID_ as id,
- COMPANY_ID_ as companyId,
- DEPT_ID_ as deptId,
- PLAN_ID_ as planId,
- CONTRACT_ID_ as contractId,
- NAME_ as name,
- DEPOT_ID_ as depotId,
- CUSTOMER_ID_ as customerId,
- CUSTOMER_NAME_ as customerName,
- UNIT_NAME_ as unitName,
- FOOD_VARIETY_ as foodVariety,
- FOOD_TYPE_ as foodType,
- FOOD_LEVEL_ as foodLevel,
- YEAR_ as year,
+ select ID_ as id,
+ COMPANY_ID_ as companyId,
+ DEPT_ID_ as deptId,
+ PLAN_ID_ as planId,
+ CONTRACT_ID_ as contractId,
+ NAME_ as name,
+ DEPOT_ID_ as depotId,
+ CUSTOMER_ID_ as customerId,
+ CUSTOMER_NAME_ as customerName,
+ UNIT_NAME_ as unitName,
+ FOOD_VARIETY_ as foodVariety,
+ FOOD_TYPE_ as foodType,
+ FOOD_LEVEL_ as foodLevel,
+ YEAR_ as year,
STORAGE_REAL_ as storageReal,
TARGET_NUMBER_ as targetNumber,
COMPLETE_NUMBER_ as completeNumber,
@@ -462,37 +453,34 @@
CREATE_USER_ as createUser,
COMPLETE_TIME_ as completeTime,
REMARK_ as remark
- from
- D_INOUT_NOTICE_OUT
- where
- COMPLETE_STATUS_ = 'NONE'
- and COMPANY_ID_ = #{companyId}
- </select>
+ from
+ D_INOUT_NOTICE_OUT
+ where
+ COMPLETE_STATUS_ = 'NONE'
+ and COMPANY_ID_ = #{companyId}
+ </select>
<!-- 閲嶆柊璁＄畻鍑哄簱閫氱煡鍗曞畬鎴愰噺锛屽彧鏍规嵁瀹㈡埛鏇存柊 -->
<update id="reSumNoticeOutComplete" parameterType="com.ld.igds.m.dto.NoticeParam">
- update D_INOUT_NOTICE_OUT t,(
- SELECT
- r.CUSTOMER_ID_,
- r.FOOD_VARIETY_,
- r.DEPOT_ID_,
- r.NOTICE_ID_,
- sum(r.RECORD_WEIGHT_) as COMPLETE_NUMBER_
- from d_inout_record r
- where r.COMPANY_ID_ = #{param.companyId}
- AND r.DEPT_ID_ = #{param.deptId}
- and r.CUSTOMER_ID_ = #{param.customerId}
- and r.DEPOT_ID_ = #{param.depotId}
- and r.FOOD_VARIETY_ = #{param.foodVariety}
- and r.RECORD_STATUS_ != 'DEL'
- and r.RECORD_STATUS_ != 'ERROR'
- GROUP BY r.DEPOT_ID_
- ) b
- SET t.COMPLETE_NUMBER_ = b.COMPLETE_NUMBER_
- WHERE t.CUSTOMER_ID_ = b.CUSTOMER_ID_
- AND t.FOOD_VARIETY_ = b.FOOD_VARIETY_
- AND t.DEPOT_ID_ = b.DEPOT_ID_
- AND t.ID_ = b.NOTICE_ID_
- </update>
+ update D_INOUT_NOTICE_OUT t,(
+ SELECT
+ r.FOOD_VARIETY_,
+ r.DEPOT_ID_,
+ r.NOTICE_ID_,
+ sum(r.RECORD_WEIGHT_) as COMPLETE_NUMBER_
+ from d_inout_record r
+ where r.COMPANY_ID_ = #{param.companyId}
+ AND r.DEPT_ID_ = #{param.deptId}
+ and r.DEPOT_ID_ = #{param.depotId}
+ and r.FOOD_VARIETY_ = #{param.foodVariety}
+ and r.RECORD_STATUS_ != 'DEL'
+ and r.RECORD_STATUS_ != 'ERROR'
+ GROUP BY r.DEPOT_ID_
+ ) b
+ SET t.COMPLETE_NUMBER_ = b.COMPLETE_NUMBER_
+ WHERE t.FOOD_VARIETY_ = b.FOOD_VARIETY_
+ AND t.DEPOT_ID_ = b.DEPOT_ID_
+ AND t.ID_ = b.NOTICE_ID_
+ </update>
</mapper>
\ No newline at end of file
diff --git a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
index 73bd4ac..fd87526 100644
--- a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
@@ -79,6 +79,7 @@
<where>
<if test="param.companyId != null and param.companyId != '' ">AND COMPANY_ID_ = #{param.companyId}</if>
<if test="param.type != null and param.type != '' ">AND TYPE_ = #{param.type}</if>
+ <if test="param.userId != null and param.userId != '' ">AND USER_ID_ = #{param.userId}</if>
<if test="param.plateNum != null and param.plateNum != '' ">AND PLATE_NUM_ = #{param.plateNum}</if>
<if test="param.intelCard != null and param.intelCard != '' ">AND INTEL_CARD_ = #{param.intelCard}</if>
<if test="param.id != null and param.id != '' ">AND ID_ = #{param.id}</if>
@@ -104,14 +105,14 @@
<if test="param.id != null and param.id != '' ">AND ID_ = #{param.id}</if>
<if test="param.progress != null and param.progress != '' ">AND PROGRESS_ = #{param.progress}</if>
<if test="param.end != null">AND
- COMPLETE_TIME_ <![CDATA[ < ]]>#{param.end,jdbcType=TIMESTAMP}
+ UPDATE_TIME_ <![CDATA[ < ]]>#{param.end,jdbcType=TIMESTAMP}
</if>
<if test="param.start != null">AND
- COMPLETE_TIME_ <![CDATA[ > ]]>#{param.start,jdbcType=TIMESTAMP}
+ UPDATE_TIME_ <![CDATA[ > ]]>#{param.start,jdbcType=TIMESTAMP}
</if>
AND PROGRESS_ = 'RECORD'
AND RECORD_STATUS_ != 'DEL'
- ORDER BY COMPLETE_TIME_
+ ORDER BY UPDATE_TIME_
</where>
</select>
@@ -193,11 +194,12 @@
#{param.recordStatus},
</if>
<if test="param.checkStatus != null and param.checkStatus != '' ">CHECK_STATUS_ = #{param.checkStatus},</if>
- <if test="param.msg != null and param.msg != '' ">REMARKS_ = concat(REMARKS_,#{param.msg})</if>
+ <if test="param.msg != null and param.msg != '' ">REMARKS_ = concat(REMARKS_,#{param.msg}),</if>
+ <if test="param.updateTime != null">UPDATE_TIME_ = #{param.updateTime}</if>
</set>
<where>
- COMPANY_ID_ = #{param.companyId},
+ COMPANY_ID_ = #{param.companyId}
AND ID_ = #{param.id}
</where>
</update>
@@ -242,6 +244,7 @@
<if test="data.foodYear != null">FOOD_YEAR_ = #{data.foodYear},</if>
<if test="data.deHandle != null">DE_HANDLE_ = #{data.deHandle},</if>
<if test="data.deOther != null">DE_OTHER_ = #{data.deOther},</if>
+ <if test="data.dePackage != null">DE_PACKAGE_ = #{data.dePackage},</if>
<if test="data.deOtherInfo != null">DE_OTHER_INTO_ = #{data.deOtherInfo},</if>
<if test="data.fullWeight != null">FULL_WEIGHT_ = #{data.fullWeight},</if>
<if test="data.fullWeightTime != null">FULL_WEIGHT_TIME_ = #{data.fullWeightTime},</if>
@@ -260,6 +263,7 @@
<if test="data.foodType != null">FOOD_TYPE_ = #{data.foodType},</if>
<if test="data.price != null">PRICE_ = #{data.price},</if>
<if test="data.bzw != null">bzw = #{data.bzw},</if>
+ <if test="data.bzw != null">bzbjs = #{data.bzbjs},</if>
<if test="data.dbz != null">dbz = #{data.dbz},</if>
<if test="data.settleMoney != null">SETTLE_MONEY_ = #{data.settleMoney},</if>
PROGRESS_ = #{data.progress}
@@ -536,10 +540,10 @@
<if test="param.foodVariety != null and param.foodVariety != ''">AND FOOD_VARIETY_ = #{param.foodVariety}</if>
<if test="param.id != null and param.id != ''">AND NOTICE_ID_ = #{param.id}</if>
<if test="param.start != null">AND
- COMPLETE_TIME_ <![CDATA[ > ]]> #{param.start}
+ UPDATE_TIME_ <![CDATA[ > ]]> #{param.start}
</if>
<if test="param.end != null">AND
- COMPLETE_TIME_ <![CDATA[ < ]]> #{param.end}
+ UPDATE_TIME_ <![CDATA[ < ]]> #{param.end}
</if>
</select>
diff --git a/igds-manager/igds-manager.iml b/igds-manager/igds-manager.iml
index dc5c524..2ea65a3 100644
--- a/igds-manager/igds-manager.iml
+++ b/igds-manager/igds-manager.iml
@@ -56,14 +56,14 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-manager/src/main/java/com/ld/igds/m/service/HFinanceService.java b/igds-manager/src/main/java/com/ld/igds/m/service/HFinanceService.java
index c4bb4d0..50f694f 100644
--- a/igds-manager/src/main/java/com/ld/igds/m/service/HFinanceService.java
+++ b/igds-manager/src/main/java/com/ld/igds/m/service/HFinanceService.java
@@ -8,6 +8,7 @@
import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import java.util.Date;
import java.util.HashMap;
@@ -28,22 +29,22 @@
String companyId = ContextUtil.getCompanyId();
String hql = " from " + AssetsLiability.class.getName()
- + " where companyId =:companyId and deptId =:deptId";
+ + " where companyId =:companyId";
Map<String, Object> args = new HashMap<String, Object>();
args.put("companyId", companyId);
- args.put("deptId", ContextUtil.subDeptId(null));
- if (null != param) {
- String str = (String) param.get("customerId");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and customerId like:customerId";
- args.put("customerId", "%" + str + "%");
+ if(null != param){
+ Date date = (Date) param.get("start");
+ if (null != date) {
+ hql += " and bbsj >=:start";
+ args.put("start", DateUtil.getCurZero(date));
}
- str = (String) param.get("customerName");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and customerName like:customerName";
- args.put("customerName", "%" + str + "%");
+
+ date = (Date) param.get("end");
+ if (null != date) {
+ hql += " and bbsj <=:end";
+ args.put("end", DateUtil.getNextZero(date));
}
}
@@ -52,16 +53,18 @@
return this.query(hql, args);
}
- public String saveAssetsData(AssetsLiability data) {
+ public String saveAssetsData(AssetsLiability oldData) {
Session session = this.getSessionFactory().openSession();
try {
-
+ AssetsLiability data = new AssetsLiability();
+ BeanUtils.copyProperties(oldData, data);
if(StringUtils.isEmpty(data.getCompanyId())){
data.setCompanyId(ContextUtil.getCompanyId());
}
if(StringUtils.isEmpty(data.getDeptId())){
data.setDeptId(ContextUtil.subDeptId(null));
}
+ data.setZhgxsj(new Date());
if (StringUtils.isEmpty(data.getId())) {
data.setId(ContextUtil.getCurTimeMillis());
@@ -93,14 +96,11 @@
public List<CashFlow> getCashFlowData(Map<String, Object> param){
- String companyId = ContextUtil.getCompanyId();
-
- String hql = " from " + AssetsLiability.class.getName()
- + " where companyId =:companyId and deptId =:deptId";
+ String hql = " from " + CashFlow.class.getName()
+ + " where companyId =:companyId";
Map<String, Object> args = new HashMap<String, Object>();
- args.put("companyId", companyId);
- args.put("deptId", ContextUtil.subDeptId(null));
+ args.put("companyId", ContextUtil.getCompanyId());
if(null != param){
Date date = (Date) param.get("start");
@@ -121,16 +121,18 @@
return this.query(hql, args);
}
- public String saveCashFlowData(CashFlow data) {
+ public String saveCashFlowData(CashFlow oldData) {
Session session = this.getSessionFactory().openSession();
try {
-
+ CashFlow data = new CashFlow();
+ BeanUtils.copyProperties(oldData, data);
if(StringUtils.isEmpty(data.getCompanyId())){
data.setCompanyId(ContextUtil.getCompanyId());
}
if(StringUtils.isEmpty(data.getDeptId())){
data.setDeptId(ContextUtil.subDeptId(null));
}
+ data.setZhgxsj(new Date());
if (StringUtils.isEmpty(data.getId())) {
data.setId(ContextUtil.getCurTimeMillis());
@@ -162,14 +164,11 @@
public List<Profit> getProfitData(Map<String, Object> param){
- String companyId = ContextUtil.getCompanyId();
-
String hql = " from " + Profit.class.getName()
- + " where companyId =:companyId and deptId =:deptId";
+ + " where companyId =:companyId";
Map<String, Object> args = new HashMap<String, Object>();
- args.put("companyId", companyId);
- args.put("deptId", ContextUtil.subDeptId(null));
+ args.put("companyId", ContextUtil.getCompanyId());
if(null != param){
Date date = (Date) param.get("start");
@@ -190,17 +189,18 @@
return this.query(hql, args);
}
- public String saveProfitData(Profit data) {
+ public String saveProfitData(Profit oldData) {
Session session = this.getSessionFactory().openSession();
try {
-
+ Profit data = new Profit();
+ BeanUtils.copyProperties(oldData, data);
if(StringUtils.isEmpty(data.getCompanyId())){
data.setCompanyId(ContextUtil.getCompanyId());
}
if(StringUtils.isEmpty(data.getDeptId())){
data.setDeptId(ContextUtil.subDeptId(null));
}
-
+ data.setZhgxsj(new Date());
if (StringUtils.isEmpty(data.getId())) {
data.setId(ContextUtil.getCurTimeMillis());
session.save(data);
diff --git a/igds-manager/src/main/java/com/ld/igds/m/view/AssetsLiability.view.xml b/igds-manager/src/main/java/com/ld/igds/m/view/AssetsLiability.view.xml
index ffde68e..ad4e0f5 100644
--- a/igds-manager/src/main/java/com/ld/igds/m/view/AssetsLiability.view.xml
+++ b/igds-manager/src/main/java/com/ld/igds/m/view/AssetsLiability.view.xml
@@ -1251,6 +1251,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">zhgxsj</Property>
+ <Property name="property">zhgxsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">hbjjqmye</Property>
<Property name="property">hbjjqmye</Property>
<Editor/>
@@ -1938,18 +1943,6 @@
<AutoFormElement>
<Property name="name">fzhsyzqyncye</Property>
<Property name="property">fzhsyzqyncye</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zhgxsj</Property>
- <Property name="property">zhgxsj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">syncTime</Property>
- <Property name="property">syncTime</Property>
- <Property name="hideMode">display</Property>
- <Property name="visible">false</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
diff --git a/igds-manager/src/main/java/com/ld/igds/m/view/CashFlow.view.xml b/igds-manager/src/main/java/com/ld/igds/m/view/CashFlow.view.xml
index cd0a412..1a7f8f6 100644
--- a/igds-manager/src/main/java/com/ld/igds/m/view/CashFlow.view.xml
+++ b/igds-manager/src/main/java/com/ld/igds/m/view/CashFlow.view.xml
@@ -755,6 +755,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">zhgxsj</Property>
+ <Property name="property">zhgxsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">jyhdxjllbys</Property>
<Property name="property">jyhdxjllbys</Property>
<Editor/>
@@ -1132,11 +1137,6 @@
<AutoFormElement>
<Property name="name">qmxjdjwyebnljs</Property>
<Property name="property">qmxjdjwyebnljs</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zhgxsj</Property>
- <Property name="property">zhgxsj</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
diff --git a/igds-manager/src/main/java/com/ld/igds/m/view/FinancePR.java b/igds-manager/src/main/java/com/ld/igds/m/view/FinancePR.java
index 258ed1b..f218df7 100644
--- a/igds-manager/src/main/java/com/ld/igds/m/view/FinancePR.java
+++ b/igds-manager/src/main/java/com/ld/igds/m/view/FinancePR.java
@@ -71,7 +71,8 @@
@DataProvider
public List<CashFlow> getCashFlowData(Map<String, Object> param) {
- return financeService.getCashFlowData(param);
+ List<CashFlow> cashFlowData = financeService.getCashFlowData(param);
+ return cashFlowData;
}
/**
diff --git a/igds-manager/src/main/java/com/ld/igds/m/view/Profit.view.xml b/igds-manager/src/main/java/com/ld/igds/m/view/Profit.view.xml
index 78f4bd7..bd8d87f 100644
--- a/igds-manager/src/main/java/com/ld/igds/m/view/Profit.view.xml
+++ b/igds-manager/src/main/java/com/ld/igds/m/view/Profit.view.xml
@@ -835,6 +835,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">zhgxsj</Property>
+ <Property name="property">zhgxsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">yyzsrbqye</Property>
<Property name="property">yyzsrbqye</Property>
<Editor/>
@@ -1262,11 +1267,6 @@
<AutoFormElement>
<Property name="name">xsmgsybnlj</Property>
<Property name="property">xsmgsybnlj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zhgxsj</Property>
- <Property name="property">zhgxsj</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
diff --git a/igds-manager/src/main/java/com/ld/igds/models/AssetsLiability.java b/igds-manager/src/main/java/com/ld/igds/models/AssetsLiability.java
index f9b839e..0cc38ab 100644
--- a/igds-manager/src/main/java/com/ld/igds/models/AssetsLiability.java
+++ b/igds-manager/src/main/java/com/ld/igds/models/AssetsLiability.java
@@ -7,7 +7,6 @@
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
-import java.math.BigDecimal;
import java.util.Date;
/**
@@ -41,556 +40,556 @@
private Date bbsj;
@PropertyDef(label = "璐у竵璧勯噾鏈熸湯浣欓(鍏�)" )
- @Column(name = "hbjjqmye", precision = 20, scale = 2)
- private BigDecimal hbjjqmye;
+ @Column(name = "hbjjqmye")
+ private Double hbjjqmye;
@PropertyDef(label = "璐у竵璧勯噾骞村垵浣欓(鍏�)" )
- @Column(name = "hbjjncye", precision = 20, scale = 2)
- private BigDecimal hbjjncye;
+ @Column(name = "hbjjncye")
+ private Double hbjjncye;
@PropertyDef(label = "浜ゆ槗鎬ч噾铻嶈祫浜ф湡鏈綑棰�(鍏�)" )
- @Column(name = "jyxjrzcqmye", precision = 20, scale = 2)
- private BigDecimal jyxjrzcqmye;
+ @Column(name = "jyxjrzcqmye")
+ private Double jyxjrzcqmye;
@PropertyDef(label = "浜ゆ槗鎬ч噾铻嶈祫浜у勾鍒濅綑棰�(鍏�)" )
- @Column(name = "jyxjrzcncye", precision = 20, scale = 2)
- private BigDecimal jyxjrzcncye;
+ @Column(name = "jyxjrzcncye")
+ private Double jyxjrzcncye;
@PropertyDef(label = "琛嶇敓閲戣瀺璧勪骇鏈熸湯浣欓(鍏�)" )
- @Column(name = "ysjrzcqmye", precision = 20, scale = 2)
- private BigDecimal ysjrzcqmye;
+ @Column(name = "ysjrzcqmye")
+ private Double ysjrzcqmye;
@PropertyDef(label = "琛嶇敓閲戣瀺璧勪骇骞村垵浣欓(鍏�)" )
- @Column(name = "ysjrzcncye", precision = 20, scale = 2)
- private BigDecimal ysjrzcncye;
+ @Column(name = "ysjrzcncye")
+ private Double ysjrzcncye;
@PropertyDef(label = "搴旀敹绁ㄦ嵁鏈熸湯浣欓(鍏�)" )
- @Column(name = "yspjqmye", precision = 20, scale = 2)
- private BigDecimal yspjqmye;
+ @Column(name = "yspjqmye")
+ private Double yspjqmye;
@PropertyDef(label = "搴旀敹绁ㄦ嵁骞村垵浣欓(鍏�)" )
- @Column(name = "yspjncye", precision = 20, scale = 2)
- private BigDecimal yspjncye;
+ @Column(name = "yspjncye")
+ private Double yspjncye;
@PropertyDef(label = "搴旀敹璐︽鏈熸湯浣欓(鍏�)" )
- @Column(name = "yszkqmye", precision = 20, scale = 2)
- private BigDecimal yszkqmye;
+ @Column(name = "yszkqmye")
+ private Double yszkqmye;
@PropertyDef(label = "搴旀敹璐︽骞村垵浣欓(鍏�)" )
- @Column(name = "yszkncye", precision = 20, scale = 2)
- private BigDecimal yszkncye;
+ @Column(name = "yszkncye")
+ private Double yszkncye;
@PropertyDef(label = "棰勪粯娆鹃」鏈熸湯浣欓(鍏�)" )
- @Column(name = "yuskxqmye", precision = 20, scale = 2)
- private BigDecimal yuskxqmye;
+ @Column(name = "yuskxqmye")
+ private Double yuskxqmye;
@PropertyDef(label = "棰勪粯娆鹃」骞村垵浣欓(鍏�)" )
- @Column(name = "yuskxncye", precision = 20, scale = 2)
- private BigDecimal yuskxncye;
+ @Column(name = "yuskxncye")
+ private Double yuskxncye;
@PropertyDef(label = "鍏朵粬搴旀敹娆炬湡鏈綑棰�(鍏�)" )
- @Column(name = "qtyszkqmye", precision = 20, scale = 2)
- private BigDecimal qtyszkqmye;
+ @Column(name = "qtyszkqmye")
+ private Double qtyszkqmye;
@PropertyDef(label = "鍏朵粬搴旀敹娆惧勾鍒濅綑棰�(鍏�)" )
- @Column(name = "qtyszkncye", precision = 20, scale = 2)
- private BigDecimal qtyszkncye;
+ @Column(name = "qtyszkncye")
+ private Double qtyszkncye;
@PropertyDef(label = "瀛樿揣鏈熸湯浣欓(鍏�)" )
- @Column(name = "chqmye", precision = 20, scale = 2)
- private BigDecimal chqmye;
+ @Column(name = "chqmye")
+ private Double chqmye;
@PropertyDef(label = "瀛樿揣骞村垵浣欓(鍏�)" )
- @Column(name = "chncye", precision = 20, scale = 2)
- private BigDecimal chncye;
+ @Column(name = "chncye")
+ private Double chncye;
@PropertyDef(label = "鍚堝悓璧勪骇鏈熸湯浣欓(鍏�)" )
- @Column(name = "htzcqmye", precision = 20, scale = 2)
- private BigDecimal htzcqmye;
+ @Column(name = "htzcqmye")
+ private Double htzcqmye;
@PropertyDef(label = "鍚堝悓璧勪骇骞村垵浣欓(鍏�)" )
- @Column(name = "htzcncye", precision = 20, scale = 2)
- private BigDecimal htzcncye;
+ @Column(name = "htzcncye")
+ private Double htzcncye;
@PropertyDef(label = "鎸佹湁寰呭敭璧勪骇鏈熸湯浣欓(鍏�)" )
- @Column(name = "cydszcqmye", precision = 20, scale = 2)
- private BigDecimal cydszcqmye;
+ @Column(name = "cydszcqmye")
+ private Double cydszcqmye;
@PropertyDef(label = "鎸佹湁寰呭敭璧勪骇骞村垵浣欓(鍏�)" )
- @Column(name = "cydszcncye", precision = 20, scale = 2)
- private BigDecimal cydszcncye;
+ @Column(name = "cydszcncye")
+ private Double cydszcncye;
@PropertyDef(label = "涓�骞村唴鍒版湡鐨勯潪娴佸姩璧勪骇鏈熸湯浣欓(鍏�)" )
- @Column(name = "ynndqfldzcqmye", precision = 20, scale = 2)
- private BigDecimal ynndqfldzcqmye;
+ @Column(name = "ynndqfldzcqmye")
+ private Double ynndqfldzcqmye;
@PropertyDef(label = "涓�骞村唴鍒版湡鐨勯潪娴佸姩璧勪骇骞村垵浣欓(鍏�)" )
- @Column(name = "ynndqfldzcncye", precision = 20, scale = 2)
- private BigDecimal ynndqfldzcncye;
+ @Column(name = "ynndqfldzcncye")
+ private Double ynndqfldzcncye;
@PropertyDef(label = "鍏朵粬娴佸姩璧勪骇鏈熸湯浣欓(鍏�)" )
- @Column(name = "qtldzcqmye", precision = 20, scale = 2)
- private BigDecimal qtldzcqmye;
+ @Column(name = "qtldzcqmye")
+ private Double qtldzcqmye;
@PropertyDef(label = "鍏朵粬娴佸姩璧勪骇骞村垵浣欓(鍏�)" )
- @Column(name = "qtldzcncye", precision = 20, scale = 2)
- private BigDecimal qtldzcncye;
+ @Column(name = "qtldzcncye")
+ private Double qtldzcncye;
@PropertyDef(label = "娴佸姩璧勪骇鍚堣鏈熸湯浣欓(鍏�)" )
- @Column(name = "ldzchjqmye", precision = 20, scale = 2)
- private BigDecimal ldzchjqmye;
+ @Column(name = "ldzchjqmye")
+ private Double ldzchjqmye;
@PropertyDef(label = "娴佸姩璧勪骇鍚堣骞村垵浣欓(鍏�)" )
- @Column(name = "ldzchjncye", precision = 20, scale = 2)
- private BigDecimal ldzchjncye;
+ @Column(name = "ldzchjncye")
+ private Double ldzchjncye;
@PropertyDef(label = "鍊哄埜鎶曡祫鏈熸湯浣欓(鍏�)" )
- @Column(name = "zjtzqmye", precision = 20, scale = 2)
- private BigDecimal zjtzqmye;
+ @Column(name = "zjtzqmye")
+ private Double zjtzqmye;
@PropertyDef(label = "鍊哄埜鎶曡祫骞村垵浣欓(鍏�)" )
- @Column(name = "zjtzncye", precision = 20, scale = 2)
- private BigDecimal zjtzncye;
+ @Column(name = "zjtzncye")
+ private Double zjtzncye;
@PropertyDef(label = "鍏朵粬鍊哄埜鎶曡祫鏈熸湯浣欓(鍏�)" )
- @Column(name = "qtzqtzqmye", precision = 20, scale = 2)
- private BigDecimal qtzqtzqmye;
+ @Column(name = "qtzqtzqmye")
+ private Double qtzqtzqmye;
@PropertyDef(label = "鍏朵粬鍊哄埜鎶曡祫骞村垵浣欓(鍏�)" )
- @Column(name = "qtzqtzncye", precision = 20, scale = 2)
- private BigDecimal qtzqtzncye;
+ @Column(name = "qtzqtzncye")
+ private Double qtzqtzncye;
@PropertyDef(label = "闀挎湡搴旀敹娆炬湡鏈綑棰�(鍏�)" )
- @Column(name = "cqyskqmye", precision = 20, scale = 2)
- private BigDecimal cqyskqmye;
+ @Column(name = "cqyskqmye")
+ private Double cqyskqmye;
@PropertyDef(label = "闀挎湡搴旀敹娆惧勾鍒濅綑棰�(鍏�)" )
- @Column(name = "cqyskncye", precision = 20, scale = 2)
- private BigDecimal cqyskncye;
+ @Column(name = "cqyskncye")
+ private Double cqyskncye;
@PropertyDef(label = "闀挎湡鑲℃潈鎶曡祫鏈熸湯浣欓(鍏�)" )
- @Column(name = "cqgqtzqmye", precision = 20, scale = 2)
- private BigDecimal cqgqtzqmye;
+ @Column(name = "cqgqtzqmye")
+ private Double cqgqtzqmye;
@PropertyDef(label = "闀挎湡鑲℃潈鎶曡祫骞村垵浣欓(鍏�)" )
- @Column(name = "cqgqtzncye", precision = 20, scale = 2)
- private BigDecimal cqgqtzncye;
+ @Column(name = "cqgqtzncye")
+ private Double cqgqtzncye;
@PropertyDef(label = "鍏朵粬鏉冪泭宸ュ叿鎶曡祫鏈熸湯浣欓(鍏�)" )
- @Column(name = "qtqygjtzqmye", precision = 20, scale = 2)
- private BigDecimal qtqygjtzqmye;
+ @Column(name = "qtqygjtzqmye")
+ private Double qtqygjtzqmye;
@PropertyDef(label = "鍏朵粬鏉冪泭宸ュ叿鎶曡祫骞村垵浣欓(鍏�)" )
- @Column(name = "qtqygjtzncye", precision = 20, scale = 2)
- private BigDecimal qtqygjtzncye;
+ @Column(name = "qtqygjtzncye")
+ private Double qtqygjtzncye;
@PropertyDef(label = "鍏朵粬闈炴祦鍔ㄩ噾铻嶈祫浜ф湡鏈綑棰�(鍏�)" )
- @Column(name = "qtfldjrzcqmye", precision = 20, scale = 2)
- private BigDecimal qtfldjrzcqmye;
+ @Column(name = "qtfldjrzcqmye")
+ private Double qtfldjrzcqmye;
@PropertyDef(label = "鍏朵粬闈炴祦鍔ㄩ噾铻嶈祫浜у勾鍒濅綑棰�(鍏�)" )
- @Column(name = "qtfldjrzcncye", precision = 20, scale = 2)
- private BigDecimal qtfldjrzcncye;
+ @Column(name = "qtfldjrzcncye")
+ private Double qtfldjrzcncye;
@PropertyDef(label = "鎶曡祫鎬ф埧鍦颁骇鏈熸湯浣欓(鍏�)" )
- @Column(name = "tzxfdcqmye", precision = 20, scale = 2)
- private BigDecimal tzxfdcqmye;
+ @Column(name = "tzxfdcqmye")
+ private Double tzxfdcqmye;
@PropertyDef(label = "鎶曡祫鎬ф埧鍦颁骇骞村垵浣欓(鍏�)" )
- @Column(name = "tzxfdcncye", precision = 20, scale = 2)
- private BigDecimal tzxfdcncye;
+ @Column(name = "tzxfdcncye")
+ private Double tzxfdcncye;
@PropertyDef(label = "鍥哄畾璧勪骇鏈熸湯浣欓(鍏�)" )
- @Column(name = "gdzcqmye", precision = 20, scale = 2)
- private BigDecimal gdzcqmye;
+ @Column(name = "gdzcqmye")
+ private Double gdzcqmye;
@PropertyDef(label = "鍥哄畾璧勪骇骞村垵浣欓(鍏�)" )
- @Column(name = "gdzcncye", precision = 20, scale = 2)
- private BigDecimal gdzcncye;
+ @Column(name = "gdzcncye")
+ private Double gdzcncye;
@PropertyDef(label = "鍦ㄥ缓宸ョ▼鏈熸湯浣欓(鍏�)" )
- @Column(name = "zjgcqmye", precision = 20, scale = 2)
- private BigDecimal zjgcqmye;
+ @Column(name = "zjgcqmye")
+ private Double zjgcqmye;
@PropertyDef(label = "鍦ㄥ缓宸ョ▼骞村垵浣欓(鍏�)" )
- @Column(name = "zjgcncye", precision = 20, scale = 2)
- private BigDecimal zjgcncye;
+ @Column(name = "zjgcncye")
+ private Double zjgcncye;
@PropertyDef(label = "鐢熶骇鎬х敓鐗╄祫浜ф湡鏈綑棰�(鍏�)" )
- @Column(name = "scxswzcqmye", precision = 20, scale = 2)
- private BigDecimal scxswzcqmye;
+ @Column(name = "scxswzcqmye")
+ private Double scxswzcqmye;
@PropertyDef(label = "鐢熶骇鎬х敓鐗╄祫浜у勾鍒濅綑棰�(鍏�)" )
- @Column(name = "scxswzcncye", precision = 20, scale = 2)
- private BigDecimal scxswzcncye;
+ @Column(name = "scxswzcncye")
+ private Double scxswzcncye;
@PropertyDef(label = "娌规皵璧勪骇鏈熸湯浣欓(鍏�)" )
- @Column(name = "yqzcqmye", precision = 20, scale = 2)
- private BigDecimal yqzcqmye;
+ @Column(name = "yqzcqmye")
+ private Double yqzcqmye;
@PropertyDef(label = "娌规皵璧勪骇骞村垵浣欓(鍏�)" )
- @Column(name = "yqzcncye", precision = 20, scale = 2)
- private BigDecimal yqzcncye;
+ @Column(name = "yqzcncye")
+ private Double yqzcncye;
@PropertyDef(label = "鏃犲舰璧勪骇鏈熸湯浣欓(鍏�)" )
- @Column(name = "wxzcqmye", precision = 20, scale = 2)
- private BigDecimal wxzcqmye;
+ @Column(name = "wxzcqmye")
+ private Double wxzcqmye;
@PropertyDef(label = "鏃犲舰璧勪骇骞村垵浣欓(鍏�)" )
- @Column(name = "wxzcncye", precision = 20, scale = 2)
- private BigDecimal wxzcncye;
+ @Column(name = "wxzcncye")
+ private Double wxzcncye;
@PropertyDef(label = "寮�鍙戞敮鍑烘湡鏈綑棰�(鍏�)" )
- @Column(name = "kfzcqmye", precision = 20, scale = 2)
- private BigDecimal kfzcqmye;
+ @Column(name = "kfzcqmye")
+ private Double kfzcqmye;
@PropertyDef(label = "寮�鍙戞敮鍑哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "kfzcncye", precision = 20, scale = 2)
- private BigDecimal kfzcncye;
+ @Column(name = "kfzcncye")
+ private Double kfzcncye;
@PropertyDef(label = "鍟嗚獕鏈熸湯浣欓(鍏�)" )
- @Column(name = "syqmye", precision = 20, scale = 2)
- private BigDecimal syqmye;
+ @Column(name = "syqmye")
+ private Double syqmye;
@PropertyDef(label = "鍟嗚獕骞村垵浣欓(鍏�)" )
- @Column(name = "syncye", precision = 20, scale = 2)
- private BigDecimal syncye;
+ @Column(name = "syncye")
+ private Double syncye;
@PropertyDef(label = "闀挎湡寰呮憡璐圭敤鏈熸湯浣欓(鍏�)" )
- @Column(name = "cqdtfyqmye", precision = 20, scale = 2)
- private BigDecimal cqdtfyqmye;
+ @Column(name = "cqdtfyqmye")
+ private Double cqdtfyqmye;
@PropertyDef(label = "闀挎湡寰呮憡璐圭敤骞村垵浣欓(鍏�)" )
- @Column(name = "cqdtfyncye", precision = 20, scale = 2)
- private BigDecimal cqdtfyncye;
+ @Column(name = "cqdtfyncye")
+ private Double cqdtfyncye;
@PropertyDef(label = "閫掑欢鎵�寰楃◣璧勪骇鏈熸湯浣欓(鍏�)" )
- @Column(name = "dysdszcqmye", precision = 20, scale = 2)
- private BigDecimal dysdszcqmye;
+ @Column(name = "dysdszcqmye")
+ private Double dysdszcqmye;
@PropertyDef(label = "閫掑欢鎵�寰楃◣璧勪骇骞村垵浣欓(鍏�)" )
- @Column(name = "dysdszcncye", precision = 20, scale = 2)
- private BigDecimal dysdszcncye;
+ @Column(name = "dysdszcncye")
+ private Double dysdszcncye;
@PropertyDef(label = "鍏朵粬闈炴祦鍔ㄨ祫浜ф湡鏈綑棰�(鍏�)" )
- @Column(name = "qtfldzcqmye", precision = 20, scale = 2)
- private BigDecimal qtfldzcqmye;
+ @Column(name = "qtfldzcqmye")
+ private Double qtfldzcqmye;
@PropertyDef(label = "鍏朵粬闈炴祦鍔ㄨ祫浜у勾鍒濅綑棰�(鍏�)" )
- @Column(name = "qtfldzcncye", precision = 20, scale = 2)
- private BigDecimal qtfldzcncye;
+ @Column(name = "qtfldzcncye")
+ private Double qtfldzcncye;
@PropertyDef(label = "闈炴祦鍔ㄨ祫浜у悎璁℃湡鏈綑棰�(鍏�)" )
- @Column(name = "fldzcqmye", precision = 20, scale = 2)
- private BigDecimal fldzcqmye;
+ @Column(name = "fldzcqmye")
+ private Double fldzcqmye;
@PropertyDef(label = "闈炴祦鍔ㄨ祫浜у悎璁″勾鍒濅綑棰�(鍏�)" )
- @Column(name = "fldzcncye", precision = 20, scale = 2)
- private BigDecimal fldzcncye;
+ @Column(name = "fldzcncye")
+ private Double fldzcncye;
@PropertyDef(label = "璧勪骇鎬昏鏈熸湯浣欓(鍏�)" )
- @Column(name = "zczjqmye", precision = 20, scale = 2)
- private BigDecimal zczjqmye;
+ @Column(name = "zczjqmye")
+ private Double zczjqmye;
@PropertyDef(label = "璧勪骇鎬昏骞村垵浣欓(鍏�)" )
- @Column(name = "zczjncye", precision = 20, scale = 2)
- private BigDecimal zczjncye;
+ @Column(name = "zczjncye")
+ private Double zczjncye;
@PropertyDef(label = "鐭湡鍊熸鏈熸湯浣欓(鍏�)" )
- @Column(name = "dqjkmye", precision = 20, scale = 2)
- private BigDecimal dqjkmye;
+ @Column(name = "dqjkmye")
+ private Double dqjkmye;
@PropertyDef(label = "鐭湡鍊熸骞村垵浣欓(鍏�)" )
- @Column(name = "dqjkncye", precision = 20, scale = 2)
- private BigDecimal dqjkncye;
+ @Column(name = "dqjkncye")
+ private Double dqjkncye;
@PropertyDef(label = "浜ゆ槗鎬ч噾铻嶈礋鍊烘湡鏈綑棰�(鍏�)" )
- @Column(name = "jyxjrfzqmye", precision = 20, scale = 2)
- private BigDecimal jyxjrfzqmye;
+ @Column(name = "jyxjrfzqmye")
+ private Double jyxjrfzqmye;
@PropertyDef(label = "浜ゆ槗鎬ч噾铻嶈礋鍊哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "jyxjrfzncye", precision = 20, scale = 2)
- private BigDecimal jyxjrfzncye;
+ @Column(name = "jyxjrfzncye")
+ private Double jyxjrfzncye;
@PropertyDef(label = "琛嶇敓閲戣瀺璐熷�烘湡鏈綑棰�(鍏�)" )
- @Column(name = "ysjrfzqmye", precision = 20, scale = 2)
- private BigDecimal ysjrfzqmye;
+ @Column(name = "ysjrfzqmye")
+ private Double ysjrfzqmye;
@PropertyDef(label = "琛嶇敓閲戣瀺璐熷�哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "ysjrfzncye", precision = 20, scale = 2)
- private BigDecimal ysjrfzncye;
+ @Column(name = "ysjrfzncye")
+ private Double ysjrfzncye;
@PropertyDef(label = "搴斾粯绁ㄦ嵁鏈熸湯浣欓(鍏�)" )
- @Column(name = "ldfzyspjqmye", precision = 20, scale = 2)
- private BigDecimal ldfzyspjqmye;
+ @Column(name = "ldfzyspjqmye")
+ private Double ldfzyspjqmye;
@PropertyDef(label = "搴斾粯绁ㄦ嵁骞村垵浣欓(鍏�)" )
- @Column(name = "ldfzyspjncye", precision = 20, scale = 2)
- private BigDecimal ldfzyspjncye;
+ @Column(name = "ldfzyspjncye")
+ private Double ldfzyspjncye;
@PropertyDef(label = "搴斾粯璐︽鏈熸湯浣欓(鍏�)" )
- @Column(name = "ldfzyszkqmye", precision = 20, scale = 2)
- private BigDecimal ldfzyszkqmye;
+ @Column(name = "ldfzyszkqmye")
+ private Double ldfzyszkqmye;
@PropertyDef(label = "搴斾粯璐︽骞村垵浣欓(鍏�)" )
- @Column(name = "ldfzyszkncye", precision = 20, scale = 2)
- private BigDecimal ldfzyszkncye;
+ @Column(name = "ldfzyszkncye")
+ private Double ldfzyszkncye;
@PropertyDef(label = "棰勬敹娆鹃」鏈熸湯浣欓(鍏�)" )
- @Column(name = "ldfzyuskxqmye", precision = 20, scale = 2)
- private BigDecimal ldfzyuskxqmye;
+ @Column(name = "ldfzyuskxqmye")
+ private Double ldfzyuskxqmye;
@PropertyDef(label = "棰勬敹娆鹃」骞村垵浣欓(鍏�)" )
- @Column(name = "ldfzyuskxncye", precision = 20, scale = 2)
- private BigDecimal ldfzyuskxncye;
+ @Column(name = "ldfzyuskxncye")
+ private Double ldfzyuskxncye;
@PropertyDef(label = "鍚堝悓璐熷�烘湡鏈綑棰�(鍏�)" )
- @Column(name = "htfzqmye", precision = 20, scale = 2)
- private BigDecimal htfzqmye;
+ @Column(name = "htfzqmye")
+ private Double htfzqmye;
@PropertyDef(label = "鍚堝悓璐熷�哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "htfzncye", precision = 20, scale = 2)
- private BigDecimal htfzncye;
+ @Column(name = "htfzncye")
+ private Double htfzncye;
@PropertyDef(label = "搴斾粯鑱屽伐钖叕鏈熸湯浣欓(鍏�)" )
- @Column(name = "yfzgxcqmye", precision = 20, scale = 2)
- private BigDecimal yfzgxcqmye;
+ @Column(name = "yfzgxcqmye")
+ private Double yfzgxcqmye;
@PropertyDef(label = "搴斾粯鑱屽伐钖叕骞村垵浣欓(鍏�)" )
- @Column(name = "yfzgxcncye", precision = 20, scale = 2)
- private BigDecimal yfzgxcncye;
+ @Column(name = "yfzgxcncye")
+ private Double yfzgxcncye;
@PropertyDef(label = "搴斾氦绋庤垂鏈熸湯浣欓(鍏�)" )
- @Column(name = "yjsfqmye", precision = 20, scale = 2)
- private BigDecimal yjsfqmye;
+ @Column(name = "yjsfqmye")
+ private Double yjsfqmye;
@PropertyDef(label = "搴斾氦绋庤垂骞村垵浣欓(鍏�)" )
- @Column(name = "yjsfncye", precision = 20, scale = 2)
- private BigDecimal yjsfncye;
+ @Column(name = "yjsfncye")
+ private Double yjsfncye;
@PropertyDef(label = "鍏朵粬搴斾粯娆炬湡鏈綑棰�(鍏�)" )
- @Column(name = "qtyfkqmye", precision = 20, scale = 2)
- private BigDecimal qtyfkqmye;
+ @Column(name = "qtyfkqmye")
+ private Double qtyfkqmye;
@PropertyDef(label = "鍏朵粬搴斾粯娆惧勾鍒濅綑棰�(鍏�)" )
- @Column(name = "qtyfkncye", precision = 20, scale = 2)
- private BigDecimal qtyfkncye;
+ @Column(name = "qtyfkncye")
+ private Double qtyfkncye;
@PropertyDef(label = "鎸佹湁寰呭敭璐熷�烘湡鏈綑棰�(鍏�)" )
- @Column(name = "cydsfzqmye", precision = 20, scale = 2)
- private BigDecimal cydsfzqmye;
+ @Column(name = "cydsfzqmye")
+ private Double cydsfzqmye;
@PropertyDef(label = "鎸佹湁寰呭敭璐熷�哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "cydsfzncye", precision = 20, scale = 2)
- private BigDecimal cydsfzncye;
+ @Column(name = "cydsfzncye")
+ private Double cydsfzncye;
@PropertyDef(label = "涓�骞村唴鍒版湡鐨勯潪娴佸姩璐熷�烘湡鏈綑棰�(鍏�)" )
- @Column(name = "ynddqfldfzqmye", precision = 20, scale = 2)
- private BigDecimal ynddqfldfzqmye;
+ @Column(name = "ynddqfldfzqmye")
+ private Double ynddqfldfzqmye;
@PropertyDef(label = "涓�骞村唴鍒版湡鐨勯潪娴佸姩璐熷�哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "ynddqfldfzncye", precision = 20, scale = 2)
- private BigDecimal ynddqfldfzncye;
+ @Column(name = "ynddqfldfzncye")
+ private Double ynddqfldfzncye;
@PropertyDef(label = "鍏朵粬娴佸姩璐熷�烘湡鏈綑棰�(鍏�)" )
- @Column(name = "qtldfzqmye", precision = 20, scale = 2)
- private BigDecimal qtldfzqmye;
+ @Column(name = "qtldfzqmye")
+ private Double qtldfzqmye;
@PropertyDef(label = "鍏朵粬娴佸姩璐熷�哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "qtldfzncye", precision = 20, scale = 2)
- private BigDecimal qtldfzncye;
+ @Column(name = "qtldfzncye")
+ private Double qtldfzncye;
@PropertyDef(label = "娴佸姩璐熷�哄悎璁℃湡鏈綑棰�(鍏�)" )
- @Column(name = "ldfzhjqmye", precision = 20, scale = 2)
- private BigDecimal ldfzhjqmye;
+ @Column(name = "ldfzhjqmye")
+ private Double ldfzhjqmye;
@PropertyDef(label = "娴佸姩璐熷�哄悎璁″勾鍒濅綑棰�(鍏�)" )
- @Column(name = "ldfzhjncye", precision = 20, scale = 2)
- private BigDecimal ldfzhjncye;
+ @Column(name = "ldfzhjncye")
+ private Double ldfzhjncye;
@PropertyDef(label = "闀挎湡鍊熸鏈熸湯浣欓(鍏�)" )
- @Column(name = "cqjkqmye", precision = 20, scale = 2)
- private BigDecimal cqjkqmye;
+ @Column(name = "cqjkqmye")
+ private Double cqjkqmye;
@PropertyDef(label = "闀挎湡鍊熸骞村垵浣欓(鍏�)" )
- @Column(name = "cqjkncye", precision = 20, scale = 2)
- private BigDecimal cqjkncye;
+ @Column(name = "cqjkncye")
+ private Double cqjkncye;
@PropertyDef(label = "搴斾粯鍊哄埜鏈熸湯浣欓(鍏�)" )
- @Column(name = "yfzqqmye", precision = 20, scale = 2)
- private BigDecimal yfzqqmye;
+ @Column(name = "yfzqqmye")
+ private Double yfzqqmye;
@PropertyDef(label = "搴斾粯鍊哄埜骞村垵浣欓(鍏�)" )
- @Column(name = "yfzqncye", precision = 20, scale = 2)
- private BigDecimal yfzqncye;
+ @Column(name = "yfzqncye")
+ private Double yfzqncye;
@PropertyDef(label = "鍏朵腑锛氫紭鍏堣偂鏈熸湯浣欓(鍏�)" )
- @Column(name = "yfzqyxgqmye", precision = 20, scale = 2)
- private BigDecimal yfzqyxgqmye;
+ @Column(name = "yfzqyxgqmye")
+ private Double yfzqyxgqmye;
@PropertyDef(label = "鍏朵腑锛氫紭鍏堣偂骞村垵浣欓(鍏�)" )
- @Column(name = "yfzqyxgncye", precision = 20, scale = 2)
- private BigDecimal yfzqyxgncye;
+ @Column(name = "yfzqyxgncye")
+ private Double yfzqyxgncye;
@PropertyDef(label = "姘哥画鍊烘湡鏈綑棰�(鍏�)" )
- @Column(name = "yfzqyxzqmye", precision = 20, scale = 2)
- private BigDecimal yfzqyxzqmye;
+ @Column(name = "yfzqyxzqmye")
+ private Double yfzqyxzqmye;
@PropertyDef(label = "姘哥画鍊哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "yfzqyxzncye", precision = 20, scale = 2)
- private BigDecimal yfzqyxzncye;
+ @Column(name = "yfzqyxzncye")
+ private Double yfzqyxzncye;
@PropertyDef(label = "闀挎湡搴斾粯娆炬湡鏈綑棰�(鍏�)" )
- @Column(name = "cqyfkqmye", precision = 20, scale = 2)
- private BigDecimal cqyfkqmye;
+ @Column(name = "cqyfkqmye")
+ private Double cqyfkqmye;
@PropertyDef(label = "闀挎湡搴斾粯娆惧勾鍒濅綑棰�(鍏�)" )
- @Column(name = "cqyfkncye", precision = 20, scale = 2)
- private BigDecimal cqyfkncye;
+ @Column(name = "cqyfkncye")
+ private Double cqyfkncye;
@PropertyDef(label = "棰勮璐熷�烘湡鏈綑棰�(鍏�)" )
- @Column(name = "ysfzqmye", precision = 20, scale = 2)
- private BigDecimal ysfzqmye;
+ @Column(name = "ysfzqmye")
+ private Double ysfzqmye;
@PropertyDef(label = "棰勮璐熷�哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "ysfzncye", precision = 20, scale = 2)
- private BigDecimal ysfzncye;
+ @Column(name = "ysfzncye")
+ private Double ysfzncye;
@PropertyDef(label = "閫掑欢鏀剁泭鏈熸湯浣欓(鍏�)" )
- @Column(name = "dysyqmye", precision = 20, scale = 2)
- private BigDecimal dysyqmye;
+ @Column(name = "dysyqmye")
+ private Double dysyqmye;
@PropertyDef(label = "閫掑欢鏀剁泭骞村垵浣欓(鍏�)" )
- @Column(name = "dysyncye", precision = 20, scale = 2)
- private BigDecimal dysyncye;
+ @Column(name = "dysyncye")
+ private Double dysyncye;
@PropertyDef(label = "閫掑欢鎵�寰楃◣璐熷�烘湡鏈綑棰�(鍏�)" )
- @Column(name = "dysdsfzqmye", precision = 20, scale = 2)
- private BigDecimal dysdsfzqmye;
+ @Column(name = "dysdsfzqmye")
+ private Double dysdsfzqmye;
@PropertyDef(label = "閫掑欢鎵�寰楃◣璐熷�哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "dysdsfzncye", precision = 20, scale = 2)
- private BigDecimal dysdsfzncye;
+ @Column(name = "dysdsfzncye")
+ private Double dysdsfzncye;
@PropertyDef(label = "鍏朵粬闈炴祦鍔ㄨ礋鍊烘湡鏈綑棰�(鍏�)" )
- @Column(name = "qtfldfzqmye", precision = 20, scale = 2)
- private BigDecimal qtfldfzqmye;
+ @Column(name = "qtfldfzqmye")
+ private Double qtfldfzqmye;
@PropertyDef(label = "鍏朵粬闈炴祦鍔ㄨ礋鍊哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "qtfldfzncye", precision = 20, scale = 2)
- private BigDecimal qtfldfzncye;
+ @Column(name = "qtfldfzncye")
+ private Double qtfldfzncye;
@PropertyDef(label = "闈炴祦鍔ㄨ礋鍊哄悎璁℃湡鏈綑棰�(鍏�)" )
- @Column(name = "fldfzhjqmye", precision = 20, scale = 2)
- private BigDecimal fldfzhjqmye;
+ @Column(name = "fldfzhjqmye")
+ private Double fldfzhjqmye;
@PropertyDef(label = "闈炴祦鍔ㄨ礋鍊哄悎璁″勾鍒濅綑棰�(鍏�)" )
- @Column(name = "fldfzhjncye", precision = 20, scale = 2)
- private BigDecimal fldfzhjncye;
+ @Column(name = "fldfzhjncye")
+ private Double fldfzhjncye;
@PropertyDef(label = "璐熷�哄悎璁℃湡鏈綑棰�(鍏�)" )
- @Column(name = "fzhjqmye", precision = 20, scale = 2)
- private BigDecimal fzhjqmye;
+ @Column(name = "fzhjqmye")
+ private Double fzhjqmye;
@PropertyDef(label = "璐熷�哄悎璁″勾鍒濅綑棰�(鍏�)" )
- @Column(name = "fzhjncye", precision = 20, scale = 2)
- private BigDecimal fzhjncye;
+ @Column(name = "fzhjncye")
+ private Double fzhjncye;
@PropertyDef(label = "瀹炴敹璧勬湰(鎴栬偂鏈�)鏈熸湯浣欓(鍏�)" )
- @Column(name = "sszbqmye", precision = 20, scale = 2)
- private BigDecimal sszbqmye;
+ @Column(name = "sszbqmye")
+ private Double sszbqmye;
@PropertyDef(label = "瀹炴敹璧勬湰(鎴栬偂鏈�)骞村垵浣欓(鍏�)" )
- @Column(name = "sszbncye", precision = 20, scale = 2)
- private BigDecimal sszbncye;
+ @Column(name = "sszbncye")
+ private Double sszbncye;
@PropertyDef(label = "鍏朵粬鏉冪泭宸ュ叿鏈熸湯浣欓(鍏�)" )
- @Column(name = "qtqygjqmye", precision = 20, scale = 2)
- private BigDecimal qtqygjqmye;
+ @Column(name = "qtqygjqmye")
+ private Double qtqygjqmye;
@PropertyDef(label = "鍏朵粬鏉冪泭宸ュ叿骞村垵浣欓(鍏�)" )
- @Column(name = "qtqygjncye", precision = 20, scale = 2)
- private BigDecimal qtqygjncye;
+ @Column(name = "qtqygjncye")
+ private Double qtqygjncye;
@PropertyDef(label = "鍏朵腑锛氫紭鍏堣偂鏈熸湯浣欓(鍏�)" )
- @Column(name = "qtqygjyxgqmye", precision = 20, scale = 2)
- private BigDecimal qtqygjyxgqmye;
+ @Column(name = "qtqygjyxgqmye")
+ private Double qtqygjyxgqmye;
@PropertyDef(label = "鍏朵腑锛氫紭鍏堣偂骞村垵浣欓(鍏�)" )
- @Column(name = "qtqygjyxgncye", precision = 20, scale = 2)
- private BigDecimal qtqygjyxgncye;
+ @Column(name = "qtqygjyxgncye")
+ private Double qtqygjyxgncye;
@PropertyDef(label = "姘哥画鍊烘湡鏈綑棰�(鍏�)" )
- @Column(name = "qtqygjyxzqmye", precision = 20, scale = 2)
- private BigDecimal qtqygjyxzqmye;
+ @Column(name = "qtqygjyxzqmye")
+ private Double qtqygjyxzqmye;
@PropertyDef(label = "姘哥画鍊哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "qtqygjyxzncye", precision = 20, scale = 2)
- private BigDecimal qtqygjyxzncye;
+ @Column(name = "qtqygjyxzncye")
+ private Double qtqygjyxzncye;
@PropertyDef(label = "璧勬湰鍏Н鏈熸湯浣欓(鍏�)" )
- @Column(name = "zbgjqmye", precision = 20, scale = 2)
- private BigDecimal zbgjqmye;
+ @Column(name = "zbgjqmye")
+ private Double zbgjqmye;
@PropertyDef(label = "璧勬湰鍏Н骞村垵浣欓(鍏�)" )
- @Column(name = "zbgjncye", precision = 20, scale = 2)
- private BigDecimal zbgjncye;
+ @Column(name = "zbgjncye")
+ private Double zbgjncye;
@PropertyDef(label = "鍑忥細搴撳瓨鑲℃湡鏈綑棰�(鍏�)" )
- @Column(name = "jkcgqmye", precision = 20, scale = 2)
- private BigDecimal jkcgqmye;
+ @Column(name = "jkcgqmye")
+ private Double jkcgqmye;
@PropertyDef(label = "鍑忥細搴撳瓨鑲″勾鍒濅綑棰�(鍏�)" )
- @Column(name = "jkcgncye", precision = 20, scale = 2)
- private BigDecimal jkcgncye;
+ @Column(name = "jkcgncye")
+ private Double jkcgncye;
@PropertyDef(label = "鍏朵粬缁煎悎鏀剁泭鏈熸湯浣欓(鍏�)" )
- @Column(name = "qtzhsyqmye", precision = 20, scale = 2)
- private BigDecimal qtzhsyqmye;
+ @Column(name = "qtzhsyqmye")
+ private Double qtzhsyqmye;
@PropertyDef(label = "鍏朵粬缁煎悎鏀剁泭骞村垵浣欓(鍏�)" )
- @Column(name = "qtzhsyncye", precision = 20, scale = 2)
- private BigDecimal qtzhsyncye;
+ @Column(name = "qtzhsyncye")
+ private Double qtzhsyncye;
@PropertyDef(label = "涓撻」鍌ㄥ鏈熸湯浣欓(鍏�)" )
- @Column(name = "zxcbqmye", precision = 20, scale = 2)
- private BigDecimal zxcbqmye;
+ @Column(name = "zxcbqmye")
+ private Double zxcbqmye;
@PropertyDef(label = "涓撻」鍌ㄥ骞村垵浣欓(鍏�)" )
- @Column(name = "zxcbncye", precision = 20, scale = 2)
- private BigDecimal zxcbncye;
+ @Column(name = "zxcbncye")
+ private Double zxcbncye;
@PropertyDef(label = "鐩堜綑鍏Н鏈熸湯浣欓(鍏�)" )
- @Column(name = "yygjqmye", precision = 20, scale = 2)
- private BigDecimal yygjqmye;
+ @Column(name = "yygjqmye")
+ private Double yygjqmye;
@PropertyDef(label = "鐩堜綑鍏Н骞村垵浣欓(鍏�)" )
- @Column(name = "yygjncye", precision = 20, scale = 2)
- private BigDecimal yygjncye;
+ @Column(name = "yygjncye")
+ private Double yygjncye;
@PropertyDef(label = "鏈垎閰嶅埄娑︽湡鏈綑棰�(鍏�)" )
- @Column(name = "wfplrqmye", precision = 20, scale = 2)
- private BigDecimal wfplrqmye;
+ @Column(name = "wfplrqmye")
+ private Double wfplrqmye;
@PropertyDef(label = "鏈垎閰嶅埄娑﹀勾鍒濅綑棰�(鍏�)" )
- @Column(name = "wfplrncye", precision = 20, scale = 2)
- private BigDecimal wfplrncye;
+ @Column(name = "wfplrncye")
+ private Double wfplrncye;
@PropertyDef(label = "鎵�鏈夎�呮潈鐩�(鎴栬偂涓滄潈鐩�)鍚堣鏈熸湯浣欓(鍏�)" )
- @Column(name = "syzqyqmye", precision = 20, scale = 2)
- private BigDecimal syzqyqmye;
+ @Column(name = "syzqyqmye")
+ private Double syzqyqmye;
@PropertyDef(label = "鎵�鏈夎�呮潈鐩�(鎴栬偂涓滄潈鐩�)鍚堣骞村垵浣欓(鍏�)" )
- @Column(name = "syzqyncye", precision = 20, scale = 2)
- private BigDecimal syzqyncye;
+ @Column(name = "syzqyncye")
+ private Double syzqyncye;
@PropertyDef(label = "璐熷�哄拰鎵�鏈夎�呮潈鐩�(鎴栬偂涓滅泭)鎬昏鏈熸湯浣欓(鍏�)" )
- @Column(name = "fzhsyzqyqmye", precision = 20, scale = 2)
- private BigDecimal fzhsyzqyqmye;
+ @Column(name = "fzhsyzqyqmye")
+ private Double fzhsyzqyqmye;
@PropertyDef(label = "璐熷�哄拰鎵�鏈夎�呮潈鐩�(鎴栬偂涓滅泭)鎬昏骞村垵浣欓(鍏�)" )
- @Column(name = "fzhsyzqyncye", precision = 20, scale = 2)
- private BigDecimal fzhsyzqyncye;
+ @Column(name = "fzhsyzqyncye")
+ private Double fzhsyzqyncye;
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
@Column(name = "zhgxsj")
diff --git a/igds-manager/src/main/java/com/ld/igds/models/CashFlow.java b/igds-manager/src/main/java/com/ld/igds/models/CashFlow.java
index 25a0fc4..8aa3e5b 100644
--- a/igds-manager/src/main/java/com/ld/igds/models/CashFlow.java
+++ b/igds-manager/src/main/java/com/ld/igds/models/CashFlow.java
@@ -7,7 +7,6 @@
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
-import java.math.BigDecimal;
import java.util.Date;
/**
@@ -41,308 +40,308 @@
private Date bbsj;
@PropertyDef(label = "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺鏈湀鏁�(鍏�)" )
- @Column(name = "jyhdxjllbys", precision = 20, scale = 2)
- private BigDecimal jyhdxjllbys;
+ @Column(name = "jyhdxjllbys")
+ private Double jyhdxjllbys;
@PropertyDef(label = "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺鏈勾绱鏁�(鍏�)" )
- @Column(name = "jyhdxjllbnljs", precision = 20, scale = 2)
- private BigDecimal jyhdxjllbnljs;
+ @Column(name = "jyhdxjllbnljs")
+ private Double jyhdxjllbnljs;
@PropertyDef(label = "閿�鍞晢鍝併�佹彁渚涘姵鍔℃敹鍒扮殑鐜伴噾鏈湀鏁�(鍏�)" )
- @Column(name = "xssplwxjbys", precision = 20, scale = 2)
- private BigDecimal xssplwxjbys;
+ @Column(name = "xssplwxjbys")
+ private Double xssplwxjbys;
@PropertyDef(label = "閿�鍞晢鍝併�佹彁渚涘姵鍔℃敹鍒扮殑鐜伴噾鏈勾绱鏁�(鍏�)" )
- @Column(name = "xssplwxjbnljs", precision = 20, scale = 2)
- private BigDecimal xssplwxjbnljs;
+ @Column(name = "xssplwxjbnljs")
+ private Double xssplwxjbnljs;
@PropertyDef(label = "鏀跺埌鐨勭◣璐硅繑杩樻湰鏈堟暟(鍏�)" )
- @Column(name = "sffhbys", precision = 20, scale = 2)
- private BigDecimal sffhbys;
+ @Column(name = "sffhbys")
+ private Double sffhbys;
@PropertyDef(label = "鏀跺埌鐨勭◣璐硅繑杩樻湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "sffhbnljs", precision = 20, scale = 2)
- private BigDecimal sffhbnljs;
+ @Column(name = "sffhbnljs")
+ private Double sffhbnljs;
@PropertyDef(label = "鏀跺埌鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾鏈湀鏁�(鍏�)" )
- @Column(name = "qtjyhdxjbys", precision = 20, scale = 2)
- private BigDecimal qtjyhdxjbys;
+ @Column(name = "qtjyhdxjbys")
+ private Double qtjyhdxjbys;
@PropertyDef(label = "鏀跺埌鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾鏈勾绱鏁�(鍏�)" )
- @Column(name = "qtjyhdxjbnljs", precision = 20, scale = 2)
- private BigDecimal qtjyhdxjbnljs;
+ @Column(name = "qtjyhdxjbnljs")
+ private Double qtjyhdxjbnljs;
@PropertyDef(label = "缁忚惀娲诲姩鐜伴噾娴佸叆灏忚鏈湀鏁�(鍏�)" )
- @Column(name = "jyhdxjlrbys", precision = 20, scale = 2)
- private BigDecimal jyhdxjlrbys;
+ @Column(name = "jyhdxjlrbys")
+ private Double jyhdxjlrbys;
@PropertyDef(label = "缁忚惀娲诲姩鐜伴噾娴佸叆灏忚鏈勾绱鏁�(鍏�)" )
- @Column(name = "jyhdxjlrbnljs", precision = 20, scale = 2)
- private BigDecimal jyhdxjlrbnljs;
+ @Column(name = "jyhdxjlrbnljs")
+ private Double jyhdxjlrbnljs;
@PropertyDef(label = "璐拱鍟嗗搧銆佹帴鍙楀姵鍔℃敮浠樼殑鐜伴噾鏈湀鏁�(鍏�)" )
- @Column(name = "gmsplwzfbys", precision = 20, scale = 2)
- private BigDecimal gmsplwzfbys;
+ @Column(name = "gmsplwzfbys")
+ private Double gmsplwzfbys;
@PropertyDef(label = "璐拱鍟嗗搧銆佹帴鍙楀姵鍔℃敮浠樼殑鐜伴噾鏈勾绱鏁�(鍏�)" )
- @Column(name = "gmsplwzfbnljs", precision = 20, scale = 2)
- private BigDecimal gmsplwzfbnljs;
+ @Column(name = "gmsplwzfbnljs")
+ private Double gmsplwzfbnljs;
@PropertyDef(label = "鏀粯缁欒亴宸ュ強涓鸿亴宸ユ敮浠樼殑鐜伴噾鏈湀鏁�(鍏�)" )
- @Column(name = "zfzgxjbys", precision = 20, scale = 2)
- private BigDecimal zfzgxjbys;
+ @Column(name = "zfzgxjbys")
+ private Double zfzgxjbys;
@PropertyDef(label = "鏀粯缁欒亴宸ュ強涓鸿亴宸ユ敮浠樼殑鐜伴噾鏈勾绱鏁�(鍏�)" )
- @Column(name = "zfzgxjbnljs", precision = 20, scale = 2)
- private BigDecimal zfzgxjbnljs;
+ @Column(name = "zfzgxjbnljs")
+ private Double zfzgxjbnljs;
@PropertyDef(label = "鏀粯鐨勫悇椤圭◣璐规湰鏈堟暟(鍏�)" )
- @Column(name = "zfxxsfbys", precision = 20, scale = 2)
- private BigDecimal zfxxsfbys;
+ @Column(name = "zfxxsfbys")
+ private Double zfxxsfbys;
@PropertyDef(label = "鏀粯鐨勫悇椤圭◣璐规湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "zfxxsfbnljs", precision = 20, scale = 2)
- private BigDecimal zfxxsfbnljs;
+ @Column(name = "zfxxsfbnljs")
+ private Double zfxxsfbnljs;
@PropertyDef(label = "鏀粯鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾鏈湀鏁�(鍏�)" )
- @Column(name = "zfqtjyhdxjbys", precision = 20, scale = 2)
- private BigDecimal zfqtjyhdxjbys;
+ @Column(name = "zfqtjyhdxjbys")
+ private Double zfqtjyhdxjbys;
@PropertyDef(label = "鏀粯鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾鏈勾绱鏁�(鍏�)" )
- @Column(name = "zfqtjyhdxjbnljs", precision = 20, scale = 2)
- private BigDecimal zfqtjyhdxjbnljs;
+ @Column(name = "zfqtjyhdxjbnljs")
+ private Double zfqtjyhdxjbnljs;
@PropertyDef(label = "缁忚惀娲诲姩鐜伴噾娴佸嚭灏忚鏈湀鏁�(鍏�)" )
- @Column(name = "jyhdxjlcbys", precision = 20, scale = 2)
- private BigDecimal jyhdxjlcbys;
+ @Column(name = "jyhdxjlcbys")
+ private Double jyhdxjlcbys;
@PropertyDef(label = "缁忚惀娲诲姩鐜伴噾娴佸嚭灏忚鏈勾绱鏁�(鍏�)" )
- @Column(name = "jyhdxjlcbnljs", precision = 20, scale = 2)
- private BigDecimal jyhdxjlcbnljs;
+ @Column(name = "jyhdxjlcbnljs")
+ private Double jyhdxjlcbnljs;
@PropertyDef(label = "缁忚惀娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰濇湰鏈堟暟(鍏�)" )
- @Column(name = "jyhdxjlljebys", precision = 20, scale = 2)
- private BigDecimal jyhdxjlljebys;
+ @Column(name = "jyhdxjlljebys")
+ private Double jyhdxjlljebys;
@PropertyDef(label = "缁忚惀娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰濇湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "jyhdxjlljebnljs", precision = 20, scale = 2)
- private BigDecimal jyhdxjlljebnljs;
+ @Column(name = "jyhdxjlljebnljs")
+ private Double jyhdxjlljebnljs;
@PropertyDef(label = "浜屻�佹姇璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛氭湰鏈堟暟(鍏�)" )
- @Column(name = "tzhdxjllbys", precision = 20, scale = 2)
- private BigDecimal tzhdxjllbys;
+ @Column(name = "tzhdxjllbys")
+ private Double tzhdxjllbys;
@PropertyDef(label = "浜屻�佹姇璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛氭湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "tzhdxjllbnljs", precision = 20, scale = 2)
- private BigDecimal tzhdxjllbnljs;
+ @Column(name = "tzhdxjllbnljs")
+ private Double tzhdxjllbnljs;
@PropertyDef(label = "鏀跺洖鎶曡祫鏀跺埌鐨勭幇閲戞湰鏈堟暟(鍏�)" )
- @Column(name = "shtzxjbys", precision = 20, scale = 2)
- private BigDecimal shtzxjbys;
+ @Column(name = "shtzxjbys")
+ private Double shtzxjbys;
@PropertyDef(label = "鏀跺洖鎶曡祫鏀跺埌鐨勭幇閲戞湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "shtzxjbnljs", precision = 20, scale = 2)
- private BigDecimal shtzxjbnljs;
+ @Column(name = "shtzxjbnljs")
+ private Double shtzxjbnljs;
@PropertyDef(label = "鍙栧緱鎶曡祫鏀剁泭鏀跺埌鐨勭幇閲戞湰鏈堟暟(鍏�)" )
- @Column(name = "qdtzsyxjbys", precision = 20, scale = 2)
- private BigDecimal qdtzsyxjbys;
+ @Column(name = "qdtzsyxjbys")
+ private Double qdtzsyxjbys;
@PropertyDef(label = "鍙栧緱鎶曡祫鏀剁泭鏀跺埌鐨勭幇閲戞湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "qdtzsyxjbnljs", precision = 20, scale = 2)
- private BigDecimal qdtzsyxjbnljs;
+ @Column(name = "qdtzsyxjbnljs")
+ private Double qdtzsyxjbnljs;
@PropertyDef(label = "澶勭疆鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀跺洖鐨勭幇閲戝噣棰濇湰鏈堟暟(鍏�)" )
- @Column(name = "czgdzcdxjjebys", precision = 20, scale = 2)
- private BigDecimal czgdzcdxjjebys;
+ @Column(name = "czgdzcdxjjebys")
+ private Double czgdzcdxjjebys;
@PropertyDef(label = "澶勭疆鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀跺洖鐨勭幇閲戝噣棰濇湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "czgdzcdxjjebnljs", precision = 20, scale = 2)
- private BigDecimal czgdzcdxjjebnljs;
+ @Column(name = "czgdzcdxjjebnljs")
+ private Double czgdzcdxjjebnljs;
@PropertyDef(label = "澶勭疆瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀跺埌鐨勭幇閲戝噣棰濇湰鏈堟暟(鍏�)" )
- @Column(name = "czqtdwxjjebys", precision = 20, scale = 2)
- private BigDecimal czqtdwxjjebys;
+ @Column(name = "czqtdwxjjebys")
+ private Double czqtdwxjjebys;
@PropertyDef(label = "澶勭疆瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀跺埌鐨勭幇閲戝噣棰濇湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "czqtdwxjjebnljs", precision = 20, scale = 2)
- private BigDecimal czqtdwxjjebnljs;
+ @Column(name = "czqtdwxjjebnljs")
+ private Double czqtdwxjjebnljs;
@PropertyDef(label = "鏀跺埌鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾鏈湀鏁�(鍏�)" )
- @Column(name = "sdqttzxjbys", precision = 20, scale = 2)
- private BigDecimal sdqttzxjbys;
+ @Column(name = "sdqttzxjbys")
+ private Double sdqttzxjbys;
@PropertyDef(label = "鏀跺埌鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾鏈勾绱鏁�(鍏�)" )
- @Column(name = "sdqttzxjbnljs", precision = 20, scale = 2)
- private BigDecimal sdqttzxjbnljs;
+ @Column(name = "sdqttzxjbnljs")
+ private Double sdqttzxjbnljs;
@PropertyDef(label = "鎶曡祫娲诲姩鐜伴噾娴佸叆灏忚鏈湀鏁�(鍏�)" )
- @Column(name = "tzhdxjlrbys", precision = 20, scale = 2)
- private BigDecimal tzhdxjlrbys;
+ @Column(name = "tzhdxjlrbys")
+ private Double tzhdxjlrbys;
@PropertyDef(label = "鎶曡祫娲诲姩鐜伴噾娴佸叆灏忚鏈勾绱鏁�(鍏�)" )
- @Column(name = "tzhdxjlrbnljs", precision = 20, scale = 2)
- private BigDecimal tzhdxjlrbnljs;
+ @Column(name = "tzhdxjlrbnljs")
+ private Double tzhdxjlrbnljs;
@PropertyDef(label = "璐缓鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀粯鐨勭幇閲戞湰鏈堟暟(鍏�)" )
- @Column(name = "gjgdzcdxjbys", precision = 20, scale = 2)
- private BigDecimal gjgdzcdxjbys;
+ @Column(name = "gjgdzcdxjbys")
+ private Double gjgdzcdxjbys;
@PropertyDef(label = "璐缓鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀粯鐨勭幇閲戞湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "gjgdzcdxjbnljs", precision = 20, scale = 2)
- private BigDecimal gjgdzcdxjbnljs;
+ @Column(name = "gjgdzcdxjbnljs")
+ private Double gjgdzcdxjbnljs;
@PropertyDef(label = "鎶曡祫鏀粯鐨勭幇閲戞湰鏈堟暟(鍏�)" )
- @Column(name = "tzzfxjbys", precision = 20, scale = 2)
- private BigDecimal tzzfxjbys;
+ @Column(name = "tzzfxjbys")
+ private Double tzzfxjbys;
@PropertyDef(label = "鎶曡祫鏀粯鐨勭幇閲戞湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "tzzfxjbnljs", precision = 20, scale = 2)
- private BigDecimal tzzfxjbnljs;
+ @Column(name = "tzzfxjbnljs")
+ private Double tzzfxjbnljs;
@PropertyDef(label = "鍙栧緱瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀粯鐨勭幇閲戝噣棰濇湰鏈堟暟(鍏�)" )
- @Column(name = "qdzgsdzfxjjebys", precision = 20, scale = 2)
- private BigDecimal qdzgsdzfxjjebys;
+ @Column(name = "qdzgsdzfxjjebys")
+ private Double qdzgsdzfxjjebys;
@PropertyDef(label = "鍙栧緱瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀粯鐨勭幇閲戝噣棰濇湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "qdzgsdzfxjjebnljs", precision = 20, scale = 2)
- private BigDecimal qdzgsdzfxjjebnljs;
+ @Column(name = "qdzgsdzfxjjebnljs")
+ private Double qdzgsdzfxjjebnljs;
@PropertyDef(label = "鏀粯鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾鏈湀鏁�(鍏�)" )
- @Column(name = "zfqttzxjbys", precision = 20, scale = 2)
- private BigDecimal zfqttzxjbys;
+ @Column(name = "zfqttzxjbys")
+ private Double zfqttzxjbys;
@PropertyDef(label = "鏀粯鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾鏈勾绱鏁�(鍏�)" )
- @Column(name = "zfqttzxjbnljs", precision = 20, scale = 2)
- private BigDecimal zfqttzxjbnljs;
+ @Column(name = "zfqttzxjbnljs")
+ private Double zfqttzxjbnljs;
@PropertyDef(label = "鎶曡祫娲诲姩鐜伴噾娴佸嚭灏忚鏈湀鏁�(鍏�)" )
- @Column(name = "tzhdxjlcbys", precision = 20, scale = 2)
- private BigDecimal tzhdxjlcbys;
+ @Column(name = "tzhdxjlcbys")
+ private Double tzhdxjlcbys;
@PropertyDef(label = "鎶曡祫娲诲姩鐜伴噾娴佸嚭灏忚鏈勾绱鏁�(鍏�)" )
- @Column(name = "tzhdxjlcbnljs", precision = 20, scale = 2)
- private BigDecimal tzhdxjlcbnljs;
+ @Column(name = "tzhdxjlcbnljs")
+ private Double tzhdxjlcbnljs;
@PropertyDef(label = "鎶曡祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰濇湰鏈堟暟(鍏�)" )
- @Column(name = "tzhdcsxjlljebys", precision = 20, scale = 2)
- private BigDecimal tzhdcsxjlljebys;
+ @Column(name = "tzhdcsxjlljebys")
+ private Double tzhdcsxjlljebys;
@PropertyDef(label = "鎶曡祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰濇湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "tzhdcsxjlljebnljs", precision = 20, scale = 2)
- private BigDecimal tzhdcsxjlljebnljs;
+ @Column(name = "tzhdcsxjlljebnljs")
+ private Double tzhdcsxjlljebnljs;
@PropertyDef(label = "涓夈�佺璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛氭湰鏈堟暟(鍏�)" )
- @Column(name = "cchdxjllbys", precision = 20, scale = 2)
- private BigDecimal cchdxjllbys;
+ @Column(name = "cchdxjllbys")
+ private Double cchdxjllbys;
@PropertyDef(label = "涓夈�佺璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛氭湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "cchdxjllbnljs", precision = 20, scale = 2)
- private BigDecimal cchdxjllbnljs;
+ @Column(name = "cchdxjllbnljs")
+ private Double cchdxjllbnljs;
@PropertyDef(label = "鍚告敹鎶曡祫鏀跺埌鐨勭幇閲戞湰鏈堟暟(鍏�)" )
- @Column(name = "xstzxjbys", precision = 20, scale = 2)
- private BigDecimal xstzxjbys;
+ @Column(name = "xstzxjbys")
+ private Double xstzxjbys;
@PropertyDef(label = "鍚告敹鎶曡祫鏀跺埌鐨勭幇閲戞湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "xstzxjbnljs", precision = 20, scale = 2)
- private BigDecimal xstzxjbnljs;
+ @Column(name = "xstzxjbnljs")
+ private Double xstzxjbnljs;
@PropertyDef(label = "鍙栧緱鍊熸鏀跺埌鐨勭幇閲戞湰鏈堟暟(鍏�)" )
- @Column(name = "qdjkxjbys", precision = 20, scale = 2)
- private BigDecimal qdjkxjbys;
+ @Column(name = "qdjkxjbys")
+ private Double qdjkxjbys;
@PropertyDef(label = "鍙栧緱鍊熸鏀跺埌鐨勭幇閲戞湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "qdjkxjbnljs", precision = 20, scale = 2)
- private BigDecimal qdjkxjbnljs;
+ @Column(name = "qdjkxjbnljs")
+ private Double qdjkxjbnljs;
@PropertyDef(label = "鏀跺埌鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾鏈湀鏁�(鍏�)" )
- @Column(name = "sdqtczxjbys", precision = 20, scale = 2)
- private BigDecimal sdqtczxjbys;
+ @Column(name = "sdqtczxjbys")
+ private Double sdqtczxjbys;
@PropertyDef(label = "鏀跺埌鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾鏈勾绱鏁�(鍏�)" )
- @Column(name = "sdqtczxjbnljs", precision = 20, scale = 2)
- private BigDecimal sdqtczxjbnljs;
+ @Column(name = "sdqtczxjbnljs")
+ private Double sdqtczxjbnljs;
@PropertyDef(label = "绛硅祫娲诲姩鐜伴噾娴佸叆灏忚鏈湀鏁�(鍏�)" )
- @Column(name = "czhdxjlrbys", precision = 20, scale = 2)
- private BigDecimal czhdxjlrbys;
+ @Column(name = "czhdxjlrbys")
+ private Double czhdxjlrbys;
@PropertyDef(label = "绛硅祫娲诲姩鐜伴噾娴佸叆灏忚鏈勾绱鏁�(鍏�)" )
- @Column(name = "czhdxjlrbnljs", precision = 20, scale = 2)
- private BigDecimal czhdxjlrbnljs;
+ @Column(name = "czhdxjlrbnljs")
+ private Double czhdxjlrbnljs;
@PropertyDef(label = "鍋胯繕鍊哄姟鏀粯鐨勭幇閲戞湰鏈堟暟(鍏�)" )
- @Column(name = "chzwzfxjbys", precision = 20, scale = 2)
- private BigDecimal chzwzfxjbys;
+ @Column(name = "chzwzfxjbys")
+ private Double chzwzfxjbys;
@PropertyDef(label = "鍋胯繕鍊哄姟鏀粯鐨勭幇閲戞湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "chzwzfxjbnljs", precision = 20, scale = 2)
- private BigDecimal chzwzfxjbnljs;
+ @Column(name = "chzwzfxjbnljs")
+ private Double chzwzfxjbnljs;
@PropertyDef(label = "鍒嗛厤鑲″埄銆佸埄娑︽垨鍋夸粯鍒╂伅鏀粯鐨勭幇閲戞湰鏈堟暟(鍏�)" )
- @Column(name = "fpgldxjbys", precision = 20, scale = 2)
- private BigDecimal fpgldxjbys;
+ @Column(name = "fpgldxjbys")
+ private Double fpgldxjbys;
@PropertyDef(label = "鍒嗛厤鑲″埄銆佸埄娑︽垨鍋夸粯鍒╂伅鏀粯鐨勭幇閲戞湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "fpgldxjbnljs", precision = 20, scale = 2)
- private BigDecimal fpgldxjbnljs;
+ @Column(name = "fpgldxjbnljs")
+ private Double fpgldxjbnljs;
@PropertyDef(label = "鏀粯鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾鏈湀鏁�(鍏�)" )
- @Column(name = "zfqtdxjbys", precision = 20, scale = 2)
- private BigDecimal zfqtdxjbys;
+ @Column(name = "zfqtdxjbys")
+ private Double zfqtdxjbys;
@PropertyDef(label = "鏀粯鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾鏈勾绱鏁�(鍏�)" )
- @Column(name = "zfqtdxjbnljs", precision = 20, scale = 2)
- private BigDecimal zfqtdxjbnljs;
+ @Column(name = "zfqtdxjbnljs")
+ private Double zfqtdxjbnljs;
@PropertyDef(label = "绛硅祫娲诲姩鐜伴噾娴佸嚭灏忚鏈湀鏁�(鍏�)" )
- @Column(name = "czhdxjlcbys", precision = 20, scale = 2)
- private BigDecimal czhdxjlcbys;
+ @Column(name = "czhdxjlcbys")
+ private Double czhdxjlcbys;
@PropertyDef(label = "绛硅祫娲诲姩鐜伴噾娴佸嚭灏忚鏈勾绱鏁�(鍏�)" )
- @Column(name = "czhdxjlcbnljs", precision = 20, scale = 2)
- private BigDecimal czhdxjlcbnljs;
+ @Column(name = "czhdxjlcbnljs")
+ private Double czhdxjlcbnljs;
@PropertyDef(label = "绛硅祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰濇湰鏈堟暟(鍏�)" )
- @Column(name = "cchdxjlljebys", precision = 20, scale = 2)
- private BigDecimal cchdxjlljebys;
+ @Column(name = "cchdxjlljebys")
+ private Double cchdxjlljebys;
@PropertyDef(label = "绛硅祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰濇湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "cchdxjlljebnljs", precision = 20, scale = 2)
- private BigDecimal cchdxjlljebnljs;
+ @Column(name = "cchdxjlljebnljs")
+ private Double cchdxjlljebnljs;
@PropertyDef(label = "鍥涖�佹眹鐜囧彉鍔ㄥ鐜伴噾鍙婄幇閲戠瓑浠风墿鐨勫奖鍝嶆湰鏈堟暟(鍏�)" )
- @Column(name = "hlbdxjyxbys", precision = 20, scale = 2)
- private BigDecimal hlbdxjyxbys;
+ @Column(name = "hlbdxjyxbys")
+ private Double hlbdxjyxbys;
@PropertyDef(label = "鍥涖�佹眹鐜囧彉鍔ㄥ鐜伴噾鍙婄幇閲戠瓑浠风墿鐨勫奖鍝嶆湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "hlbdxjyxbnljs", precision = 20, scale = 2)
- private BigDecimal hlbdxjyxbnljs;
+ @Column(name = "hlbdxjyxbnljs")
+ private Double hlbdxjyxbnljs;
@PropertyDef(label = "浜斻�佺幇閲戝強鐜伴噾绛変环鐗╁噣澧炲姞棰濇湰鏈堟暟(鍏�)" )
- @Column(name = "xjdjwjzebys", precision = 20, scale = 2)
- private BigDecimal xjdjwjzebys;
+ @Column(name = "xjdjwjzebys")
+ private Double xjdjwjzebys;
@PropertyDef(label = "浜斻�佺幇閲戝強鐜伴噾绛変环鐗╁噣澧炲姞棰濇湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "xjdjwjzebnljs", precision = 20, scale = 2)
- private BigDecimal xjdjwjzebnljs;
+ @Column(name = "xjdjwjzebnljs")
+ private Double xjdjwjzebnljs;
@PropertyDef(label = "鍔狅細鏈熷垵鐜伴噾鍙婄幇閲戠瓑浠风墿浣欓鏈湀鏁�(鍏�)" )
- @Column(name = "qcxjdjwyebys", precision = 20, scale = 2)
- private BigDecimal qcxjdjwyebys;
+ @Column(name = "qcxjdjwyebys")
+ private Double qcxjdjwyebys;
@PropertyDef(label = "鍔狅細鏈熷垵鐜伴噾鍙婄幇閲戠瓑浠风墿浣欓鏈勾绱鏁�(鍏�)" )
- @Column(name = "qcxjdjwyebnljs", precision = 20, scale = 2)
- private BigDecimal qcxjdjwyebnljs;
+ @Column(name = "qcxjdjwyebnljs")
+ private Double qcxjdjwyebnljs;
@PropertyDef(label = "鍏�佹湡鏈幇閲戝強鐜伴噾绛変环鐗╀綑棰濇湰鏈堟暟(鍏�)" )
- @Column(name = "qmxjdjwyebys", precision = 20, scale = 2)
- private BigDecimal qmxjdjwyebys;
+ @Column(name = "qmxjdjwyebys")
+ private Double qmxjdjwyebys;
@PropertyDef(label = "鍏�佹湡鏈幇閲戝強鐜伴噾绛変环鐗╀綑棰濇湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "qmxjdjwyebnljs", precision = 20, scale = 2)
- private BigDecimal qmxjdjwyebnljs;
+ @Column(name = "qmxjdjwyebnljs")
+ private Double qmxjdjwyebnljs;
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
@Column(name = "zhgxsj")
diff --git a/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java b/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java
index ec90fa8..6436f8d 100644
--- a/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java
+++ b/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java
@@ -3,7 +3,6 @@
import com.bstek.dorado.annotation.PropertyDef;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
-
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
@@ -20,29 +19,17 @@
private static final long serialVersionUID = 1L;
@Id
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "ID")
- private String id;
-
- @Column(name = "kqdm", length = 40)
- @PropertyDef(label = "搴撳尯浠ｇ爜")
- private String kqdm;
+ @Column(name = "sbbh", length = 20)
+ @PropertyDef(label = "璁惧缂栧彿")
+ private String sbbh;
@Column(name = "COMPANY_ID_", length = 10)
@PropertyDef(label = "缁勭粐缂栫爜", description = "")
private String companyId;
- @Column(name = "dwdm", length = 18)
- @PropertyDef(label = "鍗曚綅浠ｇ爜")
- private String dwdm;
-
- @Column(name = "kqmc", length = 256)
- @PropertyDef(label = "搴撳尯鍚嶇О")
- private String kqmc;
-
- @Column(name = "sbbh", length = 20)
- @PropertyDef(label = "璁惧缂栧彿")
- private String sbbh;
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲簱鍖�")
+ private String deptId;
@Column(name = "sbyqmc", length = 50)
@PropertyDef(label = "璁惧浠櫒鍚嶇О")
@@ -75,7 +62,6 @@
@Column(name = "jdsj")
@PropertyDef(label = "妫�瀹氭椂闂�")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date jdsj;
@Column(name = "jddw", length = 256)
@@ -84,7 +70,6 @@
@Column(name = "UPDATE_TIME_")
@PropertyDef(label = "鏇存柊鏃堕棿")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date updateTime;
}
diff --git a/igds-manager/src/main/java/com/ld/igds/models/OAStaff.java b/igds-manager/src/main/java/com/ld/igds/models/OAStaff.java
index c359c92..0b862ad 100644
--- a/igds-manager/src/main/java/com/ld/igds/models/OAStaff.java
+++ b/igds-manager/src/main/java/com/ld/igds/models/OAStaff.java
@@ -25,30 +25,31 @@
@Table(name = "D_OA_STAFF")
public class OAStaff implements Serializable {
private static final long serialVersionUID = 1L;
+
@Id
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "ID")
- private String id;
+ @Column(name = "sfzhm", length = 18)
+ @PropertyDef(label = "韬唤璇佸彿鐮�")
+ private String sfzhm;
@Column(name = "COMPANY_ID_", length = 10)
@PropertyDef(label = "缁勭粐缂栫爜", description = "")
private String companyId;
- @Column(name = "dwdm", length = 18)
- @PropertyDef(label = "鍗曚綅浠ｇ爜")
- private String dwdm;
-
- @Column(name = "dwmc", length = 256)
- @PropertyDef(label = "鍗曚綅鍚嶇О")
- private String dwmc;
+ @Column(name = "DEPT_ID_", length = 20)
+ @PropertyDef(label = "搴撳尯缂栫爜", description = "")
+ private String deptId;
@Column(name = "lsbm", length = 256)
@PropertyDef(label = "闅跺睘閮ㄩ棬", description = "闅跺睘閮ㄩ棬鍚嶇О")
private String lsbm;
@Column(name = "xzqhdm", length = 6)
- @PropertyDef(label = "琛屾斂鍖哄垝浠ｇ爜")
+ @PropertyDef(label = "鎵�灞炶鏀垮尯鍒�")
private String xzqhdm;
+
+ @Column(name = "xzqhmc", length = 6)
+ @PropertyDef(label = "鎵�灞炶鏀垮尯鍒�")
+ private String xzqhmc;
@Column(name = "xm", length = 32)
@PropertyDef(label = "濮撳悕")
@@ -57,10 +58,6 @@
@Column(name = "xb", length = 1)
@PropertyDef(label = "鎬у埆")
private String xb;
-
- @Column(name = "sfzhm", length = 18)
- @PropertyDef(label = "韬唤璇佸彿鐮�")
- private String sfzhm;
@Column(name = "rzrq")
@PropertyDef(label = "鍏ヨ亴鏃ユ湡")
diff --git a/igds-manager/src/main/java/com/ld/igds/models/Profit.java b/igds-manager/src/main/java/com/ld/igds/models/Profit.java
index e8a8331..94a4cc3 100644
--- a/igds-manager/src/main/java/com/ld/igds/models/Profit.java
+++ b/igds-manager/src/main/java/com/ld/igds/models/Profit.java
@@ -7,7 +7,6 @@
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
-import java.math.BigDecimal;
import java.util.Date;
/**
@@ -41,348 +40,348 @@
private Date bbsj;
@PropertyDef(label = "涓�銆佽惀涓氭敹鍏ユ湰鏈熶綑棰�(鍏�)" )
- @Column(name = "yyzsrbqye", precision = 20, scale = 2)
- private BigDecimal yyzsrbqye;
+ @Column(name = "yyzsrbqye")
+ private Double yyzsrbqye;
@PropertyDef(label = "涓�銆佽惀涓氭敹鍏ユ湰骞寸疮璁�(鍏�)" )
- @Column(name = "yyzsrbnlj", precision = 20, scale = 2)
- private BigDecimal yyzsrbnlj;
+ @Column(name = "yyzsrbnlj")
+ private Double yyzsrbnlj;
@PropertyDef(label = "鍑忥細钀ヤ笟鎴愭湰鏈湡浣欓(鍏�)" )
- @Column(name = "yycbbqye", precision = 20, scale = 2)
- private BigDecimal yycbbqye;
+ @Column(name = "yycbbqye")
+ private Double yycbbqye;
@PropertyDef(label = "鍑忥細钀ヤ笟鎴愭湰鏈勾绱(鍏�)" )
- @Column(name = "yycbbnlj", precision = 20, scale = 2)
- private BigDecimal yycbbnlj;
+ @Column(name = "yycbbnlj")
+ private Double yycbbnlj;
@PropertyDef(label = "绋庨噾鍙婇檮鍔犳湰鏈熶綑棰�(鍏�)" )
- @Column(name = "sjjfjbqye", precision = 20, scale = 2)
- private BigDecimal sjjfjbqye;
+ @Column(name = "sjjfjbqye")
+ private Double sjjfjbqye;
@PropertyDef(label = "绋庨噾鍙婇檮鍔犳湰骞寸疮璁�(鍏�)" )
- @Column(name = "sjjfjbnlj", precision = 20, scale = 2)
- private BigDecimal sjjfjbnlj;
+ @Column(name = "sjjfjbnlj")
+ private Double sjjfjbnlj;
@PropertyDef(label = "閿�鍞垂鐢ㄦ湰鏈熶綑棰�(鍏�)" )
- @Column(name = "xsfybqye", precision = 20, scale = 2)
- private BigDecimal xsfybqye;
+ @Column(name = "xsfybqye")
+ private Double xsfybqye;
@PropertyDef(label = "閿�鍞垂鐢ㄦ湰骞寸疮璁�(鍏�)" )
- @Column(name = "xsfybnlj", precision = 20, scale = 2)
- private BigDecimal xsfybnlj;
+ @Column(name = "xsfybnlj")
+ private Double xsfybnlj;
@PropertyDef(label = "绠＄悊璐圭敤鏈湡浣欓(鍏�)" )
- @Column(name = "glfybqye", precision = 20, scale = 2)
- private BigDecimal glfybqye;
+ @Column(name = "glfybqye")
+ private Double glfybqye;
@PropertyDef(label = "绠＄悊璐圭敤鏈勾绱(鍏�)" )
- @Column(name = "glfybnlj", precision = 20, scale = 2)
- private BigDecimal glfybnlj;
+ @Column(name = "glfybnlj")
+ private Double glfybnlj;
@PropertyDef(label = "鐮斿彂璐圭敤鏈湡浣欓(鍏�)" )
- @Column(name = "yffybqye", precision = 20, scale = 2)
- private BigDecimal yffybqye;
+ @Column(name = "yffybqye")
+ private Double yffybqye;
@PropertyDef(label = "鐮斿彂璐圭敤鏈勾绱(鍏�)" )
- @Column(name = "yffybnlj", precision = 20, scale = 2)
- private BigDecimal yffybnlj;
+ @Column(name = "yffybnlj")
+ private Double yffybnlj;
@PropertyDef(label = "璐㈠姟璐圭敤鏈湡浣欓(鍏�)" )
- @Column(name = "cwfybqye", precision = 20, scale = 2)
- private BigDecimal cwfybqye;
+ @Column(name = "cwfybqye")
+ private Double cwfybqye;
@PropertyDef(label = "璐㈠姟璐圭敤鏈勾绱(鍏�)" )
- @Column(name = "cwfybnlj", precision = 20, scale = 2)
- private BigDecimal cwfybnlj;
+ @Column(name = "cwfybnlj")
+ private Double cwfybnlj;
@PropertyDef(label = "鍏朵腑锛氬埄鎭垂鐢ㄦ湰鏈熶綑棰�(鍏�)" )
- @Column(name = "lxfybqye", precision = 20, scale = 2)
- private BigDecimal lxfybqye;
+ @Column(name = "lxfybqye")
+ private Double lxfybqye;
@PropertyDef(label = "鍏朵腑锛氬埄鎭垂鐢ㄦ湰骞寸疮璁�(鍏�)" )
- @Column(name = "lxfybnlj", precision = 20, scale = 2)
- private BigDecimal lxfybnlj;
+ @Column(name = "lxfybnlj")
+ private Double lxfybnlj;
@PropertyDef(label = "鍒╂伅鏀跺叆鏈湡浣欓(鍏�)" )
- @Column(name = "lxsrbqye", precision = 20, scale = 2)
- private BigDecimal lxsrbqye;
+ @Column(name = "lxsrbqye")
+ private Double lxsrbqye;
@PropertyDef(label = "鍒╂伅鏀跺叆鏈勾绱(鍏�)" )
- @Column(name = "lxsrbnlj", precision = 20, scale = 2)
- private BigDecimal lxsrbnlj;
+ @Column(name = "lxsrbnlj")
+ private Double lxsrbnlj;
@PropertyDef(label = "鍔狅細鍏朵粬鏀剁泭鏈湡浣欓(鍏�)" )
- @Column(name = "qtsybqye", precision = 20, scale = 2)
- private BigDecimal qtsybqye;
+ @Column(name = "qtsybqye")
+ private Double qtsybqye;
@PropertyDef(label = "鍔狅細鍏朵粬鏀剁泭鏈勾绱(鍏�)" )
- @Column(name = "qtsybnlj", precision = 20, scale = 2)
- private BigDecimal qtsybnlj;
+ @Column(name = "qtsybnlj")
+ private Double qtsybnlj;
@PropertyDef(label = "鎶曡祫鏀剁泭(鎹熷け浠モ��-鈥濆彿濉垪)鏈湡浣欓(鍏�)" )
- @Column(name = "tzsybqye", precision = 20, scale = 2)
- private BigDecimal tzsybqye;
+ @Column(name = "tzsybqye")
+ private Double tzsybqye;
@PropertyDef(label = "鎶曡祫鏀剁泭(鎹熷け浠モ��-鈥濆彿濉垪)鏈勾绱(鍏�)" )
- @Column(name = "tzsybnlj", precision = 20, scale = 2)
- private BigDecimal tzsybnlj;
+ @Column(name = "tzsybnlj")
+ private Double tzsybnlj;
@PropertyDef(label = "鍏朵腑锛氬鑱旇惀浼佷笟鍜屽悎钀ヤ紒涓氱殑鎶曡祫鏀剁泭鏈湡浣欓(鍏�)" )
- @Column(name = "lyqytzsybqye", precision = 20, scale = 2)
- private BigDecimal lyqytzsybqye;
+ @Column(name = "lyqytzsybqye")
+ private Double lyqytzsybqye;
@PropertyDef(label = "鍏朵腑锛氬鑱旇惀浼佷笟鍜屽悎钀ヤ紒涓氱殑鎶曡祫鏀剁泭鏈勾绱(鍏�)" )
- @Column(name = "lyqytzsybnlj", precision = 20, scale = 2)
- private BigDecimal lyqytzsybnlj;
+ @Column(name = "lyqytzsybnlj")
+ private Double lyqytzsybnlj;
@PropertyDef(label = "鍏厑浠峰�煎彉鍔ㄦ敹鐩�(鎹熷け浠モ��-鈥濆彿濉垪)鏈湡浣欓(鍏�)" )
- @Column(name = "gyjzbdsybqye", precision = 20, scale = 2)
- private BigDecimal gyjzbdsybqye;
+ @Column(name = "gyjzbdsybqye")
+ private Double gyjzbdsybqye;
@PropertyDef(label = "鍏厑浠峰�煎彉鍔ㄦ敹鐩�(鎹熷け浠モ��-鈥濆彿濉垪)鏈勾绱(鍏�)" )
- @Column(name = "gyjzbdsybnlj", precision = 20, scale = 2)
- private BigDecimal gyjzbdsybnlj;
+ @Column(name = "gyjzbdsybnlj")
+ private Double gyjzbdsybnlj;
@PropertyDef(label = "璧勪骇鍑忓�兼崯澶�(鎹熷け浠モ��-鈥濆～鍒�)鏈湡浣欓(鍏�)" )
- @Column(name = "zcjzssbqye", precision = 20, scale = 2)
- private BigDecimal zcjzssbqye;
+ @Column(name = "zcjzssbqye")
+ private Double zcjzssbqye;
@PropertyDef(label = "鏈勾绱(鍏�)" )
- @Column(name = "zcjzssbnlj", precision = 20, scale = 2)
- private BigDecimal zcjzssbnlj;
+ @Column(name = "zcjzssbnlj")
+ private Double zcjzssbnlj;
@PropertyDef(label = "璧勪骇澶勭疆鏀剁泭(鎹熷け浠モ��-鈥濆～鍒�)鏈湡浣欓(鍏�)" )
- @Column(name = "zcczsybqye", precision = 20, scale = 2)
- private BigDecimal zcczsybqye;
+ @Column(name = "zcczsybqye")
+ private Double zcczsybqye;
@PropertyDef(label = "璧勪骇澶勭疆鏀剁泭(鎹熷け浠モ��-鈥濆～鍒�)鏈勾绱(鍏�)" )
- @Column(name = "zcczsybnlj", precision = 20, scale = 2)
- private BigDecimal zcczsybnlj;
+ @Column(name = "zcczsybnlj")
+ private Double zcczsybnlj;
@PropertyDef(label = "浜屻�佽惀涓氬埄娑�(浜忔崯浠モ�滐紞鈥濆彿濉垪)鏈湡浣欓(鍏�)" )
- @Column(name = "yylrbqye", precision = 20, scale = 2)
- private BigDecimal yylrbqye;
+ @Column(name = "yylrbqye")
+ private Double yylrbqye;
@PropertyDef(label = "浜屻�佽惀涓氬埄娑�(浜忔崯浠モ�滐紞鈥濆彿濉垪)鏈勾绱(鍏�)" )
- @Column(name = "yylrbnlj", precision = 20, scale = 2)
- private BigDecimal yylrbnlj;
+ @Column(name = "yylrbnlj")
+ private Double yylrbnlj;
@PropertyDef(label = "鍔狅細钀ヤ笟澶栨敹鍏ユ湰鏈熶綑棰�(鍏�)" )
- @Column(name = "yywsrbqye", precision = 20, scale = 2)
- private BigDecimal yywsrbqye;
+ @Column(name = "yywsrbqye")
+ private Double yywsrbqye;
@PropertyDef(label = "鍔狅細钀ヤ笟澶栨敹鍏ユ湰骞寸疮璁�(鍏�)" )
- @Column(name = "yywsrbnlj", precision = 20, scale = 2)
- private BigDecimal yywsrbnlj;
+ @Column(name = "yywsrbnlj")
+ private Double yywsrbnlj;
@PropertyDef(label = "鍑忥細钀ヤ笟澶栨敮鍑烘湰鏈熶綑棰�(鍏�)" )
- @Column(name = "yywzcbqye", precision = 20, scale = 2)
- private BigDecimal yywzcbqye;
+ @Column(name = "yywzcbqye")
+ private Double yywzcbqye;
@PropertyDef(label = "鍑忥細钀ヤ笟澶栨敮鍑烘湰骞寸疮璁�(鍏�)" )
- @Column(name = "yywzcbnlj", precision = 20, scale = 2)
- private BigDecimal yywzcbnlj;
+ @Column(name = "yywzcbnlj")
+ private Double yywzcbnlj;
@PropertyDef(label = "涓夈�佸埄娑︽�婚(浜忔崯鎬婚浠モ�滐紞鈥濆彿濉垪)鏈湡浣欓(鍏�)" )
- @Column(name = "lrzebqye", precision = 20, scale = 2)
- private BigDecimal lrzebqye;
+ @Column(name = "lrzebqye")
+ private Double lrzebqye;
@PropertyDef(label = "涓夈�佸埄娑︽�婚(浜忔崯鎬婚浠モ�滐紞鈥濆彿濉垪)鏈勾绱(鍏�)" )
- @Column(name = "lrzebnlj", precision = 20, scale = 2)
- private BigDecimal lrzebnlj;
+ @Column(name = "lrzebnlj")
+ private Double lrzebnlj;
@PropertyDef(label = "鍑忥細鎵�寰楃◣璐圭敤鏈湡浣欓(鍏�)" )
- @Column(name = "sdsfybqye", precision = 20, scale = 2)
- private BigDecimal sdsfybqye;
+ @Column(name = "sdsfybqye")
+ private Double sdsfybqye;
@PropertyDef(label = "鍑忥細鎵�寰楃◣璐圭敤鏈勾绱(鍏�)" )
- @Column(name = "sdsfybnlj", precision = 20, scale = 2)
- private BigDecimal sdsfybnlj;
+ @Column(name = "sdsfybnlj")
+ private Double sdsfybnlj;
@PropertyDef(label = "鍥涖�佸噣鍒╂鼎(鍑�浜忔崯浠モ�滐紞鈥濆彿濉垪)鏈湡浣欓(鍏�)" )
- @Column(name = "jlrbqye", precision = 20, scale = 2)
- private BigDecimal jlrbqye;
+ @Column(name = "jlrbqye")
+ private Double jlrbqye;
@PropertyDef(label = "鍥涖�佸噣鍒╂鼎(鍑�浜忔崯浠モ�滐紞鈥濆彿濉垪)鏈勾绱(鍏�)" )
- @Column(name = "jlrbnlj", precision = 20, scale = 2)
- private BigDecimal jlrbnlj;
+ @Column(name = "jlrbnlj")
+ private Double jlrbnlj;
@PropertyDef(label = "鎸佺画缁忚惀鍑�鍒╂鼎(鍑�浜忔崯浠モ��-鈥濆彿濉垪)鏈湡浣欓(鍏�)" )
- @Column(name = "cxjyjlrbqye", precision = 20, scale = 2)
- private BigDecimal cxjyjlrbqye;
+ @Column(name = "cxjyjlrbqye")
+ private Double cxjyjlrbqye;
@PropertyDef(label = "鎸佺画缁忚惀鍑�鍒╂鼎(鍑�浜忔崯浠モ��-鈥濆彿濉垪)鏈勾绱(鍏�)" )
- @Column(name = "cxjyjlrbnlj", precision = 20, scale = 2)
- private BigDecimal cxjyjlrbnlj;
+ @Column(name = "cxjyjlrbnlj")
+ private Double cxjyjlrbnlj;
@PropertyDef(label = "缁堟缁忚惀鍑�鍒╂鼎(鍑�浜忔崯浠モ��-鈥濆彿濉垪)鏈湡浣欓(鍏�)" )
- @Column(name = "zzjyjlrbqye", precision = 20, scale = 2)
- private BigDecimal zzjyjlrbqye;
+ @Column(name = "zzjyjlrbqye")
+ private Double zzjyjlrbqye;
@PropertyDef(label = "缁堟缁忚惀鍑�鍒╂鼎(鍑�浜忔崯浠モ��-鈥濆彿濉垪)鏈勾绱(鍏�)" )
- @Column(name = "zzjyjlrbnlj", precision = 20, scale = 2)
- private BigDecimal zzjyjlrbnlj;
+ @Column(name = "zzjyjlrbnlj")
+ private Double zzjyjlrbnlj;
@PropertyDef(label = "浜斻�佸叾浠栫患鍚堟敹鐩婄殑绋庡悗鍑�棰濇湰鏈熶綑棰�(鍏�)" )
- @Column(name = "qtzhsyjebqye", precision = 20, scale = 2)
- private BigDecimal qtzhsyjebqye;
+ @Column(name = "qtzhsyjebqye")
+ private Double qtzhsyjebqye;
@PropertyDef(label = "浜斻�佸叾浠栫患鍚堟敹鐩婄殑绋庡悗鍑�棰濇湰骞寸疮璁�(鍏�)" )
- @Column(name = "qtzhsyjebnlj", precision = 20, scale = 2)
- private BigDecimal qtzhsyjebnlj;
+ @Column(name = "qtzhsyjebnlj")
+ private Double qtzhsyjebnlj;
@PropertyDef(label = "(涓�)涓嶈兘閲嶅垎绫昏繘鎹熺泭鐨勫叾浠栫患鍚堟敹鐩婃湰鏈熶綑棰�(鍏�)" )
- @Column(name = "bnflzhsybqye", precision = 20, scale = 2)
- private BigDecimal bnflzhsybqye;
+ @Column(name = "bnflzhsybqye")
+ private Double bnflzhsybqye;
@PropertyDef(label = "(涓�)涓嶈兘閲嶅垎绫昏繘鎹熺泭鐨勫叾浠栫患鍚堟敹鐩婃湰骞寸疮璁�(鍏�)" )
- @Column(name = "bnflzhsybnlj", precision = 20, scale = 2)
- private BigDecimal bnflzhsybnlj;
+ @Column(name = "bnflzhsybnlj")
+ private Double bnflzhsybnlj;
@PropertyDef(label = "1.閲嶆柊璁￠噺璁惧畾鍙楃泭璁″垝鍙樺姩棰濇湰鏈熶綑棰�(鍏�)" )
- @Column(name = "cxjlbdebqye", precision = 20, scale = 2)
- private BigDecimal cxjlbdebqye;
+ @Column(name = "cxjlbdebqye")
+ private Double cxjlbdebqye;
@PropertyDef(label = "1.閲嶆柊璁￠噺璁惧畾鍙楃泭璁″垝鍙樺姩棰濇湰骞寸疮璁�(鍏�)" )
- @Column(name = "cxjlbdebnlj", precision = 20, scale = 2)
- private BigDecimal cxjlbdebnlj;
+ @Column(name = "cxjlbdebnlj")
+ private Double cxjlbdebnlj;
@PropertyDef(label = "2.鏉冪泭娉曚笅涓嶈兘杞崯鐩婄殑鍏朵粬缁煎悎鏀剁泭鏈湡浣欓(鍏�)" )
- @Column(name = "qyfbnzsybqye", precision = 20, scale = 2)
- private BigDecimal qyfbnzsybqye;
+ @Column(name = "qyfbnzsybqye")
+ private Double qyfbnzsybqye;
@PropertyDef(label = "2.鏉冪泭娉曚笅涓嶈兘杞崯鐩婄殑鍏朵粬缁煎悎鏀剁泭鏈勾绱(鍏�)" )
- @Column(name = "qyfbnzsybnlj", precision = 20, scale = 2)
- private BigDecimal qyfbnzsybnlj;
+ @Column(name = "qyfbnzsybnlj")
+ private Double qyfbnzsybnlj;
@PropertyDef(label = "3.鍏朵粬鏉冪泭宸ュ叿鎶曡祫鍏厑浠峰�煎彉鍔ㄦ湰鏈熶綑棰�(鍏�)" )
- @Column(name = "qtqygjjzbdbqye", precision = 20, scale = 2)
- private BigDecimal qtqygjjzbdbqye;
+ @Column(name = "qtqygjjzbdbqye")
+ private Double qtqygjjzbdbqye;
@PropertyDef(label = "3.鍏朵粬鏉冪泭宸ュ叿鎶曡祫鍏厑浠峰�煎彉鍔ㄦ湰骞寸疮璁�(鍏�)" )
- @Column(name = "qtqygjjzbdbnlj", precision = 20, scale = 2)
- private BigDecimal qtqygjjzbdbnlj;
+ @Column(name = "qtqygjjzbdbnlj")
+ private Double qtqygjjzbdbnlj;
@PropertyDef(label = "4.浼佷笟鑷韩淇＄敤椋庨櫓鍏厑浠峰�煎彉鍔ㄦ湰鏈熶綑棰�(鍏�)" )
- @Column(name = "qyxyfxbdbqye", precision = 20, scale = 2)
- private BigDecimal qyxyfxbdbqye;
+ @Column(name = "qyxyfxbdbqye")
+ private Double qyxyfxbdbqye;
@PropertyDef(label = "4.浼佷笟鑷韩淇＄敤椋庨櫓鍏厑浠峰�煎彉鍔ㄦ湰骞寸疮璁�(鍏�)" )
- @Column(name = "qyxyfxbdbnlj", precision = 20, scale = 2)
- private BigDecimal qyxyfxbdbnlj;
+ @Column(name = "qyxyfxbdbnlj")
+ private Double qyxyfxbdbnlj;
@PropertyDef(label = "5.鍏朵粬鏈湡浣欓(鍏�)" )
- @Column(name = "bnflzhsyqtbqye", precision = 20, scale = 2)
- private BigDecimal bnflzhsyqtbqye;
+ @Column(name = "bnflzhsyqtbqye")
+ private Double bnflzhsyqtbqye;
@PropertyDef(label = "5.鍏朵粬鏈勾绱(鍏�)" )
- @Column(name = "bnflzhsyqtbnlj", precision = 20, scale = 2)
- private BigDecimal bnflzhsyqtbnlj;
+ @Column(name = "bnflzhsyqtbnlj")
+ private Double bnflzhsyqtbnlj;
@PropertyDef(label = "1.鏉冪泭娉曚笅鍙浆鎹熺泭鐨勫叾浠栫患鍚堟敹鐩婃湰鏈熶綑棰�(鍏�)" )
- @Column(name = "qyfkzsybqye", precision = 20, scale = 2)
- private BigDecimal qyfkzsybqye;
+ @Column(name = "qyfkzsybqye")
+ private Double qyfkzsybqye;
@PropertyDef(label = "1.鏉冪泭娉曚笅鍙浆鎹熺泭鐨勫叾浠栫患鍚堟敹鐩婃湰骞寸疮璁�(鍏�)" )
- @Column(name = "qyfkzsybnlj", precision = 20, scale = 2)
- private BigDecimal qyfkzsybnlj;
+ @Column(name = "qyfkzsybnlj")
+ private Double qyfkzsybnlj;
@PropertyDef(label = "2.鍏朵粬鍊烘潈鎶曡祫鍏厑浠峰�煎彉鍔ㄦ湰鏈熶綑棰�(鍏�)" )
- @Column(name = "qtzqjzbdbqye", precision = 20, scale = 2)
- private BigDecimal qtzqjzbdbqye;
+ @Column(name = "qtzqjzbdbqye")
+ private Double qtzqjzbdbqye;
@PropertyDef(label = "2.鍏朵粬鍊烘潈鎶曡祫鍏厑浠峰�煎彉鍔ㄦ湰骞寸疮璁�(鍏�)" )
- @Column(name = "qtzqjzbdbnlj", precision = 20, scale = 2)
- private BigDecimal qtzqjzbdbnlj;
+ @Column(name = "qtzqjzbdbnlj")
+ private Double qtzqjzbdbnlj;
@PropertyDef(label = "3.鍙緵鍑哄敭閲戣瀺璧勪骇鍏厑浠峰�煎彉鍔ㄦ崯鐩婃湰鏈熶綑棰�(鍏�)" )
- @Column(name = "kgcszcbdsybqye", precision = 20, scale = 2)
- private BigDecimal kgcszcbdsybqye;
+ @Column(name = "kgcszcbdsybqye")
+ private Double kgcszcbdsybqye;
@PropertyDef(label = "3.鍙緵鍑哄敭閲戣瀺璧勪骇鍏厑浠峰�煎彉鍔ㄦ崯鐩婃湰骞寸疮璁�(鍏�)" )
- @Column(name = "kgcszcbdsybnlj", precision = 20, scale = 2)
- private BigDecimal kgcszcbdsybnlj;
+ @Column(name = "kgcszcbdsybnlj")
+ private Double kgcszcbdsybnlj;
@PropertyDef(label = "4.閲戣瀺璧勪骇閲嶅垎绫昏鍏ュ叾浠栫患鍚堟敹鐩婄殑閲戦鏈湡浣欓(鍏�)" )
- @Column(name = "jrzcflsyjebqye", precision = 20, scale = 2)
- private BigDecimal jrzcflsyjebqye;
+ @Column(name = "jrzcflsyjebqye")
+ private Double jrzcflsyjebqye;
@PropertyDef(label = "4.閲戣瀺璧勪骇閲嶅垎绫昏鍏ュ叾浠栫患鍚堟敹鐩婄殑閲戦鏈勾绱(鍏�)" )
- @Column(name = "jrzcflsyjebnlj", precision = 20, scale = 2)
- private BigDecimal jrzcflsyjebnlj;
+ @Column(name = "jrzcflsyjebnlj")
+ private Double jrzcflsyjebnlj;
@PropertyDef(label = "5.鎸佹湁鑷冲埌鏈熸姇璧勯噸鍒嗙被涓哄彲渚涘嚭鍞噾铻嶈祫浜ф崯鐩婃湰鏈熶綑棰�(鍏�)" )
- @Column(name = "cydqtzzcsybqye", precision = 20, scale = 2)
- private BigDecimal cydqtzzcsybqye;
+ @Column(name = "cydqtzzcsybqye")
+ private Double cydqtzzcsybqye;
@PropertyDef(label = "5.鎸佹湁鑷冲埌鏈熸姇璧勯噸鍒嗙被涓哄彲渚涘嚭鍞噾铻嶈祫浜ф崯鐩婃湰骞寸疮璁�(鍏�)" )
- @Column(name = "cydqtzzcsybnlj", precision = 20, scale = 2)
- private BigDecimal cydqtzzcsybnlj;
+ @Column(name = "cydqtzzcsybnlj")
+ private Double cydqtzzcsybnlj;
@PropertyDef(label = "6.鍏朵粬鍊烘潈鎶曡祫淇＄敤鍑忓�煎噯澶囨湰鏈熶綑棰�(鍏�)" )
- @Column(name = "qtzqtzjzbqye", precision = 20, scale = 2)
- private BigDecimal qtzqtzjzbqye;
+ @Column(name = "qtzqtzjzbqye")
+ private Double qtzqtzjzbqye;
@PropertyDef(label = "6.鍏朵粬鍊烘潈鎶曡祫淇＄敤鍑忓�煎噯澶囨湰骞寸疮璁�(鍏�)" )
- @Column(name = "qtzqtzjzbnlj", precision = 20, scale = 2)
- private BigDecimal qtzqtzjzbnlj;
+ @Column(name = "qtzqtzjzbnlj")
+ private Double qtzqtzjzbnlj;
@PropertyDef(label = "7.鐜伴噾娴侀噺濂楁湡鎹熺泭鐨勬湁鏁堥儴鍒嗘湰鏈熶綑棰�(鍏�)" )
- @Column(name = "zjllsybqye", precision = 20, scale = 2)
- private BigDecimal zjllsybqye;
+ @Column(name = "zjllsybqye")
+ private Double zjllsybqye;
@PropertyDef(label = "7.鐜伴噾娴侀噺濂楁湡鎹熺泭鐨勬湁鏁堥儴鍒嗘湰骞寸疮璁�(鍏�)" )
- @Column(name = "zjllsybnlj", precision = 20, scale = 2)
- private BigDecimal zjllsybnlj;
+ @Column(name = "zjllsybnlj")
+ private Double zjllsybnlj;
@PropertyDef(label = "8.澶栧竵璐㈠姟鎶ヨ〃鎶樼畻宸鏈湡浣欓(鍏�)" )
- @Column(name = "wbcwbbcebqye", precision = 20, scale = 2)
- private BigDecimal wbcwbbcebqye;
+ @Column(name = "wbcwbbcebqye")
+ private Double wbcwbbcebqye;
@PropertyDef(label = "8.澶栧竵璐㈠姟鎶ヨ〃鎶樼畻宸鏈勾绱(鍏�)" )
- @Column(name = "wbcwbbcebnlj", precision = 20, scale = 2)
- private BigDecimal wbcwbbcebnlj;
+ @Column(name = "wbcwbbcebnlj")
+ private Double wbcwbbcebnlj;
@PropertyDef(label = "9.鍏朵粬鏈湡浣欓(鍏�)" )
- @Column(name = "cflsybqye", precision = 20, scale = 2)
- private BigDecimal cflsybqye;
+ @Column(name = "cflsybqye")
+ private Double cflsybqye;
@PropertyDef(label = "9.鍏朵粬鏈勾绱(鍏�)" )
- @Column(name = "cflsybnlj", precision = 20, scale = 2)
- private BigDecimal cflsybnlj;
+ @Column(name = "cflsybnlj")
+ private Double cflsybnlj;
@PropertyDef(label = "鍏�佺患鍚堟敹鐩婃�婚鏈湡浣欓(鍏�)" )
- @Column(name = "zhsyzebqye", precision = 20, scale = 2)
- private BigDecimal zhsyzebqye;
+ @Column(name = "zhsyzebqye")
+ private Double zhsyzebqye;
@PropertyDef(label = "鍏�佺患鍚堟敹鐩婃�婚鏈勾绱(鍏�)" )
- @Column(name = "zhsyzebnlj", precision = 20, scale = 2)
- private BigDecimal zhsyzebnlj;
+ @Column(name = "zhsyzebnlj")
+ private Double zhsyzebnlj;
@PropertyDef(label = "涓冦�佹瘡鑲℃敹鐩婏細鏈湡浣欓(鍏�)" )
- @Column(name = "mgsybqye", precision = 20, scale = 2)
- private BigDecimal mgsybqye;
+ @Column(name = "mgsybqye")
+ private Double mgsybqye;
@PropertyDef(label = "涓冦�佹瘡鑲℃敹鐩婏細鏈勾绱(鍏�)" )
- @Column(name = "mgsybnlj", precision = 20, scale = 2)
- private BigDecimal mgsybnlj;
+ @Column(name = "mgsybnlj")
+ private Double mgsybnlj;
@PropertyDef(label = "(涓�)鍩烘湰姣忚偂鏀剁泭鏈湡浣欓(鍏�)" )
- @Column(name = "jbmgsybqye", precision = 20, scale = 2)
- private BigDecimal jbmgsybqye;
+ @Column(name = "jbmgsybqye")
+ private Double jbmgsybqye;
@PropertyDef(label = "(涓�)鍩烘湰姣忚偂鏀剁泭鏈勾绱(鍏�)" )
- @Column(name = "jbmgsybnlj", precision = 20, scale = 2)
- private BigDecimal jbmgsybnlj;
+ @Column(name = "jbmgsybnlj")
+ private Double jbmgsybnlj;
@PropertyDef(label = "(浜�)绋�閲婃瘡鑲℃敹鐩婃湰鏈熶綑棰�(鍏�)" )
- @Column(name = "xsmgsybqye", precision = 20, scale = 2)
- private BigDecimal xsmgsybqye;
+ @Column(name = "xsmgsybqye")
+ private Double xsmgsybqye;
@PropertyDef(label = "(浜�)绋�閲婃瘡鑲℃敹鐩婃湰骞寸疮璁�(鍏�)" )
- @Column(name = "xsmgsybnlj", precision = 20, scale = 2)
- private BigDecimal xsmgsybnlj;
+ @Column(name = "xsmgsybnlj")
+ private Double xsmgsybnlj;
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
@Column(name = "zhgxsj")
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java b/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java
index 37a7a54..0fc419d 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java
+++ b/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java
@@ -9,6 +9,7 @@
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -34,10 +35,11 @@
//=====================================搴撳尯璁惧=======================================//
public void pageData(Page<DeptDevice> page, Map<String, Object> param)
throws Exception {
- String hql = " from " + DeptDevice.class.getName() + " where companyId=:companyId";
+ String hql = " from " + DeptDevice.class.getName() + " where companyId =:companyId and deptId =:deptId";
Map<String, Object> args = new HashMap<>();
args.put("companyId", ContextUtil.getCompanyId());
+ args.put("deptId", ContextUtil.subDeptId(null));
if (null != param) {
hql = buildHql(hql, param, args);
@@ -57,14 +59,12 @@
if (null == data.getCompanyId()) {
data.setCompanyId(ContextUtil.getCompanyId());
}
- if (StringUtils.isEmpty(data.getKqdm())) {
- data.setKqdm(ContextUtil.subDeptId(null));
+ if (StringUtils.isEmpty(data.getDeptId())) {
+ data.setDeptId(ContextUtil.subDeptId(null));
}
- DefaultDept dept = sysDeptService.getCacheDept(data.getCompanyId(), data.getKqdm());
- data.setKqmc(dept.getName());
data.setUpdateTime(new Date());
- if (null == data.getId()) {
- data.setId(ContextUtil.getUUID());
+ if (null == data.getSbbh()) {
+ data.setSbbh(DateFormatUtils.format(new Date(), "yyyyMMdd") + getIndex(data.getCompanyId()));
}
session.saveOrUpdate(data);
} finally {
@@ -74,6 +74,39 @@
return null;
}
+ public String getIndex(String companyId) {
+ List<DeptDevice> list = getDataByTime(companyId);
+ int index = 10000;
+ if (list != null && list.size() > 0) {
+ String id = list.get(0).getSbbh().substring(8);
+ int temp = Integer.valueOf(id) + 1;
+ index += temp;
+ }else {
+ index ++;
+ }
+ return String.valueOf(index).substring(1);
+ }
+
+ private List<DeptDevice> getDataByTime(String companyId) {
+ String hql = " from " + DeptDevice.class.getName()
+ + " where companyId =:companyId ";
+
+ Map<String, Object> args = new HashMap<String, Object>();
+ args.put("companyId", companyId);
+
+ hql += " and updateTime >:startTime";
+ args.put("startTime", DateUtil.getCurZero(new Date()));
+
+
+ hql += " and updateTime <:endTime";
+ args.put("endTime", DateUtil.getNextZero(new Date()));
+
+
+ hql += " order by id desc";
+
+ return this.query(hql, args);
+ }
+
public String delData(DeptDevice data) {
Session session = this.getSessionFactory().openSession();
try {
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java b/igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java
index a867e98..9ede4ec 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java
+++ b/igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java
@@ -25,10 +25,11 @@
public void pageData(Page<OAStaff> page, Map<String, Object> param)
throws Exception {
- String hql = " from " + OAStaff.class.getName() + " where companyId=:companyId";
+ String hql = " from " + OAStaff.class.getName() + " where companyId =:companyId and deptId =:deptId";
Map<String, Object> args = new HashMap<>();
args.put("companyId", ContextUtil.getCompanyId());
+ args.put("deptId", ContextUtil.subDeptId(null));
if (null != param) {
@@ -68,13 +69,13 @@
}
public String saveOrUpdate(OAStaff data) {
-
+ //鍒ゆ柇缁勭粐缂栫爜
+ if (StringUtils.isEmpty(data.getCompanyId())) {
+ data.setCompanyId(data.getCompanyId());
+ }
Session session = this.getSessionFactory().openSession();
try {
data.setCompanyId(ContextUtil.getCompanyId());
- if (null == data.getId()) {
- data.setId(ContextUtil.getUUID());
- }
session.saveOrUpdate(data);
} finally {
session.flush();
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/Archives.view.xml b/igds-manager/src/main/java/com/ld/igds/oa/view/Archives.view.xml
index 8e6f18f..c946f2f 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/view/Archives.view.xml
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/Archives.view.xml
@@ -417,7 +417,7 @@
}
self.set("parameter",{mark: mark})
</ClientEvent>
- <Property name="fileResolver">oaPR#uploadFile</Property>
+ <Property name="fileResolver">applyOrderUploadProcessor#uploadFile</Property>
<Property name="maxFileSize">50MB</Property>
<Property name="successMessage">闄勪欢涓婁紶鎴愬姛锛侊紒</Property>
<Filters/>
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml b/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
index 83ea38b..068802c 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
@@ -5,48 +5,95 @@
<Model>
<DataType name="dtMain">
<Property name="creationType">com.ld.igds.models.DeptDevice</Property>
- <PropertyDef name="id">
- <Property name="label">ID</Property>
+ <PropertyDef name="sbbh">
+ <Property/>
+ <Property name="label">璁惧缂栧彿</Property>
+ <Property name="readOnly">true</Property>
</PropertyDef>
- <PropertyDef name="kqdm">
- <Property></Property>
- <Property name="label">搴撳尯浠ｇ爜</Property>
+ <PropertyDef name="companyId">
+ <Property/>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="deptId">
+ <Property/>
+ <Property name="label">鎵�灞炲簱鍖�</Property>
+ <Property name="readOnly">false</Property>
+ <Property name="required">true</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
<Property name="keyProperty">id</Property>
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
- <PropertyDef name="companyId">
- <Property></Property>
- <Property name="label">缁勭粐缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="dwdm">
- <Property></Property>
- <Property name="label">鍗曚綅浠ｇ爜</Property>
- </PropertyDef>
- <PropertyDef name="kqmc">
- <Property></Property>
- <Property name="label">搴撳尯鍚嶇О</Property>
- </PropertyDef>
- <PropertyDef name="sbbh">
- <Property></Property>
- <Property name="label">璁惧缂栧彿</Property>
- </PropertyDef>
<PropertyDef name="sbyqmc">
- <Property></Property>
+ <Property/>
<Property name="label">璁惧浠櫒鍚嶇О</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="sbyqdm">
- <Property></Property>
+ <Property/>
<Property name="label">璁惧浠櫒浠ｇ爜</Property>
+ <Property name="readOnly">false</Property>
+ <Property name="required">true</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">11</Property>
+ <Property name="value">11-绮补閫氱敤鏈烘璁惧</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">12</Property>
+ <Property name="value">12-绮粨鏈烘璁惧</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">13</Property>
+ <Property name="value">13-妫�楠屽寲楠屼华鍣ㄨ澶�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">14</Property>
+ <Property name="value">14-璁￠噺璁惧</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">15</Property>
+ <Property name="value">15-娣�绮夌敓浜ф満姊拌澶�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">16</Property>
+ <Property name="value">16-鍒剁矇鏈烘璁惧</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">17</Property>
+ <Property name="value">17-纰剧背鏈烘璁惧</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">18</Property>
+ <Property name="value">18-绮补椋熷搧鏈烘璁惧</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">21</Property>
+ <Property name="value">21-楗叉枡鍔犲伐鏈烘璁惧</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">22</Property>
+ <Property name="value">22-娌硅剛鍔犲伐鏈烘鍜岃澶�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">99</Property>
+ <Property name="value">99-鍏朵粬绮璁惧</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
</PropertyDef>
<PropertyDef name="sbggxh">
- <Property></Property>
+ <Property/>
<Property name="label">璁惧瑙勬牸鍨嬪彿</Property>
</PropertyDef>
<PropertyDef name="sccj">
- <Property></Property>
+ <Property/>
<Property name="label">鐢熶骇鍘傚</Property>
</PropertyDef>
<PropertyDef name="scrq">
@@ -54,11 +101,11 @@
<Property name="label">鐢熶骇鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="sbms">
- <Property></Property>
+ <Property/>
<Property name="label">璁惧鎻忚堪</Property>
</PropertyDef>
<PropertyDef name="sbzt">
- <Property></Property>
+ <Property/>
<Property name="label">璁惧鐘舵��</Property>
<Property name="mapping">
<Property name="keyProperty">key</Property>
@@ -66,20 +113,20 @@
<Property name="mapValues">
<Collection>
<Entity>
- <Property name="key">1</Property>
- <Property name="value">1锛氬畬濂�</Property>
+ <Property name="key">1</Property>
+ <Property name="value">1-瀹屽ソ</Property>
</Entity>
<Entity>
- <Property name="key">2</Property>
- <Property name="value">2锛氭姤搴�</Property>
+ <Property name="key">2</Property>
+ <Property name="value">2-鎶ュ簾</Property>
</Entity>
<Entity>
- <Property name="key">3</Property>
- <Property name="value">3锛氬緟妫�淇�</Property>
+ <Property name="key">3</Property>
+ <Property name="value">3-寰呮淇�</Property>
</Entity>
<Entity>
- <Property name="key">4</Property>
- <Property name="value">4锛氬叾浠�</Property>
+ <Property name="key">4</Property>
+ <Property name="value">4-鍏朵粬</Property>
</Entity>
</Collection>
</Property>
@@ -90,13 +137,12 @@
<Property name="label">妫�瀹氭椂闂�</Property>
</PropertyDef>
<PropertyDef name="jddw">
- <Property></Property>
+ <Property/>
<Property name="label">妫�瀹氬崟浣�</Property>
</PropertyDef>
<PropertyDef name="updateTime">
- <Property name="dataType">Date</Property>
+ <Property name="dataType">DateTime</Property>
<Property name="label">鏇存柊鏃堕棿</Property>
- <Property name="readOnly">true</Property>
</PropertyDef>
</DataType>
<DataType name="dtParam">
@@ -284,65 +330,50 @@
<RowNumColumn>
<Property name="caption">搴忓彿</Property>
</RowNumColumn>
- <DataColumn name="dwdm">
- <Property name="property">dwdm</Property>
- <Property name="align">center</Property>
+ <DataColumn name="sbbh">
+ <Property name="property">sbbh</Property>
<Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
</DataColumn>
- <DataColumn name="kqmc">
- <Property name="property">kqmc</Property>
- <Property name="align">center</Property>
+ <DataColumn name="deptId">
+ <Property name="property">deptId</Property>
<Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="sbyqmc">
<Property name="property">sbyqmc</Property>
- <Property name="align">center</Property>
<Property name="readOnly">true</Property>
- </DataColumn>
- <DataColumn name="sbyqdm">
- <Property name="property">sbyqdm</Property>
<Property name="align">center</Property>
- <Property name="readOnly">true</Property>
</DataColumn>
<DataColumn name="sbggxh">
<Property name="property">sbggxh</Property>
- <Property name="align">center</Property>
<Property name="readOnly">true</Property>
- </DataColumn>
- <DataColumn name="sccj">
- <Property name="property">sccj</Property>
<Property name="align">center</Property>
- <Property name="readOnly">true</Property>
</DataColumn>
<DataColumn name="scrq">
<Property name="property">scrq</Property>
- <Property name="align">center</Property>
<Property name="readOnly">true</Property>
- </DataColumn>
- <DataColumn name="sbms">
- <Property name="property">sbms</Property>
<Property name="align">center</Property>
- <Property name="readOnly">true</Property>
</DataColumn>
<DataColumn name="sbzt">
<Property name="property">sbzt</Property>
- <Property name="align">center</Property>
<Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="jdsj">
<Property name="property">jdsj</Property>
- <Property name="align">center</Property>
<Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="jddw">
<Property name="property">jddw</Property>
- <Property name="align">center</Property>
<Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="updateTime">
<Property name="property">updateTime</Property>
- <Property name="align">center</Property>
<Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
</DataColumn>
</DataGrid>
</Container>
@@ -386,13 +417,13 @@
<Property name="labelSeparator">锛�</Property>
<Property name="labelWidth">150</Property>
<AutoFormElement>
- <Property name="name">kqdm</Property>
- <Property name="property">kqdm</Property>
+ <Property name="name">sbbh</Property>
+ <Property name="property">sbbh</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">sbbh</Property>
- <Property name="property">sbbh</Property>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java b/igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java
index a5cf7bd..36ca071 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java
@@ -229,39 +229,6 @@
return service.delArchives(data);
}
- /**
- * oaPR#uploadFile
- *
- * @param file
- * @param parameter
- * @return fileId 鏂版枃浠禝D鍖呭惈鏂囦欢鍚庣紑
- */
- @FileResolver
- public String uploadFile(UploadFile file, Map<String, Object> parameter) {
- String fileId = null;
- String mark = (String) parameter.get("mark");
- if ("NO_UPLOAD".equals(mark)) {
- return null;
- }
- try {
-
- String basePath = fileService.getCommonFilePath(null);
-
- fileId = ContextUtil.getTimeId(1000)
- + file.getFileName().substring(
- file.getFileName().lastIndexOf("."));
-
- file.transferTo(new File(basePath + fileId));
-
- } catch (IllegalStateException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- return fileId;
- }
-
// =====================璧勪骇绠＄悊=====================//
/**
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml b/igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml
index 1329fae..7b453e3 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml
@@ -5,33 +5,44 @@
<Model>
<DataType name="dtMain">
<Property name="creationType">com.ld.igds.models.OAStaff</Property>
- <PropertyDef name="id">
+ <PropertyDef name="sfzhm">
<Property></Property>
- <Property name="label">ID</Property>
+ <Property name="label">韬唤璇佸彿鐮�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="companyId">
<Property></Property>
<Property name="label">缁勭粐缂栫爜</Property>
</PropertyDef>
- <PropertyDef name="dwdm">
+ <PropertyDef name="deptId">
<Property></Property>
- <Property name="label">鍗曚綅浠ｇ爜</Property>
- </PropertyDef>
- <PropertyDef name="dwmc">
- <Property></Property>
- <Property name="label">鍗曚綅鍚嶇О</Property>
+ <Property name="label">鎵�灞炲簱鍖�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="lsbm">
<Property></Property>
<Property name="label">闅跺睘閮ㄩ棬</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="xzqhdm">
<Property></Property>
- <Property name="label">琛屾斂鍖哄垝浠ｇ爜</Property>
+ <Property name="label">鎵�灞炶鏀垮尯鍒�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="xzqhmc">
+ <Property></Property>
+ <Property name="label">鎵�灞炶鏀垮尯鍒�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="xm">
<Property></Property>
<Property name="label">濮撳悕</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="xb">
<Property></Property>
@@ -52,32 +63,58 @@
</Collection>
</Property>
</Property>
- </PropertyDef>
- <PropertyDef name="sfzhm">
- <Property></Property>
- <Property name="label">韬唤璇佸彿鐮�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="rzrq">
<Property name="dataType">Date</Property>
<Property name="label">鍏ヨ亴鏃ユ湡</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="gwxz">
<Property></Property>
<Property name="label">宀椾綅鎬ц川</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("GWXZ")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">11</Property>
+ <Property name="value">11-鍦ㄥ矖鑱屽伐(闀挎湡)</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">12</Property>
+ <Property name="value">12-鍦ㄥ矖鑱屽伐(涓存椂)</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">20</Property>
+ <Property name="value">20-鍏朵粬浠庝笟浜哄憳</Property>
+ </Entity>
+ </Collection>
+ </Property>
</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="zgzt">
<Property></Property>
<Property name="label">鍦ㄥ矖鐘舵��</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("ZGZT")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">01</Property>
+ <Property name="value">01-鍦ㄥ矖</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">02</Property>
+ <Property name="value">02-宸茬鑱�</Property>
+ </Entity>
+ </Collection>
+ </Property>
</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="lzrq">
<Property></Property>
@@ -100,27 +137,382 @@
<Property></Property>
<Property name="label">姘戞棌</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("MZ")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">01</Property>
+ <Property name="value">01-姹夋棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">02</Property>
+ <Property name="value">02-钂欏彜鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">03</Property>
+ <Property name="value">03-鍥炴棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">04</Property>
+ <Property name="value">04-钘忔棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">05</Property>
+ <Property name="value">05-缁村惥灏旀棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">06</Property>
+ <Property name="value">06-鑻楁棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">07</Property>
+ <Property name="value">07-褰濇棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">08</Property>
+ <Property name="value">08-澹棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">09</Property>
+ <Property name="value">09-甯冧緷鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">10</Property>
+ <Property name="value">10-鏈濋矞鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">11</Property>
+ <Property name="value">11-婊℃棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">12</Property>
+ <Property name="value">12-渚楁棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">13</Property>
+ <Property name="value">13-鐟舵棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">14</Property>
+ <Property name="value">14-鐧芥棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">15</Property>
+ <Property name="value">15-鍦熷鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">16</Property>
+ <Property name="value">16-鍝堝凹鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">17</Property>
+ <Property name="value">17-鍝堣惃鍏嬫棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">18</Property>
+ <Property name="value">18-鍌ｆ棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">19</Property>
+ <Property name="value">19-榛庢棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">20</Property>
+ <Property name="value">20-鍌堝兂鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">21</Property>
+ <Property name="value">21-浣ゆ棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">22</Property>
+ <Property name="value">22-鐣叉棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">23</Property>
+ <Property name="value">23-楂樺北鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">24</Property>
+ <Property name="value">24-鎷夌鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">25</Property>
+ <Property name="value">25-姘存棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">26</Property>
+ <Property name="value">26-涓滀埂鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">27</Property>
+ <Property name="value">27-绾宠タ鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">28</Property>
+ <Property name="value">28-鏅鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">29</Property>
+ <Property name="value">29-鏌皵鍏嬪瓬鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">30</Property>
+ <Property name="value">30-鍦熸棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">31</Property>
+ <Property name="value">31-杈炬枴灏旀棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">32</Property>
+ <Property name="value">32-浠浆鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">33</Property>
+ <Property name="value">33-缇屾棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">34</Property>
+ <Property name="value">34-甯冩湕鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">35</Property>
+ <Property name="value">35-鎾掓媺鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">36</Property>
+ <Property name="value">36-姣涘崡鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">37</Property>
+ <Property name="value">37-浠′浆</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">38</Property>
+ <Property name="value">38-閿′集鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">39</Property>
+ <Property name="value">39-闃挎槍鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">40</Property>
+ <Property name="value">40-鏅背鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">41</Property>
+ <Property name="value">41-濉斿悏鍏嬫棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">42</Property>
+ <Property name="value">42-鎬掓棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">43</Property>
+ <Property name="value">43-涔屽瓬鍒厠鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">44</Property>
+ <Property name="value">44-淇勭綏鏂棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">45</Property>
+ <Property name="value">45-閯傛俯鍏嬫棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">46</Property>
+ <Property name="value">46-宕╅緳鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">47</Property>
+ <Property name="value">47-淇濆畨鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">48</Property>
+ <Property name="value">48-瑁曞浐鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">49</Property>
+ <Property name="value">49-浜棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">50</Property>
+ <Property name="value">50-濉斿灏旀棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">51</Property>
+ <Property name="value">51-鐙緳鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">52</Property>
+ <Property name="value">52-閯備鸡鏄ユ棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">53</Property>
+ <Property name="value">53-璧摬鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">54</Property>
+ <Property name="value">54-闂ㄥ反鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">55</Property>
+ <Property name="value">55-鐝炲反鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">56</Property>
+ <Property name="value">56-鍩鸿鏃�</Property>
+ </Entity>
+ </Collection>
+ </Property>
</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="zzmm">
<Property></Property>
<Property name="label">鏀挎不闈㈣矊</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("ZZMM")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">01</Property>
+ <Property name="value">01-涓浗鍏变骇鍏氬厷鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">02</Property>
+ <Property name="value">02-涓浗鍏变骇鍏氶澶囧厷鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">03</Property>
+ <Property name="value">03-涓浗鍏变骇涓讳箟闈掑勾鍥㈠洟鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">04</Property>
+ <Property name="value">04-涓浗鍥芥皯鍏氶潻鍛藉鍛樹細浼氬憳</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">05</Property>
+ <Property name="value">05-涓浗涓诲悓鐩熺洘鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">06</Property>
+ <Property name="value">06-涓浗姘戜富寤哄浗浼氫細鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">07</Property>
+ <Property name="value">07-涓浗姘戜富淇冭繘浼氫細鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">08</Property>
+ <Property name="value">08-涓浗鍐滃伐姘戜富鍏氬厷鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">09</Property>
+ <Property name="value">09-涓浗鑷村叕鍏氬厷鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">10</Property>
+ <Property name="value">10-涔濅笁瀛︾ぞ绀惧憳</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">11</Property>
+ <Property name="value">11-鍙版咕姘戜富鑷不鍚岀洘鐩熷憳</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">12</Property>
+ <Property name="value">12-鏃犲厷娲炬皯涓讳汉澹�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">13</Property>
+ <Property name="value">13-缇や紬</Property>
+ </Entity>
+ </Collection>
+ </Property>
</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="rylb">
<Property></Property>
<Property name="label">浜哄憳绫诲埆</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("RYLB")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1100</Property>
+ <Property name="value">1100-鍏姟鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1200</Property>
+ <Property name="value">1200-浜嬩笟鍗曚綅绠＄悊浜哄憳</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1300</Property>
+ <Property name="value">1300-浼佷笟缁忚惀绠＄悊浜哄憳</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1400</Property>
+ <Property name="value">1400-涓撲笟鎶�鏈汉鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1410</Property>
+ <Property name="value">1410-楂樼骇鑱岀О</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1411</Property>
+ <Property name="value">1411-姝ｉ珮绾ц亴绉�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1420</Property>
+ <Property name="value">1420-涓骇鑱岀О</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1430</Property>
+ <Property name="value">1430-鍒濈骇鍙婁互涓嬭亴绉�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1431</Property>
+ <Property name="value">1431-涓昏涓撹亴淇濈浜哄憳</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1432</Property>
+ <Property name="value">1432-涓昏涓撹亴妫�鍖栭獙浜哄憳</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1500</Property>
+ <Property name="value">1500-宸ヤ汉</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1510</Property>
+ <Property name="value">1510-鎶�鏈伐浜�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1511</Property>
+ <Property name="value">1511-楂樼骇鎶�甯�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1512</Property>
+ <Property name="value">1512-鎶�甯�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1513</Property>
+ <Property name="value">1513-楂樼骇宸�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1514</Property>
+ <Property name="value">1514-涓骇宸�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1515</Property>
+ <Property name="value">1515-鍒濈骇宸�</Property>
+ </Entity>
+ </Collection>
+ </Property>
</Property>
</PropertyDef>
<PropertyDef name="zy">
@@ -129,16 +521,40 @@
</PropertyDef>
<PropertyDef name="qdzgzchzyzgsj">
<Property name="dataType">Date</Property>
- <Property name="label">鍙栧緱鏈�楂樿亴绉版垨鑱屼笟璧勬牸鏃堕棿</Property>
+ <Property name="label">鑱屼笟璧勬牸鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="xl">
<Property></Property>
<Property name="label">瀛﹀巻</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("XL")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">0</Property>
+ <Property name="value">0-鐮旂┒鐢�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1-澶у鏈</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2-澶у涓撶</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3-涓笓</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">4-楂樹腑鍙婁互涓�</Property>
+ </Entity>
+ </Collection>
+ </Property>
</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="zw">
<Property></Property>
@@ -158,14 +574,6 @@
</PropertyDef>
<PropertyDef name="userId">
<Property name="label">韬唤璇佸彿</Property>
- </PropertyDef>
- <PropertyDef name="start">
- <Property name="label">鍏ヨ亴鏃ユ湡锛堝紑濮嬶級</Property>
- <Property name="dataType">Date</Property>
- </PropertyDef>
- <PropertyDef name="end">
- <Property name="label">鍏ヨ亴鏃ユ湡锛堢粨鏉燂級</Property>
- <Property name="dataType">Date</Property>
</PropertyDef>
</DataType>
</Model>
@@ -195,8 +603,12 @@
<Property name="iconClass">fa fa-plus</Property>
</Button>
<Button layoutConstraint="left">
- <ClientEvent name="onClick">var dialog= view.get("#dialogMain");
-dialog.show();</ClientEvent>
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+if(data){
+ view.get("#dialogMain").show();
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷慨鏀圭殑鏁版嵁锛�");
+}</ClientEvent>
<Property name="caption">缂栬緫</Property>
<Property name="exClassName">btn-warm</Property>
<Property name="iconClass">fa fa-pencil</Property>
@@ -247,12 +659,6 @@
<Property name="exClassName">btn-normal</Property>
<Property name="iconClass">fa fa-search</Property>
</Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">view.get("#dsParam").flushAsync();</ClientEvent>
- <Property name="caption">閲嶇疆</Property>
- <Property name="iconClass">fa fa-refresh</Property>
- <Property name="exClassName">btn-default</Property>
- </Button>
</Container>
</AutoForm>
<DataGrid id="dgMain">
@@ -263,12 +669,12 @@
<RowNumColumn>
<Property name="caption">搴忓彿</Property>
</RowNumColumn>
- <DataColumn name="lsbm">
- <Property name="property">lsbm</Property>
- <Property name="align">center</Property>
- </DataColumn>
<DataColumn name="xm">
<Property name="property">xm</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="lsbm">
+ <Property name="property">lsbm</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="xb">
@@ -291,22 +697,6 @@
<Property name="property">mz</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="rylb">
- <Property name="property">rylb</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="zy">
- <Property name="property">zy</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="qdzgzchzyzgsj">
- <Property name="property">qdzgzchzyzgsj</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="xl">
- <Property name="property">xl</Property>
- <Property name="align">center</Property>
- </DataColumn>
<DataColumn name="zw">
<Property name="property">zw</Property>
<Property name="align">center</Property>
@@ -326,8 +716,8 @@
</Container>
<Dialog id="dialogMain">
<Property name="closeable">false</Property>
- <Property name="caption">浠撳簱璁惧淇℃伅</Property>
- <Property name="width">80%</Property>
+ <Property name="caption">浜哄憳淇℃伅</Property>
+ <Property name="width">70%</Property>
<Property name="iconClass">fa fa-tasks</Property>
<Buttons>
<Button id="btnOk">
@@ -352,23 +742,23 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*</Property>
- <Property name="labelAlign">left</Property>
+ <Property name="cols">*,*</Property>
+ <Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
- <Property name="labelPosition">top</Property>
- <AutoFormElement>
- <Property name="name">lsbm</Property>
- <Property name="property">lsbm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">xzqhdm</Property>
- <Property name="property">xzqhdm</Property>
- <Editor/>
- </AutoFormElement>
+ <Property name="labelWidth">120</Property>
<AutoFormElement>
<Property name="name">xm</Property>
<Property name="property">xm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfzhm</Property>
+ <Property name="property">sfzhm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -377,8 +767,14 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">sfzhm</Property>
- <Property name="property">sfzhm</Property>
+ <Property name="name">lsbm</Property>
+ <Property name="property">lsbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xzqhmc</Property>
+ <Property name="property">xzqhmc</Property>
+ <Property name="trigger">ddFoodOrigin</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -472,5 +868,66 @@
<Property name="service">staffPR#delData</Property>
<Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property>
</AjaxAction>
+ <CustomDropDown id="ddFoodOrigin">
+ <Property name="minHeight">500</Property>
+ <Property name="assignmentMap">xzqhmc=name,xzqhdm=code</Property>
+ <Property name="minWidth">500</Property>
+ <Container layout="regionPadding:5">
+ <DataSet id="dsFoodOrigin">
+ <Property name="dataProvider">dicAreaPR#pageList</Property>
+ <Property name="dataType">[dtArea]</Property>
+ <Property name="parameter"></Property>
+ <Property name="pageSize">30</Property>
+ </DataSet>
+ <Container layout="hbox regionPadding:5">
+ <TextEditor id="key2">
+ <Property name="blankText"> -- 缂栫爜鎴栬�呭悕绉� --</Property>
+ <Property name="width">200</Property>
+ </TextEditor>
+ <Button>
+ <ClientEvent name="onClick">var key = view.get("#key2.value");
+ view.get("#dsFoodOrigin").set("parameter",{key:key}).flushAsync();</ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var data = view.get("#dsFoodOrigin.data:#");
+ if(data){
+ view.get("#ddFoodOrigin").close(data.toJSON());
+ }</ClientEvent>
+ <Property name="iconClass">fa fa-check</Property>
+ <Property name="caption">纭畾</Property>
+ </Button>
+ </Container>
+ <DataGrid>
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsFoodOrigin.data:#");
+ if(data){
+ view.get("#ddFoodOrigin").close(data.toJSON());
+ }</ClientEvent>
+ <Property name="dataSet">dsFoodOrigin</Property>
+ <Property name="readOnly">true</Property>
+ <DataColumn name="code">
+ <Property name="property">code</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="name">
+ <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
+ arg.processDefault = true;</ClientEvent>
+ <Property name="property">name</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="simple">
+ <Property name="property">simple</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
+ <DataPilot layoutConstraint="bottom">
+ <Property name="dataSet">dsFoodOrigin</Property>
+ </DataPilot>
+ </Container>
+ </CustomDropDown>
</View>
</ViewConfig>
diff --git a/igds-n2/igds-n2.iml b/igds-n2/igds-n2.iml
index 294d45e..f7b7fd8 100644
--- a/igds-n2/igds-n2.iml
+++ b/igds-n2/igds-n2.iml
@@ -56,14 +56,14 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-n2/src/main/java/com/ld/igds/n2/manager/N2AutoManager.java b/igds-n2/src/main/java/com/ld/igds/n2/manager/N2AutoManager.java
index c0b70b8..1ba71ca 100644
--- a/igds-n2/src/main/java/com/ld/igds/n2/manager/N2AutoManager.java
+++ b/igds-n2/src/main/java/com/ld/igds/n2/manager/N2AutoManager.java
@@ -22,9 +22,9 @@
import com.ld.igds.n2.service.HN2Service;
import com.ld.igds.util.ContextUtil;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -37,15 +37,15 @@
@Component
public class N2AutoManager {
- @Autowired
+ @Resource
private CoreCommonService coreCommonService;
- @Autowired
+ @Resource
private RemoteManager remoteManager;
- @Autowired
+ @Resource
private CoreSerService coreSerService;
- @Autowired
+ @Resource
private CoreN2Service coreN2Service;
- @Autowired
+ @Resource
private HN2Service hn2Service;
diff --git a/igds-parent-pom/igds-parent-pom.iml b/igds-parent-pom/igds-parent-pom.iml
index 4321fc8..4a0448e 100644
--- a/igds-parent-pom/igds-parent-pom.iml
+++ b/igds-parent-pom/igds-parent-pom.iml
@@ -24,9 +24,6 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
@@ -48,6 +45,9 @@
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.17.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.3.17.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-parent-pom/pom.xml b/igds-parent-pom/pom.xml
index 3e6bdec..cfdd261 100644
--- a/igds-parent-pom/pom.xml
+++ b/igds-parent-pom/pom.xml
@@ -39,12 +39,6 @@
</exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-websocket</artifactId>
- <version>${spring.boot.version}</version>
- </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/igds-protocol-beibo/igds-protocol-beibo.iml b/igds-protocol-beibo/igds-protocol-beibo.iml
index 22a87d4..e708428 100644
--- a/igds-protocol-beibo/igds-protocol-beibo.iml
+++ b/igds-protocol-beibo/igds-protocol-beibo.iml
@@ -55,14 +55,14 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.13.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.13.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/RemoteGrainServiceImpl.java b/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/RemoteGrainServiceImpl.java
deleted file mode 100644
index 601dccb..0000000
--- a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/RemoteGrainServiceImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.ld.igds.protocol.beibo.grain;
-
-import com.ld.igds.io.RemoteGrainService;
-import com.ld.igds.io.constant.OrderRespEnum;
-import com.ld.igds.io.constant.ProtocolEnum;
-import com.ld.igds.io.request.CheckGrainRequest;
-import com.ld.igds.io.response.GrainResponse;
-import com.ld.igds.protocol.beibo.grain.builder.CommandBuild;
-import com.ld.igds.protocol.beibo.grain.client.BeiboClientEngine;
-import com.ld.igds.util.BytesUtil;
-import com.ld.io.api.InvokeResult;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * 璐濆崥绮儏鍒嗘満鍗忚
- *
- * @author czt
- */
-@Slf4j
-@Component(RemoteGrainServiceImpl.BEAN_ID)
-public class RemoteGrainServiceImpl implements RemoteGrainService {
-
- public static final String BEAN_ID = "beiboGrain.remoteGrainService";
-
- @Override
- public String getProtocol() {
- return ProtocolEnum.TCP_BEIBO_GRAIN_V1.getCode();
- }
-
- @Override
- public GrainResponse checkGrain(CheckGrainRequest request) {
- try {
- log.info("璐濆崥绮儏鍒嗘満寮�濮嬫娴嬶紝鍒嗘満{}鐨処P={},绔彛={}",request.getSerId(),request.getIp(),request.getPort());
- BeiboClientEngine beibo = new BeiboClientEngine(request.getIp(),request.getPort());
- beibo.start();
- Thread.sleep(3000);
-
- //鐢熸垚绮儏鍛戒护
- String hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), request.getDepotId());
-
- InvokeResult result = beibo.send(BytesUtil.hexStrToBytes(hexStr));
-
- log.info("result=" +result.getMessage());
-
- // 灏佽杩斿洖淇℃伅
- if (InvokeResult.SUCCESS == result) {
- return new GrainResponse(OrderRespEnum.ORDER_SUCCESS.getCode(),
- "绮儏绮儏鍙戦�佹垚鍔燂紒");
- } else {
- log.error("骞冲彴------>>>>璐濆崥绮儏鍒嗘満锛氱伯鎯呮娴�-澶辫触{}", result.getMessage());
- return new GrainResponse(OrderRespEnum.ORDER_ERROR.getCode(),
- "鍛戒护鍙戦�佸紓甯革細" + result.getMessage());
- }
-
- } catch (Exception e) {
- log.error("绮儏妫�娴嬪紓甯革細{}", e);
- return new GrainResponse(OrderRespEnum.ORDER_ERROR.getCode(), "鍚庣寮傚父锛�" + e.getMessage());
- }
- }
-}
\ No newline at end of file
diff --git a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/analysis/AnalysisService.java b/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/analysis/AnalysisService.java
deleted file mode 100644
index ed6fedd..0000000
--- a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/analysis/AnalysisService.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.ld.igds.protocol.beibo.grain.analysis;
-
-import com.ld.igds.common.CoreCommonService;
-import com.ld.igds.common.CoreSerService;
-import com.ld.igds.common.dto.THDto;
-import com.ld.igds.constant.BizType;
-import com.ld.igds.grain.GrainUtil;
-import com.ld.igds.io.notify.NotifyGrainInvoker;
-import com.ld.igds.models.DepotConf;
-import com.ld.igds.models.DeviceSer;
-import com.ld.igds.models.DicSysConf;
-import com.ld.igds.order.ExeOrderService;
-import com.ld.igds.order.data.ExeRequest;
-import com.ld.igds.protocol.beibo.grain.util.BeiboGrainServerUtils;
-import com.ld.igds.util.ContextUtil;
-import com.ld.igds.warn.WarnUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.*;
-
-/**
- * 鍗忚瑙ｆ瀽
- *
- * @author vince
- */
-@Slf4j
-@Component(AnalysisService.BEAN_ID)
-public class AnalysisService {
-
-
- /**
- * 閽堝鍒嗗寘绮儏鎶ユ枃杩涜灏佽
- */
- public static Map<String, String> contextMapGrain = new HashMap<>();
-
- /**
- * 鐢ㄤ簬瀛樻斁杩斿洖鐨勪粨娓╀粨婀夸俊鎭�
- */
- public static Map<String, THDto> contextMapTH = new HashMap<>();
-
- public static final String BEAN_ID = "beiboGrain.analysisService";
-
- @Autowired
- private CoreSerService coreSerService;
- @Autowired
- private CoreCommonService commonService;
- @Autowired
- private NotifyGrainInvoker notifyGrainInvoker;
- @Autowired
- private GrainUtil grainUtil;
- @Autowired
- private WarnUtils warnUtils;
- @Autowired
- private ExeOrderService exeOrderService;
-
- /**
- *
- * @param result
- */
- public void analysis(String result){
- log.info("璐濆崥鍒嗘満------->>骞冲彴锛氫俊鎭姤鏂�={}", result);
- if(!result.startsWith(BeiboGrainServerUtils.MSG_START)){
- log.error("璐濆崥鍒嗘満------->>骞冲彴锛岃В鏋愮伯鎯呭け璐ワ細鎶ユ枃璧峰绗﹂敊璇紝涓嶈В鏋�");
- }
- //鍘婚櫎璧峰绗�
- result = result.substring(9*2-1);
-
- analysisGrain(result);
- }
-
-
- private void analysisGrain(String result) {
- try {
-
- //鎴彇鍒嗘満鍦板潃
- String serId = result.substring(0, 2);
- //鏍规嵁鍒嗘満鍦板潃鑾峰彇鍒嗘満淇℃伅
- DeviceSer ser = coreSerService.getCacheSer(ContextUtil.getDefaultCompanyId(),serId);
- if (ser == null) {
- log.error("璐濆崥鍒嗘満-------->>骞冲彴锛岃В鏋愮伯鎯呭け璐ワ紝鏈幏鍙栧埌绯荤粺绮儏涓绘満閰嶇疆锛�" + serId);
- return;
- }
-
- // 棣栧厛鑾峰彇鍒扮郴缁熷弬鏁帮紝鍒ゆ柇鏄惁闇�瑕佹壒娆¤嚜鍔ㄤ紭鍖�
- DicSysConf sysConf = commonService.getCacheSysConf(ser.getCompanyId());
- List<ExeRequest> list = exeOrderService.getInProgressOrderBySerId(BizType.GRAIN.getCode(), ser.getId());
-
- if (null == list || list.isEmpty()) {
- String info = "绮儏瑙ｆ瀽澶辫触:鍒嗘満=" + ser.getName() + "娌℃湁鑾峰彇鍒版墍灞炰粨搴撲俊鎭��";
- log.error("璐濆崥鍒嗘満------>>>骞冲彴锛�" + info);
- return;
- }
-
- //鑾峰彇閽堝褰撳墠浠撳簱鐨勫懡浠�
- ExeRequest exeRequest = list.get(0);
- if (null == exeRequest) {
- String info = "绮儏瑙ｆ瀽澶辫触:鍒嗘満=" + ser.getName() + "娌℃湁鑾峰彇鍘嗗彶鍛戒护銆�";
- log.error("璐濆崥鍒嗘満------>>>骞冲彴锛�" + info);
- return;
- }
-
- DepotConf depotConf = commonService.getCacheDepotConf(exeRequest.getCompanyId(), exeRequest.getDepotId());
-
- if (null == depotConf) {
- String info = "绮儏瑙ｆ瀽澶辫触:鍒嗘満=" + ser.getName() + "娌℃湁鑾峰彇鍒扮伯鎯呭弬鏁伴厤缃俊鎭��";
- log.error("璐濆崥鍒嗘満------>>>骞冲彴锛�" + info);
- return;
- }
-
- // 绮儏鐨勬壒娆″彿閲嶆柊鏍规嵁棰戠巼璋冩暣
- String batchId = ContextUtil.getBatchIdByFireq(depotConf.getGrainFreq());
-
- //TODO 鏍规嵁瀹為檯鎶ユ枃锛屽緟瀹炵幇
-
-
-
-
-
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- }
- }
-}
diff --git a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/builder/CommandBuild.java b/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/builder/CommandBuild.java
deleted file mode 100644
index 8b02a21..0000000
--- a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/builder/CommandBuild.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.ld.igds.protocol.beibo.grain.builder;
-
-import com.ld.igds.protocol.beibo.grain.util.BeiboGrainServerUtils;
-import com.ld.igds.util.BytesUtil;
-
-/**
- * 鍛戒护鐢熸垚
- *
- * @author czt
- */
-public class CommandBuild {
-
- private final static CommandBuild instance = new CommandBuild();
-
- private CommandBuild() {
- }
-
- public static CommandBuild getInstance() {
- return instance;
- }
-
- /**
- * 绮儏閲囬泦鍛戒护
- *
- * @param grainAddr 绮儏鍒嗘満鍦板潃
- * @param deptId 浠撳簱缂栧彿鍦板潃
- * @return
- */
- public static String getMsgCheck(String grainAddr, String deptId) {
-
- StringBuffer sb = new StringBuffer();
-
- //璧峰绗�
- sb.append(BeiboGrainServerUtils.MSG_START);
-
- //鍒嗘満鍦板潃
- int i = Integer.parseInt(grainAddr);
- sb.append(BytesUtil.intToHexStr1(i));
-
- //鎺у埗鍛戒护
- sb.append("82");
-
- //鍒嗘満鍦板潃
- sb.append(BytesUtil.intToHexStr1(i));
-
- //娴嬫俯鐢电紗灞傛暟锛屼笉鐭ラ亾鐢电紗閲囬泦灞傛暟鏃讹紝榛樿00鎴栬�匜F
- sb.append("00");
-
- //缁撳熬绗�
- sb.append(BeiboGrainServerUtils.MSG_END);
-
- return sb.toString();
- }
-}
diff --git a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/client/BeiboClientEngine.java b/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/client/BeiboClientEngine.java
deleted file mode 100644
index b4d65e2..0000000
--- a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/client/BeiboClientEngine.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.ld.igds.protocol.beibo.grain.client;
-
-import com.ld.igds.util.BytesUtil;
-import com.ld.io.api.InvokeResult;
-import io.netty.bootstrap.Bootstrap;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.*;
-import io.netty.channel.oio.OioEventLoopGroup;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.socket.oio.OioSocketChannel;
-import io.netty.handler.codec.bytes.ByteArrayDecoder;
-import io.netty.handler.codec.bytes.ByteArrayEncoder;
-
-/**
- * 璐濆崥绮儏鍗忚锛屽垎鏈轰负鏈嶅姟绔紝骞冲彴涓哄鎴风涓诲姩杩炴帴
- *
- * @author czt
- */
-public class BeiboClientEngine implements Runnable {
-
- private String host;
- private int port;
- // public ChannelFuture channelFuture;
- public Channel channel;
-
- public BeiboClientEngine(String host, int port) {
- this.host = host;
- this.port = port;
- }
- public void start() {
- Thread thread = new Thread(this);
- thread.start();
- }
-
- @Override
- public void run() {
- try {
- startRun();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public void startRun() throws Exception {
- EventLoopGroup group = new OioEventLoopGroup();
- Bootstrap b = new Bootstrap();
- // b.option(ChannelOption.SO_KEEPALIVE, true);
- b.group(group).channel(OioSocketChannel.class)
- .handler(new ChannelInitializer<SocketChannel>() {
- @Override
- protected void initChannel(SocketChannel ch)
- throws Exception {
- ChannelPipeline p = ch.pipeline();
- // 瀛楃涓茶В鐮� 鍜� 缂栫爜
- p.addLast("decoder", new ByteArrayDecoder());
- p.addLast("encoder", new ByteArrayEncoder());
- // 鑷繁鐨勯�昏緫Handler
- p.addLast("handler", new ClientHandler());
- }
- });
-
- // 鍙戣捣寮傛杩炴帴璇锋眰锛岀粦瀹氳繛鎺ョ鍙ｅ拰host淇℃伅
- ChannelFuture channelFuture = b.connect(host, port);
- this.channel = channelFuture.channel();
- // channelFuture.channel().closeFuture().sync();
-
- channelFuture.addListener(new ChannelFutureListener() {
- @Override
- public void operationComplete(ChannelFuture arg0) throws Exception {
- if (channelFuture.isSuccess()) {
- System.out.println("杩炴帴鏈嶅姟鍣ㄦ垚鍔�");
- } else {
- System.out.println("杩炴帴鏈嶅姟鍣ㄥけ璐�");
- channelFuture.cause().printStackTrace();
- group.shutdownGracefully(); // 鍏抽棴绾跨▼缁�
- }
- }
- });
- }
-
- public InvokeResult send(byte[] array) throws InterruptedException {
- if (null == channel) {
- return InvokeResult.SOCKET_NOT_CREATE;
- }
- if (!channel.isActive()) {
- return InvokeResult.CHANNEL_CLOSED;
- }
- channel.writeAndFlush(Unpooled.copiedBuffer(array)).sync();
-
- return InvokeResult.SUCCESS;
- }
-
- public static void main(String[] args) {
- try {
-
- String msg = "000000000006010600070012";
- BeiboClientEngine test = new BeiboClientEngine(
- "192.168.1.95", 9999);
-
- test.start();
-
- msg = "BB BB BB BB";
-
- // Thread.sleep(3000L);
-
- test.send(BytesUtil.hexStrToBytes(msg));
-
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
-
- public Channel getChannel() {
- return channel;
- }
-
-}
diff --git a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/client/ClientHandler.java b/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/client/ClientHandler.java
deleted file mode 100644
index ad53e2c..0000000
--- a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/client/ClientHandler.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.ld.igds.protocol.beibo.grain.client;
-
-import com.ld.igds.protocol.beibo.grain.analysis.AnalysisService;
-import com.ld.igds.util.BytesUtil;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
-import io.netty.util.internal.logging.InternalLogger;
-import io.netty.util.internal.logging.InternalLoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.net.InetSocketAddress;
-
-/**
- * Handles a client-side channel.
- */
-
-public class ClientHandler extends SimpleChannelInboundHandler<Object> {
- @Autowired
- private AnalysisService analysisService;
- private final InternalLogger log = InternalLoggerFactory.getInstance(this
- .getClass());
- @Override
- public void channelActive(ChannelHandlerContext ctx) {
- InetSocketAddress insocket = (InetSocketAddress) ctx.channel()
- .remoteAddress();
- log.info("璐濆崥绮儏鍒嗘満鎴愬姛杩炴帴锛孖P={},port={}", insocket.getAddress()
- .getHostAddress(), insocket.getPort());
- }
-
- @Override
- public void channelInactive(ChannelHandlerContext ctx) throws Exception {
- super.channelInactive(ctx);
-
- InetSocketAddress insocket = (InetSocketAddress) ctx.channel()
- .remoteAddress();
-
- log.info("璐濆崥绮儏鍒嗘満鏂紑杩炴帴锛孖P={},port={}", insocket.getAddress(),insocket.getPort());
- }
-
- @Override
- public void channelRead0(ChannelHandlerContext ctx, Object msg)
- throws Exception {
- byte[] bytes = (byte[]) msg;
- String result = BytesUtil.bytesToString(bytes);
- log.info("璐濆崥绮儏鍒嗘満杩斿洖淇℃伅=" + result);
-
- InetSocketAddress insocket = (InetSocketAddress) ctx.channel().remoteAddress();
-
- //瑙ｆ瀽
- analysisService.analysis(result);
- }
-
- @Override
- public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
- ctx.close();
- }
-
-}
diff --git a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/package-info.java b/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/package-info.java
deleted file mode 100644
index cf5b4a3..0000000
--- a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * 璐濆崥绮儏鍗忚-鍒嗘満涓烘湇鍔＄
- */
-package com.ld.igds.protocol.beibo.grain;
-
-
diff --git a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/util/BeiboGrainServerUtils.java b/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/util/BeiboGrainServerUtils.java
deleted file mode 100644
index de00a97..0000000
--- a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/util/BeiboGrainServerUtils.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.ld.igds.protocol.beibo.grain.util;
-
-/**
- * 宸ュ叿绫�
- *
- * @author czt
- */
-public class BeiboGrainServerUtils {
-
-
- public static String MSG_START = "00000000FFEB90FEAA"; //璧峰绗�
- public static String MSG_END = "00000000000000000000000000"; //缁撳熬绗�
-}
diff --git a/igds-protocol-bhzn/igds-protocol-bhzn.iml b/igds-protocol-bhzn/igds-protocol-bhzn.iml
index aa9b4ef..ba35d1f 100644
--- a/igds-protocol-bhzn/igds-protocol-bhzn.iml
+++ b/igds-protocol-bhzn/igds-protocol-bhzn.iml
@@ -55,14 +55,14 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.13.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.13.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java
index 4e73906..64524bd 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java
+++ b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java
@@ -26,16 +26,29 @@
private BhznGrainV1ServerEngine bhznGrainServerEngine1;
@Autowired
private BhznVerbServerEngine bhznVerbServerEngine;
+
@Override
public void run(String... strings) throws Exception {
- if (configData.getActive().indexOf("pro") >= 0) {
+ if (configData.getActive().indexOf("fzzy") >= 0) {
bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
- // bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
+ return;
+ }
+
+ if (configData.getActive().indexOf("pro") >= 0) {
+ //寰愰椈鏈嶅姟鍣ㄤ娇鐢�
+// bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
+
+ //姹熻タ璧ｅ窞銆佸箍涓滈珮宸炰娇鐢ㄣ�佽タ钘忓北鍗椼�佸畞澶忕煶鍢村北銆佸箍涓滀經灞便�佷笂娴峰槈瀹�
+ bhznGrainServerEngine2.start(BhznGrainV2ServerEngine.PORT);
+ //骞夸笢楂樺窞浣跨敤
+// bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
+ return;
}
if (configData.getActive().indexOf("dev") >= 0) {
bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
- //bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
+// bhznGrainServerEngine2.start(BhznGrainV2ServerEngine.PORT);
+// bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
}
}
}
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/AnalysisService.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/AnalysisService.java
index 7772715..6a883f3 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/AnalysisService.java
+++ b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/AnalysisService.java
@@ -6,7 +6,9 @@
import com.ld.igds.constant.BizType;
import com.ld.igds.constant.Constant;
import com.ld.igds.constant.DepotType;
+import com.ld.igds.constant.RedisConst;
import com.ld.igds.grain.GrainUtil;
+import com.ld.igds.grain.dto.GrainData;
import com.ld.igds.grain.dto.GrainItemInfo;
import com.ld.igds.io.notify.NotifyGrainInvoker;
import com.ld.igds.models.*;
@@ -19,6 +21,7 @@
import com.ld.igds.protocol.bhzn.grainv1.server.BhznGrainV1ServerUtils;
import com.ld.igds.util.BytesUtil;
import com.ld.igds.util.ContextUtil;
+import com.ld.igds.util.RedisUtil;
import com.ld.igds.warn.WarnUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +52,8 @@
public static final String BEAN_ID = "bhznGrainv1.analysisService";
@Autowired
+ private RedisUtil redisUtil;
+ @Autowired
private CoreSerService coreSerService;
@Autowired
private BhznGrainV1ServerEngine serverEngine;
@@ -68,12 +73,19 @@
*/
public void analysis(String sessionKey, IoMessage message) throws Exception {
+ String companyId = ContextUtil.getDefaultCompanyId();
+ //FZZY浜戞湇鍔″櫒-璁告槍鍐涚伯
+ if("1000".equals(companyId)){
+ companyId = "5323";
+ }
+ message.setCompanyId(companyId);
//娉ㄥ唽
if (BhznGrainV1ServerUtils.FUNCTION_ID_F1.equals(message.getFunctionId())) {
//DO NOTHING
log.info("涓绘満------->>骞冲彴锛氭敞鍐屼俊鎭姤鏂�={}", message);
- DeviceSer ser = coreSerService.getCacheSerBySn("5323",message.getAddr());
+
+ DeviceSer ser = coreSerService.getCacheSerBySn(message.getCompanyId(), message.getAddr());
if(ser!= null ){
ser.setIp(message.getIp());
ser.setPort(message.getPort());
@@ -111,7 +123,7 @@
//鏍规嵁鍒嗘満鍦板潃鑾峰彇鍒嗘満淇℃伅
- DeviceSer ser = coreSerService.getCacheSer("5323", message.getAddr());
+ DeviceSer ser = coreSerService.getCacheSer(message.getCompanyId(), message.getAddr());
if (ser == null) {
replayGrain(message);
log.error("涓绘満-------->>骞冲彴锛岃В鏋愮伯鎯呭け璐ワ紝鏈幏鍙栧埌绯荤粺绮儏涓绘満閰嶇疆锛�" + message.getAddr());
@@ -158,7 +170,7 @@
int cableY = 1;
int cableX = 1;
- if(DepotType.TYPE_01.equals(depot.getDepotType())){
+ if(DepotType.TYPE_01.getCode().equals(depot.getDepotType())){
cableZ = Integer.valueOf(attCable[0]);
cableY = Integer.valueOf(attCable[1]);
cableX = Integer.valueOf(attCable[2]);
@@ -239,7 +251,7 @@
int cableY = 1;
int cableX = 1;
- if(DepotType.TYPE_01.equals(depot.getDepotType())){
+ if(DepotType.TYPE_01.getCode().equals(depot.getDepotType())){
cableZ = Integer.valueOf(attCable[0]);
cableY = Integer.valueOf(attCable[1]);
cableX = Integer.valueOf(attCable[2]);
@@ -286,12 +298,13 @@
if (null != thDto) {
log.debug("-------THDto--={}", thDto.toString());
}
+
+
//娓呯┖
String key = "GRAIN_" + message.getAddr();
contextMapGrain.put(key, null);
// 灏嗛泦鍚堣В鏋愭垚鍧愭爣鏁版嵁
addPoint1(temps, depotConf, ser, exeRequest, thDto, sysConf, batchId);
-
}
@@ -326,7 +339,7 @@
int cableY = 1;
int cableX = 1;
- if(DepotType.TYPE_01.equals(depot.getDepotType())){
+ if(DepotType.TYPE_01.getCode().equals(depot.getDepotType())){
cableZ = Integer.valueOf(attCable[0]);
cableY = Integer.valueOf(attCable[1]);
cableX = Integer.valueOf(attCable[2]);
@@ -337,6 +350,9 @@
}
+
+
+
Grain grain = new Grain();
grain.setDepotId(depotConf.getDepotId());
grain.setCompanyId(depotConf.getCompanyId());
@@ -345,6 +361,14 @@
grain.setBatchId(batchId);
grain.setTempIn(Constant.ERROR_TEMP);
grain.setHumidityIn(Constant.ERROR_TEMP);
+
+ //濡傛灉鏄补缃愪粨
+ if(DepotType.TYPE_03.getCode().equals(depot.getDepotType())){
+ GrainData tempData = (GrainData) redisUtil.get(RedisConst.buildKey(ser.getCompanyId(),RedisConst.KEY_DEPOT_HEIGHT,depot.getId()));
+ if(null != tempData){
+ //TODO
+ }
+ }
if (null != thDto) {
log.debug("绮儏瑙ｆ瀽涓幏鍙栧埌鐨勬俯婀垮害淇℃伅={}", thDto.toString());
@@ -476,7 +500,7 @@
private void analysisTh(IoMessage message) {
try {
THDto th = new THDto();
- th.setCompanyId("5323");
+ th.setCompanyId(message.getCompanyId());
String data = message.getContent();
String houseNo = data.substring(0, 2);
String t = data.substring(4, 8);
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/message/IoMessage.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/message/IoMessage.java
index d453ca3..4e6ffb8 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/message/IoMessage.java
+++ b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv1/msg/message/IoMessage.java
@@ -9,6 +9,7 @@
private String ip;
private int port;
+ private String companyId;
private String pcAddr;
private String addr;
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/RemoteGrainV2ServiceImpl.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/RemoteGrainV2ServiceImpl.java
index 7202e5d..bfcd4ff 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/RemoteGrainV2ServiceImpl.java
+++ b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/RemoteGrainV2ServiceImpl.java
@@ -1,16 +1,18 @@
package com.ld.igds.protocol.bhzn.grainv2;
-import com.ld.igds.common.CoreSerService;
+import com.ld.igds.common.CoreCommonService;
import com.ld.igds.io.RemoteGrainService;
import com.ld.igds.io.constant.OrderRespEnum;
import com.ld.igds.io.constant.ProtocolEnum;
import com.ld.igds.io.request.CheckGrainRequest;
import com.ld.igds.io.response.GrainResponse;
+import com.ld.igds.models.Depot;
import com.ld.igds.protocol.bhzn.grainv2.msg.builder.CommandBuild;
import com.ld.igds.protocol.bhzn.grainv2.server.BhznGrainV2ServerEngine;
import com.ld.igds.util.BytesUtil;
import com.ld.io.api.InvokeResult;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -27,7 +29,7 @@
public static final String BEAN_ID = "bhznGrainv2.remoteGrainService";
@Autowired
- private CoreSerService coreSerService;
+ private CoreCommonService coreCommonService;
@Autowired
private BhznGrainV2ServerEngine bhznGrainServerEngine;
@@ -39,14 +41,16 @@
@Override
public GrainResponse checkGrain(CheckGrainRequest request) {
try {
+ String depotId = request.getDepotId();
+
+ //鍒ゆ柇閭︽捣浠撳簱缂栫爜鏄惁閰嶇疆
+ Depot depot = coreCommonService.getCacheDepot(request.getCompanyId(), request.getDepotId());
+ if(null != depot && StringUtils.isNotEmpty(depot.getBhId())){
+ depotId = depot.getBhId();
+ }
+
// 鐢熸垚绮儏淇℃伅
- String hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), request.getDepotId());
-
-
-// //閫氳浣跨敤鐨勬槸涓绘満閫氳
-// DeviceSer mainSer = coreSerService.getCacheSer(ContextUtil.getDefaultCompanyId(), BhznGrainV1ServerUtils.DEFAULT_MAC_ID);
-// request.setIp(mainSer.getIp());
-// request.setPort(mainSer.getPort());
+ String hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), depotId);
// 鍙戦�佸懡浠�
InvokeResult result = bhznGrainServerEngine.push(request.getIp(),request.getPort(), BytesUtil.hexStrToBytes(hexStr));
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/msg/AnalysisService.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/msg/AnalysisService.java
index 3a46bff..49c51b5 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/msg/AnalysisService.java
+++ b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/msg/AnalysisService.java
@@ -81,6 +81,7 @@
ser.setPort(message.getPort());
ser.setStatus(Constant.YN_Y);
coreSerService.updateByData(ser);
+ log.info("涓绘満------->>骞冲彴锛氭敞鍐屾垚鍔燂紝鍒嗘満淇℃伅={}", ser);
}
return;
}
@@ -164,7 +165,7 @@
//濡傛灉褰撳墠鍖呯殑鏁版嵁涓暟澶т簬绛変簬褰撳墠浠撳簱鐨勯厤缃偣浣嶅垯琛ㄧず鍗曞寘杩斿洖
if (curPoint >= sumPoint) {
-
+ log.info("鍒嗘満------>>>骞冲彴锛氱伯鎯呮暟鎹崟鍖�=" + grainHex);
//杩斿洖绮儏鎺ユ敹淇℃伅
replayGrain(message);
@@ -188,11 +189,12 @@
if (grainHex.length() >= sumPoint * 4) {
//杩斿洖绮儏鎺ユ敹淇℃伅
replayGrain(message);
-
+ log.info("鍒嗘満------>>>骞冲彴锛氱伯鎯呮暟鎹鍖咃紝瀹屾暣鏁版嵁=" + grainHex);
analysisGrain2(ser, message, exeRequest, depotConf, sysConf, batchId, grainHex);
return;
} else {
+ log.info("鍒嗘満------>>>骞冲彴锛氬皢绗竴鍖呮暟鎹瓨鍏ュ唴瀛�=" + grainHex);
contextMapGrain.put(key, grainHex);
replayGrain(message);
}
@@ -207,7 +209,8 @@
*
* @param message
*/
- private void replayGrain(IoMessage message) {
+ private void replayGrain(IoMessage message) throws InterruptedException {
+ Thread.sleep(50);
String hexStr = CommandBuild.getMsgGrainReply(message.getAddr());
log.info("骞冲彴--------->>>涓绘満锛岃繑鍥炵伯鎯呮姤鏂囨敹鍒颁俊鎭紝鎶ユ枃={}", hexStr);
serverEngine.push(message.getIp(),message.getPort(),BytesUtil.hexStrToBytes(hexStr));
@@ -431,27 +434,41 @@
try {
THDto th = new THDto();
th.setCompanyId(ContextUtil.getDefaultCompanyId());
+
String data = message.getContent();
- String houseNo = data.substring(0, 2);
+ String houseNo = data.substring(0, 4);
+ int depotId = BytesUtil.hexToInt(BytesUtil.tran_LH(houseNo));
String t = data.substring(4, 8);
String h = data.substring(8, 12);
- double temp, humy;
+ double humy;
+ String temp;
+ int symbol = 0; //绗﹀彿浣�
+ double tempValue;
if (ReMessageBuilder.ERROR_TAG.equals(t)) {
- temp = 0.0;
+ temp = "0000";
} else {
- temp = (double) BytesUtil.hexToBigInt(BytesUtil.tran_LH(t)) / 10;
+ temp = BytesUtil.tran_LH(t);
}
+ temp = BytesUtil.hexString2binaryString(temp, 16);
+
+ //绗﹀彿浣�
+ symbol = Integer.valueOf(temp.substring(0, 1));
+ //鑾峰彇娓╁害鍊�
+ tempValue = BytesUtil.biannary2Decimal(temp.substring(6))/10;
+ //鑻ヤ负璐燂紝鍒欒ˉ鐮侊細鍙栧弽鍔�1
+ if (symbol == 1) {
+ tempValue = 0.0 - BytesUtil.twoToString(temp)/10;
+ }
+ th.setTempIn(tempValue);
if (ReMessageBuilder.ERROR_TAG.equals(h)) {
humy = 0.0;
} else {
humy = (double) BytesUtil.hexToBigInt(BytesUtil.tran_LH(h)) / 10;
}
-
- th.setTempIn(temp);
th.setHumidityIn(humy);
- log.info("涓绘満--------->>>骞冲彴锛岃В鏋愪粨娓╀粨婀夸俊鎭紝浠撳簱={},缁撴灉={}", houseNo, th.toString());
+ log.info("涓绘満--------->>>骞冲彴锛岃В鏋愪粨娓╀粨婀夸俊鎭紝浠撳簱={},缁撴灉={}", depotId, th.toString());
- String key = "TH_" + houseNo;
+ String key = "TH_" + depotId;
contextMapTH.put(key, th);
} catch (Exception e) {
@@ -466,8 +483,8 @@
private THDto getTH(IoMessage message) {
String data = message.getContent();
String houseNo = data.substring(0, 2);
-
- String key = "TH_" + houseNo;
+ Integer depotId = BytesUtil.hexToInt(houseNo);
+ String key = "TH_" + depotId;
return contextMapTH.get(key);
}
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/msg/builder/CommandBuild.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/msg/builder/CommandBuild.java
index ddacfb6..ade91b0 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/msg/builder/CommandBuild.java
+++ b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/msg/builder/CommandBuild.java
@@ -38,7 +38,7 @@
sb.append(BytesUtil.tran_LH(BytesUtil.intToHexStr(i)));
//鍙戦�佹柟鍦板潃
- sb.append("0000");
+ sb.append("0001");
//鍛戒护ID
sb.append(BhznGrainV1ServerUtils.FUNCTION_ID_F2);
@@ -78,7 +78,7 @@
sb.append(BytesUtil.tran_LH(BytesUtil.intToHexStr(i)));
//鍙戦�佹柟鍦板潃
- sb.append("0000");
+ sb.append("0001");
//鍛戒护ID
sb.append(BhznGrainV1ServerUtils.FUNCTION_ID_83);
@@ -118,7 +118,7 @@
sb.append(BytesUtil.tran_LH(BytesUtil.intToHexStr(i)));
//鍙戦�佹柟鍦板潃
- sb.append("0000");
+ sb.append("0001");
//鍛戒护ID
sb.append(BhznGrainV1ServerUtils.FUNCTION_ID_93);
@@ -156,7 +156,7 @@
sb.append(BytesUtil.tran_LH(BytesUtil.intToHexStr(i)));
//鍙戦�佹柟鍦板潃
- sb.append("0000");
+ sb.append("0001");
//鍛戒护ID
sb.append(BhznGrainV1ServerUtils.FUNCTION_ID_92);
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/ServerRunner.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/ServerRunner.class
deleted file mode 100644
index 10a7b73..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/ServerRunner.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/RemoteGrainV1ServiceImpl.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/RemoteGrainV1ServiceImpl.class
deleted file mode 100644
index 937f95b..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/RemoteGrainV1ServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/ServerRunner.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/ServerRunner.class
deleted file mode 100644
index ef15010..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/ServerRunner.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/msg/AnalysisService.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/msg/AnalysisService.class
deleted file mode 100644
index d09c8c4..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/msg/AnalysisService.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/msg/builder/CommandBuild.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/msg/builder/CommandBuild.class
deleted file mode 100644
index 9341b02..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/msg/builder/CommandBuild.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/msg/builder/ReMessageBuilder.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/msg/builder/ReMessageBuilder.class
deleted file mode 100644
index 7a3d1eb..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/msg/builder/ReMessageBuilder.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/msg/message/Content.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/msg/message/Content.class
deleted file mode 100644
index 43ea149..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/msg/message/Content.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/msg/message/IoMessage.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/msg/message/IoMessage.class
deleted file mode 100644
index 7668fb5..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/msg/message/IoMessage.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/server/BhznGrainV1HeartbeatImpl.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/server/BhznGrainV1HeartbeatImpl.class
deleted file mode 100644
index 456a60a..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/server/BhznGrainV1HeartbeatImpl.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/server/BhznGrainV1MessageConsumer.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/server/BhznGrainV1MessageConsumer.class
deleted file mode 100644
index 9a6fd16..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/server/BhznGrainV1MessageConsumer.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/server/BhznGrainV1ServerEngine.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/server/BhznGrainV1ServerEngine.class
deleted file mode 100644
index a8f0f3e..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/server/BhznGrainV1ServerEngine.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/server/BhznGrainV1ServerUtils.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/server/BhznGrainV1ServerUtils.class
deleted file mode 100644
index 2951101..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/server/BhznGrainV1ServerUtils.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/server/BhznGrainV1SessionListener.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/server/BhznGrainV1SessionListener.class
deleted file mode 100644
index 99b760c..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv1/server/BhznGrainV1SessionListener.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/RemoteGrainV2ServiceImpl.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/RemoteGrainV2ServiceImpl.class
deleted file mode 100644
index 491c061..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/RemoteGrainV2ServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/msg/AnalysisService.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/msg/AnalysisService.class
deleted file mode 100644
index f342119..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/msg/AnalysisService.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/msg/builder/CommandBuild.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/msg/builder/CommandBuild.class
deleted file mode 100644
index b2a7463..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/msg/builder/CommandBuild.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/msg/builder/ReMessageBuilder.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/msg/builder/ReMessageBuilder.class
deleted file mode 100644
index fc6fd42..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/msg/builder/ReMessageBuilder.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/msg/message/Content.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/msg/message/Content.class
deleted file mode 100644
index 1a5a0c5..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/msg/message/Content.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/msg/message/IoMessage.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/msg/message/IoMessage.class
deleted file mode 100644
index 56f61f1..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/msg/message/IoMessage.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2HeartbeatImpl.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2HeartbeatImpl.class
deleted file mode 100644
index 6294266..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2HeartbeatImpl.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2MessageConsumer.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2MessageConsumer.class
deleted file mode 100644
index 62de0c7..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2MessageConsumer.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2ServerEngine.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2ServerEngine.class
deleted file mode 100644
index a66c919..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2ServerEngine.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2ServerUtils.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2ServerUtils.class
deleted file mode 100644
index 67c3ce0..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2ServerUtils.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2SessionListener.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2SessionListener.class
deleted file mode 100644
index c65c033..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2SessionListener.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/inout/BHZNWeightServiceImpl.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/inout/BHZNWeightServiceImpl.class
deleted file mode 100644
index a481b15..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/inout/BHZNWeightServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/inout/client/BHZNClientEngine.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/inout/client/BHZNClientEngine.class
deleted file mode 100644
index f6f0385..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/inout/client/BHZNClientEngine.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/inout/client/ClientHandler.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/inout/client/ClientHandler.class
deleted file mode 100644
index a3abe9b..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/inout/client/ClientHandler.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/inout/client/ReqGate.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/inout/client/ReqGate.class
deleted file mode 100644
index 42f9e32..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/inout/client/ReqGate.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/utils/CRC.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/utils/CRC.class
deleted file mode 100644
index 7be4e4d..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/utils/CRC.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/utils/CRC16.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/utils/CRC16.class
deleted file mode 100644
index 3c4ce64..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/utils/CRC16.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/utils/CRC8.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/utils/CRC8.class
deleted file mode 100644
index a55116a..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/utils/CRC8.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/utils/WindDirectionUtil.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/utils/WindDirectionUtil.class
deleted file mode 100644
index 2c73e3d..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/utils/WindDirectionUtil.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/analysis/AnalysisDevice.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/analysis/AnalysisDevice.class
deleted file mode 100644
index 9d615fa..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/analysis/AnalysisDevice.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/analysis/AnalysisES.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/analysis/AnalysisES.class
deleted file mode 100644
index c05dd85..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/analysis/AnalysisES.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/analysis/AnalysisGas.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/analysis/AnalysisGas.class
deleted file mode 100644
index 2e9f56d..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/analysis/AnalysisGas.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/analysis/AnalysisService.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/analysis/AnalysisService.class
deleted file mode 100644
index d1e2808..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/analysis/AnalysisService.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/analysis/AnalysisWeather.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/analysis/AnalysisWeather.class
deleted file mode 100644
index d17d43b..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/analysis/AnalysisWeather.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/builder/CommandBuilder.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/builder/CommandBuilder.class
deleted file mode 100644
index 1582f22..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/builder/CommandBuilder.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/builder/ControlCommandBuilder.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/builder/ControlCommandBuilder.class
deleted file mode 100644
index 9410b74..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/builder/ControlCommandBuilder.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/builder/EsCommandBuilder.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/builder/EsCommandBuilder.class
deleted file mode 100644
index ec12035..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/builder/EsCommandBuilder.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/builder/GasCommandBuilder.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/builder/GasCommandBuilder.class
deleted file mode 100644
index db415b4..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/builder/GasCommandBuilder.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/builder/GasStopCommandBuilder.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/builder/GasStopCommandBuilder.class
deleted file mode 100644
index 0a6fe11..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/builder/GasStopCommandBuilder.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/builder/TempControlCommandBuilder.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/builder/TempControlCommandBuilder.class
deleted file mode 100644
index 16e7a65..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/builder/TempControlCommandBuilder.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/command/BaseRemoteImpl.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/command/BaseRemoteImpl.class
deleted file mode 100644
index 55fa570..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/command/BaseRemoteImpl.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/command/RemoteCommonImpl.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/command/RemoteCommonImpl.class
deleted file mode 100644
index 32bcff3..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/command/RemoteCommonImpl.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/command/RemoteControlServiceImpl.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/command/RemoteControlServiceImpl.class
deleted file mode 100644
index d389fc9..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/command/RemoteControlServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/command/RemoteEsServiceImpl.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/command/RemoteEsServiceImpl.class
deleted file mode 100644
index 7a9f12a..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/command/RemoteEsServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/command/RemoteGasServiceImpl.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/command/RemoteGasServiceImpl.class
deleted file mode 100644
index 679c5b2..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/command/RemoteGasServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/command/RemoteGrainServiceImpl.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/command/RemoteGrainServiceImpl.class
deleted file mode 100644
index fc91a93..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/command/RemoteGrainServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/command/RemotePestServiceImpl.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/command/RemotePestServiceImpl.class
deleted file mode 100644
index 8f455dc..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/command/RemotePestServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/dto/IoMessage.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/dto/IoMessage.class
deleted file mode 100644
index a0cff96..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/dto/IoMessage.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/dto/Req209.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/dto/Req209.class
deleted file mode 100644
index e69dc29..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/dto/Req209.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/dto/Req248.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/dto/Req248.class
deleted file mode 100644
index a90749a..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/dto/Req248.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/dto/Res208.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/dto/Res208.class
deleted file mode 100644
index 8f84a4c..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/dto/Res208.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/dto/Res209.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/dto/Res209.class
deleted file mode 100644
index 28964dc..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/dto/Res209.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/dto/Res247.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/dto/Res247.class
deleted file mode 100644
index 7b9d1b7..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/dto/Res247.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/dto/Res248.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/dto/Res248.class
deleted file mode 100644
index c43b1ab..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/dto/Res248.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/msg/ReMessageBuilder.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/msg/ReMessageBuilder.class
deleted file mode 100644
index 8e850d8..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/msg/ReMessageBuilder.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/server/BhznVerbHeartbeatImpl.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/server/BhznVerbHeartbeatImpl.class
deleted file mode 100644
index f04d6b4..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/server/BhznVerbHeartbeatImpl.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/server/BhznVerbMessageConsumer.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/server/BhznVerbMessageConsumer.class
deleted file mode 100644
index 9c847e3..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/server/BhznVerbMessageConsumer.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/server/BhznVerbServerEngine.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/server/BhznVerbServerEngine.class
deleted file mode 100644
index 22eda10..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/server/BhznVerbServerEngine.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/server/BhznVerbServerUtils.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/server/BhznVerbServerUtils.class
deleted file mode 100644
index 6093e48..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/server/BhznVerbServerUtils.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/server/BhznVerbSessionListener.class b/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/server/BhznVerbSessionListener.class
deleted file mode 100644
index b782546..0000000
--- a/igds-protocol-bhzn/target/classes/com/ld/igds/protocol/bhzn/verb/server/BhznVerbSessionListener.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-block/igds-protocol-block.iml b/igds-protocol-block/igds-protocol-block.iml
index d42bf25..1885ef0 100644
--- a/igds-protocol-block/igds-protocol-block.iml
+++ b/igds-protocol-block/igds-protocol-block.iml
@@ -15,6 +15,7 @@
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
@@ -49,14 +50,14 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-protocol-block/pom.xml b/igds-protocol-block/pom.xml
index 74f23ca..9da0a41 100644
--- a/igds-protocol-block/pom.xml
+++ b/igds-protocol-block/pom.xml
@@ -36,6 +36,7 @@
<version>1.0.0-RELEASE</version>
</dependency>
+
<!-- 寮曞叆娴峰悍鐨� OpenAPI-->
<dependency>
<groupId>com.hikvision.ga</groupId>
diff --git a/igds-protocol-block/src/main/java/com/ld/igds/protocol/ServerRunner.java b/igds-protocol-block/src/main/java/com/ld/igds/protocol/ServerRunner.java
index 342fd2f..2f082fe 100644
--- a/igds-protocol-block/src/main/java/com/ld/igds/protocol/ServerRunner.java
+++ b/igds-protocol-block/src/main/java/com/ld/igds/protocol/ServerRunner.java
@@ -33,5 +33,9 @@
SnapServerEngine.start();
ShuhanServerEngine.start();
}
+
+ if (configData.getActive().indexOf("uat") >= 0) {
+ SnapServerEngine.start();
+ }
}
}
diff --git a/igds-protocol-block/src/main/java/com/ld/igds/protocol/openapi/OpenApiInoutService.java b/igds-protocol-block/src/main/java/com/ld/igds/protocol/openapi/OpenApiInoutService.java
index ab9f1a3..0498c7e 100644
--- a/igds-protocol-block/src/main/java/com/ld/igds/protocol/openapi/OpenApiInoutService.java
+++ b/igds-protocol-block/src/main/java/com/ld/igds/protocol/openapi/OpenApiInoutService.java
@@ -23,7 +23,7 @@
public class OpenApiInoutService implements ApiInoutService {
- private String http_url = "http://127.0.0.1:8081:/api/anpr/plate/single-recognition";
+ private String http_url = "http://127.0.0.1:8081/api/anpr/plate/single-recognition";
@Override
public String getProtocol() {
diff --git a/igds-protocol-block/src/main/java/com/ld/igds/protocol/vlcmedia/VlcMediaService.java b/igds-protocol-block/src/main/java/com/ld/igds/protocol/vlcmedia/VlcMediaService.java
index 20020f1..25686dd 100644
--- a/igds-protocol-block/src/main/java/com/ld/igds/protocol/vlcmedia/VlcMediaService.java
+++ b/igds-protocol-block/src/main/java/com/ld/igds/protocol/vlcmedia/VlcMediaService.java
@@ -9,21 +9,24 @@
import com.ld.igds.sec.dto.SecCameraDto;
import com.ld.onvif.OnvifService;
import com.ld.onvif.data.OnvifResult;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
import java.util.List;
/**
* 椋庢鑷磋繙鑷湁娴佸獟浣撴湇鍔″櫒
*/
+@Slf4j
@Component
public class VlcMediaService implements ApiCameraService {
- @Autowired
+ @Resource
private SnapPluginService snapPluginService;
- @Autowired
+ @Resource
private OnvifService onvifService;
@Override
@@ -50,10 +53,13 @@
}
try {
+ log.debug("瑙嗛鎺у埗寮�濮�={}", param.toString());
+// return new ApiCameraResp(ApiCameraResp.CODE_ERROR, "娌℃湁鑾峰彇鍒板綋鍓嶆憚鍍忔満淇℃伅锛屼笉鏀寔浜戝彴鎺у埗");
OnvifResult result = onvifService.ptz(param.getIp(), param.getPortV(), param.getLoginId(),
param.getPwd(), param.getCommand(), 0.5);
- return new ApiCameraResp(result.get("code")+"", (String)result.get("msg"));
+ log.debug("瑙嗛鎺у埗={}", result.toString());
+ return new ApiCameraResp(result.get("code") + "", (String) result.get("msg"));
} catch (Exception e) {
@@ -69,10 +75,12 @@
return new ApiCameraResp(ApiCameraResp.CODE_ERROR, "娌℃湁鑾峰彇鍒板綋鍓嶆憚鍍忔満淇℃伅锛屼笉鏀寔浜戝彴鎺у埗");
}
try {
+ log.debug("瑙嗛鎺у埗寮�濮�={}", param.toString());
+// return new ApiCameraResp(ApiCameraResp.CODE_ERROR, "娌℃湁鑾峰彇鍒板綋鍓嶆憚鍍忔満淇℃伅锛屼笉鏀寔浜戝彴鎺у埗");
OnvifResult result = onvifService.preset(param.getIp(), param.getPortV(),
param.getLoginId(), param.getPwd(), param.getPreset());
-
- return new ApiCameraResp((String)result.get("code"), (String)result.get("msg"));
+ log.debug("瑙嗛鎺у埗={}", result.toString());
+ return new ApiCameraResp((String) result.get("code"), (String) result.get("msg"));
} catch (Exception e) {
@@ -96,7 +104,6 @@
if (CameraUtil.SNAP_TYPE_FZZY_PLUGIN.equals(apiCameraDto.getSnapType())) {
return snapPluginService.snapImg(apiCameraDto);
}
-
return null;
}
}
diff --git a/igds-protocol-fzzy3/igds-protocol-fzzy3.iml b/igds-protocol-fzzy3/igds-protocol-fzzy3.iml
index b8fb7d5..52397f9 100644
--- a/igds-protocol-fzzy3/igds-protocol-fzzy3.iml
+++ b/igds-protocol-fzzy3/igds-protocol-fzzy3.iml
@@ -55,14 +55,14 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.13.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.13.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerRunner.java b/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerRunner.java
index e7c18cf..2f5c2cb 100644
--- a/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerRunner.java
+++ b/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerRunner.java
@@ -22,6 +22,12 @@
@Override
public void run(String... strings) throws Exception {
+ if (configData.getActive().indexOf("fzzy") >= 0) {
+ FzzyServerEngine.start(FzzyServerEngine.default_port);
+ }
+ if (configData.getActive().indexOf("dev") >= 0) {
+ FzzyServerEngine.start(FzzyServerEngine.default_port);
+ }
if (configData.getActive().indexOf("pro") >= 0) {
FzzyServerEngine.start(FzzyServerEngine.default_port);
}
diff --git a/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.java b/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.java
index fefac90..7e08a4d 100644
--- a/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.java
+++ b/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.java
@@ -15,14 +15,12 @@
import com.ld.igds.protocol.fzzy.resp.Response2102;
import com.ld.igds.protocol.fzzy.builder.SimpleCommandBuilder;
import com.ld.igds.util.ContextUtil;
+import com.ld.igds.util.NumberUtil;
import com.ld.igds.warn.WarnUtils;
-import com.ld.igds.warn.service.CoreWarnService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -107,6 +105,13 @@
grain.setCheckUser(exeRequest.getExeUser());
grain.setDepotId(response.getHouseId());
grain.setCompanyId(depotConf.getCompanyId());
+ //鎯犳柊鏆傛椂浣跨敤-鏆傛椂澶勭悊娓╂箍搴︽娴嬩负璐熷��
+ if(null != response.getHIn() && response.getHIn() < 0){
+ response.setHIn(NumberUtil.keepPrecision(Math.random() * 10 + 64, 1));
+ }
+ if(null != response.getTIn() && response.getTIn() < 0){
+ response.setTIn(response.getTAvg());
+ }
grain.setHumidityIn(response.getHIn());
grain.setHumidityOut(response.getHOut());
grain.setTempIn(response.getTIn());
@@ -201,9 +206,6 @@
return StringUtils.join(array, ",");
}
- /**
- * 涓嬮敟褰㈣ˉ鐐�-鐐逛綅浣嶇疆姝ｇ‘锛屽皢閿ュ舰鐐硅ˉ涓�-102
- */
/**
* 涓嬮敟褰㈣ˉ鐐�(鐐逛綅浣嶇疆姝ｇ‘锛岄渶瑕佽ˉ鐐逛负-102)
*
diff --git a/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/builder/ObjectCommandBuilder.java b/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/builder/ObjectCommandBuilder.java
index f03ee24..6ffd693 100644
--- a/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/builder/ObjectCommandBuilder.java
+++ b/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/builder/ObjectCommandBuilder.java
@@ -6,8 +6,6 @@
import com.ld.igds.protocol.fzzy.dto.ReMessage;
import com.ld.igds.protocol.fzzy.dto.SendMessage;
-import org.apache.commons.lang3.RandomUtils;
-
/**
* 绯荤粺鎺ュ彛
*/
@@ -68,7 +66,9 @@
info.setIedId(reMessage.getIedId());
info.setFunctionId(functionId);
info.setRespCode("0000");
- info.setOrderId(RandomUtils.nextInt(4000, 9999) + "");
+ //鍚敤闅忔満鏁板懡浠わ紝鍦↙inux涓細闃诲绾跨▼锛屼笉鎵ц
+// info.setOrderId(RandomUtils.nextInt(4000, 9999) + "");
+ info.setOrderId(reMessage.getOrderId());
info.setUserData("0");
info.setSign("0000");
info.setContent(object);
@@ -82,7 +82,9 @@
info.setIedId(deviceSer.getId());
info.setFunctionId(functionId);
info.setRespCode("0000");
- info.setOrderId(RandomUtils.nextInt(4000, 9999) + "");
+ //鍚敤闅忔満鏁板懡浠わ紝鍦↙inux涓細闃诲绾跨▼锛屼笉鎵ц
+// info.setOrderId(RandomUtils.nextInt(4000, 9999) + "");
+ info.setOrderId(deviceSer.getOrgId());
info.setUserData("0");
info.setSign("0000");
diff --git a/igds-protocol-fzzy3/target/classes/com/ld/igds/protocol/fzzy/ServerRunner.class b/igds-protocol-fzzy3/target/classes/com/ld/igds/protocol/fzzy/ServerRunner.class
index 7135c2a..d08c682 100644
--- a/igds-protocol-fzzy3/target/classes/com/ld/igds/protocol/fzzy/ServerRunner.class
+++ b/igds-protocol-fzzy3/target/classes/com/ld/igds/protocol/fzzy/ServerRunner.class
Binary files differ
diff --git a/igds-protocol-fzzy3/target/classes/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.class b/igds-protocol-fzzy3/target/classes/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.class
index f98d9ed..914c836 100644
--- a/igds-protocol-fzzy3/target/classes/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.class
+++ b/igds-protocol-fzzy3/target/classes/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.class
Binary files differ
diff --git a/igds-protocol-fzzy3/target/classes/com/ld/igds/protocol/fzzy/builder/ObjectCommandBuilder.class b/igds-protocol-fzzy3/target/classes/com/ld/igds/protocol/fzzy/builder/ObjectCommandBuilder.class
index ce3879e..819669b 100644
--- a/igds-protocol-fzzy3/target/classes/com/ld/igds/protocol/fzzy/builder/ObjectCommandBuilder.class
+++ b/igds-protocol-fzzy3/target/classes/com/ld/igds/protocol/fzzy/builder/ObjectCommandBuilder.class
Binary files differ
diff --git a/igds-protocol-iot/igds-protocol-iot.iml b/igds-protocol-iot/igds-protocol-iot.iml
index 43c3a93..03409ac 100644
--- a/igds-protocol-iot/igds-protocol-iot.iml
+++ b/igds-protocol-iot/igds-protocol-iot.iml
@@ -69,14 +69,14 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.13.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.13.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-protocol-iot/src/main/java/com/ld/igds/protocol/iot/ServerRunner.java b/igds-protocol-iot/src/main/java/com/ld/igds/protocol/iot/ServerRunner.java
index 394f3f9..ef4564c 100644
--- a/igds-protocol-iot/src/main/java/com/ld/igds/protocol/iot/ServerRunner.java
+++ b/igds-protocol-iot/src/main/java/com/ld/igds/protocol/iot/ServerRunner.java
@@ -34,6 +34,11 @@
return;
}
+ //FZZY-浜戞湇鍔″櫒鐜
+ if (configData.getActive().indexOf("fzzy") >= 0) {
+ iotServerEngine.start(IotServerEngine.PORT);
+ }
+
if (configData.getActive().indexOf("pro") >= 0) {
iotServerEngine.start(IotServerEngine.PORT);
fzzyServerEngine.start(9307);
diff --git a/igds-protocol-iot/src/main/java/com/ld/igds/protocol/iot/height/analysis/AnalysisHeightService.java b/igds-protocol-iot/src/main/java/com/ld/igds/protocol/iot/height/analysis/AnalysisHeightService.java
index 51dd540..9700830 100644
--- a/igds-protocol-iot/src/main/java/com/ld/igds/protocol/iot/height/analysis/AnalysisHeightService.java
+++ b/igds-protocol-iot/src/main/java/com/ld/igds/protocol/iot/height/analysis/AnalysisHeightService.java
@@ -1,13 +1,18 @@
package com.ld.igds.protocol.iot.height.analysis;
+import com.ld.igds.common.CoreCommonService;
import com.ld.igds.constant.RedisConst;
import com.ld.igds.grain.dto.GrainData;
+import com.ld.igds.models.Building;
+import com.ld.igds.models.Depot;
import com.ld.igds.models.DeviceIot;
import com.ld.igds.models.DeviceSer;
import com.ld.igds.protocol.iot.height.analysis.message.DeviceAttr;
import com.ld.igds.protocol.iot.height.analysis.message.DeviceAttrInfo;
import com.ld.igds.util.RedisUtil;
+import com.ld.igds.view.service.BuildingService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -27,7 +32,10 @@
@Autowired
private RedisUtil redisUtil;
-
+ @Autowired
+ private CoreCommonService coreCommonService;
+ @Autowired
+ private BuildingService buildingService;
/**
* @param deviceAttr
@@ -36,12 +44,45 @@
public void analysis(DeviceAttr deviceAttr , DeviceSer ser ,DeviceIot deviceIot) {
try{
List<DeviceAttrInfo> deviceAttrInfos = deviceAttr.getTerminalAttrInfoList();
- String herght =(deviceAttrInfos.get(2).getValue());
+ String height =(deviceAttrInfos.get(2).getValue());
GrainData data = new GrainData();
- data.setOilHeight(herght);
+ data.setOilHeight(height);
data.setReceiveDate(new Date());
data.setDepotId(deviceIot.getDepotId());
data.setCompanyId(ser.getCompanyId());
+// //璁＄畻鍌ㄩ噺
+// Depot depot = coreCommonService.getCacheDepot(ser.getCompanyId(), deviceIot.getDepotId());
+//
+// if(null != depot){
+// Building building;
+// //瀹归噸
+// Double bulkWeight = depot.getBulkWeight();
+// if (null != depot.getBuildingId()) {
+// building = buildingService.getCacheBuilding(depot.getCompanyId(),depot.getDeptId(), depot.getBuildingId());
+// if (null != building) {
+// if (null != building.getHeight()) {
+// height = building.getHeight() + "";
+// }
+// if (null != building.getLength()) {
+// diameter = building.getLength();
+// }
+// if (null != building.getDeVolume()) {
+// deVolume = building.getDeVolume();
+// }
+// }
+// }
+//
+// grainData.setDepotData(depot);
+// grainData.setDepotHeight(height);
+// if (null != bulkWeight && StringUtils.isNotEmpty(grainData.getOilHeight())) {
+// Double oilHeight = Double.valueOf(grainData.getOilHeight());
+// //璁＄畻浣撶Н
+// volume = 3.14 * Math.pow(diameter / 2, 2) * oilHeight - deVolume;
+// storage = volume * bulkWeight;
+// }
+//
+// grainData.setStorage(storage);
+// }
redisUtil.set(RedisConst.buildKey(ser.getCompanyId(),RedisConst.KEY_DEPOT_HEIGHT,deviceIot.getDepotId()),data);
log.info("楂樺害瑙ｆ瀽瀹屾垚锛�" + data.toString());
}catch (Exception e){
diff --git a/igds-protocol-modbus/igds-protocol-modbus.iml b/igds-protocol-modbus/igds-protocol-modbus.iml
index 1ebabf5..9ee6740 100644
--- a/igds-protocol-modbus/igds-protocol-modbus.iml
+++ b/igds-protocol-modbus/igds-protocol-modbus.iml
@@ -68,14 +68,14 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.13.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.13.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemotePestServiceImpl.java b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemotePestServiceImpl.java
index bc8f151..ece8394 100644
--- a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemotePestServiceImpl.java
+++ b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemotePestServiceImpl.java
@@ -1,6 +1,7 @@
package com.ld.igds.protocol.modbus.command;
import com.ld.igds.io.RemotePestService;
+import com.ld.igds.io.constant.ProtocolEnum;
import com.ld.igds.io.request.CheckPestRequest;
import com.ld.igds.io.response.PestResponse;
import lombok.extern.slf4j.Slf4j;
@@ -22,7 +23,7 @@
@Override
public String getProtocol() {
- return null;
+ return ProtocolEnum.TCP_MODBUS.getCode();
}
@Override
diff --git a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemotePressureServiceImpl.java b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemotePressureServiceImpl.java
index e63ce53..e0933db 100644
--- a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemotePressureServiceImpl.java
+++ b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/command/RemotePressureServiceImpl.java
@@ -1,6 +1,7 @@
package com.ld.igds.protocol.modbus.command;
import com.ld.igds.io.RemotePressureService;
+import com.ld.igds.io.constant.ProtocolEnum;
import com.ld.igds.io.request.BaseRequest;
import com.ld.igds.io.response.BaseResponse;
import lombok.extern.slf4j.Slf4j;
@@ -21,7 +22,7 @@
@Override
public String getProtocol() {
- return null;
+ return ProtocolEnum.TCP_MODBUS.getCode();
}
@Override
diff --git a/igds-protocol-modbus/target/classes/com/ld/igds/modbus/DeviceModbus.view.xml b/igds-protocol-modbus/target/classes/com/ld/igds/modbus/DeviceModbus.view.xml
deleted file mode 100644
index 0992467..0000000
--- a/igds-protocol-modbus/target/classes/com/ld/igds/modbus/DeviceModbus.view.xml
+++ /dev/null
@@ -1,313 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ViewConfig>
- <Arguments/>
- <Context/>
- <Model>
- <DataType name="dtMain">
- <Property name="creationType">com.ld.igds.models.DeviceModbus</Property>
- <PropertyDef name="id">
- <Property/>
- <Property name="label">ID</Property>
- </PropertyDef>
- <PropertyDef name="deviceCode">
- <Property/>
- <Property name="label">璁惧缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="open">
- <Property/>
- <Property name="label">寮�鍦板潃</Property>
- </PropertyDef>
- <PropertyDef name="openFun">
- <Property/>
- <Property name="label">鍔熻兘鍙�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deviceModbusPR#triggerFun").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="close">
- <Property/>
- <Property name="label">鍏冲湴鍧�</Property>
- </PropertyDef>
- <PropertyDef name="closeFun">
- <Property/>
- <Property name="label">鍔熻兘鍙�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deviceModbusPR#triggerFun").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="stop">
- <Property/>
- <Property name="label">鍋滃湴鍧�</Property>
- </PropertyDef>
- <PropertyDef name="stopFun">
- <Property/>
- <Property name="label">鍔熻兘鍙�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deviceModbusPR#triggerFun").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="openEnd">
- <Property/>
- <Property name="label">鍋滃湴鍧�</Property>
- </PropertyDef>
- <PropertyDef name="openEndFun">
- <Property/>
- <Property name="label">鍔熻兘鍙�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deviceModbusPR#triggerFun").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="closeEnd">
- <Property/>
- <Property name="label">鍏冲埌浣嶅湴鍧�</Property>
- </PropertyDef>
- <PropertyDef name="closeEndFun">
- <Property/>
- <Property name="label">鍔熻兘鍙�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deviceModbusPR#triggerFun").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="openError">
- <Property/>
- <Property name="label">寮�鏁呴殰鍦板潃</Property>
- </PropertyDef>
- <PropertyDef name="openErrorFun">
- <Property/>
- <Property name="label">鍔熻兘鍙�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deviceModbusPR#triggerFun").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="closeError">
- <Property/>
- <Property name="label">鍏虫晠闅滃湴鍧�</Property>
- </PropertyDef>
- <PropertyDef name="closeErrorFun">
- <Property/>
- <Property name="label">鍔熻兘鍙�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deviceModbusPR#triggerFun").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="bizType">
- <Property/>
- <Property name="label">涓氬姟绫诲瀷</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#triggerBizType").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="serId">
- <Property/>
- <Property name="label">鎵�灞炲垎鏈�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deviceSerPR#getAllSerCache").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- </DataType>
- </Model>
- <View layout="padding:5;regionPadding:5">
- <Property name="packages">font-awesome,css-common</Property>
- <DataSet id="dsMain">
- <Property name="loadMode">lazy</Property>
- <Property name="dataType">[dtMain]</Property>
- <Property name="dataProvider">deviceModbusPR#listAll</Property>
- </DataSet>
- <Container layout="regionPadding:10" layoutConstraint="top">
- <Property name="exClassName">bg-color</Property>
- <Property name="contentOverflow">hidden</Property>
- <Property name="height">55</Property>
- <Label layoutConstraint="left">
- <Property name="text">鑿滃崟鏍忥細</Property>
- </Label>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">view.get("#dsMain").insert({});</ClientEvent>
- <Property name="caption">鏂板</Property>
- <Property name="exClassName">btn-default</Property>
- <Property name="iconClass">fa fa-plus</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick"> view.get("#uaAction").execute(); </ClientEvent>
- <Property name="caption">淇濆瓨</Property>
- <Property name="iconClass">fa fa-check</Property>
- <Property name="exClassName">btn-normal</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
-if(!data){
- return;
-}
-view.get("#ajaxDel").set("parameter",data).execute(function(result){
- if(result){
- $alert(result);
- return;
- }else{
- data.remove();
- }
-}); </ClientEvent>
- <Property name="caption">鍒犻櫎</Property>
- <Property name="exClassName">btn-warn</Property>
- <Property name="iconClass">fa fa-minus</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">view.get("#dsMain").flushAsync(); </ClientEvent>
- <Property name="caption">鍒锋柊</Property>
- <Property name="exClassName">btn-default</Property>
- <Property name="iconClass">fa fa-refresh</Property>
- </Button>
- <Button layoutConstraint="left">
- <Property name="caption">鍒锋柊缂撳瓨</Property>
- <Property name="exClassName">btn-default</Property>
- <Property name="iconClass">fa fa-refresh</Property>
- <Property name="action">ajaxFlushCache</Property>
- </Button>
- </Container>
- <Container layout="regionPadding:10" layoutConstraint="center">
- <Property name="exClassName">bg-color</Property>
- <DataGrid layoutConstraint="center padding:5px">
- <Property name="dataSet">dsMain</Property>
- <RowNumColumn/>
- <DataColumn name="deviceCode">
- <Property name="property">deviceCode</Property>
- </DataColumn>
- <DataColumn name="serId">
- <Property name="property">serId</Property>
- </DataColumn>
- <DataColumn name="bizType">
- <Property name="property">bizType</Property>
- </DataColumn>
- <ColumnGroup>
- <Property name="caption">寮�鎿嶄綔</Property>
- <DataColumn name="open">
- <Property name="property">open</Property>
- <Property name="caption">鍦板潃</Property>
- <Property name="width">80</Property>
- </DataColumn>
- <DataColumn name="openFun">
- <Property name="property">openFun</Property>
- <Property name="caption">鍔熻兘</Property>
- <Property name="width">100</Property>
- <Property name="trigger">autoMappingDropDown1</Property>
- </DataColumn>
- </ColumnGroup>
- <ColumnGroup>
- <Property name="caption">鍏虫搷浣�</Property>
- <DataColumn name="close">
- <Property name="property">close</Property>
- <Property name="caption">鍦板潃</Property>
- <Property name="width">80</Property>
- </DataColumn>
- <DataColumn name="closeFun">
- <Property name="property">closeFun</Property>
- <Property name="caption">鍔熻兘</Property>
- <Property name="width">100</Property>
- <Property name="trigger">autoMappingDropDown1</Property>
- </DataColumn>
- </ColumnGroup>
- <ColumnGroup>
- <Property name="caption">鍋滄搷浣�</Property>
- <DataColumn name="stop">
- <Property name="property">stop</Property>
- <Property name="caption">鍦板潃</Property>
- <Property name="width">80</Property>
- </DataColumn>
- <DataColumn name="stopFun">
- <Property name="property">stopFun</Property>
- <Property name="caption">鍔熻兘</Property>
- <Property name="width">100</Property>
- <Property name="trigger">autoMappingDropDown1</Property>
- </DataColumn>
- </ColumnGroup>
- <ColumnGroup>
- <Property name="caption">寮�鍒颁綅</Property>
- <DataColumn name="openEnd">
- <Property name="property">openEnd</Property>
- <Property name="caption">鍦板潃</Property>
- <Property name="width">80</Property>
- </DataColumn>
- <DataColumn name="openEndFun">
- <Property name="property">openEndFun</Property>
- <Property name="caption">鍔熻兘</Property>
- <Property name="width">100</Property>
- <Property name="trigger">autoMappingDropDown1</Property>
- </DataColumn>
- </ColumnGroup>
- <ColumnGroup>
- <Property name="caption">鍏冲埌浣�</Property>
- <DataColumn name="closeEnd">
- <Property name="property">closeEnd</Property>
- <Property name="caption">鍦板潃</Property>
- <Property name="width">80</Property>
- </DataColumn>
- <DataColumn name="closeEndFun">
- <Property name="property">closeEndFun</Property>
- <Property name="caption">鍔熻兘</Property>
- <Property name="width">100</Property>
- <Property name="trigger">autoMappingDropDown1</Property>
- </DataColumn>
- </ColumnGroup>
- <ColumnGroup>
- <Property name="caption">寮�鏁呴殰</Property>
- <DataColumn name="openError">
- <Property name="property">openError</Property>
- <Property name="caption">鍦板潃</Property>
- <Property name="width">80</Property>
- </DataColumn>
- <DataColumn name="openErrorFun">
- <Property name="property">openErrorFun</Property>
- <Property name="caption">鍔熻兘</Property>
- <Property name="width">100</Property>
- <Property name="trigger">autoMappingDropDown1</Property>
- </DataColumn>
- </ColumnGroup>
- <ColumnGroup>
- <Property name="caption">鍏虫晠闅�</Property>
- <DataColumn name="closeError">
- <Property name="property">closeError</Property>
- <Property name="caption">鍦板潃</Property>
- <Property name="width">80</Property>
- </DataColumn>
- <DataColumn name="closeErrorFun">
- <Property name="property">closeErrorFun</Property>
- <Property name="caption">鍔熻兘</Property>
- <Property name="width">100</Property>
- <Property name="trigger">autoMappingDropDown1</Property>
- </DataColumn>
- </ColumnGroup>
- </DataGrid>
- </Container>
- <UpdateAction id="uaAction">
- <Property name="dataResolver">deviceModbusPR#updateData</Property>
- <UpdateItem>
- <Property name="dataSet">dsMain</Property>
- <Property name="dataPath">!DIRTY_TREE</Property>
- </UpdateItem>
- </UpdateAction>
- <AjaxAction id="ajaxDel">
- <Property name="service">deviceModbusPR#delData</Property>
- <Property name="confirmMessage">纭畾瑕佸垹闄や箞锛�</Property>
- </AjaxAction>
- <AjaxAction id="ajaxFlushCache">
- <Property name="service">deviceModbusPR#flushCache</Property>
- <Property name="successMessage">缂撳瓨鏇存柊鎴愬姛</Property>
- </AjaxAction>
- </View>
-</ViewConfig>
diff --git a/igds-protocol-modbus/target/classes/com/ld/igds/modbus/DeviceModbusPR.class b/igds-protocol-modbus/target/classes/com/ld/igds/modbus/DeviceModbusPR.class
deleted file mode 100644
index 8d340a5..0000000
--- a/igds-protocol-modbus/target/classes/com/ld/igds/modbus/DeviceModbusPR.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-modbus/target/classes/com/ld/igds/modbus/GasModbus.view.xml b/igds-protocol-modbus/target/classes/com/ld/igds/modbus/GasModbus.view.xml
deleted file mode 100644
index 2576894..0000000
--- a/igds-protocol-modbus/target/classes/com/ld/igds/modbus/GasModbus.view.xml
+++ /dev/null
@@ -1,378 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ViewConfig>
- <Arguments/>
- <Context/>
- <Model>
- <DataType name="dtMain">
- <Property name="creationType">com.ld.igds.models.DeviceModbus</Property>
- <PropertyDef name="id">
- <Property></Property>
- <Property name="label">ID</Property>
- </PropertyDef>
- <PropertyDef name="deviceCode">
- <Property></Property>
- <Property name="label">浠撳簱缂栫爜</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="open">
- <Property></Property>
- <Property name="label">寮�鍦板潃</Property>
- </PropertyDef>
- <PropertyDef name="openFun">
- <Property></Property>
- <Property name="label">鍔熻兘鍙�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deviceModbusPR#triggerFun").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="close">
- <Property></Property>
- <Property name="label">鍏冲湴鍧�</Property>
- </PropertyDef>
- <PropertyDef name="closeFun">
- <Property></Property>
- <Property name="label">鍔熻兘鍙�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deviceModbusPR#triggerFun").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="stop">
- <Property></Property>
- <Property name="label">鍋滃湴鍧�</Property>
- </PropertyDef>
- <PropertyDef name="stopFun">
- <Property></Property>
- <Property name="label">鍔熻兘鍙�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deviceModbusPR#triggerFun").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="openEnd">
- <Property></Property>
- <Property name="label">寮�鍒颁綅</Property>
- </PropertyDef>
- <PropertyDef name="openEndFun">
- <Property></Property>
- <Property name="label">鍔熻兘鍙�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deviceModbusPR#triggerFun").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="closeEnd">
- <Property></Property>
- <Property name="label">鍏冲埌浣�</Property>
- </PropertyDef>
- <PropertyDef name="closeEndFun">
- <Property></Property>
- <Property name="label">鍔熻兘鍙�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deviceModbusPR#triggerFun").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="openError">
- <Property></Property>
- <Property name="label">寮�鏁呴殰</Property>
- </PropertyDef>
- <PropertyDef name="openErrorFun">
- <Property></Property>
- <Property name="label">鍔熻兘鍙�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deviceModbusPR#triggerFun").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="closeError">
- <Property></Property>
- <Property name="label">鍏虫晠闅�</Property>
- </PropertyDef>
- <PropertyDef name="closeErrorFun">
- <Property></Property>
- <Property name="label">鍔熻兘鍙�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deviceModbusPR#triggerFun").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <Reference name="listGas">
- <Property name="dataType">[dtGas]</Property>
- <Property name="dataProvider">gasModbusPR#listGasModBus</Property>
- <Property name="parameter">$${this.deviceCode}</Property>
- </Reference>
- </DataType>
- <DataType name="dtGas">
- <Property name="creationType">com.ld.igds.models.GasModbus</Property>
- <PropertyDef name="id">
- <Property></Property>
- <Property name="label">ID</Property>
- </PropertyDef>
- <PropertyDef name="depotId">
- <Property></Property>
- <Property name="label">鎵�灞炰粨搴�</Property>
- </PropertyDef>
- <PropertyDef name="passcode">
- <Property name="dataType">int</Property>
- <Property name="label">閫氶亾</Property>
- </PropertyDef>
- <PropertyDef name="co2">
- <Property></Property>
- <Property name="label">浜屾哀鍖栫⒊</Property>
- </PropertyDef>
- <PropertyDef name="co2Fun">
- <Property></Property>
- <Property name="label">鍔熻兘鍙�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deviceModbusPR#triggerFun").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="o2">
- <Property></Property>
- <Property name="label">姘ф皵</Property>
- </PropertyDef>
- <PropertyDef name="o2Fun">
- <Property></Property>
- <Property name="label">鍔熻兘鍙�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deviceModbusPR#triggerFun").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="ph3">
- <Property></Property>
- <Property name="label">纾峰寲姘�</Property>
- </PropertyDef>
- <PropertyDef name="ph3Fun">
- <Property></Property>
- <Property name="label">鍔熻兘鍙�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deviceModbusPR#triggerFun").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- </DataType>
- </Model>
- <View layout="padding:5;regionPadding:5">
- <Property name="packages">font-awesome,css-common</Property>
- <DataSet id="dsMain">
- <Property name="loadMode">lazy</Property>
- <Property name="dataType">dtMain</Property>
- <Property name="dataProvider">gasModbusPR#getGasData</Property>
- <Property name="parameter">${request.getParameter('depotId')}</Property>
- </DataSet>
- <Container layout="regionPadding:10" layoutConstraint="top">
- <Property name="exClassName">bg-color</Property>
- <Property name="contentOverflow">hidden</Property>
- <Property name="height">55</Property>
- <Label layoutConstraint="left">
- <Property name="text">鑿滃崟鏍忥細</Property>
- </Label>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">var list = view.get("#dsMain.data").get("listGas");
-list.insert({});</ClientEvent>
- <Property name="caption">鏂板閫氶亾</Property>
- <Property name="exClassName">btn-default</Property>
- <Property name="iconClass">fa fa-plus</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">view.get("#uaAction").execute(); </ClientEvent>
- <Property name="caption">淇濆瓨鏁版嵁</Property>
- <Property name="iconClass">fa fa-check</Property>
- <Property name="exClassName">btn-normal</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">var data = view.get("#dataGrid1").getCurrentItem();;
-if(!data){
- return;
-}
-view.get("#ajaxDel").set("parameter",data).execute(function(result){
- if(result){
- $alert(result);
- return;
- }else{
- data.remove();
- }
-}); </ClientEvent>
- <Property name="caption">鍒犻櫎閫氶亾</Property>
- <Property name="exClassName">btn-warn</Property>
- <Property name="iconClass">fa fa-minus</Property>
- </Button>
- </Container>
- <Container layout="regionPadding:10" layoutConstraint="center">
- <Property name="exClassName">bg-color</Property>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*,*</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelSeparator">锛�</Property>
- <Property name="labelWidth">100</Property>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">deviceCode</Property>
- <Property name="property">deviceCode</Property>
- <Property name="label">浠撳簱缂栫爜</Property>
- <Property name="labelWidth">100</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">open</Property>
- <Property name="property">open</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">openFun</Property>
- <Property name="property">openFun</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">close</Property>
- <Property name="property">close</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">closeFun</Property>
- <Property name="property">closeFun</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">stop</Property>
- <Property name="property">stop</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">stopFun</Property>
- <Property name="property">stopFun</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">openEnd</Property>
- <Property name="property">openEnd</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">openEndFun</Property>
- <Property name="property">openEndFun</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">closeEnd</Property>
- <Property name="property">closeEnd</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">closeEndFun</Property>
- <Property name="property">closeEndFun</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">openError</Property>
- <Property name="property">openError</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">openErrorFun</Property>
- <Property name="property">openErrorFun</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">closeError</Property>
- <Property name="property">closeError</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">closeErrorFun</Property>
- <Property name="property">closeErrorFun</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
- <ToolBar>
- <ToolBarLabel>
- <Property name="text">妫�娴嬮�氶亾閰嶇疆</Property>
- <Property name="style">
- <Property name="font-weight">bold</Property>
- </Property>
- </ToolBarLabel>
- </ToolBar>
- <DataGrid id="dataGrid1" layoutConstraint="center padding:5px">
- <Property name="dataSet">dsMain</Property>
- <Property name="dataPath">#.listGas</Property>
- <RowNumColumn/>
- <DataColumn>
- <Property name="property">passcode</Property>
- <Property name="name">passcode</Property>
- <Editor/>
- </DataColumn>
- <ColumnGroup>
- <Property name="caption">CO2</Property>
- <DataColumn>
- <Property name="property">co2</Property>
- <Property name="caption">鍦板潃</Property>
- <Property name="name">co2</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">co2Fun</Property>
- <Property name="caption">鍔熻兘</Property>
- <Property name="trigger">autoMappingDropDown1</Property>
- <Property name="name">co2Fun</Property>
- </DataColumn>
- </ColumnGroup>
- <ColumnGroup>
- <Property name="caption">O2</Property>
- <DataColumn>
- <Property name="property">o2</Property>
- <Property name="caption">鍦板潃</Property>
- <Property name="name">o2</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">o2Fun</Property>
- <Property name="caption">鍔熻兘</Property>
- <Property name="trigger">autoMappingDropDown1</Property>
- <Property name="name">o2Fun</Property>
- </DataColumn>
- </ColumnGroup>
- <ColumnGroup>
- <Property name="caption">PH3</Property>
- <DataColumn>
- <Property name="property">ph3</Property>
- <Property name="caption">鍦板潃</Property>
- <Property name="name">ph3</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">ph3Fun</Property>
- <Property name="caption">鍔熻兘</Property>
- <Property name="trigger">autoMappingDropDown1</Property>
- <Property name="name">ph3Fun</Property>
- </DataColumn>
- </ColumnGroup>
- </DataGrid>
- </Container>
- <UpdateAction id="uaAction">
- <Property name="dataResolver">gasModbusPR#updateData</Property>
- <UpdateItem>
- <Property name="dataSet">dsMain</Property>
- <Property name="dataPath">[#current]</Property>
- </UpdateItem>
- </UpdateAction>
- <AjaxAction id="ajaxDel">
- <Property name="service">gasModbusPR#delData</Property>
- <Property name="confirmMessage">纭畾瑕佸垹闄や箞锛�</Property>
- </AjaxAction>
- </View>
-</ViewConfig>
diff --git a/igds-protocol-modbus/target/classes/com/ld/igds/modbus/GasModbusPR.class b/igds-protocol-modbus/target/classes/com/ld/igds/modbus/GasModbusPR.class
deleted file mode 100644
index 77c6feb..0000000
--- a/igds-protocol-modbus/target/classes/com/ld/igds/modbus/GasModbusPR.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-modbus/target/classes/com/ld/igds/modbus/ModbusConstant.class b/igds-protocol-modbus/target/classes/com/ld/igds/modbus/ModbusConstant.class
deleted file mode 100644
index 60f076a..0000000
--- a/igds-protocol-modbus/target/classes/com/ld/igds/modbus/ModbusConstant.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-modbus/target/classes/com/ld/igds/modbus/service/HModbusService.class b/igds-protocol-modbus/target/classes/com/ld/igds/modbus/service/HModbusService.class
deleted file mode 100644
index 14bfe73..0000000
--- a/igds-protocol-modbus/target/classes/com/ld/igds/modbus/service/HModbusService.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-modbus/target/classes/com/ld/igds/models/DeviceModbus.class b/igds-protocol-modbus/target/classes/com/ld/igds/models/DeviceModbus.class
deleted file mode 100644
index 2c14ee0..0000000
--- a/igds-protocol-modbus/target/classes/com/ld/igds/models/DeviceModbus.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-modbus/target/classes/com/ld/igds/models/GasModbus.class b/igds-protocol-modbus/target/classes/com/ld/igds/models/GasModbus.class
deleted file mode 100644
index ab37613..0000000
--- a/igds-protocol-modbus/target/classes/com/ld/igds/models/GasModbus.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/ModbusTest.class b/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/ModbusTest.class
deleted file mode 100644
index 423796c..0000000
--- a/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/ModbusTest.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/ModbusUtil2.class b/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/ModbusUtil2.class
deleted file mode 100644
index 6836bda..0000000
--- a/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/ModbusUtil2.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/ServerUtil.class b/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/ServerUtil.class
deleted file mode 100644
index b0f5c9e..0000000
--- a/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/ServerUtil.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/command/AnalysisService.class b/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/command/AnalysisService.class
deleted file mode 100644
index 6361fea..0000000
--- a/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/command/AnalysisService.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/command/RemoteControlServiceImpl.class b/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/command/RemoteControlServiceImpl.class
deleted file mode 100644
index b347db6..0000000
--- a/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/command/RemoteControlServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/command/RemoteEsServiceImpl.class b/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/command/RemoteEsServiceImpl.class
deleted file mode 100644
index e446204..0000000
--- a/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/command/RemoteEsServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/command/RemoteGasServiceImpl.class b/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/command/RemoteGasServiceImpl.class
deleted file mode 100644
index 9720659..0000000
--- a/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/command/RemoteGasServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/command/RemotePestServiceImpl.class b/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/command/RemotePestServiceImpl.class
deleted file mode 100644
index 3308e34..0000000
--- a/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/command/RemotePestServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/command/RemotePressureServiceImpl.class b/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/command/RemotePressureServiceImpl.class
deleted file mode 100644
index 8cfdc97..0000000
--- a/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/command/RemotePressureServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/data/ModbusGasResult.class b/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/data/ModbusGasResult.class
deleted file mode 100644
index 45d3938..0000000
--- a/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/data/ModbusGasResult.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/data/ModbusTcp.class b/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/data/ModbusTcp.class
deleted file mode 100644
index 29d3a80..0000000
--- a/igds-protocol-modbus/target/classes/com/ld/igds/protocol/modbus/data/ModbusTcp.class
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-modbus/target/classes/lib/modbus4j-3.1.0.jar b/igds-protocol-modbus/target/classes/lib/modbus4j-3.1.0.jar
deleted file mode 100644
index ab89c85..0000000
--- a/igds-protocol-modbus/target/classes/lib/modbus4j-3.1.0.jar
+++ /dev/null
Binary files differ
diff --git a/igds-protocol-sdk/igds-protocol-sdk.iml b/igds-protocol-sdk/igds-protocol-sdk.iml
index 12754c3..578b721 100644
--- a/igds-protocol-sdk/igds-protocol-sdk.iml
+++ b/igds-protocol-sdk/igds-protocol-sdk.iml
@@ -56,14 +56,14 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.13.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.13.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-protocol-zldz/igds-protocol-zldz.iml b/igds-protocol-zldz/igds-protocol-zldz.iml
index 22a87d4..e708428 100644
--- a/igds-protocol-zldz/igds-protocol-zldz.iml
+++ b/igds-protocol-zldz/igds-protocol-zldz.iml
@@ -55,14 +55,14 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.13.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.13.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.13.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/ServerRunner.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/ServerRunner.java
index c15bfff..d83863f 100644
--- a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/ServerRunner.java
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/ServerRunner.java
@@ -23,7 +23,7 @@
@Override
public void run(String... strings) throws Exception {
//
- if ("fzzy".equals(configData.getActive())) {
+ if (configData.getActive().indexOf("fzzy") >= 0) {
ZldzServerEngine.start(9201);
return;
}
@@ -36,8 +36,6 @@
//椋庢鑷磋繙榛樿閮ㄧ讲鏈嶅姟褰撳墠搴旂敤浣跨敤9000绔彛
if (configData.getActive().indexOf("pro") >= 0) {
- //FZZY骞冲彴
-// ZldzServerEngine.start(9201);
//鍏朵粬骞冲彴
ZldzServerEngine.start(9000);
return;
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisGrain.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisGrain.java
index 983803d..8720573 100644
--- a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisGrain.java
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisGrain.java
@@ -163,8 +163,7 @@
* @param msg
* @throws Exception
*/
- private void analysisStep(DepotConf depotConf, ReMessage msg,
- DeviceSer ser, ExeRequest exeRequest, DicSysConf sysConf) {
+ private void analysisStep(DepotConf depotConf, ReMessage msg, DeviceSer ser, ExeRequest exeRequest, DicSysConf sysConf) {
// 绮儏鐨勬壒娆″彿閲嶆柊鏍规嵁棰戠巼璋冩暣
msg.setBatchId(ContextUtil.getBatchIdByFireq(depotConf.getGrainFreq()));
diff --git a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/task/CommandReSendService.java b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/task/CommandReSendService.java
index 018f342..831de3d 100644
--- a/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/task/CommandReSendService.java
+++ b/igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/task/CommandReSendService.java
@@ -8,7 +8,6 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutorService;
diff --git a/igds-quantity/igds-quantity.iml b/igds-quantity/igds-quantity.iml
index e01f4ab..75a03a4 100644
--- a/igds-quantity/igds-quantity.iml
+++ b/igds-quantity/igds-quantity.iml
@@ -56,14 +56,14 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-quantity/src/main/java/com/ld/igds/io/ServerRunner.java b/igds-quantity/src/main/java/com/ld/igds/io/ServerRunner.java
index 95d8b67..5fa3cfc 100644
--- a/igds-quantity/src/main/java/com/ld/igds/io/ServerRunner.java
+++ b/igds-quantity/src/main/java/com/ld/igds/io/ServerRunner.java
@@ -1,13 +1,11 @@
package com.ld.igds.io;
-
import com.ld.igds.data.ConfigData;
import com.ld.igds.io.fzzy.server.BhznQuantityServerEngine;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
-
/**
* 鍙互鏍规嵁閰嶇疆鏂囦欢鐏垫椿璋冩暣
@@ -32,7 +30,6 @@
return;
}
- //椋庢鑷磋繙榛樿閮ㄧ讲鏈嶅姟褰撳墠搴旂敤浣跨敤9000绔彛
if (configData.getActive().indexOf("pro") >= 0) {
serverEngine.start(BhznQuantityServerEngine.PORT);
return;
diff --git a/igds-quantity/target/classes/com/ld/igds/io/ServerRunner.class b/igds-quantity/target/classes/com/ld/igds/io/ServerRunner.class
index 25b67ee..94ddb8b 100644
--- a/igds-quantity/target/classes/com/ld/igds/io/ServerRunner.class
+++ b/igds-quantity/target/classes/com/ld/igds/io/ServerRunner.class
Binary files differ
diff --git a/igds-recir/igds-recir.iml b/igds-recir/igds-recir.iml
index 6cbd6c3..f5f3524 100644
--- a/igds-recir/igds-recir.iml
+++ b/igds-recir/igds-recir.iml
@@ -55,14 +55,14 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogApplyService.java b/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogApplyService.java
index 81a16d8..d7b611d 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogApplyService.java
+++ b/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogApplyService.java
@@ -1,14 +1,15 @@
package com.ld.igds.drug.service;
-import com.bstek.bdf2.core.model.DefaultDept;
+import com.bstek.bdf2.core.model.RoleMember;
import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.constant.RedisConst;
import com.ld.igds.models.*;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.RedisUtil;
-import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,7 +48,7 @@
if (null != param) {
buildHql(hql, param, args);
}
- hql.append(" order by id ");
+ hql.append(" order by xzbm ");
String countHql = "select count(*) " + hql.toString();
this.pagingQuery(page, String.valueOf(hql), countHql, args);
}
@@ -69,75 +70,34 @@
data.setUpdateTime(new Date());
try {
if (null == data.getXzbm()) {
- String id = createId(data.getCompanyId());
+ String id = createId(data.getCompanyId(), data.getTbrq());
data.setXzbm(id);
}
- if (StringUtils.isEmpty(data.getDtlId())){
+ if (StringUtils.isEmpty(data.getDtlId())) {
data.setDtlId(ContextUtil.getUUID());
}
- if (StringUtils.isEmpty(data.getWayId())){
+ if (StringUtils.isEmpty(data.getWayId())) {
data.setWayId(ContextUtil.getUUID());
}
- //娣诲姞绮儏瀛愯〃
- saveDtl(data);
- //娣诲姞澶囨鏂瑰紡瀛愯〃
- saveWay(data);
//娣诲姞涓昏〃
session.saveOrUpdate(data);
if (!CollectionUtils.isEmpty(data.getDrugLogPeople())) {
for (DrugLogPeople drugLogPeople : data.getDrugLogPeople()) {
if (null == drugLogPeople.getPropleId()) {
- String tbrq = DateFormatUtils.format(data.getTbrq(), "yyyyMMdd");
drugLogPeople.setPropleId(ContextUtil.getUUID());
- drugLogPeople.setId(data.getXzbm() + data.getDeptId() + tbrq);
- drugLogPeople.setTbrq(data.getTbrq());
drugLogPeople.setDrugLogId(data.getXzbm());
- drugLogPeople.setDeptId(data.getDeptId());
}
session.saveOrUpdate(drugLogPeople);
- session.flush();
}
}
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- session.flush();
- session.close();
- }
- return null;
- }
-
- private void saveWay(DrugLogApply data) {
- Session session = this.getSessionFactory().openSession();
-
- try {
DrugLogWay way = new DrugLogWay();
BeanUtils.copyProperties(data, way);
- way.setWayId(ContextUtil.getUUID());
- String tbrq = DateFormatUtils.format(data.getTbrq(), "yyyyMMdd");
- way.setId(data.getXzbm() + data.getDeptId() + tbrq);
+ way.setDrugLogId(data.getXzbm());
session.saveOrUpdate(way);
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- session.flush();
- session.close();
- }
- }
-
- /**
- * 鏍规嵁涓昏〃淇℃伅娣诲姞绮儏瀛楄〃
- *
- * @param data
- */
- private void saveDtl(DrugLogApply data) {
- Session session = this.getSessionFactory().openSession();
- try {
DrugLogDtl dtl = new DrugLogDtl();
BeanUtils.copyProperties(data, dtl);
- String tbrq = DateFormatUtils.format(data.getTbrq(), "yyyyMMdd");
- dtl.setId(data.getXzbm() + data.getDeptId() + tbrq);
+ dtl.setDrugLogId(data.getXzbm());
session.saveOrUpdate(dtl);
} catch (Exception e) {
e.printStackTrace();
@@ -145,6 +105,7 @@
session.flush();
session.close();
}
+ return null;
}
/**
@@ -158,9 +119,20 @@
try {
if (null != data.getXzbm()) {
session.delete(data);
- for (DrugLogPeople drugLogPeople : data.getDrugLogPeople()) {
- session.delete(drugLogPeople);
- }
+ String hqlPeople = "delete from " + DrugLogPeople.class.getName() + " where DRUG_LOG_ID_=:drugLogId";
+ Query queryPeople = session.createQuery(hqlPeople);
+ queryPeople.setString("drugLogId", data.getXzbm());
+ queryPeople.executeUpdate();
+
+ String hqlDtl = "delete from " + DrugLogDtl.class.getName() + " where DRUG_LOG_ID_=:drugLogId";
+ Query queryDtl = session.createQuery(hqlDtl);
+ queryDtl.setString("drugLogId", data.getXzbm());
+ queryDtl.executeUpdate();
+
+ String hqlWay = "delete from " + DrugLogWay.class.getName() + " where DRUG_LOG_ID_=:drugLogId";
+ Query queryWay = session.createQuery(hqlWay);
+ queryWay.setString("drugLogId", data.getXzbm());
+ queryWay.executeUpdate();
}
} catch (Exception e) {
e.printStackTrace();
@@ -183,9 +155,10 @@
hql.append(" from " + DrugLogApply.class.getName() + " where companyId=:companyId");
args.put("companyId", ContextUtil.getCompanyId());
if (null != param) {
+
buildHql(hql, param, args);
}
- hql.append(" order by id desc");
+ hql.append(" order by xzbm desc");
return this.query(String.valueOf(hql), args);
}
@@ -211,13 +184,10 @@
* @return
*/
public String saveDrugLogDtl(DrugLogDtl data) {
- if (null == data.getDeptId()) {
- data.setDeptId(ContextUtil.subDeptId(null));
- }
Session session = this.getSessionFactory().openSession();
try {
- if (null == data.getId()) {
- data.setId(ContextUtil.getUUID());
+ if (null == data.getDtlId()) {
+ data.setDtlId(ContextUtil.getUUID());
session.save(data);
} else {
session.update(data);
@@ -241,7 +211,7 @@
public String delDrugLogDtl(DrugLogDtl data) {
Session session = this.getSessionFactory().openSession();
try {
- if (null != data.getId()) {
+ if (null != data.getDtlId()) {
session.delete(data);
}
} catch (Exception e) {
@@ -265,13 +235,9 @@
Map<String, Object> args = new HashMap<>();
if (null != param) {
-
String xzbm = (String) param.get("xzbm");
- String deptId = (String) param.get("deptId");
- String tbrq = DateFormatUtils.format((Date) param.get("tbrq"), "yyyyMMdd");
- String id = xzbm + deptId + tbrq;
- hql.append(" from " + DrugLogPeople.class.getName() + " where id=:id");
- args.put("id", id);
+ hql.append(" from " + DrugLogPeople.class.getName() + " where DRUG_LOG_ID_=:id");
+ args.put("id", xzbm);
buildHql(hql, param, args);
}
return this.query(String.valueOf(hql), args);
@@ -284,13 +250,10 @@
* @return
*/
public String saveDrugLogPeople(DrugLogPeople data) {
- if (null == data.getDeptId()) {
- data.setDeptId(ContextUtil.subDeptId(null));
- }
Session session = this.getSessionFactory().openSession();
try {
- if (null == data.getId()) {
- data.setId(ContextUtil.getUUID());
+ if (null == data.getPropleId()) {
+ data.setPropleId(ContextUtil.getUUID());
session.save(data);
} else {
session.update(data);
@@ -314,7 +277,7 @@
public String delDrugLogPeople(DrugLogPeople data) {
Session session = this.getSessionFactory().openSession();
try {
- if (null != data.getId()) {
+ if (null != data.getPropleId()) {
session.delete(data);
}
} catch (Exception e) {
@@ -338,11 +301,8 @@
if (null != param) {
String xzbm = (String) param.get("xzbm");
- String deptId = (String) param.get("deptId");
- String tbrq = DateFormatUtils.format((Date) param.get("tbsj"), "yyMMdd");
- String id = xzbm + deptId + tbrq;
hql.append(" from " + DrugLogWay.class.getName() + " where id=:id");
- args.put("id", id);
+ args.put("id", xzbm);
buildHql(hql, param, args);
}
return this.query(String.valueOf(hql), args);
@@ -356,13 +316,10 @@
* @return
*/
public String saveDrugLogWay(DrugLogWay data) {
- if (null == data.getDeptId()) {
- data.setDeptId(ContextUtil.subDeptId(null));
- }
Session session = this.getSessionFactory().openSession();
try {
- if (null == data.getId()) {
- data.setId(ContextUtil.getUUID());
+ if (null == data.getWayId()) {
+ data.setWayId(ContextUtil.getUUID());
session.save(data);
} else {
session.update(data);
@@ -385,7 +342,7 @@
public String delDrugLogWay(DrugLogWay data) {
Session session = this.getSessionFactory().openSession();
try {
- if (null != data.getId()) {
+ if (null != data.getWayId()) {
session.delete(data);
}
} catch (Exception e) {
@@ -410,6 +367,11 @@
hql.append(" and drugLogId=:drugLogId");
args.put("drugLogId", str);
}
+ str = (String) param.get("id");
+ if (StringUtils.isNotEmpty(str)) {
+ hql.append(" and xzbm like:id");
+ args.put("id", str + "%");
+ }
str = (String) param.get("depotId");
if (StringUtils.isNotEmpty(str)) {
hql.append(" and depotId=:depotId");
@@ -427,25 +389,28 @@
}
}
- public String createId(String companyId) throws Exception {
+ public String createId(String companyId, Date time) throws Exception {
+ String timeKey = DateFormatUtils.format(time, "yyyyMMdd");
// 浠庣紦瀛樹腑鑾峰彇宸叉湁鐨勭粍缁囩紪鐮�
String cacheKey = RedisConst.buildKey(companyId, HDrugLogApplyService.CACHE_DRUG_LOG_APPLY_ID);
String cacheId = (String) redisUtil.get(cacheKey);
-
- if (null != cacheId) {
- Integer i = Integer.valueOf(cacheId);
- cacheId = String.format("%04d", ++i);
+ if (null != cacheId && cacheId.indexOf(timeKey) >= 0) {
+ String temp = cacheId.substring(cacheId.length() - 4);
+ Integer i = Integer.valueOf(temp);
+ cacheId = timeKey + String.format("%04d", ++i);
} else {
- List<DrugLogApply> drugLogApplies = this.drugLogApplyList(null);
+ Map<String, Object> param = new HashMap<>();
+ param.put("id", timeKey);
+ List<DrugLogApply> drugLogApplies = this.drugLogApplyList(param);
if (null == drugLogApplies || drugLogApplies.size() == 0) {
- cacheId = "0001";
+ cacheId = timeKey + "0001";
} else {
-
String temp = drugLogApplies.get(0).getXzbm();
- Integer i = Integer.valueOf(temp);
- cacheId = String.format("%04d", ++i);
+ String tempNum = temp.substring(temp.length() - 4);
+ Integer i = Integer.valueOf(tempNum);
+ cacheId = timeKey + String.format("%04d", ++i);
}
}
// 鏇存柊缂撳瓨
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogService.java b/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogService.java
index fd9718a..daac4f3 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogService.java
+++ b/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogService.java
@@ -1,5 +1,6 @@
package com.ld.igds.drug.service;
+import com.bstek.bdf2.core.business.IUser;
import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.models.DrugLog;
@@ -20,10 +21,10 @@
public void pageData(Page<DrugLog> page, Map<String, Object> param)
throws Exception {
String hql = " from " + DrugLog.class.getName()
- + " where companyId=:companyId";
+ + " where deptId=:deptId";
Map<String, Object> args = new HashMap<String, Object>();
- args.put("companyId", ContextUtil.getCompanyId());
+ args.put("deptId", ContextUtil.subDeptId(null));
if (null != param) {
@@ -34,8 +35,18 @@
}
str = (String) param.get("name");
if (StringUtils.isNotEmpty(str)) {
- hql += " and user =:name";
+ hql += " and user like:name";
args.put("name", "%" + str + "%");
+ }
+ Date date = (Date) param.get("start");
+ if (null != date) {
+ hql +=(" and start >=:start");
+ args.put("start", date);
+ }
+ date = (Date) param.get("end");
+ if (null != date) {
+ hql +=(" and end <=:end");
+ args.put("end", date);
}
}
@@ -97,7 +108,7 @@
data.setUpdateUser(ContextUtil.getLoginUserCName());
try {
if (null == data.getId()) {
- data.setId(data.getDepotId() + DateFormatUtils.format(new Date(), "yyyyMMdd") + getIndex(data.getCompanyId()));
+ data.setId(DateFormatUtils.format(new Date(), "yyyyMMdd") + getIndex(data.getCompanyId()));
session.save(data);
} else {
session.update(data);
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugService.java b/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugService.java
index 045e470..f446581 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugService.java
+++ b/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugService.java
@@ -14,6 +14,7 @@
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.RedisUtil;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -45,8 +46,8 @@
public void pageDrug(Page<Drug> page, Map<String, Object> param) throws Exception {
StringBuffer hql = new StringBuffer();
Map<String, Object> args = new HashMap<>();
- hql.append(" from " + Drug.class.getName() + " where companyId=:companyId");
- args.put("companyId", ContextUtil.getCompanyId());
+ hql.append(" from " + Drug.class.getName() + " where deptId=:deptId");
+ args.put("deptId", ContextUtil.subDeptId(null));
if (null != param) {
buildHql(hql, param, args);
}
@@ -86,14 +87,12 @@
if (null == data.getDeptId()) {
data.setDeptId(ContextUtil.subDeptId(null));
}
- DefaultDept dept = sysDeptService.getDeptById(data.getDeptId());
- data.setDeptName(dept.getName());
Session session = this.getSessionFactory().openSession();
data.setUpdateTime(new Date());
data.setUpdateUser(ContextUtil.getLoginUserCName());
try {
if (null == data.getId()) {
- String id = createId(data.getCompanyId(), data.getDeptId());
+ String id = createId(data.getCompanyId(), data.getCgrq());
data.setId(id);
session.save(data);
} else {
@@ -184,26 +183,27 @@
}
- public String createId(String companyId, String deptId) {
+ public String createId(String companyId, Date time) {
+ String timeKey = DateFormatUtils.format(time, "yyyyMMdd");
// 浠庣紦瀛樹腑鑾峰彇宸叉湁鐨勭粍缁囩紪鐮�
String cacheKey = RedisConst.buildKey(companyId, HDrugService.CACHE_DRUG_ID);
String cacheId = (String) redisUtil.get(cacheKey);
- if (null != cacheId && cacheId.indexOf(deptId) >= 0) {
+ if (null != cacheId && cacheId.indexOf(timeKey) >= 0) {
String temp = cacheId.substring(cacheId.length() - 3);
Integer i = Integer.valueOf(temp);
- cacheId = deptId + String.format("%03d", ++i);
+ cacheId = timeKey + String.format("%03d", ++i);
} else {
List<Drug> result = listDrug(companyId, null);
if (null == result || result.size() == 0) {
- cacheId = deptId + "001";
+ cacheId = timeKey + "001";
} else {
Drug drug = result.get(0);
String temp = drug.getId().substring(drug.getId().length() - 3);
Integer i = Integer.valueOf(temp);
- cacheId = deptId + String.format("%03d", ++i);
+ cacheId = timeKey + String.format("%03d", ++i);
}
}
// 鏇存柊缂撳瓨
@@ -221,7 +221,7 @@
}
str = (String) param.get("name");
if (StringUtils.isNotEmpty(str)) {
- hql.append(" and name like :name");
+ hql.append(" and name like:name");
args.put("name", "%" + str + "%");
}
Date date = (Date) param.get("start");
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/view/Drug.view.xml b/igds-recir/src/main/java/com/ld/igds/drug/view/Drug.view.xml
index e3439ac..b16b1ab 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/view/Drug.view.xml
+++ b/igds-recir/src/main/java/com/ld/igds/drug/view/Drug.view.xml
@@ -4,6 +4,28 @@
<Context/>
<Model>
<DataType name="dtMain" parent="dtDrug"/>
+ <DataType name="dtParam">
+ <PropertyDef name="depotId">
+ <Property></Property>
+ <Property name="label">浠撴埧鍚嶇О</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="start">
+ <Property name="dataType">Date</Property>
+ <Property name="label">寮�濮嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="end">
+ <Property name="dataType">Date</Property>
+ <Property name="label">缁撴潫鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="name">
+ <Property name="label">鑽搧鍚嶇О</Property>
+ </PropertyDef>
+ </DataType>
</Model>
<View layout="padding:5;regionPadding:5">
<Property name="packages">font-awesome,css-common</Property>
@@ -12,6 +34,56 @@
<Property name="dataProvider">drugPR#pageDrug</Property>
<Property name="pageSize">20</Property>
</DataSet>
+ <DataSet id="dsParam">
+ <ClientEvent name="onReady">self.insert({});
+</ClientEvent>
+ <Property name="dataType">dtParam</Property>
+ </DataSet>
+ <Container>
+ <Property name="exClassName">bg-color</Property>
+ <AutoForm>
+ <Property name="cols">*,*,*,*,*</Property>
+ <Property name="dataSet">dsParam</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement layoutConstraint="align:left">
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">start</Property>
+ <Property name="property">start</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">end</Property>
+ <Property name="property">end</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">name</Property>
+ <Property name="property">name</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Container layout="regionPadding:15">
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var param = view.get("#dsParam.data");
+view.get("#dsMain").set("parameter",param).flushAsync();</ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsParam").setData({});
+view.get("#dsMain").set("parameter",{}).flushAsync();</ClientEvent>
+ <Property name="caption">閲嶇疆</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ </Button>
+ </Container>
+ </AutoForm>
+ </Container>
<Container layout="regionPadding:10" layoutConstraint="top">
<Property name="exClassName">bg-color</Property>
<Property name="height">55</Property>
@@ -56,16 +128,6 @@
<Property name="exClassName">btn-warn</Property>
<Property name="iconClass">fa fa-minus</Property>
</Button>
- <TextEditor id="paramName" layoutConstraint="right">
- <Property name="width">200</Property>
- <Property name="blankText">--鑽搧鍚嶇О--</Property>
- <Property name="trigger">triggerQuery</Property>
- </TextEditor>
- <Trigger id="triggerQuery">
- <ClientEvent name="onExecute">var name = view.get("#paramName.text");
-view.get("#dsMain").set("parameter",{name:name}).flushAsync();</ClientEvent>
- <Property name="iconClass">fa fa-search</Property>
- </Trigger>
</Container>
<Container layout="regionPadding:10" layoutConstraint="center">
<Property name="exClassName">bg-color</Property>
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml
index 8c8e321..bd9755f 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml
+++ b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml
@@ -441,6 +441,100 @@
<Property name="label">鐔忚捀浣滀笟浜哄憳</Property>
</PropertyDef>
</DataType>
+ <DataType name="dtPest">
+ <Property name="creationType">com.ld.igds.models.Pest</Property>
+ <PropertyDef name="batchId">
+ <Property></Property>
+ <Property name="label">妫�娴嬫壒娆�</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property></Property>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="depotId">
+ <Property></Property>
+ <Property name="label">妫�娴嬩粨鎴�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="pestMax">
+ <Property name="dataType">int</Property>
+ <Property name="label">鏈�澶氭暟閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="method">
+ <Property></Property>
+ <Property name="label">铏妫�娴嬫柟娉�</Property>
+ </PropertyDef>
+ <PropertyDef name="position">
+ <Property></Property>
+ <Property name="label">鍙戠敓閮ㄤ綅</Property>
+ </PropertyDef>
+ <PropertyDef name="pestType">
+ <Property></Property>
+ <Property name="label">铏绉嶇被</Property>
+ </PropertyDef>
+ <PropertyDef name="pestLevel">
+ <Property></Property>
+ <Property name="label">铏伯绛夌骇鍒ゅ畾</Property>
+ </PropertyDef>
+ <PropertyDef name="pestAnalysis">
+ <Property></Property>
+ <Property name="label">瀹宠櫕鎶楄嵂鎬у垎鏋�</Property>
+ </PropertyDef>
+ <PropertyDef name="pestStart">
+ <Property name="dataType">int</Property>
+ <Property name="label">铏閲囬泦鐐瑰紑濮�</Property>
+ </PropertyDef>
+ <PropertyDef name="pestEnd">
+ <Property name="dataType">int</Property>
+ <Property name="label">铏閲囬泦鐐规埅鑷�</Property>
+ </PropertyDef>
+ <PropertyDef name="checkNum">
+ <Property name="dataType">int</Property>
+ <Property name="label">閲囬泦閫氶亾涓暟</Property>
+ </PropertyDef>
+ <PropertyDef name="receiveDate">
+ <Property name="dataType">Date</Property>
+ <Property name="label">妫�娴嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="points">
+ <Property></Property>
+ <Property name="label">閲囬泦鐐逛俊鎭�</Property>
+ </PropertyDef>
+ <PropertyDef name="checkUser">
+ <Property></Property>
+ <Property name="label">妫�娴嬩汉</Property>
+ </PropertyDef>
+ <PropertyDef name="remark">
+ <Property></Property>
+ <Property name="label">澶囨敞淇℃伅</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtParam">
+ <PropertyDef name="depotId">
+ <Property></Property>
+ <Property name="label">浠撴埧鍚嶇О</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="start">
+ <Property name="dataType">Date</Property>
+ <Property name="label">寮�濮嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="end">
+ <Property name="dataType">Date</Property>
+ <Property name="label">缁撴潫鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="name">
+ <Property name="label">鎿嶄綔浜�</Property>
+ </PropertyDef>
+ </DataType>
</Model>
<View layout="padding:5;regionPadding:5">
<Property name="packages">font-awesome,css-common</Property>
@@ -449,31 +543,83 @@
<Property name="pageSize">20</Property>
<Property name="dataProvider">drugLogPR#pageDrugLog</Property>
</DataSet>
- <Container layout="regionPadding:10" layoutConstraint="top">
+ <DataSet id="dsParam">
+ <ClientEvent name="onReady">self.insert({});
+</ClientEvent>
+ <Property name="dataType">dtParam</Property>
+ </DataSet>
+ <Container>
<Property name="exClassName">bg-color</Property>
- <Property name="height">55</Property>
- <Property name="contentOverflow">hidden</Property>
- <Label layoutConstraint="left">
- <Property name="text">鑿滃崟鏍忥細</Property>
- </Label>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">view.get("#dsMain").insert({});
+ <AutoForm>
+ <Property name="cols">*,*,*,*,*</Property>
+ <Property name="dataSet">dsParam</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">start</Property>
+ <Property name="property">start</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">end</Property>
+ <Property name="property">end</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">name</Property>
+ <Property name="property">name</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Container layout="regionPadding:15">
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var param = view.get("#dsParam.data");
+view.get("#dsMain").set("parameter",param).flushAsync();</ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsParam").setData({});
+view.get("#dsMain").set("parameter",{}).flushAsync();</ClientEvent>
+ <Property name="caption">閲嶇疆</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ </Button>
+ </Container>
+ </AutoForm>
+ </Container>
+ <Container layout="regionPadding:5" layoutConstraint="center">
+ <Property name="exClassName">bg-color</Property>
+ <Container layout="regionPadding:10" layoutConstraint="top">
+ <Property name="exClassName">bg-color</Property>
+ <Property name="height">55</Property>
+ <Property name="contentOverflow">hidden</Property>
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").insert({});
view.get("#dialogMain").show();</ClientEvent>
- <Property name="caption">鏂板</Property>
- <Property name="exClassName">btn-default</Property>
- <Property name="iconClass">fa fa-plus</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-plus</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
if(data){
view.get("#dialogMain").show();
}</ClientEvent>
- <Property name="caption">缂栬緫</Property>
- <Property name="exClassName">btn-warm</Property>
- <Property name="iconClass">fa fa-pencil</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+ <Property name="caption">缂栬緫</Property>
+ <Property name="exClassName">btn-warm</Property>
+ <Property name="iconClass">fa fa-pencil</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
if(!data){
return;
}
@@ -487,29 +633,17 @@
}
});
</ClientEvent>
- <Property name="caption">鍒犻櫎</Property>
- <Property name="exClassName">btn-warn</Property>
- <Property name="iconClass">fa fa-minus</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">view.get("#dsMain").flushAsync();</ClientEvent>
- <Property name="caption">鍒锋柊</Property>
- <Property name="exClassName">btn-default</Property>
- <Property name="iconClass">fa fa-search</Property>
- </Button>
- <TextEditor id="paramName" layoutConstraint="right">
- <Property name="width">200</Property>
- <Property name="blankText">--鎿嶄綔浜�--</Property>
- <Property name="trigger">triggerQuery</Property>
- </TextEditor>
- <Trigger id="triggerQuery">
- <ClientEvent name="onExecute">var name = view.get("#paramName.text");
-view.get("#dsMain").set("parameter",{name:name}).flushAsync();</ClientEvent>
- <Property name="iconClass">fa fa-search</Property>
- </Trigger>
- </Container>
- <Container layout="regionPadding:5" layoutConstraint="center">
- <Property name="exClassName">bg-color</Property>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").flushAsync();</ClientEvent>
+ <Property name="caption">鍒锋柊</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ </Button>
+ </Container>
<DataGrid>
<ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
if(data){
@@ -622,6 +756,7 @@
<AutoFormElement>
<Property name="name">pestBatchId</Property>
<Property name="property">pestBatchId</Property>
+ <Property name="trigger">cddPest</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -951,5 +1086,53 @@
<Property name="items">鐗囧墏,娉ㄥ皠鍓�,涔冲墏,涓稿墏,棰楃矑鍓�,鍏朵粬</Property>
<Property name="autoOpen">true</Property>
</ListDropDown>
+ <CustomDropDown id="cddPest">
+ <ClientEvent name="onOpen">var key = view.get("#dsMain.data:#").get("depotId");
+console.log(key)
+view.get("#dsPest").set("parameter",{depotId:key}).flushAsync();</ClientEvent>
+ <Property name="width">500</Property>
+ <Property name="assignmentMap">pestBatchId=batchId</Property>
+ <Property name="height">500</Property>
+ <Property name="maxHeight">500</Property>
+ <Property name="minHeight">500</Property>
+ <Container layout="regionPadding:5">
+ <DataSet id="dsPest">
+ <Property name="dataType">[dtPest]</Property>
+ <Property name="dataProvider">pestDataPR#getData</Property>
+ <Property name="pageSize">10</Property>
+ </DataSet>
+ <Container>
+ <Property name="exClassName">bg-color</Property>
+ <DataGrid id="dgPest" layoutConstraint="top">
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsPest.data:#");
+if(data){
+ view.get("#cddPest").close(data.toJSON());
+}</ClientEvent>
+ <Property name="dataSet">dsPest</Property>
+ <Property name="readOnly">true</Property>
+ <DataColumn>
+ <Property name="property">depotId</Property>
+ <Property name="name">depotId</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="batchId">
+ <Property name="property">batchId</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="receiveDate">
+ <Property name="property">receiveDate</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Container layoutConstraint="bottom">
+ <Property name="exClassName">bg-color</Property>
+ <DataPilot layoutConstraint="right">
+ <Property name="dataSet">dsPest</Property>
+ <Property name="itemCodes">pageSize,pages</Property>
+ </DataPilot>
+ </Container>
+ </Container>
+ </CustomDropDown>
</View>
</ViewConfig>
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml
index 65db267..70d512c 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml
+++ b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml
@@ -6,228 +6,384 @@
<DataType name="dtMain">
<Property name="creationType">com.ld.igds.models.DrugLogApply</Property>
<PropertyDef name="xzbm">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀澶囨缂栧彿</Property>
</PropertyDef>
<PropertyDef name="deptId">
- <Property/>
+ <Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="companyId">
- <Property/>
+ <Property></Property>
<Property name="label">缁勭粐缂栫爜</Property>
</PropertyDef>
<PropertyDef name="tbrq">
<Property name="dataType">Date</Property>
<Property name="label">濉姤鏃ユ湡</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="dwdm">
- <Property/>
+ <Property></Property>
<Property name="label">鍗曚綅浠ｇ爜</Property>
+ <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="sqxzrq">
<Property name="dataType">Date</Property>
<Property name="label">鐢宠鐔忚捀鏃ユ湡</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="fzr">
- <Property/>
+ <Property></Property>
<Property name="label">璐熻矗浜�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="fzrdh">
- <Property/>
+ <Property></Property>
<Property name="label">璐熻矗浜虹數璇�</Property>
</PropertyDef>
<PropertyDef name="xcfzr">
- <Property/>
+ <Property></Property>
<Property name="label">鐜板満璐熻矗浜�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="xcfzrzw">
- <Property/>
+ <Property></Property>
<Property name="label">鐜板満璐熻矗浜鸿亴鍔�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="xcfzrdh">
- <Property/>
+ <Property></Property>
<Property name="label">鐜板満璐熻矗浜虹數璇�</Property>
</PropertyDef>
<PropertyDef name="tbr">
- <Property/>
+ <Property></Property>
<Property name="label">濉〃浜�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="tbrdh">
- <Property/>
+ <Property></Property>
<Property name="label">濉〃浜虹數璇�</Property>
</PropertyDef>
<PropertyDef name="sfszjjxd">
- <Property/>
+ <Property></Property>
<Property name="label">鏄惁璁剧疆璀︽垝绾�(涓�)</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="sfszjjxx">
- <Property/>
+ <Property></Property>
<Property name="label">鏄惁璁剧疆璀︽垝绾�(瑗�)</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="sfszjjxn">
- <Property/>
+ <Property></Property>
<Property name="label">鏄惁璁剧疆璀︽垝绾�(鍗�)</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="sfszjjxb">
- <Property/>
+ <Property></Property>
<Property name="label">鏄惁璁剧疆璀︽垝绾�(鍖�)</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="ssxzzystqybqk">
- <Property/>
+ <Property></Property>
<Property name="label">瀹炴柦鐔忚捀浣滀笟鏃跺ぉ姘旈鎶ユ儏鍐�</Property>
</PropertyDef>
<PropertyDef name="xzssgcap">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀瀹夋帓鍙婂疄鏂借繃绋�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="aqfhjyjcccs">
- <Property/>
+ <Property></Property>
<Property name="label">瀹夊叏闃叉姢鍙婂簲鎬ュ缃帾鏂�</Property>
</PropertyDef>
<PropertyDef name="xzzysx">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀娉ㄦ剰浜嬮」</Property>
</PropertyDef>
<PropertyDef name="fileStorageId">
- <Property/>
+ <Property></Property>
<Property name="label">鏂囦欢瀛樺偍ID</Property>
</PropertyDef>
<PropertyDef name="drugName">
- <Property/>
+ <Property></Property>
<Property name="label">鑽墏鍚嶇О</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="drugType">
- <Property/>
+ <Property></Property>
<Property name="label">鑽墏绫诲瀷/鍨嬪彿</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="yjyxqz">
<Property name="dataType">Date</Property>
<Property name="label">鑽墏鏈夋晥鏈熻嚦</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="lqsl">
<Property name="dataType">Double</Property>
<Property name="label">棰嗗彇鏁伴噺</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="sysbjfs">
- <Property/>
+ <Property></Property>
<Property name="label">鏂借嵂璁惧鍙婃柟寮�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="zcdd">
- <Property/>
+ <Property></Property>
<Property name="label">鏆傚瓨鍦扮偣</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="lqr">
- <Property/>
+ <Property></Property>
<Property name="label">棰嗗彇浜�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="lqsj">
<Property name="dataType">Date</Property>
- <Property name="label">棰嗗彇鏃堕棿鏃堕棿</Property>
+ <Property name="label">棰嗗彇鏃堕棿</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="updateTime">
<Property name="dataType">Date</Property>
<Property name="label">鏇存柊鏃堕棿</Property>
+ <Property name="readOnly">true</Property>
</PropertyDef>
<PropertyDef name="depotId">
- <Property/>
- <Property name="label">浠撴埧/娌圭綈浠ｇ爜</Property>
+ <Property></Property>
+ <Property name="label">浠撴埧/娌圭綈</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="foodVariety">
- <Property/>
+ <Property></Property>
<Property name="label">绮鍝佺</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="foodType">
- <Property/>
+ <Property></Property>
<Property name="label">绮鎬ц川</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="foodLevel">
- <Property/>
+ <Property></Property>
<Property name="label">绮绛夌骇</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="number">
<Property name="dataType">Double</Property>
<Property name="label">绮鏁伴噺</Property>
+ <Property name="displayFormat">#0.000鍚�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="perWet">
<Property name="dataType">Double</Property>
<Property name="label">姘村垎</Property>
+ <Property name="displayFormat">#0.000%</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="perImpurity">
<Property name="dataType">Double</Property>
<Property name="label">鏉傝川</Property>
+ <Property name="displayFormat">#0.000%</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="lw">
<Property name="dataType">Double</Property>
<Property name="label">绮俯</Property>
+ <Property name="displayFormat">#0.000鈩�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="cw">
+ <Property name="dataType">Double</Property>
+ <Property name="label">浠撴俯</Property>
+ <Property name="displayFormat">#0.000鈩�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="cnsd">
<Property name="dataType">Double</Property>
<Property name="label">浠撳唴婀垮害</Property>
+ <Property name="displayFormat">#0.000%</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="clfs">
- <Property/>
+ <Property></Property>
<Property name="label">瀛樼伯鏂瑰紡</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1锛氭暎瑁呭偍绮�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2锛氬寘瑁�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3锛氬洿鍖呮暎瀛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">9</Property>
+ <Property name="value">9锛氬叾浠�</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="rkrq">
<Property name="dataType">Date</Property>
<Property name="label">鍏ュ簱鏃ユ湡</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="hc">
- <Property/>
+ <Property></Property>
<Property name="label">瀹宠櫕</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="cldjpd">
- <Property/>
+ <Property></Property>
<Property name="label">铏伯绛夌骇鍒ゅ畾</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">531</Property>
+ <Property name="value">鍩烘湰鏃犺櫕绮�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">532</Property>
+ <Property name="value">涓�鑸櫕绮�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">533</Property>
+ <Property name="value">涓ラ噸铏伯</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">534</Property>
+ <Property name="value">涓ラ噸铏伯</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="ldtj">
<Property name="dataType">Double</Property>
<Property name="label">绮爢浣撶Н</Property>
+ <Property name="displayFormat">#0.000m鲁</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="kjtj">
<Property name="dataType">Double</Property>
<Property name="label">绌洪棿浣撶Н</Property>
+ <Property name="displayFormat">#0.000m鲁</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="lddwyyl">
<Property name="dataType">Double</Property>
<Property name="label">绮爢鍗曚綅鐢ㄨ嵂閲�</Property>
+ <Property name="displayFormat">#0.000g/m鲁</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="kjdwyyl">
<Property name="dataType">Double</Property>
<Property name="label">绌洪棿鍗曚綅鐢ㄨ嵂閲�</Property>
+ <Property name="displayFormat">#0.000g/m鲁</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="zyyl">
<Property name="dataType">Double</Property>
<Property name="label">鎬荤敤鑽噺</Property>
+ <Property name="displayFormat">#0.000g</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="qmx">
- <Property/>
+ <Property></Property>
<Property name="label">姘斿瘑鎬�</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1:鈪犵骇锛宼鈮�300s</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2:鈪＄骇锛�20s鈮<300s</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3:鈪㈢骇锛�40s鈮<120s (骞虫埧浠�) ; 60s鈮� t<120s (绔嬬瓛浠撱�佹祬鍦嗕粨)</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">4锛氣叄绾э紝t<40s (骞虫埧浠�) 锛宼<60s (绔嬬瓛浠撱�佹祬鍦嗕粨</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="jhxzksrq">
<Property name="dataType">Date</Property>
<Property name="label">璁″垝鐔忚捀寮�濮嬫棩鏈�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="jhxzjsrq">
<Property name="dataType">Date</Property>
<Property name="label">璁″垝鐔忚捀缁撴潫鏃ユ湡</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="xznd">
<Property name="dataType">Double</Property>
<Property name="label">璁惧畾鐔忚捀娴撳害</Property>
+ <Property name="displayFormat">#0.000ml/m鲁</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="mbsj">
<Property name="dataType">Integer</Property>
<Property name="label">瀵嗛棴鏃堕棿</Property>
+ <Property name="displayFormat">#0澶�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="xzfs">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀鏂瑰紡</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="sqfs">
- <Property/>
+ <Property></Property>
<Property name="label">鏁ｆ皵鏂瑰紡</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<Reference name="drugLogPeople">
<Property name="dataType">[dtPeople]</Property>
@@ -235,28 +391,34 @@
<Property name="parameter">
<Entity>
<Property name="xzbm">$${this.xzbm}</Property>
- <Property name="deptId">$${this.deptId}</Property>
- <Property name="tbrq">$${this.tbrq}</Property>
</Entity>
</Property>
</Reference>
+ <PropertyDef name="dtlId">
+ <Property></Property>
+ <Property name="label">dtlId</Property>
+ </PropertyDef>
+ <PropertyDef name="wayId">
+ <Property></Property>
+ <Property name="label">wayId</Property>
+ </PropertyDef>
</DataType>
<DataType name="dtPeople">
<Property name="creationType">com.ld.igds.models.DrugLogPeople</Property>
<PropertyDef name="propleId">
- <Property/>
+ <Property></Property>
<Property name="label">propleId</Property>
</PropertyDef>
<PropertyDef name="id">
- <Property/>
+ <Property></Property>
<Property name="label">id</Property>
</PropertyDef>
<PropertyDef name="drugLogId">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀澶囨缂栧彿</Property>
</PropertyDef>
<PropertyDef name="deptId">
- <Property/>
+ <Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="tbrq">
@@ -264,27 +426,27 @@
<Property name="label">濉姤鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="mx">
- <Property/>
+ <Property></Property>
<Property name="label">濮撳悕</Property>
</PropertyDef>
<PropertyDef name="zw">
- <Property/>
+ <Property></Property>
<Property name="label">鑱屽姟</Property>
</PropertyDef>
<PropertyDef name="zyzg">
- <Property/>
+ <Property></Property>
<Property name="label">鑱屼笟璧勬牸</Property>
</PropertyDef>
<PropertyDef name="stzk">
- <Property/>
+ <Property></Property>
<Property name="label">韬綋鐘跺喌</Property>
</PropertyDef>
<PropertyDef name="xzrwfg">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀浠诲姟鍒嗗伐</Property>
</PropertyDef>
<PropertyDef name="sfwb">
- <Property/>
+ <Property></Property>
<Property name="label">鏄惁澶栧寘</Property>
</PropertyDef>
</DataType>
@@ -310,15 +472,15 @@
<DataType name="dtDtl">
<Property name="creationType">com.ld.igds.models.DrugLogDtl</Property>
<PropertyDef name="id">
- <Property/>
+ <Property></Property>
<Property name="label">id</Property>
</PropertyDef>
<PropertyDef name="drugLogId">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀澶囨缂栧彿</Property>
</PropertyDef>
<PropertyDef name="deptId">
- <Property/>
+ <Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="tbrq">
@@ -326,19 +488,19 @@
<Property name="label">濉姤鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="depotId">
- <Property/>
+ <Property></Property>
<Property name="label">浠撴埧/娌圭綈浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="foodVariety">
- <Property/>
+ <Property></Property>
<Property name="label">绮鍝佺</Property>
</PropertyDef>
<PropertyDef name="foodType">
- <Property/>
+ <Property></Property>
<Property name="label">绮鎬ц川</Property>
</PropertyDef>
<PropertyDef name="foodLevel">
- <Property/>
+ <Property></Property>
<Property name="label">绮绛夌骇</Property>
</PropertyDef>
<PropertyDef name="number">
@@ -366,7 +528,7 @@
<Property name="label">浠撳唴婀垮害</Property>
</PropertyDef>
<PropertyDef name="clfs">
- <Property/>
+ <Property></Property>
<Property name="label">瀛樼伯鏂瑰紡</Property>
</PropertyDef>
<PropertyDef name="rkrq">
@@ -374,11 +536,11 @@
<Property name="label">鍏ュ簱鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="hc">
- <Property/>
+ <Property></Property>
<Property name="label">瀹宠櫕</Property>
</PropertyDef>
<PropertyDef name="cldjpd">
- <Property/>
+ <Property></Property>
<Property name="label">铏伯绛夌骇鍒ゅ畾</Property>
</PropertyDef>
<PropertyDef name="ldtj">
@@ -402,7 +564,7 @@
<Property name="label">鎬荤敤鑽噺</Property>
</PropertyDef>
<PropertyDef name="qmx">
- <Property/>
+ <Property></Property>
<Property name="label">姘斿瘑鎬�</Property>
</PropertyDef>
<PropertyDef name="jhxzksrq">
@@ -417,15 +579,15 @@
<DataType name="dtWay">
<Property name="creationType">com.ld.igds.models.DrugLogWay</Property>
<PropertyDef name="id">
- <Property/>
+ <Property></Property>
<Property name="label">id</Property>
</PropertyDef>
<PropertyDef name="drugLogId">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀澶囨缂栧彿</Property>
</PropertyDef>
<PropertyDef name="deptId">
- <Property/>
+ <Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="tbrq">
@@ -441,11 +603,11 @@
<Property name="label">瀵嗛棴鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="xzfs">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀鏂瑰紡</Property>
</PropertyDef>
<PropertyDef name="sqfs">
- <Property/>
+ <Property></Property>
<Property name="label">鏁ｆ皵鏂瑰紡</Property>
</PropertyDef>
</DataType>
@@ -484,6 +646,8 @@
<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
if(data){
view.get("#dialogMain").show();
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷慨鏀圭殑鏁版嵁锛�");
}</ClientEvent>
<Property name="caption">缂栬緫</Property>
<Property name="exClassName">btn-warm</Property>
@@ -763,6 +927,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">lqsj</Property>
+ <Property name="property">lqsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">updateTime</Property>
<Property name="property">updateTime</Property>
<Editor/>
@@ -845,6 +1014,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">cw</Property>
+ <Property name="property">cw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">cnsd</Property>
<Property name="property">cnsd</Property>
<Editor/>
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugPR.java b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugPR.java
index fba4c02..c0af352 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugPR.java
+++ b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugPR.java
@@ -1,11 +1,13 @@
package com.ld.igds.drug.view;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.models.DicTrigger;
+import com.ld.igds.util.ContextUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -64,10 +66,10 @@
*
* @throws Exception
*/
-// @DataProvider
-// public List<Drug> listDrug(String name) throws Exception {
-// return drugService.listDrug(name);
-// }
+ @DataProvider
+ public List<Drug> listDrug() throws Exception {
+ return drugService.listDrug(ContextUtil.getCompanyId(), null);
+ }
/**
* ${dorado.getDataProvider("drugPR#pageDrug").getResult()}
diff --git a/igds-recir/src/main/java/com/ld/igds/models/Drug.java b/igds-recir/src/main/java/com/ld/igds/models/Drug.java
index b15da85..ce55d28 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/Drug.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/Drug.java
@@ -26,15 +26,13 @@
@Id
@Column(name = "ID_", length = 40)
- @PropertyDef(label = "鑽墏缂栧彿", description = "搴撳尯浠ｇ爜+涓変綅椤哄簭鍙�")
+ @PropertyDef(label = "鑽墏缂栧彿", description = "閲囪喘鏃ユ湡(yyyyMMdd)+涓変綅椤哄簭鍙�")
private String id;
- @Id
@Column(name = "DEPT_ID_", length = 50)
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String deptId;
- @Id
@Column(name = "cgrq")
@PropertyDef(label = "閲囪喘鏃ユ湡")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLog.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLog.java
index 63f37bf..76f75f2 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/DrugLog.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLog.java
@@ -25,7 +25,7 @@
@Id
@Column(name = "ID_", length = 40)
- @PropertyDef(label = "鐔忚捀浣滀笟鍗曞彿", description = "浠撴埧浠ｇ爜+浣滀笟鏃ユ湡 (yyyyMMdd) +3 浣嶉『搴忓彿")
+ @PropertyDef(label = "鐔忚捀浣滀笟鍗曞彿", description = "浣滀笟鏃ユ湡 (yyyyMMdd) +3 浣嶉『搴忓彿")
private String id;
@Column(name = "COMPANY_ID_", length = 10)
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLogApply.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLogApply.java
index 5b7cd4d..8c9a79c 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/DrugLogApply.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLogApply.java
@@ -20,11 +20,10 @@
public class DrugLogApply implements Serializable {
@Id
- @Column(name = "xzbm", length = 4)
- @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
+ @Column(name = "xzbm", length = 12)
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "濉姤鏃ユ湡yyyyMMdd+4浣嶉『搴忓彿")
private String xzbm;
- @Id
@Column(name = "DEPT_ID_", length = 21)
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String deptId;
@@ -33,7 +32,6 @@
@PropertyDef(label = "缁勭粐缂栫爜")
private String companyId;
- @Id
@Column(name = "tbrq")
@PropertyDef(label = "濉姤鏃ユ湡")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
@@ -152,7 +150,6 @@
/**
* 鍌ㄧ伯绮儏鏄庣粏琛�
- *
*/
@Transient
private List<DrugLogDtl> drugLogDtls;
@@ -192,6 +189,10 @@
@Column(name = "lw", precision = 20, scale = 3)
@PropertyDef(label = "绮俯")
private Double lw;
+
+ @Column(name = "cw", precision = 20, scale = 3)
+ @PropertyDef(label = "浠撴俯")
+ private Double cw;
@Column(name = "cnsd", precision = 20, scale = 3)
@PropertyDef(label = "浠撳唴婀垮害")
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java
index fdf340d..ca89998 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java
@@ -19,29 +19,16 @@
@Entity
@Data
@Table(name = "D_DRUG_LOG_DTL")
- public class DrugLogDtl implements Serializable {
+public class DrugLogDtl implements Serializable {
@Id
@Column(name = "DTL_ID_", length = 40)
@PropertyDef(label = "dtlId")
private String dtlId;
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "id", description = "鐔忚捀缂栧彿+搴撳尯浠ｇ爜+濉姤鏃ユ湡")
- private String id;
-
- @Column(name = "DRUG_LOG_ID_", length = 4)
- @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
+ @Column(name = "DRUG_LOG_ID_", length = 12)
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "濉姤鏃ユ湡yyyyMMdd+4浣嶉『搴忓彿")
private String drugLogId;
-
- @Column(name = "DEPT_ID_", length = 21)
- @PropertyDef(label = "搴撳尯浠ｇ爜")
- private String deptId;
-
- @Column(name = "tbrq")
- @PropertyDef(label = "濉姤鏃ユ湡")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date tbrq;
@Column(name = "DEPOT_ID_", length = 50)
@PropertyDef(label = "浠撴埧/娌圭綈浠ｇ爜")
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java
index 8707f80..1a97371 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java
@@ -26,22 +26,10 @@
@PropertyDef(label = "propleId")
private String propleId;
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "id")
- private String id;
- @Column(name = "DRUG_LOG_ID_", length = 4)
- @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
+ @Column(name = "DRUG_LOG_ID_", length = 12)
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "濉姤鏃ユ湡yyyyMMdd+4浣嶉『搴忓彿")
private String drugLogId;
-
- @Column(name = "DEPT_ID_", length = 21)
- @PropertyDef(label = "搴撳尯浠ｇ爜")
- private String deptId;
-
- @Column(name = "tbrq")
- @PropertyDef(label = "濉姤鏃ユ湡")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date tbrq;
@Column(name = "mx", length = 20)
@PropertyDef(label = "濮撳悕")
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java
index 08a7530..c272226 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java
@@ -27,23 +27,9 @@
@PropertyDef(label = "wayId")
private String wayId;
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "id",description = "涓庡妗堜俊鎭叧鑱擨D 鐔忚捀缂栫爜+搴撳尯浠ｇ爜+濉姤鏃ユ湡")
- private String id;
-
- @Column(name = "DRUG_LOG_ID_", length = 4)
- @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
+ @Column(name = "DRUG_LOG_ID_", length = 12)
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "濉姤鏃ユ湡yyyyMMdd+4浣嶉『搴忓彿")
private String drugLogId;
-
- @Column(name = "DEPT_ID_", length = 21)
- @PropertyDef(label = "搴撳尯浠ｇ爜")
- @JSONField
- private String deptId;
-
- @Column(name = "tbrq")
- @PropertyDef(label = "濉姤鏃ユ湡")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date tbrq;
@Column(name = "xznd", precision = 20, scale = 3)
@PropertyDef(label = "璁惧畾鐔忚捀娴撳害", description = "鍗曚綅锛歮l/m鲁")
diff --git a/igds-recir/target/classes/com/ld/igds/drug/service/HDrugLogApplyService.class b/igds-recir/target/classes/com/ld/igds/drug/service/HDrugLogApplyService.class
index 3094830..e4ffdc2 100644
--- a/igds-recir/target/classes/com/ld/igds/drug/service/HDrugLogApplyService.class
+++ b/igds-recir/target/classes/com/ld/igds/drug/service/HDrugLogApplyService.class
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/drug/service/HDrugLogService.class b/igds-recir/target/classes/com/ld/igds/drug/service/HDrugLogService.class
index c996786..355c740 100644
--- a/igds-recir/target/classes/com/ld/igds/drug/service/HDrugLogService.class
+++ b/igds-recir/target/classes/com/ld/igds/drug/service/HDrugLogService.class
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/drug/service/HDrugService.class b/igds-recir/target/classes/com/ld/igds/drug/service/HDrugService.class
index 4dfc1ae..dbee6c2 100644
--- a/igds-recir/target/classes/com/ld/igds/drug/service/HDrugService.class
+++ b/igds-recir/target/classes/com/ld/igds/drug/service/HDrugService.class
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/drug/view/Drug.view.xml b/igds-recir/target/classes/com/ld/igds/drug/view/Drug.view.xml
index e3439ac..b16b1ab 100644
--- a/igds-recir/target/classes/com/ld/igds/drug/view/Drug.view.xml
+++ b/igds-recir/target/classes/com/ld/igds/drug/view/Drug.view.xml
@@ -4,6 +4,28 @@
<Context/>
<Model>
<DataType name="dtMain" parent="dtDrug"/>
+ <DataType name="dtParam">
+ <PropertyDef name="depotId">
+ <Property></Property>
+ <Property name="label">浠撴埧鍚嶇О</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="start">
+ <Property name="dataType">Date</Property>
+ <Property name="label">寮�濮嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="end">
+ <Property name="dataType">Date</Property>
+ <Property name="label">缁撴潫鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="name">
+ <Property name="label">鑽搧鍚嶇О</Property>
+ </PropertyDef>
+ </DataType>
</Model>
<View layout="padding:5;regionPadding:5">
<Property name="packages">font-awesome,css-common</Property>
@@ -12,6 +34,56 @@
<Property name="dataProvider">drugPR#pageDrug</Property>
<Property name="pageSize">20</Property>
</DataSet>
+ <DataSet id="dsParam">
+ <ClientEvent name="onReady">self.insert({});
+</ClientEvent>
+ <Property name="dataType">dtParam</Property>
+ </DataSet>
+ <Container>
+ <Property name="exClassName">bg-color</Property>
+ <AutoForm>
+ <Property name="cols">*,*,*,*,*</Property>
+ <Property name="dataSet">dsParam</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement layoutConstraint="align:left">
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">start</Property>
+ <Property name="property">start</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">end</Property>
+ <Property name="property">end</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">name</Property>
+ <Property name="property">name</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Container layout="regionPadding:15">
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var param = view.get("#dsParam.data");
+view.get("#dsMain").set("parameter",param).flushAsync();</ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsParam").setData({});
+view.get("#dsMain").set("parameter",{}).flushAsync();</ClientEvent>
+ <Property name="caption">閲嶇疆</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ </Button>
+ </Container>
+ </AutoForm>
+ </Container>
<Container layout="regionPadding:10" layoutConstraint="top">
<Property name="exClassName">bg-color</Property>
<Property name="height">55</Property>
@@ -56,16 +128,6 @@
<Property name="exClassName">btn-warn</Property>
<Property name="iconClass">fa fa-minus</Property>
</Button>
- <TextEditor id="paramName" layoutConstraint="right">
- <Property name="width">200</Property>
- <Property name="blankText">--鑽搧鍚嶇О--</Property>
- <Property name="trigger">triggerQuery</Property>
- </TextEditor>
- <Trigger id="triggerQuery">
- <ClientEvent name="onExecute">var name = view.get("#paramName.text");
-view.get("#dsMain").set("parameter",{name:name}).flushAsync();</ClientEvent>
- <Property name="iconClass">fa fa-search</Property>
- </Trigger>
</Container>
<Container layout="regionPadding:10" layoutConstraint="center">
<Property name="exClassName">bg-color</Property>
diff --git a/igds-recir/target/classes/com/ld/igds/drug/view/DrugLog.view.xml b/igds-recir/target/classes/com/ld/igds/drug/view/DrugLog.view.xml
index 8c8e321..bd9755f 100644
--- a/igds-recir/target/classes/com/ld/igds/drug/view/DrugLog.view.xml
+++ b/igds-recir/target/classes/com/ld/igds/drug/view/DrugLog.view.xml
@@ -441,6 +441,100 @@
<Property name="label">鐔忚捀浣滀笟浜哄憳</Property>
</PropertyDef>
</DataType>
+ <DataType name="dtPest">
+ <Property name="creationType">com.ld.igds.models.Pest</Property>
+ <PropertyDef name="batchId">
+ <Property></Property>
+ <Property name="label">妫�娴嬫壒娆�</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property></Property>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="depotId">
+ <Property></Property>
+ <Property name="label">妫�娴嬩粨鎴�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="pestMax">
+ <Property name="dataType">int</Property>
+ <Property name="label">鏈�澶氭暟閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="method">
+ <Property></Property>
+ <Property name="label">铏妫�娴嬫柟娉�</Property>
+ </PropertyDef>
+ <PropertyDef name="position">
+ <Property></Property>
+ <Property name="label">鍙戠敓閮ㄤ綅</Property>
+ </PropertyDef>
+ <PropertyDef name="pestType">
+ <Property></Property>
+ <Property name="label">铏绉嶇被</Property>
+ </PropertyDef>
+ <PropertyDef name="pestLevel">
+ <Property></Property>
+ <Property name="label">铏伯绛夌骇鍒ゅ畾</Property>
+ </PropertyDef>
+ <PropertyDef name="pestAnalysis">
+ <Property></Property>
+ <Property name="label">瀹宠櫕鎶楄嵂鎬у垎鏋�</Property>
+ </PropertyDef>
+ <PropertyDef name="pestStart">
+ <Property name="dataType">int</Property>
+ <Property name="label">铏閲囬泦鐐瑰紑濮�</Property>
+ </PropertyDef>
+ <PropertyDef name="pestEnd">
+ <Property name="dataType">int</Property>
+ <Property name="label">铏閲囬泦鐐规埅鑷�</Property>
+ </PropertyDef>
+ <PropertyDef name="checkNum">
+ <Property name="dataType">int</Property>
+ <Property name="label">閲囬泦閫氶亾涓暟</Property>
+ </PropertyDef>
+ <PropertyDef name="receiveDate">
+ <Property name="dataType">Date</Property>
+ <Property name="label">妫�娴嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="points">
+ <Property></Property>
+ <Property name="label">閲囬泦鐐逛俊鎭�</Property>
+ </PropertyDef>
+ <PropertyDef name="checkUser">
+ <Property></Property>
+ <Property name="label">妫�娴嬩汉</Property>
+ </PropertyDef>
+ <PropertyDef name="remark">
+ <Property></Property>
+ <Property name="label">澶囨敞淇℃伅</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtParam">
+ <PropertyDef name="depotId">
+ <Property></Property>
+ <Property name="label">浠撴埧鍚嶇О</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="start">
+ <Property name="dataType">Date</Property>
+ <Property name="label">寮�濮嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="end">
+ <Property name="dataType">Date</Property>
+ <Property name="label">缁撴潫鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="name">
+ <Property name="label">鎿嶄綔浜�</Property>
+ </PropertyDef>
+ </DataType>
</Model>
<View layout="padding:5;regionPadding:5">
<Property name="packages">font-awesome,css-common</Property>
@@ -449,31 +543,83 @@
<Property name="pageSize">20</Property>
<Property name="dataProvider">drugLogPR#pageDrugLog</Property>
</DataSet>
- <Container layout="regionPadding:10" layoutConstraint="top">
+ <DataSet id="dsParam">
+ <ClientEvent name="onReady">self.insert({});
+</ClientEvent>
+ <Property name="dataType">dtParam</Property>
+ </DataSet>
+ <Container>
<Property name="exClassName">bg-color</Property>
- <Property name="height">55</Property>
- <Property name="contentOverflow">hidden</Property>
- <Label layoutConstraint="left">
- <Property name="text">鑿滃崟鏍忥細</Property>
- </Label>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">view.get("#dsMain").insert({});
+ <AutoForm>
+ <Property name="cols">*,*,*,*,*</Property>
+ <Property name="dataSet">dsParam</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">start</Property>
+ <Property name="property">start</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">end</Property>
+ <Property name="property">end</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">name</Property>
+ <Property name="property">name</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Container layout="regionPadding:15">
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var param = view.get("#dsParam.data");
+view.get("#dsMain").set("parameter",param).flushAsync();</ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsParam").setData({});
+view.get("#dsMain").set("parameter",{}).flushAsync();</ClientEvent>
+ <Property name="caption">閲嶇疆</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ </Button>
+ </Container>
+ </AutoForm>
+ </Container>
+ <Container layout="regionPadding:5" layoutConstraint="center">
+ <Property name="exClassName">bg-color</Property>
+ <Container layout="regionPadding:10" layoutConstraint="top">
+ <Property name="exClassName">bg-color</Property>
+ <Property name="height">55</Property>
+ <Property name="contentOverflow">hidden</Property>
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").insert({});
view.get("#dialogMain").show();</ClientEvent>
- <Property name="caption">鏂板</Property>
- <Property name="exClassName">btn-default</Property>
- <Property name="iconClass">fa fa-plus</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-plus</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
if(data){
view.get("#dialogMain").show();
}</ClientEvent>
- <Property name="caption">缂栬緫</Property>
- <Property name="exClassName">btn-warm</Property>
- <Property name="iconClass">fa fa-pencil</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+ <Property name="caption">缂栬緫</Property>
+ <Property name="exClassName">btn-warm</Property>
+ <Property name="iconClass">fa fa-pencil</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
if(!data){
return;
}
@@ -487,29 +633,17 @@
}
});
</ClientEvent>
- <Property name="caption">鍒犻櫎</Property>
- <Property name="exClassName">btn-warn</Property>
- <Property name="iconClass">fa fa-minus</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">view.get("#dsMain").flushAsync();</ClientEvent>
- <Property name="caption">鍒锋柊</Property>
- <Property name="exClassName">btn-default</Property>
- <Property name="iconClass">fa fa-search</Property>
- </Button>
- <TextEditor id="paramName" layoutConstraint="right">
- <Property name="width">200</Property>
- <Property name="blankText">--鎿嶄綔浜�--</Property>
- <Property name="trigger">triggerQuery</Property>
- </TextEditor>
- <Trigger id="triggerQuery">
- <ClientEvent name="onExecute">var name = view.get("#paramName.text");
-view.get("#dsMain").set("parameter",{name:name}).flushAsync();</ClientEvent>
- <Property name="iconClass">fa fa-search</Property>
- </Trigger>
- </Container>
- <Container layout="regionPadding:5" layoutConstraint="center">
- <Property name="exClassName">bg-color</Property>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").flushAsync();</ClientEvent>
+ <Property name="caption">鍒锋柊</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ </Button>
+ </Container>
<DataGrid>
<ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
if(data){
@@ -622,6 +756,7 @@
<AutoFormElement>
<Property name="name">pestBatchId</Property>
<Property name="property">pestBatchId</Property>
+ <Property name="trigger">cddPest</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -951,5 +1086,53 @@
<Property name="items">鐗囧墏,娉ㄥ皠鍓�,涔冲墏,涓稿墏,棰楃矑鍓�,鍏朵粬</Property>
<Property name="autoOpen">true</Property>
</ListDropDown>
+ <CustomDropDown id="cddPest">
+ <ClientEvent name="onOpen">var key = view.get("#dsMain.data:#").get("depotId");
+console.log(key)
+view.get("#dsPest").set("parameter",{depotId:key}).flushAsync();</ClientEvent>
+ <Property name="width">500</Property>
+ <Property name="assignmentMap">pestBatchId=batchId</Property>
+ <Property name="height">500</Property>
+ <Property name="maxHeight">500</Property>
+ <Property name="minHeight">500</Property>
+ <Container layout="regionPadding:5">
+ <DataSet id="dsPest">
+ <Property name="dataType">[dtPest]</Property>
+ <Property name="dataProvider">pestDataPR#getData</Property>
+ <Property name="pageSize">10</Property>
+ </DataSet>
+ <Container>
+ <Property name="exClassName">bg-color</Property>
+ <DataGrid id="dgPest" layoutConstraint="top">
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsPest.data:#");
+if(data){
+ view.get("#cddPest").close(data.toJSON());
+}</ClientEvent>
+ <Property name="dataSet">dsPest</Property>
+ <Property name="readOnly">true</Property>
+ <DataColumn>
+ <Property name="property">depotId</Property>
+ <Property name="name">depotId</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="batchId">
+ <Property name="property">batchId</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="receiveDate">
+ <Property name="property">receiveDate</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Container layoutConstraint="bottom">
+ <Property name="exClassName">bg-color</Property>
+ <DataPilot layoutConstraint="right">
+ <Property name="dataSet">dsPest</Property>
+ <Property name="itemCodes">pageSize,pages</Property>
+ </DataPilot>
+ </Container>
+ </Container>
+ </CustomDropDown>
</View>
</ViewConfig>
diff --git a/igds-recir/target/classes/com/ld/igds/drug/view/DrugLogApply.view.xml b/igds-recir/target/classes/com/ld/igds/drug/view/DrugLogApply.view.xml
index 65db267..70d512c 100644
--- a/igds-recir/target/classes/com/ld/igds/drug/view/DrugLogApply.view.xml
+++ b/igds-recir/target/classes/com/ld/igds/drug/view/DrugLogApply.view.xml
@@ -6,228 +6,384 @@
<DataType name="dtMain">
<Property name="creationType">com.ld.igds.models.DrugLogApply</Property>
<PropertyDef name="xzbm">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀澶囨缂栧彿</Property>
</PropertyDef>
<PropertyDef name="deptId">
- <Property/>
+ <Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="companyId">
- <Property/>
+ <Property></Property>
<Property name="label">缁勭粐缂栫爜</Property>
</PropertyDef>
<PropertyDef name="tbrq">
<Property name="dataType">Date</Property>
<Property name="label">濉姤鏃ユ湡</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="dwdm">
- <Property/>
+ <Property></Property>
<Property name="label">鍗曚綅浠ｇ爜</Property>
+ <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="sqxzrq">
<Property name="dataType">Date</Property>
<Property name="label">鐢宠鐔忚捀鏃ユ湡</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="fzr">
- <Property/>
+ <Property></Property>
<Property name="label">璐熻矗浜�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="fzrdh">
- <Property/>
+ <Property></Property>
<Property name="label">璐熻矗浜虹數璇�</Property>
</PropertyDef>
<PropertyDef name="xcfzr">
- <Property/>
+ <Property></Property>
<Property name="label">鐜板満璐熻矗浜�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="xcfzrzw">
- <Property/>
+ <Property></Property>
<Property name="label">鐜板満璐熻矗浜鸿亴鍔�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="xcfzrdh">
- <Property/>
+ <Property></Property>
<Property name="label">鐜板満璐熻矗浜虹數璇�</Property>
</PropertyDef>
<PropertyDef name="tbr">
- <Property/>
+ <Property></Property>
<Property name="label">濉〃浜�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="tbrdh">
- <Property/>
+ <Property></Property>
<Property name="label">濉〃浜虹數璇�</Property>
</PropertyDef>
<PropertyDef name="sfszjjxd">
- <Property/>
+ <Property></Property>
<Property name="label">鏄惁璁剧疆璀︽垝绾�(涓�)</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="sfszjjxx">
- <Property/>
+ <Property></Property>
<Property name="label">鏄惁璁剧疆璀︽垝绾�(瑗�)</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="sfszjjxn">
- <Property/>
+ <Property></Property>
<Property name="label">鏄惁璁剧疆璀︽垝绾�(鍗�)</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="sfszjjxb">
- <Property/>
+ <Property></Property>
<Property name="label">鏄惁璁剧疆璀︽垝绾�(鍖�)</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="ssxzzystqybqk">
- <Property/>
+ <Property></Property>
<Property name="label">瀹炴柦鐔忚捀浣滀笟鏃跺ぉ姘旈鎶ユ儏鍐�</Property>
</PropertyDef>
<PropertyDef name="xzssgcap">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀瀹夋帓鍙婂疄鏂借繃绋�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="aqfhjyjcccs">
- <Property/>
+ <Property></Property>
<Property name="label">瀹夊叏闃叉姢鍙婂簲鎬ュ缃帾鏂�</Property>
</PropertyDef>
<PropertyDef name="xzzysx">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀娉ㄦ剰浜嬮」</Property>
</PropertyDef>
<PropertyDef name="fileStorageId">
- <Property/>
+ <Property></Property>
<Property name="label">鏂囦欢瀛樺偍ID</Property>
</PropertyDef>
<PropertyDef name="drugName">
- <Property/>
+ <Property></Property>
<Property name="label">鑽墏鍚嶇О</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="drugType">
- <Property/>
+ <Property></Property>
<Property name="label">鑽墏绫诲瀷/鍨嬪彿</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="yjyxqz">
<Property name="dataType">Date</Property>
<Property name="label">鑽墏鏈夋晥鏈熻嚦</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="lqsl">
<Property name="dataType">Double</Property>
<Property name="label">棰嗗彇鏁伴噺</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="sysbjfs">
- <Property/>
+ <Property></Property>
<Property name="label">鏂借嵂璁惧鍙婃柟寮�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="zcdd">
- <Property/>
+ <Property></Property>
<Property name="label">鏆傚瓨鍦扮偣</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="lqr">
- <Property/>
+ <Property></Property>
<Property name="label">棰嗗彇浜�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="lqsj">
<Property name="dataType">Date</Property>
- <Property name="label">棰嗗彇鏃堕棿鏃堕棿</Property>
+ <Property name="label">棰嗗彇鏃堕棿</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="updateTime">
<Property name="dataType">Date</Property>
<Property name="label">鏇存柊鏃堕棿</Property>
+ <Property name="readOnly">true</Property>
</PropertyDef>
<PropertyDef name="depotId">
- <Property/>
- <Property name="label">浠撴埧/娌圭綈浠ｇ爜</Property>
+ <Property></Property>
+ <Property name="label">浠撴埧/娌圭綈</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="foodVariety">
- <Property/>
+ <Property></Property>
<Property name="label">绮鍝佺</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="foodType">
- <Property/>
+ <Property></Property>
<Property name="label">绮鎬ц川</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="foodLevel">
- <Property/>
+ <Property></Property>
<Property name="label">绮绛夌骇</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="number">
<Property name="dataType">Double</Property>
<Property name="label">绮鏁伴噺</Property>
+ <Property name="displayFormat">#0.000鍚�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="perWet">
<Property name="dataType">Double</Property>
<Property name="label">姘村垎</Property>
+ <Property name="displayFormat">#0.000%</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="perImpurity">
<Property name="dataType">Double</Property>
<Property name="label">鏉傝川</Property>
+ <Property name="displayFormat">#0.000%</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="lw">
<Property name="dataType">Double</Property>
<Property name="label">绮俯</Property>
+ <Property name="displayFormat">#0.000鈩�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="cw">
+ <Property name="dataType">Double</Property>
+ <Property name="label">浠撴俯</Property>
+ <Property name="displayFormat">#0.000鈩�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="cnsd">
<Property name="dataType">Double</Property>
<Property name="label">浠撳唴婀垮害</Property>
+ <Property name="displayFormat">#0.000%</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="clfs">
- <Property/>
+ <Property></Property>
<Property name="label">瀛樼伯鏂瑰紡</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1锛氭暎瑁呭偍绮�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2锛氬寘瑁�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3锛氬洿鍖呮暎瀛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">9</Property>
+ <Property name="value">9锛氬叾浠�</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="rkrq">
<Property name="dataType">Date</Property>
<Property name="label">鍏ュ簱鏃ユ湡</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="hc">
- <Property/>
+ <Property></Property>
<Property name="label">瀹宠櫕</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="cldjpd">
- <Property/>
+ <Property></Property>
<Property name="label">铏伯绛夌骇鍒ゅ畾</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">531</Property>
+ <Property name="value">鍩烘湰鏃犺櫕绮�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">532</Property>
+ <Property name="value">涓�鑸櫕绮�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">533</Property>
+ <Property name="value">涓ラ噸铏伯</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">534</Property>
+ <Property name="value">涓ラ噸铏伯</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="ldtj">
<Property name="dataType">Double</Property>
<Property name="label">绮爢浣撶Н</Property>
+ <Property name="displayFormat">#0.000m鲁</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="kjtj">
<Property name="dataType">Double</Property>
<Property name="label">绌洪棿浣撶Н</Property>
+ <Property name="displayFormat">#0.000m鲁</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="lddwyyl">
<Property name="dataType">Double</Property>
<Property name="label">绮爢鍗曚綅鐢ㄨ嵂閲�</Property>
+ <Property name="displayFormat">#0.000g/m鲁</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="kjdwyyl">
<Property name="dataType">Double</Property>
<Property name="label">绌洪棿鍗曚綅鐢ㄨ嵂閲�</Property>
+ <Property name="displayFormat">#0.000g/m鲁</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="zyyl">
<Property name="dataType">Double</Property>
<Property name="label">鎬荤敤鑽噺</Property>
+ <Property name="displayFormat">#0.000g</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="qmx">
- <Property/>
+ <Property></Property>
<Property name="label">姘斿瘑鎬�</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1:鈪犵骇锛宼鈮�300s</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2:鈪＄骇锛�20s鈮<300s</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3:鈪㈢骇锛�40s鈮<120s (骞虫埧浠�) ; 60s鈮� t<120s (绔嬬瓛浠撱�佹祬鍦嗕粨)</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">4锛氣叄绾э紝t<40s (骞虫埧浠�) 锛宼<60s (绔嬬瓛浠撱�佹祬鍦嗕粨</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="jhxzksrq">
<Property name="dataType">Date</Property>
<Property name="label">璁″垝鐔忚捀寮�濮嬫棩鏈�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="jhxzjsrq">
<Property name="dataType">Date</Property>
<Property name="label">璁″垝鐔忚捀缁撴潫鏃ユ湡</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="xznd">
<Property name="dataType">Double</Property>
<Property name="label">璁惧畾鐔忚捀娴撳害</Property>
+ <Property name="displayFormat">#0.000ml/m鲁</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="mbsj">
<Property name="dataType">Integer</Property>
<Property name="label">瀵嗛棴鏃堕棿</Property>
+ <Property name="displayFormat">#0澶�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="xzfs">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀鏂瑰紡</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="sqfs">
- <Property/>
+ <Property></Property>
<Property name="label">鏁ｆ皵鏂瑰紡</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<Reference name="drugLogPeople">
<Property name="dataType">[dtPeople]</Property>
@@ -235,28 +391,34 @@
<Property name="parameter">
<Entity>
<Property name="xzbm">$${this.xzbm}</Property>
- <Property name="deptId">$${this.deptId}</Property>
- <Property name="tbrq">$${this.tbrq}</Property>
</Entity>
</Property>
</Reference>
+ <PropertyDef name="dtlId">
+ <Property></Property>
+ <Property name="label">dtlId</Property>
+ </PropertyDef>
+ <PropertyDef name="wayId">
+ <Property></Property>
+ <Property name="label">wayId</Property>
+ </PropertyDef>
</DataType>
<DataType name="dtPeople">
<Property name="creationType">com.ld.igds.models.DrugLogPeople</Property>
<PropertyDef name="propleId">
- <Property/>
+ <Property></Property>
<Property name="label">propleId</Property>
</PropertyDef>
<PropertyDef name="id">
- <Property/>
+ <Property></Property>
<Property name="label">id</Property>
</PropertyDef>
<PropertyDef name="drugLogId">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀澶囨缂栧彿</Property>
</PropertyDef>
<PropertyDef name="deptId">
- <Property/>
+ <Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="tbrq">
@@ -264,27 +426,27 @@
<Property name="label">濉姤鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="mx">
- <Property/>
+ <Property></Property>
<Property name="label">濮撳悕</Property>
</PropertyDef>
<PropertyDef name="zw">
- <Property/>
+ <Property></Property>
<Property name="label">鑱屽姟</Property>
</PropertyDef>
<PropertyDef name="zyzg">
- <Property/>
+ <Property></Property>
<Property name="label">鑱屼笟璧勬牸</Property>
</PropertyDef>
<PropertyDef name="stzk">
- <Property/>
+ <Property></Property>
<Property name="label">韬綋鐘跺喌</Property>
</PropertyDef>
<PropertyDef name="xzrwfg">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀浠诲姟鍒嗗伐</Property>
</PropertyDef>
<PropertyDef name="sfwb">
- <Property/>
+ <Property></Property>
<Property name="label">鏄惁澶栧寘</Property>
</PropertyDef>
</DataType>
@@ -310,15 +472,15 @@
<DataType name="dtDtl">
<Property name="creationType">com.ld.igds.models.DrugLogDtl</Property>
<PropertyDef name="id">
- <Property/>
+ <Property></Property>
<Property name="label">id</Property>
</PropertyDef>
<PropertyDef name="drugLogId">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀澶囨缂栧彿</Property>
</PropertyDef>
<PropertyDef name="deptId">
- <Property/>
+ <Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="tbrq">
@@ -326,19 +488,19 @@
<Property name="label">濉姤鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="depotId">
- <Property/>
+ <Property></Property>
<Property name="label">浠撴埧/娌圭綈浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="foodVariety">
- <Property/>
+ <Property></Property>
<Property name="label">绮鍝佺</Property>
</PropertyDef>
<PropertyDef name="foodType">
- <Property/>
+ <Property></Property>
<Property name="label">绮鎬ц川</Property>
</PropertyDef>
<PropertyDef name="foodLevel">
- <Property/>
+ <Property></Property>
<Property name="label">绮绛夌骇</Property>
</PropertyDef>
<PropertyDef name="number">
@@ -366,7 +528,7 @@
<Property name="label">浠撳唴婀垮害</Property>
</PropertyDef>
<PropertyDef name="clfs">
- <Property/>
+ <Property></Property>
<Property name="label">瀛樼伯鏂瑰紡</Property>
</PropertyDef>
<PropertyDef name="rkrq">
@@ -374,11 +536,11 @@
<Property name="label">鍏ュ簱鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="hc">
- <Property/>
+ <Property></Property>
<Property name="label">瀹宠櫕</Property>
</PropertyDef>
<PropertyDef name="cldjpd">
- <Property/>
+ <Property></Property>
<Property name="label">铏伯绛夌骇鍒ゅ畾</Property>
</PropertyDef>
<PropertyDef name="ldtj">
@@ -402,7 +564,7 @@
<Property name="label">鎬荤敤鑽噺</Property>
</PropertyDef>
<PropertyDef name="qmx">
- <Property/>
+ <Property></Property>
<Property name="label">姘斿瘑鎬�</Property>
</PropertyDef>
<PropertyDef name="jhxzksrq">
@@ -417,15 +579,15 @@
<DataType name="dtWay">
<Property name="creationType">com.ld.igds.models.DrugLogWay</Property>
<PropertyDef name="id">
- <Property/>
+ <Property></Property>
<Property name="label">id</Property>
</PropertyDef>
<PropertyDef name="drugLogId">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀澶囨缂栧彿</Property>
</PropertyDef>
<PropertyDef name="deptId">
- <Property/>
+ <Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="tbrq">
@@ -441,11 +603,11 @@
<Property name="label">瀵嗛棴鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="xzfs">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀鏂瑰紡</Property>
</PropertyDef>
<PropertyDef name="sqfs">
- <Property/>
+ <Property></Property>
<Property name="label">鏁ｆ皵鏂瑰紡</Property>
</PropertyDef>
</DataType>
@@ -484,6 +646,8 @@
<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
if(data){
view.get("#dialogMain").show();
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷慨鏀圭殑鏁版嵁锛�");
}</ClientEvent>
<Property name="caption">缂栬緫</Property>
<Property name="exClassName">btn-warm</Property>
@@ -763,6 +927,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">lqsj</Property>
+ <Property name="property">lqsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">updateTime</Property>
<Property name="property">updateTime</Property>
<Editor/>
@@ -845,6 +1014,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">cw</Property>
+ <Property name="property">cw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">cnsd</Property>
<Property name="property">cnsd</Property>
<Editor/>
diff --git a/igds-recir/target/classes/com/ld/igds/drug/view/DrugPR.class b/igds-recir/target/classes/com/ld/igds/drug/view/DrugPR.class
index da83ad4..f93188b 100644
--- a/igds-recir/target/classes/com/ld/igds/drug/view/DrugPR.class
+++ b/igds-recir/target/classes/com/ld/igds/drug/view/DrugPR.class
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/models/Drug.class b/igds-recir/target/classes/com/ld/igds/models/Drug.class
index f13db5f..847d556 100644
--- a/igds-recir/target/classes/com/ld/igds/models/Drug.class
+++ b/igds-recir/target/classes/com/ld/igds/models/Drug.class
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/models/DrugLog.class b/igds-recir/target/classes/com/ld/igds/models/DrugLog.class
index 67d55e4..c6317fc 100644
--- a/igds-recir/target/classes/com/ld/igds/models/DrugLog.class
+++ b/igds-recir/target/classes/com/ld/igds/models/DrugLog.class
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/models/DrugLogApply.class b/igds-recir/target/classes/com/ld/igds/models/DrugLogApply.class
index f3efbbc..567b751 100644
--- a/igds-recir/target/classes/com/ld/igds/models/DrugLogApply.class
+++ b/igds-recir/target/classes/com/ld/igds/models/DrugLogApply.class
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/models/DrugLogDtl.class b/igds-recir/target/classes/com/ld/igds/models/DrugLogDtl.class
index 4c5b757..b9c8b8a 100644
--- a/igds-recir/target/classes/com/ld/igds/models/DrugLogDtl.class
+++ b/igds-recir/target/classes/com/ld/igds/models/DrugLogDtl.class
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/models/DrugLogPeople.class b/igds-recir/target/classes/com/ld/igds/models/DrugLogPeople.class
index d97a918..59cded5 100644
--- a/igds-recir/target/classes/com/ld/igds/models/DrugLogPeople.class
+++ b/igds-recir/target/classes/com/ld/igds/models/DrugLogPeople.class
Binary files differ
diff --git a/igds-recir/target/classes/com/ld/igds/models/DrugLogWay.class b/igds-recir/target/classes/com/ld/igds/models/DrugLogWay.class
index 760cee2..6fc713a 100644
--- a/igds-recir/target/classes/com/ld/igds/models/DrugLogWay.class
+++ b/igds-recir/target/classes/com/ld/igds/models/DrugLogWay.class
Binary files differ
diff --git a/igds-security/igds-security.iml b/igds-security/igds-security.iml
index 294d45e..f7b7fd8 100644
--- a/igds-security/igds-security.iml
+++ b/igds-security/igds-security.iml
@@ -56,14 +56,14 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-security/src/main/java/com/ld/igds/sec/controller/FireController.java b/igds-security/src/main/java/com/ld/igds/sec/controller/FireController.java
index 540cec5..fdfd779 100644
--- a/igds-security/src/main/java/com/ld/igds/sec/controller/FireController.java
+++ b/igds-security/src/main/java/com/ld/igds/sec/controller/FireController.java
@@ -8,7 +8,6 @@
import com.ld.igds.sec.dto.SecurityParam;
import com.ld.igds.sec.manager.SecManager;
import com.ld.igds.util.ContextUtil;
-import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -17,7 +16,6 @@
/**
* 瀹夐槻--娑堥槻绠＄悊鎺у埗灞�
*/
-@Slf4j
@RestController
@RequestMapping("basic/security")
public class FireController {
diff --git a/igds-security/src/main/java/com/ld/igds/sec/controller/PatrolController.java b/igds-security/src/main/java/com/ld/igds/sec/controller/PatrolController.java
index 00cae55..8c105e3 100644
--- a/igds-security/src/main/java/com/ld/igds/sec/controller/PatrolController.java
+++ b/igds-security/src/main/java/com/ld/igds/sec/controller/PatrolController.java
@@ -2,7 +2,6 @@
import com.ld.igds.sec.dto.SecPatrolRecordDto;
import com.ld.igds.sec.manager.SecManager;
-import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -11,7 +10,6 @@
/**
* 瀹夐槻--鐢靛瓙宸℃洿绠＄悊鎺у埗灞�
*/
-@Slf4j
@RestController
@RequestMapping("basic/security")
public class PatrolController {
diff --git a/igds-security/src/main/java/com/ld/igds/sec/service/SecurityService.java b/igds-security/src/main/java/com/ld/igds/sec/service/SecurityService.java
index 0b45821..7293220 100644
--- a/igds-security/src/main/java/com/ld/igds/sec/service/SecurityService.java
+++ b/igds-security/src/main/java/com/ld/igds/sec/service/SecurityService.java
@@ -8,9 +8,9 @@
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -19,7 +19,7 @@
@Component
public class SecurityService extends HibernateDao {
- @Autowired
+ @Resource
private CoreSecCameraService coreSecCameraService;
public List<SecCamera> listCamera(Map<String, Object> param) {
@@ -59,7 +59,7 @@
if (null == data.getCompanyId()) {
data.setCompanyId(ContextUtil.getCompanyId());
}
-
+ data.setUpdateTime(new Date());
if (data.getChanNum() == 0) {
data.setChanNum(1);
}
diff --git a/igds-security/src/main/java/com/ld/igds/sec/service/impl/CoreSecFireServiceImpl.java b/igds-security/src/main/java/com/ld/igds/sec/service/impl/CoreSecFireServiceImpl.java
index 9b905c2..16132ae 100644
--- a/igds-security/src/main/java/com/ld/igds/sec/service/impl/CoreSecFireServiceImpl.java
+++ b/igds-security/src/main/java/com/ld/igds/sec/service/impl/CoreSecFireServiceImpl.java
@@ -4,7 +4,6 @@
import com.ld.igds.sec.dto.SecurityParam;
import com.ld.igds.sec.mapper.SecFireServiceMapper;
import com.ld.igds.sec.service.CoreSecFireService;
-import com.ld.igds.util.RedisUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
@@ -16,8 +15,6 @@
@Autowired
private SecFireServiceMapper serviceMapper;
- @Autowired
- private RedisUtil redisUtil;
@Override
public List<SecFireDto> getAllFire(String companyId) {
diff --git a/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml b/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml
index 810be96..9f57859 100644
--- a/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml
+++ b/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml
@@ -141,6 +141,10 @@
<Property></Property>
<Property name="label">rtsp鍦板潃</Property>
</PropertyDef>
+ <PropertyDef name="phoneAddr">
+ <Property></Property>
+ <Property name="label">鎵嬫満鍦板潃</Property>
+ </PropertyDef>
<PropertyDef name="remark">
<Property></Property>
<Property name="label">澶囨敞璇存槑</Property>
@@ -192,6 +196,110 @@
<Entity>
<Property name="code">Y</Property>
<Property name="name">鑷姩鎶撴媿</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鏇存柊鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="spjklx">
+ <Property/>
+ <Property name="label">鐩戞帶绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1锛氫粨鍐�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2锛氫笟鍔＄被</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3锛氬畨闃茬被</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="spdwlx">
+ <Property/>
+ <Property name="label">鐐逛綅绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1锛氬嚭鍏ュ彛</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2锛氭墻鏍锋満</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3锛氬寲楠屽</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">4锛氱粨绠楀</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">5</Property>
+ <Property name="value">5锛氬湴纾呭</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">6</Property>
+ <Property name="value">6锛氬簱鍖轰富骞查亾</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">7</Property>
+ <Property name="value">7锛氫粨闂寸洃鎺�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">8</Property>
+ <Property name="value">8锛氫粨鍐�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">9</Property>
+ <Property name="value">9锛氳嵂鍝佹埧鍐呭</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">10</Property>
+ <Property name="value">10锛氬櫒鏉愬鍐呭</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">11</Property>
+ <Property name="value">11锛氬埗楂樼偣</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">12</Property>
+ <Property name="value">12锛氭补搴撶綈鍖�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">13</Property>
+ <Property name="value">13锛氭敹鍙戞补璁惧</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">14</Property>
+ <Property name="value">14锛氭车鎴�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">15</Property>
+ <Property name="value">15锛氭补搴撲富瑕佽緭閫佺閬�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">16</Property>
+ <Property name="value">16锛氬懆鐣�</Property>
</Entity>
</Collection>
</Property>
@@ -459,7 +567,7 @@
</DataGrid>
</Container>
<Dialog id="dialogMain" layout="padding:5;regionPadding:5">
- <Property name="width">800</Property>
+ <Property name="width">75%</Property>
<Property name="caption">鐩戞帶璁惧淇℃伅</Property>
<Property name="iconClass">fa fa-flag-o</Property>
<Property name="closeable">false</Property>
@@ -492,7 +600,7 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
+ <Property name="cols">*,*,*</Property>
<Property name="labelWidth">100</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
@@ -526,6 +634,16 @@
<Property name="property">snapType</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">spjklx</Property>
+ <Property name="property">spjklx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">spdwlx</Property>
+ <Property name="property">spdwlx</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
</GroupBox>
@@ -535,10 +653,26 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
+ <Property name="cols">*,*,*</Property>
<Property name="labelWidth">100</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
+ <AutoFormElement>
+ <Property name="name">screenShow</Property>
+ <Property name="property">screenShow</Property>
+ <Editor>
+ <RadioGroup>
+ <RadioButton>
+ <Property name="text">榛樿灞曠ず</Property>
+ <Property name="value">Y</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="text">閫夋嫨灞曠ず</Property>
+ <Property name="value">N</Property>
+ </RadioButton>
+ </RadioGroup>
+ </Editor>
+ </AutoFormElement>
<AutoFormElement>
<Property name="name">snapTag</Property>
<Property name="property">snapTag</Property>
@@ -561,22 +695,6 @@
<Property name="color">blue</Property>
</Property>
</Label>
- <AutoFormElement>
- <Property name="name">screenShow</Property>
- <Property name="property">screenShow</Property>
- <Editor>
- <RadioGroup>
- <RadioButton>
- <Property name="text">榛樿灞曠ず</Property>
- <Property name="value">Y</Property>
- </RadioButton>
- <RadioButton>
- <Property name="text">閫夋嫨灞曠ず</Property>
- <Property name="value">N</Property>
- </RadioButton>
- </RadioGroup>
- </Editor>
- </AutoFormElement>
</AutoForm>
</Children>
</GroupBox>
@@ -609,7 +727,7 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
+ <Property name="cols">*,*,*</Property>
<Property name="labelWidth">100</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
@@ -643,7 +761,7 @@
<Property name="property">portInC</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">mediaAddr</Property>
<Property name="property">mediaAddr</Property>
<Property name="trigger">triggerMedia</Property>
@@ -654,6 +772,11 @@
</Editor>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:3">
+ <Property name="name">phoneAddr</Property>
+ <Property name="property">phoneAddr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">remark</Property>
<Property name="property">remark</Property>
<Property name="editorType">TextArea</Property>
diff --git a/igds-security/src/main/java/com/ld/igds/timer/JobLampService.java b/igds-security/src/main/java/com/ld/igds/timer/JobLampService.java
index 28c5fde..0cdeb60 100644
--- a/igds-security/src/main/java/com/ld/igds/timer/JobLampService.java
+++ b/igds-security/src/main/java/com/ld/igds/timer/JobLampService.java
@@ -13,8 +13,9 @@
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -28,9 +29,9 @@
@Service(Constant.JOB_BEAN_LAMP)
public class JobLampService implements Job {
- @Autowired
+ @Resource
private LampManager lampManager;
- @Autowired
+ @Resource
private CoreDeviceService coreDeviceService;
@Override
diff --git a/igds-security/target/classes/com/ld/igds/sec/controller/FireController.class b/igds-security/target/classes/com/ld/igds/sec/controller/FireController.class
index 3364e79..5bda080 100644
--- a/igds-security/target/classes/com/ld/igds/sec/controller/FireController.class
+++ b/igds-security/target/classes/com/ld/igds/sec/controller/FireController.class
Binary files differ
diff --git a/igds-security/target/classes/com/ld/igds/sec/controller/PatrolController.class b/igds-security/target/classes/com/ld/igds/sec/controller/PatrolController.class
index 4a944b7..fff0693 100644
--- a/igds-security/target/classes/com/ld/igds/sec/controller/PatrolController.class
+++ b/igds-security/target/classes/com/ld/igds/sec/controller/PatrolController.class
Binary files differ
diff --git a/igds-security/target/classes/com/ld/igds/sec/service/SecurityService.class b/igds-security/target/classes/com/ld/igds/sec/service/SecurityService.class
index 7d397b2..8338d06 100644
--- a/igds-security/target/classes/com/ld/igds/sec/service/SecurityService.class
+++ b/igds-security/target/classes/com/ld/igds/sec/service/SecurityService.class
Binary files differ
diff --git a/igds-security/target/classes/com/ld/igds/sec/service/impl/CoreSecFireServiceImpl.class b/igds-security/target/classes/com/ld/igds/sec/service/impl/CoreSecFireServiceImpl.class
index d2094cf..c4d5179 100644
--- a/igds-security/target/classes/com/ld/igds/sec/service/impl/CoreSecFireServiceImpl.class
+++ b/igds-security/target/classes/com/ld/igds/sec/service/impl/CoreSecFireServiceImpl.class
Binary files differ
diff --git a/igds-security/target/classes/com/ld/igds/sec/view/SecCamera.view.xml b/igds-security/target/classes/com/ld/igds/sec/view/SecCamera.view.xml
index 810be96..9f57859 100644
--- a/igds-security/target/classes/com/ld/igds/sec/view/SecCamera.view.xml
+++ b/igds-security/target/classes/com/ld/igds/sec/view/SecCamera.view.xml
@@ -141,6 +141,10 @@
<Property></Property>
<Property name="label">rtsp鍦板潃</Property>
</PropertyDef>
+ <PropertyDef name="phoneAddr">
+ <Property></Property>
+ <Property name="label">鎵嬫満鍦板潃</Property>
+ </PropertyDef>
<PropertyDef name="remark">
<Property></Property>
<Property name="label">澶囨敞璇存槑</Property>
@@ -192,6 +196,110 @@
<Entity>
<Property name="code">Y</Property>
<Property name="name">鑷姩鎶撴媿</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鏇存柊鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="spjklx">
+ <Property/>
+ <Property name="label">鐩戞帶绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1锛氫粨鍐�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2锛氫笟鍔＄被</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3锛氬畨闃茬被</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="spdwlx">
+ <Property/>
+ <Property name="label">鐐逛綅绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1锛氬嚭鍏ュ彛</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2锛氭墻鏍锋満</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3锛氬寲楠屽</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">4锛氱粨绠楀</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">5</Property>
+ <Property name="value">5锛氬湴纾呭</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">6</Property>
+ <Property name="value">6锛氬簱鍖轰富骞查亾</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">7</Property>
+ <Property name="value">7锛氫粨闂寸洃鎺�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">8</Property>
+ <Property name="value">8锛氫粨鍐�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">9</Property>
+ <Property name="value">9锛氳嵂鍝佹埧鍐呭</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">10</Property>
+ <Property name="value">10锛氬櫒鏉愬鍐呭</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">11</Property>
+ <Property name="value">11锛氬埗楂樼偣</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">12</Property>
+ <Property name="value">12锛氭补搴撶綈鍖�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">13</Property>
+ <Property name="value">13锛氭敹鍙戞补璁惧</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">14</Property>
+ <Property name="value">14锛氭车鎴�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">15</Property>
+ <Property name="value">15锛氭补搴撲富瑕佽緭閫佺閬�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">16</Property>
+ <Property name="value">16锛氬懆鐣�</Property>
</Entity>
</Collection>
</Property>
@@ -459,7 +567,7 @@
</DataGrid>
</Container>
<Dialog id="dialogMain" layout="padding:5;regionPadding:5">
- <Property name="width">800</Property>
+ <Property name="width">75%</Property>
<Property name="caption">鐩戞帶璁惧淇℃伅</Property>
<Property name="iconClass">fa fa-flag-o</Property>
<Property name="closeable">false</Property>
@@ -492,7 +600,7 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
+ <Property name="cols">*,*,*</Property>
<Property name="labelWidth">100</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
@@ -526,6 +634,16 @@
<Property name="property">snapType</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">spjklx</Property>
+ <Property name="property">spjklx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">spdwlx</Property>
+ <Property name="property">spdwlx</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
</GroupBox>
@@ -535,10 +653,26 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
+ <Property name="cols">*,*,*</Property>
<Property name="labelWidth">100</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
+ <AutoFormElement>
+ <Property name="name">screenShow</Property>
+ <Property name="property">screenShow</Property>
+ <Editor>
+ <RadioGroup>
+ <RadioButton>
+ <Property name="text">榛樿灞曠ず</Property>
+ <Property name="value">Y</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="text">閫夋嫨灞曠ず</Property>
+ <Property name="value">N</Property>
+ </RadioButton>
+ </RadioGroup>
+ </Editor>
+ </AutoFormElement>
<AutoFormElement>
<Property name="name">snapTag</Property>
<Property name="property">snapTag</Property>
@@ -561,22 +695,6 @@
<Property name="color">blue</Property>
</Property>
</Label>
- <AutoFormElement>
- <Property name="name">screenShow</Property>
- <Property name="property">screenShow</Property>
- <Editor>
- <RadioGroup>
- <RadioButton>
- <Property name="text">榛樿灞曠ず</Property>
- <Property name="value">Y</Property>
- </RadioButton>
- <RadioButton>
- <Property name="text">閫夋嫨灞曠ず</Property>
- <Property name="value">N</Property>
- </RadioButton>
- </RadioGroup>
- </Editor>
- </AutoFormElement>
</AutoForm>
</Children>
</GroupBox>
@@ -609,7 +727,7 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
+ <Property name="cols">*,*,*</Property>
<Property name="labelWidth">100</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
@@ -643,7 +761,7 @@
<Property name="property">portInC</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">mediaAddr</Property>
<Property name="property">mediaAddr</Property>
<Property name="trigger">triggerMedia</Property>
@@ -654,6 +772,11 @@
</Editor>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:3">
+ <Property name="name">phoneAddr</Property>
+ <Property name="property">phoneAddr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">remark</Property>
<Property name="property">remark</Property>
<Property name="editorType">TextArea</Property>
diff --git a/igds-security/target/classes/com/ld/igds/timer/JobLampService.class b/igds-security/target/classes/com/ld/igds/timer/JobLampService.class
index aae76c4..176fdab 100644
--- a/igds-security/target/classes/com/ld/igds/timer/JobLampService.class
+++ b/igds-security/target/classes/com/ld/igds/timer/JobLampService.class
Binary files differ
diff --git a/igds-verb/igds-verb.iml b/igds-verb/igds-verb.iml
index 294d45e..f7b7fd8 100644
--- a/igds-verb/igds-verb.iml
+++ b/igds-verb/igds-verb.iml
@@ -56,14 +56,14 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-verb/src/main/java/com/ld/igds/verb/service/HMAreationDataService.java b/igds-verb/src/main/java/com/ld/igds/verb/service/HMAreationDataService.java
index 6a33db5..e5456d7 100644
--- a/igds-verb/src/main/java/com/ld/igds/verb/service/HMAreationDataService.java
+++ b/igds-verb/src/main/java/com/ld/igds/verb/service/HMAreationDataService.java
@@ -2,18 +2,29 @@
import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.bstek.dorado.data.provider.Page;
+import com.ld.igds.constant.RedisConst;
import com.ld.igds.models.MAreationData;
import com.ld.igds.util.ContextUtil;
+import com.ld.igds.util.RedisUtil;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
import org.hibernate.Session;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@Service
public class HMAreationDataService extends HibernateDao {
+
+ @Autowired
+ private RedisUtil redisUtil;
+
+ public static final String CACHE_AREATION_ID = "AREATION_ID";
+
public void pageData(Page<MAreationData> page, Map<String, Object> param)
throws Exception {
String hql = " from " + MAreationData.class.getName()
@@ -49,7 +60,8 @@
data.setUpdateUser(ContextUtil.getLoginUserCName());
try {
if (null == data.getId()) {
- data.setId(ContextUtil.getUUID());
+ String id = createId(data.getCompanyId(), data.getStartTime());
+ data.setId(id);
session.save(data);
} else {
session.update(data);
@@ -61,6 +73,7 @@
session.close();
}
}
+
public String delData(MAreationData data) {
Session session = this.getSessionFactory().openSession();
try {
@@ -75,4 +88,50 @@
}
return null;
}
+
+ public List<MAreationData> areationList(Map<String, Object> param) {
+ StringBuffer hql = new StringBuffer();
+ Map<String, Object> args = new HashMap<>();
+ hql.append(" from " + MAreationData.class.getName() + " where companyId=:companyId");
+ args.put("companyId", ContextUtil.getCompanyId());
+ if (null != param) {
+ String str = (String) param.get("id");
+ if (StringUtils.isNotEmpty(str)) {
+ hql.append(" and id like:id");
+ args.put("id", str + "%");
+ }
+ }
+ hql.append(" order by id desc");
+ return this.query(String.valueOf(hql), args);
+ }
+
+ public String createId(String companyId, Date time) {
+
+ String timeKey = DateFormatUtils.format(time, "yyyyMMdd");
+ // 浠庣紦瀛樹腑鑾峰彇宸叉湁鐨勭粍缁囩紪鐮�
+ String cacheKey = RedisConst.buildKey(companyId, HMAreationDataService.CACHE_AREATION_ID);
+
+ String cacheId = (String) redisUtil.get(cacheKey);
+ if (null != cacheId && cacheId.indexOf(timeKey) >= 0) {
+ String temp = cacheId.substring(cacheId.length() - 3);
+ Integer i = Integer.valueOf(temp);
+ cacheId = timeKey + String.format("%03d", ++i);
+ } else {
+ Map<String, Object> param = new HashMap<>();
+ param.put("id", timeKey);
+ List<MAreationData> areationList = this.areationList(param);
+ if (null == areationList || areationList.size() == 0) {
+ cacheId = timeKey + "001";
+ } else {
+ String temp = areationList.get(0).getId();
+ String tempNum = temp.substring(temp.length() - 3);
+ Integer i = Integer.valueOf(tempNum);
+ cacheId = timeKey + String.format("%03d", ++i);
+ }
+ }
+ // 鏇存柊缂撳瓨
+ redisUtil.set(cacheKey, cacheId);
+
+ return cacheId;
+ }
}
diff --git a/igds-verb/src/main/java/com/ld/igds/verb/view/AreationData.view.xml b/igds-verb/src/main/java/com/ld/igds/verb/view/AreationData.view.xml
index ac5f466..ffb804a 100644
--- a/igds-verb/src/main/java/com/ld/igds/verb/view/AreationData.view.xml
+++ b/igds-verb/src/main/java/com/ld/igds/verb/view/AreationData.view.xml
@@ -35,6 +35,34 @@
<PropertyDef name="objective">
<Property></Property>
<Property name="label">閫氶鐩殑</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">闄嶆俯閫氶</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">闄嶆按閫氶</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">澶勭悊鍙戠儹绮�氶</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">鍧囪 绮俯閫氶</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">5</Property>
+ <Property name="value">鍏朵粬鐩殑閫氶</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="type">
<Property></Property>
@@ -147,22 +175,29 @@
<PropertyDef name="totalEs">
<Property name="dataType">Double</Property>
<Property name="label">鎬昏�楃數閲�</Property>
+ <Property name="displayFormat">#0.000鍗冪摝</Property>
</PropertyDef>
<PropertyDef name="beforeTempAvg">
<Property name="dataType">Double</Property>
<Property name="label">浣滀笟鍓嶅钩鍧囩伯娓�</Property>
+ <Property name="displayFormat">#0.000鈩�</Property>
</PropertyDef>
<PropertyDef name="afterTempAvg">
<Property name="dataType">Double</Property>
<Property name="label">浣滀笟鍚庡钩鍧囩伯娓�</Property>
+ <Property name="displayFormat">#0.000鈩�</Property>
</PropertyDef>
<PropertyDef name="beforPerWetAvg">
<Property name="dataType">Double</Property>
<Property name="label">浣滀笟鍓嶅钩鍧囨按鍒�</Property>
+ <Property name="displayFormat">#0.000%</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="afterPerWetAvg">
<Property name="dataType">Double</Property>
<Property name="label">浣滀笟鍚庡钩鍧囨按鍒�</Property>
+ <Property name="displayFormat">#0.000%</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="chargeUser">
<Property></Property>
@@ -192,6 +227,179 @@
<PropertyDef name="remark">
<Property></Property>
<Property name="label">澶囨敞淇℃伅</Property>
+ </PropertyDef>
+ <PropertyDef name="ldkxd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">绮爢瀛旈殭搴�</Property>
+ <Property name="displayFormat">#0.000%</Property>
+ </PropertyDef>
+ <PropertyDef name="fdxs">
+ <Property/>
+ <Property name="label">椋庣綉璁剧疆鏂瑰紡</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1锛氫竴瀛楀瀷</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2锛氬湡瀛楀瀷</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">3锛氬湱瀛楄</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">4锛歎 瀛楀瀷</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">5</Property>
+ <Property name="value">5锛氭í鍚�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">6</Property>
+ <Property name="value">6锛氬す搴�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">9</Property>
+ <Property name="value">9锛氬叾浠�</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="zfdjmj">
+ <Property name="dataType">Double</Property>
+ <Property name="label">涓婚閬撴埅闈㈢Н</Property>
+ </PropertyDef>
+ <PropertyDef name="zhfdjmj">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鏀閬撴埅闈㈢Н</Property>
+ </PropertyDef>
+ <PropertyDef name="zfdzcd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鏀閬撴�婚暱搴�</Property>
+ </PropertyDef>
+ <PropertyDef name="fwkkl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">椋庣綉寮�瀛旂巼</Property>
+ </PropertyDef>
+ <PropertyDef name="kqtjb">
+ <Property name="dataType">Double</Property>
+ <Property name="label">绌烘皵閫斿緞姣�</Property>
+ </PropertyDef>
+ <PropertyDef name="tfkszgs">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">閫氶鍙ｈ缃釜鏁�</Property>
+ </PropertyDef>
+ <PropertyDef name="tfjxh">
+ <Property/>
+ <Property name="label">閫氶鏈哄瀷鍙�</Property>
+ </PropertyDef>
+ <PropertyDef name="tfjts">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">閫氶鏈哄彴鏁�</Property>
+ </PropertyDef>
+ <PropertyDef name="dtfjedqy">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍗曞彴椋庢満棰濆畾鍏ㄥ帇</Property>
+ </PropertyDef>
+ <PropertyDef name="dtfjedfl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍗曞彴椋庢満棰濆畾椋庨噺</Property>
+ </PropertyDef>
+ <PropertyDef name="dtfjedgl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍗曞彴椋庢満棰濆畾鍔熺巼</Property>
+ </PropertyDef>
+ <PropertyDef name="dtfjscfl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍗曞彴椋庢満瀹炴祴椋庨噺</Property>
+ </PropertyDef>
+ <PropertyDef name="dtfjzgl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍗曞彴椋庢満杞村姛鐜�</Property>
+ </PropertyDef>
+ <PropertyDef name="zfl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鎬婚閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="dwtfl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍗曚綅閫氶閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="scxtzl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">瀹炴祴绯荤粺闃诲姏</Property>
+ </PropertyDef>
+ <PropertyDef name="zysqw">
+ <Property name="dataType">double</Property>
+ <Property name="label">浣滀笟鏃舵皵娓�</Property>
+ </PropertyDef>
+ <PropertyDef name="zysqs">
+ <Property name="dataType">double</Property>
+ <Property name="label">浣滀笟鏃舵皵婀�</Property>
+ </PropertyDef>
+ <PropertyDef name="jwfd">
+ <Property name="dataType">double</Property>
+ <Property name="label">闄嶆俯骞呭害</Property>
+ </PropertyDef>
+ <PropertyDef name="dljwnh">
+ <Property name="dataType">double</Property>
+ <Property name="label">鍚ㄧ伯闄嶆俯鑳借��</Property>
+ </PropertyDef>
+ <PropertyDef name="ssl">
+ <Property name="dataType">double</Property>
+ <Property name="label">澶辨按鐜�</Property>
+ </PropertyDef>
+ <PropertyDef name="bsxgpjjg">
+ <Property/>
+ <Property name="label">淇濇按鏁堟灉璇勪环缁撴灉</Property>
+ </PropertyDef>
+ <PropertyDef name="tfjwjyxpjzc">
+ <Property/>
+ <Property name="label">閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇鏁翠粨</Property>
+ </PropertyDef>
+ <PropertyDef name="tfjwjyxpjsc">
+ <Property/>
+ <Property name="label">閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇涓婂眰</Property>
+ </PropertyDef>
+ <PropertyDef name="tfjwjyxpjzjc">
+ <Property/>
+ <Property name="label">閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇涓�(闂�)灞�</Property>
+ </PropertyDef>
+ <PropertyDef name="tfjwjyxpjxc">
+ <Property/>
+ <Property name="label">閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇涓嬪眰</Property>
+ </PropertyDef>
+ <PropertyDef name="jsfd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">闄嶆按骞呭害</Property>
+ </PropertyDef>
+ <PropertyDef name="dljsnh">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍚ㄧ伯闄嶆按鑳借��</Property>
+ </PropertyDef>
+ <PropertyDef name="tfjsjyxfxzc">
+ <Property/>
+ <Property name="label">閫氶闄嶆按鍧囧寑鎬у垎鏋恄鏁翠粨</Property>
+ </PropertyDef>
+ <PropertyDef name="tfjsjyxfxsc">
+ <Property/>
+ <Property name="label">閫氶闄嶆按鍧囧寑鎬у垎鏋恄涓婂眰</Property>
+ </PropertyDef>
+ <PropertyDef name="tfjsjyxfxzjc">
+ <Property/>
+ <Property name="label">閫氶闄嶆按鍧囧寑鎬у垎鏋恄涓�(闂�)灞�</Property>
+ </PropertyDef>
+ <PropertyDef name="tfjsjyxfxxc">
+ <Property/>
+ <Property name="label">閫氶闄嶆按鍧囧寑鎬у垎鏋恄涓嬪眰</Property>
</PropertyDef>
</DataType>
<DataType name="dtParam">
@@ -388,10 +596,11 @@
</DataPilot>
</Container>
<Dialog id="dialogMain" layout="padding:5;regionPadding:10">
- <Property name="width">60%</Property>
+ <Property name="width">80%</Property>
<Property name="caption">璇︾粏淇℃伅</Property>
<Property name="iconClass">fa fa-flag-o</Property>
<Property name="closeable">false</Property>
+ <Property name="height">80%</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
@@ -417,10 +626,10 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
+ <Property name="cols">*,*,*,*</Property>
<Property name="labelWidth">140</Property>
- <Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">top</Property>
<AutoFormElement>
<Property name="name">depotId</Property>
<Property name="property">depotId</Property>
@@ -491,7 +700,187 @@
<Property name="property">operators</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:3">
+ <AutoFormElement>
+ <Property name="name">ldkxd</Property>
+ <Property name="property">ldkxd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zfdjmj</Property>
+ <Property name="property">zfdjmj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zhfdjmj</Property>
+ <Property name="property">zhfdjmj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zfdzcd</Property>
+ <Property name="property">zfdzcd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fwkkl</Property>
+ <Property name="property">fwkkl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqtjb</Property>
+ <Property name="property">kqtjb</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfkszgs</Property>
+ <Property name="property">tfkszgs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfjxh</Property>
+ <Property name="property">tfjxh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfjts</Property>
+ <Property name="property">tfjts</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dtfjedqy</Property>
+ <Property name="property">dtfjedqy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dtfjedfl</Property>
+ <Property name="property">dtfjedfl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dtfjedgl</Property>
+ <Property name="property">dtfjedgl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dtfjscfl</Property>
+ <Property name="property">dtfjscfl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dtfjzgl</Property>
+ <Property name="property">dtfjzgl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zfl</Property>
+ <Property name="property">zfl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dwtfl</Property>
+ <Property name="property">dwtfl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">scxtzl</Property>
+ <Property name="property">scxtzl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zysqw</Property>
+ <Property name="property">zysqw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zysqs</Property>
+ <Property name="property">zysqs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jwfd</Property>
+ <Property name="property">jwfd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dljwnh</Property>
+ <Property name="property">dljwnh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ssl</Property>
+ <Property name="property">ssl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bsxgpjjg</Property>
+ <Property name="property">bsxgpjjg</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fdxs</Property>
+ <Property name="property">fdxs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfjwjyxpjzc</Property>
+ <Property name="property">tfjwjyxpjzc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfjwjyxpjsc</Property>
+ <Property name="property">tfjwjyxpjsc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfjwjyxpjzjc</Property>
+ <Property name="property">tfjwjyxpjzjc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfjwjyxpjxc</Property>
+ <Property name="property">tfjwjyxpjxc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jsfd</Property>
+ <Property name="property">jsfd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dljsnh</Property>
+ <Property name="property">dljsnh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfjsjyxfxzc</Property>
+ <Property name="property">tfjsjyxfxzc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfjsjyxfxsc</Property>
+ <Property name="property">tfjsjyxfxsc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfjsjyxfxzjc</Property>
+ <Property name="property">tfjsjyxfxzjc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfjsjyxfxxc</Property>
+ <Property name="property">tfjsjyxfxxc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateUser</Property>
+ <Property name="property">updateUser</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:4">
<Property name="name">remark</Property>
<Property name="property">remark</Property>
<Property name="editorType">TextArea</Property>
diff --git a/igds-verb/target/classes/com/ld/igds/verb/service/HMAreationDataService.class b/igds-verb/target/classes/com/ld/igds/verb/service/HMAreationDataService.class
index 9d4d9fe..c58e73d 100644
--- a/igds-verb/target/classes/com/ld/igds/verb/service/HMAreationDataService.class
+++ b/igds-verb/target/classes/com/ld/igds/verb/service/HMAreationDataService.class
Binary files differ
diff --git a/igds-verb/target/classes/com/ld/igds/verb/view/AreationData.view.xml b/igds-verb/target/classes/com/ld/igds/verb/view/AreationData.view.xml
index ac5f466..ffb804a 100644
--- a/igds-verb/target/classes/com/ld/igds/verb/view/AreationData.view.xml
+++ b/igds-verb/target/classes/com/ld/igds/verb/view/AreationData.view.xml
@@ -35,6 +35,34 @@
<PropertyDef name="objective">
<Property></Property>
<Property name="label">閫氶鐩殑</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">闄嶆俯閫氶</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">闄嶆按閫氶</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">澶勭悊鍙戠儹绮�氶</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">鍧囪 绮俯閫氶</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">5</Property>
+ <Property name="value">鍏朵粬鐩殑閫氶</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="type">
<Property></Property>
@@ -147,22 +175,29 @@
<PropertyDef name="totalEs">
<Property name="dataType">Double</Property>
<Property name="label">鎬昏�楃數閲�</Property>
+ <Property name="displayFormat">#0.000鍗冪摝</Property>
</PropertyDef>
<PropertyDef name="beforeTempAvg">
<Property name="dataType">Double</Property>
<Property name="label">浣滀笟鍓嶅钩鍧囩伯娓�</Property>
+ <Property name="displayFormat">#0.000鈩�</Property>
</PropertyDef>
<PropertyDef name="afterTempAvg">
<Property name="dataType">Double</Property>
<Property name="label">浣滀笟鍚庡钩鍧囩伯娓�</Property>
+ <Property name="displayFormat">#0.000鈩�</Property>
</PropertyDef>
<PropertyDef name="beforPerWetAvg">
<Property name="dataType">Double</Property>
<Property name="label">浣滀笟鍓嶅钩鍧囨按鍒�</Property>
+ <Property name="displayFormat">#0.000%</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="afterPerWetAvg">
<Property name="dataType">Double</Property>
<Property name="label">浣滀笟鍚庡钩鍧囨按鍒�</Property>
+ <Property name="displayFormat">#0.000%</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="chargeUser">
<Property></Property>
@@ -192,6 +227,179 @@
<PropertyDef name="remark">
<Property></Property>
<Property name="label">澶囨敞淇℃伅</Property>
+ </PropertyDef>
+ <PropertyDef name="ldkxd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">绮爢瀛旈殭搴�</Property>
+ <Property name="displayFormat">#0.000%</Property>
+ </PropertyDef>
+ <PropertyDef name="fdxs">
+ <Property/>
+ <Property name="label">椋庣綉璁剧疆鏂瑰紡</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1锛氫竴瀛楀瀷</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2锛氬湡瀛楀瀷</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">3锛氬湱瀛楄</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">4锛歎 瀛楀瀷</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">5</Property>
+ <Property name="value">5锛氭í鍚�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">6</Property>
+ <Property name="value">6锛氬す搴�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">9</Property>
+ <Property name="value">9锛氬叾浠�</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="zfdjmj">
+ <Property name="dataType">Double</Property>
+ <Property name="label">涓婚閬撴埅闈㈢Н</Property>
+ </PropertyDef>
+ <PropertyDef name="zhfdjmj">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鏀閬撴埅闈㈢Н</Property>
+ </PropertyDef>
+ <PropertyDef name="zfdzcd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鏀閬撴�婚暱搴�</Property>
+ </PropertyDef>
+ <PropertyDef name="fwkkl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">椋庣綉寮�瀛旂巼</Property>
+ </PropertyDef>
+ <PropertyDef name="kqtjb">
+ <Property name="dataType">Double</Property>
+ <Property name="label">绌烘皵閫斿緞姣�</Property>
+ </PropertyDef>
+ <PropertyDef name="tfkszgs">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">閫氶鍙ｈ缃釜鏁�</Property>
+ </PropertyDef>
+ <PropertyDef name="tfjxh">
+ <Property/>
+ <Property name="label">閫氶鏈哄瀷鍙�</Property>
+ </PropertyDef>
+ <PropertyDef name="tfjts">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">閫氶鏈哄彴鏁�</Property>
+ </PropertyDef>
+ <PropertyDef name="dtfjedqy">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍗曞彴椋庢満棰濆畾鍏ㄥ帇</Property>
+ </PropertyDef>
+ <PropertyDef name="dtfjedfl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍗曞彴椋庢満棰濆畾椋庨噺</Property>
+ </PropertyDef>
+ <PropertyDef name="dtfjedgl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍗曞彴椋庢満棰濆畾鍔熺巼</Property>
+ </PropertyDef>
+ <PropertyDef name="dtfjscfl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍗曞彴椋庢満瀹炴祴椋庨噺</Property>
+ </PropertyDef>
+ <PropertyDef name="dtfjzgl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍗曞彴椋庢満杞村姛鐜�</Property>
+ </PropertyDef>
+ <PropertyDef name="zfl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鎬婚閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="dwtfl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍗曚綅閫氶閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="scxtzl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">瀹炴祴绯荤粺闃诲姏</Property>
+ </PropertyDef>
+ <PropertyDef name="zysqw">
+ <Property name="dataType">double</Property>
+ <Property name="label">浣滀笟鏃舵皵娓�</Property>
+ </PropertyDef>
+ <PropertyDef name="zysqs">
+ <Property name="dataType">double</Property>
+ <Property name="label">浣滀笟鏃舵皵婀�</Property>
+ </PropertyDef>
+ <PropertyDef name="jwfd">
+ <Property name="dataType">double</Property>
+ <Property name="label">闄嶆俯骞呭害</Property>
+ </PropertyDef>
+ <PropertyDef name="dljwnh">
+ <Property name="dataType">double</Property>
+ <Property name="label">鍚ㄧ伯闄嶆俯鑳借��</Property>
+ </PropertyDef>
+ <PropertyDef name="ssl">
+ <Property name="dataType">double</Property>
+ <Property name="label">澶辨按鐜�</Property>
+ </PropertyDef>
+ <PropertyDef name="bsxgpjjg">
+ <Property/>
+ <Property name="label">淇濇按鏁堟灉璇勪环缁撴灉</Property>
+ </PropertyDef>
+ <PropertyDef name="tfjwjyxpjzc">
+ <Property/>
+ <Property name="label">閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇鏁翠粨</Property>
+ </PropertyDef>
+ <PropertyDef name="tfjwjyxpjsc">
+ <Property/>
+ <Property name="label">閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇涓婂眰</Property>
+ </PropertyDef>
+ <PropertyDef name="tfjwjyxpjzjc">
+ <Property/>
+ <Property name="label">閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇涓�(闂�)灞�</Property>
+ </PropertyDef>
+ <PropertyDef name="tfjwjyxpjxc">
+ <Property/>
+ <Property name="label">閫氶闄嶆俯鍧囧寑鎬ц瘎浠穇涓嬪眰</Property>
+ </PropertyDef>
+ <PropertyDef name="jsfd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">闄嶆按骞呭害</Property>
+ </PropertyDef>
+ <PropertyDef name="dljsnh">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍚ㄧ伯闄嶆按鑳借��</Property>
+ </PropertyDef>
+ <PropertyDef name="tfjsjyxfxzc">
+ <Property/>
+ <Property name="label">閫氶闄嶆按鍧囧寑鎬у垎鏋恄鏁翠粨</Property>
+ </PropertyDef>
+ <PropertyDef name="tfjsjyxfxsc">
+ <Property/>
+ <Property name="label">閫氶闄嶆按鍧囧寑鎬у垎鏋恄涓婂眰</Property>
+ </PropertyDef>
+ <PropertyDef name="tfjsjyxfxzjc">
+ <Property/>
+ <Property name="label">閫氶闄嶆按鍧囧寑鎬у垎鏋恄涓�(闂�)灞�</Property>
+ </PropertyDef>
+ <PropertyDef name="tfjsjyxfxxc">
+ <Property/>
+ <Property name="label">閫氶闄嶆按鍧囧寑鎬у垎鏋恄涓嬪眰</Property>
</PropertyDef>
</DataType>
<DataType name="dtParam">
@@ -388,10 +596,11 @@
</DataPilot>
</Container>
<Dialog id="dialogMain" layout="padding:5;regionPadding:10">
- <Property name="width">60%</Property>
+ <Property name="width">80%</Property>
<Property name="caption">璇︾粏淇℃伅</Property>
<Property name="iconClass">fa fa-flag-o</Property>
<Property name="closeable">false</Property>
+ <Property name="height">80%</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
@@ -417,10 +626,10 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
+ <Property name="cols">*,*,*,*</Property>
<Property name="labelWidth">140</Property>
- <Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">top</Property>
<AutoFormElement>
<Property name="name">depotId</Property>
<Property name="property">depotId</Property>
@@ -491,7 +700,187 @@
<Property name="property">operators</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:3">
+ <AutoFormElement>
+ <Property name="name">ldkxd</Property>
+ <Property name="property">ldkxd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zfdjmj</Property>
+ <Property name="property">zfdjmj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zhfdjmj</Property>
+ <Property name="property">zhfdjmj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zfdzcd</Property>
+ <Property name="property">zfdzcd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fwkkl</Property>
+ <Property name="property">fwkkl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqtjb</Property>
+ <Property name="property">kqtjb</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfkszgs</Property>
+ <Property name="property">tfkszgs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfjxh</Property>
+ <Property name="property">tfjxh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfjts</Property>
+ <Property name="property">tfjts</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dtfjedqy</Property>
+ <Property name="property">dtfjedqy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dtfjedfl</Property>
+ <Property name="property">dtfjedfl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dtfjedgl</Property>
+ <Property name="property">dtfjedgl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dtfjscfl</Property>
+ <Property name="property">dtfjscfl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dtfjzgl</Property>
+ <Property name="property">dtfjzgl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zfl</Property>
+ <Property name="property">zfl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dwtfl</Property>
+ <Property name="property">dwtfl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">scxtzl</Property>
+ <Property name="property">scxtzl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zysqw</Property>
+ <Property name="property">zysqw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zysqs</Property>
+ <Property name="property">zysqs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jwfd</Property>
+ <Property name="property">jwfd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dljwnh</Property>
+ <Property name="property">dljwnh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ssl</Property>
+ <Property name="property">ssl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bsxgpjjg</Property>
+ <Property name="property">bsxgpjjg</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fdxs</Property>
+ <Property name="property">fdxs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfjwjyxpjzc</Property>
+ <Property name="property">tfjwjyxpjzc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfjwjyxpjsc</Property>
+ <Property name="property">tfjwjyxpjsc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfjwjyxpjzjc</Property>
+ <Property name="property">tfjwjyxpjzjc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfjwjyxpjxc</Property>
+ <Property name="property">tfjwjyxpjxc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jsfd</Property>
+ <Property name="property">jsfd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dljsnh</Property>
+ <Property name="property">dljsnh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfjsjyxfxzc</Property>
+ <Property name="property">tfjsjyxfxzc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfjsjyxfxsc</Property>
+ <Property name="property">tfjsjyxfxsc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfjsjyxfxzjc</Property>
+ <Property name="property">tfjsjyxfxzjc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tfjsjyxfxxc</Property>
+ <Property name="property">tfjsjyxfxxc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateUser</Property>
+ <Property name="property">updateUser</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:4">
<Property name="name">remark</Property>
<Property name="property">remark</Property>
<Property name="editorType">TextArea</Property>
diff --git a/igds-warn/igds-warn.iml b/igds-warn/igds-warn.iml
index 6cbd6c3..f5f3524 100644
--- a/igds-warn/igds-warn.iml
+++ b/igds-warn/igds-warn.iml
@@ -55,14 +55,14 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-web/igds-web.iml b/igds-web/igds-web.iml
index d71810f..2fefd79 100644
--- a/igds-web/igds-web.iml
+++ b/igds-web/igds-web.iml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
@@ -86,17 +86,6 @@
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
<orderEntry type="module" module-name="igds-api-inte" />
<orderEntry type="module" module-name="igds-protocol-fzzy3" />
- <orderEntry type="module" module-name="igds-protocol-modbus" />
- <orderEntry type="module-library">
- <library name="Maven: com.infiniteautomation:modbus4j:3.1.0">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../igds-protocol-modbus/src/main/resources/lib/modbus4j-3.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module" module-name="igds-protocol-bhzn" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.5.9.RELEASE" level="project" />
@@ -111,9 +100,6 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.9.RELEASE" level="project" />
@@ -135,6 +121,9 @@
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.17.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.3.17.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.5.9.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.17.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.17.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:2.1.6.RELEASE" level="project" />
diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index fff77dc..d701a47 100644
--- a/igds-web/pom.xml
+++ b/igds-web/pom.xml
@@ -169,7 +169,7 @@
</exclusions>
</dependency>
- <!-- MODBUS-TCP -->
+ <!-- MODBUS-TCP
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-modbus</artifactId>
@@ -184,7 +184,7 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
<!-- 绉佹湁鍗忚-椋庢鑷磋繙IOT銆佸埗姘満
@@ -221,7 +221,24 @@
</exclusions>
</dependency>-->
- <!-- 绉佹湁鍗忚-閭︽捣鏅鸿兘-->
+ <!-- 绉佹湁鍗忚-DLT645鐢佃〃鍗忚
+ <dependency>
+ <groupId>com.ld.igds</groupId>
+ <artifactId>igds-protocol-es</artifactId>
+ <version>${igds.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>-->
+
+ <!-- 绉佹湁鍗忚-閭︽捣鏅鸿兘
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-bhzn</artifactId>
@@ -236,7 +253,7 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
<!-- 绉佹湁鍗忚-姝ｆ潵鐢靛瓙
<dependency>
@@ -253,7 +270,7 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency> -->
+ </dependency>-->
<!-- 娴峰悍杞︾墝璇嗗埆-SDK
<dependency>
@@ -319,6 +336,7 @@
<configuration>
<fork>true</fork>
</configuration>
+
</plugin>
<!-- YUI Compressor Maven鍘嬬缉鎻掍欢 寮�鍙戝寘涓嶅疄鐢�-->
diff --git a/igds-web/src/main/java/com/ld/igds/TestAction.java b/igds-web/src/main/java/com/ld/igds/TestAction.java
index 5fb216b..75db25c 100644
--- a/igds-web/src/main/java/com/ld/igds/TestAction.java
+++ b/igds-web/src/main/java/com/ld/igds/TestAction.java
@@ -11,7 +11,7 @@
import com.ld.igds.grain.service.CoreGrainService;
import com.ld.igds.models.WeatherConf;
import com.ld.igds.models.WeatherInfo;
-import com.ld.igds.timer.WeatherScheduled;
+import com.ld.igds.timer.WeatherTimerService;
import com.ld.igds.util.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -37,7 +37,7 @@
@Autowired
private RedisUtil redisUtil;
@Autowired
- private WeatherScheduled weatherScheduled;
+ private WeatherTimerService weatherTimerService;
@Override
public String getUrl() {
@@ -137,7 +137,7 @@
}
if (t.equals("weather11")) {
- weatherScheduled.scheduled();
+ weatherTimerService.doExe();
}
}
@@ -168,7 +168,7 @@
log.info("-----娴嬭瘯璋冪敤姘旇薄----deptId={},cityId={}", deptId, cityId);
Date date = new Date();
- WeatherInfo info = weatherScheduled.getWeatherByWeb(date, conf);
+ WeatherInfo info = weatherTimerService.getWeatherByWeb(date, conf);
if (null == info) {
response.getWriter().print("MSG:ERROR");
} else {
diff --git a/igds-web/src/main/java/com/ld/igds/web/TestController.java b/igds-web/src/main/java/com/ld/igds/web/TestController.java
index 60afad7..1fbac0c 100644
--- a/igds-web/src/main/java/com/ld/igds/web/TestController.java
+++ b/igds-web/src/main/java/com/ld/igds/web/TestController.java
@@ -1,10 +1,16 @@
package com.ld.igds.web;
+import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* 娴嬭瘯浣跨敤
@@ -15,77 +21,100 @@
* @data:2019骞�12鏈�17鏃�
*/
@Controller
-@RequestMapping
+@RequestMapping("/test")
public class TestController {
+//
+// /**
+// * 鍗曠粍缁囧ぇ灞忚烦杞�
+// *
+// * @return
+// */
+// @RequestMapping("/test/grain-detail")
+// public ModelAndView singleScreen() {
+// // 鐢ㄦ埛淇℃伅
+// ModelAndView view = new ModelAndView();
+// view.setViewName("test/grainDetail");
+// return view;
+// }
+//
+// @RequestMapping("/test/print")
+// public ModelAndView testPrint() {
+// ModelAndView view = new ModelAndView();
+// view.setViewName("test/demoPrint");
+// return view;
+// }
+//
+// @RequestMapping("/test/print-check")
+// public ModelAndView testPrintCheck() {
+// ModelAndView view = new ModelAndView();
+// view.setViewName("test/demoCheckPrint");
+// return view;
+// }
+//
+// @RequestMapping("/test/inout/print/2019")
+// public ModelAndView testPrint2019() {
+// ModelAndView view = new ModelAndView();
+// view.setViewName("test/print-out-2019");
+// return view;
+// }
+//
+// @RequestMapping("/test/gas-print")
+// public ModelAndView testGasPrint() {
+// ModelAndView view = new ModelAndView();
+// view.setViewName("test/demoGasPrint");
+// return view;
+// }
+//
+// @RequestMapping("/test/demp")
+// public ModelAndView testDemo(
+// @RequestParam(name = "t", required = false) String t) {
+// ModelAndView view = new ModelAndView();
+//
+// String desc = "鈥︹�﹀姛鑳借皟璇曚腑鈥︹��";
+//
+// if (StringUtils.isNotEmpty(t)) {
+// if ("security-no".equals(t)) {
+// desc = "鈥︹�﹀緟涓夌淮妯″瀷鍥剧粯鍒跺畬鎴愬悗灞曠ず鈥︹��";
+// }
+// }
+// view.addObject("desc", desc);
+//
+// view.setViewName("test/demo");
+// return view;
+// }
+//
+// @RequestMapping("/test/no-access")
+// public ModelAndView testNoAccess(
+// @RequestParam(name = "t", required = false) String t) {
+// ModelAndView view = new ModelAndView();
+//
+// String desc = "鈥︹�︽偍娌℃湁鏉冮檺锛岃鑱旂郴绯荤粺绠＄悊鍛樷�︹��";
+// view.addObject("desc", desc);
+// view.setViewName("test/demo");
+// return view;
+// }
- /**
- * 鍗曠粍缁囧ぇ灞忚烦杞�
- *
- * @return
- */
- @RequestMapping("/test/grain-detail")
- public ModelAndView singleScreen() {
- // 鐢ㄦ埛淇℃伅
- ModelAndView view = new ModelAndView();
- view.setViewName("test/grainDetail");
- return view;
- }
- @RequestMapping("/test/print")
- public ModelAndView testPrint() {
- ModelAndView view = new ModelAndView();
- view.setViewName("test/demoPrint");
- return view;
- }
+ @RequestMapping("/IDCARD")
+ public @ResponseBody String testIDCARD(
+ @RequestParam(name = "t", required = false) String t , HttpServletRequest request, HttpServletResponse response) {
- @RequestMapping("/test/print-check")
- public ModelAndView testPrintCheck() {
- ModelAndView view = new ModelAndView();
- view.setViewName("test/demoCheckPrint");
- return view;
- }
-
- @RequestMapping("/test/inout/print/2019")
- public ModelAndView testPrint2019() {
- ModelAndView view = new ModelAndView();
- view.setViewName("test/print-out-2019");
- return view;
- }
-
- @RequestMapping("/test/gas-print")
- public ModelAndView testGasPrint() {
- ModelAndView view = new ModelAndView();
- view.setViewName("test/demoGasPrint");
- return view;
- }
-
- @RequestMapping("/test/demp")
- public ModelAndView testDemo(
- @RequestParam(name = "t", required = false) String t) {
- ModelAndView view = new ModelAndView();
-
- String desc = "鈥︹�﹀姛鑳借皟璇曚腑鈥︹��";
-
- if (StringUtils.isNotEmpty(t)) {
- if ("security-no".equals(t)) {
- desc = "鈥︹�﹀緟涓夌淮妯″瀷鍥剧粯鍒跺畬鎴愬悗灞曠ず鈥︹��";
- }
- }
- view.addObject("desc", desc);
-
- view.setViewName("test/demo");
- return view;
- }
-
- @RequestMapping("/test/no-access")
- public ModelAndView testNoAccess(
- @RequestParam(name = "t", required = false) String t) {
- ModelAndView view = new ModelAndView();
-
- String desc = "鈥︹�︽偍娌℃湁鏉冮檺锛岃鑱旂郴绯荤粺绠＄悊鍛樷�︹��";
- view.addObject("desc", desc);
- view.setViewName("test/demo");
- return view;
+// JSONObject content= new JSONObject();
+// JSONObject data = new JSONObject();
+ return "{\n" +
+ " \"address\": \"xxxxxxxxxxxxxxxxxx-17\",\n" +
+ " \"birthdate\": \"1996-12-01\",\n" +
+ " \"cnName\": \"璁稿浆\",\n" +
+ " \"effectedDate\": \"2014-04-02\",\n" +
+ " \"expiredDate\": \"2024-04-02\",\n" +
+ " \"folk\": \"姹塡",\n" +
+ " \"idNum\": \"510000000000000000\",\n" +
+ " \"issue\": \"瀹夐檰甯傚叕瀹夊眬\",\n" +
+ " \"nation\": \"涓浗\",\n" +
+ " \"sex\": \"鐢穃"\n" +
+ "}\n" +
+ "\n" +
+ "";
}
}
diff --git a/igds-web/src/main/java/com/ld/igds/web/WebController.java b/igds-web/src/main/java/com/ld/igds/web/WebController.java
index 40a7827..6343018 100644
--- a/igds-web/src/main/java/com/ld/igds/web/WebController.java
+++ b/igds-web/src/main/java/com/ld/igds/web/WebController.java
@@ -97,7 +97,7 @@
// 鎶�鏈敮鎸佷俊鎭�
view.addObject("support", "鎶�鏈敮鎸侊細" + sysConf.getSupport());
- if (StringUtils.isEmpty(groupTag)){
+ if (StringUtils.isEmpty(groupTag)) {
groupTag = "0";
}
view.addObject("groupTag", groupTag);
@@ -108,13 +108,17 @@
if ("5303".equals(companyId)) {
view.setViewName("index/index-5303");
}
- //闄曡タ瀹夊悍
if ("5318".equals(companyId)) {
view.setViewName("index/index-5318");
}
- //姝︽眽鍐涚伯
+ if ("5326".equals(companyId)) {
+ view.setViewName("index/index-5326");
+ }
if ("5327".equals(companyId)) {
view.setViewName("index/index-5327");
+ }
+ if ("5329".equals(companyId)) {
+ view.setViewName("index/index-5329");
}
return view;
}
@@ -195,7 +199,7 @@
welcomeUrl += "all";
} else {
welcomeUrl += code;
- menuList = systemService.getMenuBySystemId(company.getId(), code,user);
+ menuList = systemService.getMenuBySystemId(company.getId(), code, user);
}
view.addObject("menuList", menuList);
diff --git a/igds-web/src/main/resources/READ-INFO.properties b/igds-web/src/main/resources/READ-INFO.properties
index 1904cac..e9bc34a 100644
--- a/igds-web/src/main/resources/READ-INFO.properties
+++ b/igds-web/src/main/resources/READ-INFO.properties
@@ -9,4 +9,5 @@
# 9307 ---制氮机控制网关协议
# 9308 ---气象站对外TCP协议
# 9309 ---邦海智能纯粮情协议
-# 9310 ---邦海智能控制柜协议
\ No newline at end of file
+# 9310 ---邦海智能控制柜协议
+# 9311 ---贝博粮情客户端协议
\ No newline at end of file
diff --git a/igds-web/src/main/resources/application-dev.yml b/igds-web/src/main/resources/application-dev.yml
index b81cf2e..732ef68 100644
--- a/igds-web/src/main/resources/application-dev.yml
+++ b/igds-web/src/main/resources/application-dev.yml
@@ -12,7 +12,19 @@
db-base:
name: db-base
type: com.alibaba.druid.pool.DruidDataSource
+# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_dxys?useUnicode=true&characterEncoding=utf-8 #骞夸笢鎯犲窞鎯犳柊
+# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_fzzy?useUnicode=true&characterEncoding=utf-8 #椋庢鑷磋繙17鏈嶅姟鍣�--绮儏鏈嶅姟
+# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5000?useUnicode=true&characterEncoding=utf-8 #婕旂ず璐﹀彿
+# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5016?useUnicode=true&characterEncoding=utf-8 #澶ф咕鍖烘柊鐗堟湰
+# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5303?useUnicode=true&characterEncoding=utf-8 #涓婃捣鍢夊畾鏂扮増鏈�
+# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5322?useUnicode=true&characterEncoding=utf-8 #骞夸笢寰愰椈
+# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5325?useUnicode=true&characterEncoding=utf-8 #姹熻タ璧ｅ窞-澶у叕
+# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5326?useUnicode=true&characterEncoding=utf-8 #骞夸笢鎯犲窞鎯犳柊
url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5327?useUnicode=true&characterEncoding=utf-8 #姝︽眽鍐涚伯
+# url: jdbc:mysql://192.168.10.241:3306/igds_4.0_5327?useUnicode=true&characterEncoding=utf-8 #姝︽眽鍐涚伯
+# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5328?useUnicode=true&characterEncoding=utf-8 #骞胯タ鏉ュ
+# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5329?useUnicode=true&characterEncoding=utf-8 #骞夸笢浣涘北绂呭煄鍖�
+# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5332?useUnicode=true&characterEncoding=utf-8 #姣曡妭澶ф柟
driver-class-name: com.mysql.jdbc.Driver
username: root
password: ukJp12Qf+elyBvGHkJ5MQMa95pfVm0oFBHefdEgDFKoFSjbgYa9PYfv5vlem5nvoXjQsP9tIIo53DvSbsl160Q==
@@ -66,4 +78,4 @@
## 绯荤粺鎺ュ彛璺敱閰嶇疆 娉ㄦ剰鏁板瓧濡傛灉浠�0寮�澶寸殑璇濓紝鍚庡彴浼氬嚭鐜拌浆涔夛紝璇锋坊鍔�""
igds:
default:
- companyId: 5325
\ No newline at end of file
+ companyId: 5327
\ No newline at end of file
diff --git a/igds-web/src/main/resources/application-fzzy.yml b/igds-web/src/main/resources/application-fzzy.yml
new file mode 100644
index 0000000..077e658
--- /dev/null
+++ b/igds-web/src/main/resources/application-fzzy.yml
@@ -0,0 +1,80 @@
+########################## 椋庢鑷磋繙-绮儏鏈嶅姟鍣� ##########################
+server:
+ port: 8201
+ context-path: /
+ connection-timeout: 5000
+ tomcat:
+ uri-encoding: UTF-8
+
+########################## datasourcec ##########################
+spring:
+ datasource:
+ db-base:
+ name: db-base
+ type: com.alibaba.druid.pool.DruidDataSource
+ url: jdbc:mysql://127.0.0.1:3306/igds_master_v35?useUnicode=true&characterEncoding=utf-8
+ driver-class-name: com.mysql.jdbc.Driver
+ username: root
+ password: ukJp12Qf+elyBvGHkJ5MQMa95pfVm0oFBHefdEgDFKoFSjbgYa9PYfv5vlem5nvoXjQsP9tIIo53DvSbsl160Q==
+ public-key:
+ config-decrypt: true
+ initial-size: 5
+ min-idle: 5
+ max-active: 50
+ max-wait: 60000
+ time-between-eviction-runs-millis: 60000
+ min-evictable-idle-time-millis: 300000
+ validation-query: select 1 from dual
+ test-whileIdle: true
+ test-on-borrow: false
+ test-on-return: false
+ pool-prepared-statements: true
+ max-pool-prepared-statement-per-connection-size: 20
+ filters: stat
+ connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+ use-global-data-source-stat: true
+ remove-abandoned: true
+ remove-abandoned-timeout: 1800
+ log-abandoned: true
+ db-sqlite:
+ name: db-sqlite
+ url: jdbc:sqlite:D:/app/igds/db/iot_cfg.db
+ driver-class-name: org.sqlite.JDBC
+ type: com.alibaba.druid.pool.DruidDataSource
+ username:
+ password:
+
+ # Redis鐩稿叧閰嶇疆
+ redis:
+ database: 0
+ host: 127.0.0.1
+ port: 6379
+ password: Abc123..
+ # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
+ pool:
+ max-active: 200
+ max-wait: -1
+ max-idle: 10
+ min-idle: 0
+ timeout: 6000
+
+license:
+ subject: ld_license
+ publicAlias: publicCert
+ storePass: PUBLICFZZYXXJSGFYXGS888888
+ licensePath: C:/license/license.lic
+ publicKeysStorePath: C:/license/publicCerts.keystore
+
+########################## IGDS ##########################
+## 绯荤粺鎺ュ彛璺敱閰嶇疆 娉ㄦ剰鏁板瓧濡傛灉浠�0寮�澶寸殑璇濓紝鍚庡彴浼氬嚭鐜拌浆涔夛紝璇锋坊鍔�""
+igds:
+ default:
+ companyId: 1000
+ sys-name: 鏅烘収绮簱绠＄悊绯荤粺
+ logo: logo-default.png
+ logo-title: logo-title-default.png
+ support: 鏅烘収绮儏绮儏浜戠鐞嗗钩鍙�
+ grian-add-point: N
+ media-ip: 124.71.162.207
+ media-port: 18000
+ file-path: C:/IGDS/FILE/
\ No newline at end of file
diff --git a/igds-web/src/main/resources/application-linux.yml b/igds-web/src/main/resources/application-linux.yml
index 3a22b99..03d0465 100644
--- a/igds-web/src/main/resources/application-linux.yml
+++ b/igds-web/src/main/resources/application-linux.yml
@@ -1,4 +1,4 @@
-########################## 姝︽眽榛勯檪鍐涚伯 ##########################
+########################## 姝︽眽榛勯檪鍐涚伯-Linux ##########################
server:
port: 8888
context-path: /
diff --git a/igds-web/src/main/resources/application.yml b/igds-web/src/main/resources/application.yml
index 6fb08da..c8dab5c 100644
--- a/igds-web/src/main/resources/application.yml
+++ b/igds-web/src/main/resources/application.yml
@@ -1,4 +1,4 @@
-########################## Server ########################## 涓规１鍩庡叧鐪佺伯椋熷偍澶囧簱
+########################## Server ##########################
spring:
profiles:
active: dev
@@ -14,15 +14,15 @@
date-format: yyyy-MM-dd HH:mm:ss
joda-date-time-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
-
-########################## thymeleaf妯℃澘閰嶇疆 ##########################
+
+ ########################## thymeleaf妯℃澘閰嶇疆 ##########################
thymeleaf:
prefix: classpath:/templates/
suffix: .html
mode: LEGACYHTML5
encoding: UTF-8
- cache: false
-########################## 鎵嬫満APP鍊间粨鍥剧墖涓婁紶澶у皬 ##########################
+ cache: false
+ ########################## 鎵嬫満APP鍊间粨鍥剧墖涓婁紶澶у皬 ##########################
http:
multipart:
maxFileSize: 50Mb
@@ -47,6 +47,8 @@
phone: 400-627-1116
website: http://www.fzzygf.com
address: 閮戝窞甯傞珮鏂板尯闀挎た璺�11鍙锋渤鍗楃渷鍥藉澶у绉戞妧鍥鍖�1鍙锋ゼ
+ ##浠撳唴瑙嗛鎶撴媿鏃堕棿閰嶇疆0-24
+ snap-time: 12
file-path: D:/IGDS/FILE/
## 鎺ㄩ�佸井淇″钩鍙扮殑鍦板潃
warn-path: http://124.71.162.207:8299/igds-wx/gateway
diff --git a/igds-web/src/main/resources/d7/css/common.css b/igds-web/src/main/resources/d7/css/common.css
index 87d45aa..0ef0389 100644
--- a/igds-web/src/main/resources/d7/css/common.css
+++ b/igds-web/src/main/resources/d7/css/common.css
@@ -2,6 +2,22 @@
/** 閲嶅啓D7鐨勯厤缃�**/
+/** block **/
+
+/** 娉ㄦ剰寮哄埗涓�4鍒� **/
+.block{
+ width:24.2% !important;
+}
+
+.d-block-view .block{
+ border: 1px solid #39aef5;
+}
+
+.d-block-view .block-current{
+ border: 1px solid #39aef5;
+}
+
+
/** dataGrid鐨勮〃澶� **/
.d-grid .header-table .header .caption {
margin-left: 4px;
diff --git a/igds-web/src/main/resources/gas-conf.properties b/igds-web/src/main/resources/gas-conf.properties
index 0f75746..b5d538b 100644
--- a/igds-web/src/main/resources/gas-conf.properties
+++ b/igds-web/src/main/resources/gas-conf.properties
@@ -65,6 +65,9 @@
gas.mapImg.5325_15.img=5325_001.png
gas.mapImg.5325_16.img=5325_001.png
+## 5326 惠州惠新
+gas.mapImg.5326_001.img=5326_001.png
+
## 5328 广西来宾
gas.mapImg.5328_0P18.img=5328_001_7.png
gas.mapImg.5328_0P19.img=5328_001_7.png
diff --git a/igds-web/src/main/resources/logback-spring.xml b/igds-web/src/main/resources/logback-spring.xml
index 2b6af2e..e1cc5d8 100644
--- a/igds-web/src/main/resources/logback-spring.xml
+++ b/igds-web/src/main/resources/logback-spring.xml
@@ -11,6 +11,8 @@
<property name="UAT_LOG_HOME" value="C:/app/igds-uat/log" />
<!-- pro鏂囦欢璺緞 -->
<property name="PRO_LOG_HOME" value="D:/app/igds-v4/log" />
+ <!-- pro2鏂囦欢璺緞 -->
+ <property name="PRO_LOG_HOME2" value="C:/app/igds-v4/log" />
<!-- linux鏂囦欢璺緞 -->
<property name="PRO_LINUX_HOME" value="/usr/local/igds/log" />
@@ -107,6 +109,40 @@
</root>
</springProfile>
+ <!-- 鐢熶骇鐜 -->
+ <springProfile name="pro2">
+ <!-- 姣忓ぉ浜х敓涓�涓枃浠� -->
+ <appender name="PRO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <!-- 鏂囦欢璺緞 -->
+ <file>${PRO_LOG_HOME2}/${APP_MODEL}-info.log</file>
+ <!-- 鏃ュ織璁板綍鍣ㄧ殑婊氬姩绛栫暐锛屾寜鏃ユ湡锛屾寜澶у皬璁板綍 -->
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 鏂囦欢鍚嶇О -->
+ <fileNamePattern>${PRO_LOG_HOME2}/${APP_MODEL}-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+ <!--鏃ュ織鏂囦欢淇濈暀澶╂暟 -->
+ <maxHistory>60</maxHistory>
+ <!-- 鏃ュ織澶у皬 -->
+ <timeBasedFileNamingAndTriggeringPolicy
+ class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <maxFileSize>100MB</maxFileSize>
+ </timeBasedFileNamingAndTriggeringPolicy>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+ <charset>UTF-8</charset>
+ </encoder>
+ <layout class="ch.qos.logback.classic.PatternLayout">
+ <pattern>${PATTERN}</pattern>
+ </layout>
+ </appender>
+
+ <logger name="org.hibernate.tool" level="WARN"/>
+ <logger name="com.bstek.dorado" level="WARN"/>
+ <root level="info">
+ <appender-ref ref="PRO_FILE"/>
+ </root>
+ </springProfile>
+
<!-- 鐢熶骇鐜-linux -->
<springProfile name="linux">
<!-- 姣忓ぉ浜х敓涓�涓枃浠� -->
@@ -141,4 +177,38 @@
</root>
</springProfile>
+ <!-- FZZY-绮儏鐢熶骇鐜 -->
+ <springProfile name="fzzy">
+ <!-- 姣忓ぉ浜х敓涓�涓枃浠� -->
+ <appender name="PRO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <!-- 鏂囦欢璺緞 -->
+ <file>${PRO_LOG_HOME}/${APP_MODEL}-info.log</file>
+ <!-- 鏃ュ織璁板綍鍣ㄧ殑婊氬姩绛栫暐锛屾寜鏃ユ湡锛屾寜澶у皬璁板綍 -->
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 鏂囦欢鍚嶇О -->
+ <fileNamePattern>${PRO_LOG_HOME}/${APP_MODEL}-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+ <!--鏃ュ織鏂囦欢淇濈暀澶╂暟 -->
+ <maxHistory>60</maxHistory>
+ <!-- 鏃ュ織澶у皬 -->
+ <timeBasedFileNamingAndTriggeringPolicy
+ class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <maxFileSize>100MB</maxFileSize>
+ </timeBasedFileNamingAndTriggeringPolicy>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+ <charset>UTF-8</charset>
+ </encoder>
+ <layout class="ch.qos.logback.classic.PatternLayout">
+ <pattern>${PATTERN}</pattern>
+ </layout>
+ </appender>
+
+ <logger name="org.hibernate.tool" level="WARN"/>
+ <logger name="com.bstek.dorado" level="WARN"/>
+ <root level="info">
+ <appender-ref ref="PRO_FILE"/>
+ </root>
+ </springProfile>
+
</configuration>
\ No newline at end of file
diff --git a/igds-web/src/main/resources/media.properties b/igds-web/src/main/resources/media.properties
index a29a86d..68d7255 100644
--- a/igds-web/src/main/resources/media.properties
+++ b/igds-web/src/main/resources/media.properties
@@ -34,6 +34,7 @@
hik.mapMedia.5318.appSecret=2SrVYEybgnLYYBjvv08l
hik.mapMedia.5318.contextPath=/artemis
hik.mapMedia.5318.regionIndexCodes=[]
+
#-----演示环境-----#
hik.mapMedia.5000.ip=192.168.66.200
hik.mapMedia.5000.wanIp=221.8.37.106
diff --git a/igds-web/src/main/resources/static/admin/grain/grain-check1.js b/igds-web/src/main/resources/static/admin/grain/grain-check1.js
index 4785a51..74bbb83 100644
--- a/igds-web/src/main/resources/static/admin/grain/grain-check1.js
+++ b/igds-web/src/main/resources/static/admin/grain/grain-check1.js
@@ -546,12 +546,20 @@
$("#tempMax").text(grainData.tempMax);
$("#tempAve").text(grainData.tempAve);
$("#tempMin").text(grainData.tempMin);
- $("#tempIn").text(grainData.tempIn <= -100.0 ? "--" : grainData.tempIn);
- $("#tempOut").text(grainData.tempOut <= -100.0 ? "--" : grainData.tempOut);
- $("#humidityIn").text(
- grainData.humidityIn <= -100.0 ? "--" : grainData.humidityIn);
- $("#humidityOut").text(
- grainData.humidityOut <= -100.0 ? "--" : grainData.humidityOut);
+
+
+ //console.log("------------"+grainData.humidityIn);
+ //濡傛灉婀垮害==0琛ㄧず娌℃湁鑾峰彇鍒�
+ if(grainData.humidityIn != 0){
+ $("#tempIn").text(grainData.tempIn <= -100.0 ? "--" : grainData.tempIn);
+ $("#humidityIn").text(
+ grainData.humidityIn <= -100.0 ? "--" : grainData.humidityIn);
+ }
+ if(grainData.humidityOut != 0){
+ $("#tempOut").text(grainData.tempOut <= -100.0 ? "--" : grainData.tempOut);
+ $("#humidityOut").text(
+ grainData.humidityOut <= -100.0 ? "--" : grainData.humidityOut);
+ }
};
// 鏍规嵁鎵规鏇存柊鐨勫�艰皟鏁�
diff --git a/igds-web/src/main/resources/static/admin/grain/grainPoint3.js b/igds-web/src/main/resources/static/admin/grain/grainPoint3.js
index f9c14b2..5efef9a 100644
--- a/igds-web/src/main/resources/static/admin/grain/grainPoint3.js
+++ b/igds-web/src/main/resources/static/admin/grain/grainPoint3.js
@@ -52,9 +52,12 @@
var timer;
var t=-2;
+var isSleep = true;
+
// 鍒濆鍖栧弬鏁�
function initCanvasParam() {
+ isSleep = true;
cirNum = distrList.length; //鍦堟暟
layNum = bottomList[bottomList.length-1]; //灞傛暟
longAxis = 120; //绗竴鍐呭湀鍗婇暱杞�
@@ -633,7 +636,12 @@
initCanvasParam();
draw();
- sleep();//寮�濮嬮棯鐑�
+
+ if(distrList.length == 1){
+ sleep2();
+ }else{
+ sleep();//寮�濮嬮棯鐑�
+ }
curType = "z";
curVal = 1;
renderGrainByLay(curVal);
@@ -655,4 +663,54 @@
return;
}
});
-};
\ No newline at end of file
+};
+
+//鏍规煡鐪�
+function sleep2() {
+ isSleep = false;
+ curCol = 1;
+ listPoints = grainData.listPoints;
+ listLays = grainData.listLays;
+ distrList = grainData.cable.split("-").map(Number);
+ bottomList = grainData.cableCir.split("-").map(Number);
+
+ flash2();
+}
+
+
+//闂儊绋嬪簭
+function flash2() {
+
+ var canvas = document.getElementById('canvas');
+ var ctx = canvas.getContext('2d');
+ canvas.height = canvas.height;
+ colPoints = [];
+ arr = [];
+ make_ellipse(ctx);
+ gainData2(ctx);
+ entityBlock2(ctx);
+ make_top_ellipse(ctx);
+ title(ctx)
+}
+
+//杩囨护鏁版嵁
+function gainData2() {
+ for (i = 0; i < listPoints.length; i++) {
+ if ((listPoints[i]['y'] + 1) == curCol) {
+ colPoints.push(listPoints[i])
+ }
+ }
+}
+
+//杩涜鎺掔嚎锛岀粯鍒惰壊鍧�
+function entityBlock2(ctx) {
+ //璁剧疆鐐瑰�间负null;
+ var point = null;
+ //寰幆鐢熸垚鍦堝唴鐐�
+ for (j = 0; j < colPoints.length; j++) {
+ point = colPoints[j];
+ point_x = center_x;
+ point_y = center_y + (j + 1) * spaceLay;
+ textBox(ctx, point, point_x, point_y)
+ }
+}
\ No newline at end of file
diff --git a/igds-web/src/main/resources/static/admin/grain/grainPoint4.js b/igds-web/src/main/resources/static/admin/grain/grainPoint4.js
index 81cae72..5247bad 100644
--- a/igds-web/src/main/resources/static/admin/grain/grainPoint4.js
+++ b/igds-web/src/main/resources/static/admin/grain/grainPoint4.js
@@ -205,7 +205,6 @@
var showMax = turns;
//寰幆鐢熸垚姣忓湀
for (i = turns; i >= 1; i--) {
-
//鍐呭鏄剧ず閫昏緫鍒ゆ柇
if ((displayMode === 'outside') && !(i === cirNum)) {
continue;
@@ -231,9 +230,7 @@
continue;
}
-
ctx.beginPath();
-
ctx.strokeStyle = 'rgba(0,0,0,1)';
ctx.ellipse(center_x, center_y + (curVal) * spaceLay, longAxis + i * spaceCir, shortAxis + i * spaceCir, 0, 0, Math.PI * 2);
@@ -241,10 +238,8 @@
var grd = ctx.createRadialGradient(center_x, center_y + caseHeight - longAxis, shortAxis, center_x, center_y + caseHeight - 2 * longAxis, 5 * longAxis);
grd.addColorStop(0, "rgba(245,222,179)");
grd.addColorStop(1, "rgba(240 255 255)");
-
ctx.fillStyle = grd;
ctx.fill();
-
} else {
var grd = ctx.createRadialGradient(center_x, center_y + caseHeight - longAxis, shortAxis, center_x, center_y + caseHeight - 2 * longAxis, 2 * longAxis);
grd.addColorStop(0, "white");
diff --git a/igds-web/src/main/resources/static/admin/grain/liquid-height.js b/igds-web/src/main/resources/static/admin/grain/liquid-height.js
index ef55c1a..08d185e 100644
--- a/igds-web/src/main/resources/static/admin/grain/liquid-height.js
+++ b/igds-web/src/main/resources/static/admin/grain/liquid-height.js
@@ -19,13 +19,13 @@
html += '<div class="status-succ">姝ｅ父</div>';
html += '<div class="num-tit"><div class="t">' + (depot.name == null ? "":depot.name) + '</div></div>';
- html += '<div class="basic-info"><div class="bifo-field"><span class="t">绮鎬ц川</span>';
+ html += '<div class="basic-info"><div class="bifo-field"><span class="t">绮补鎬ц川</span>';
html += '<span class="val">' + (depot.foodTypeName == null ? "--" : depot.foodTypeName) + '</span></div>';
- html += '<div class="bifo-field"><span class="t">绮鍝佺</span>';
+ html += '<div class="bifo-field"><span class="t">绮补鍝佺</span>';
html += '<span class="val">' + (depot.foodVarietyName == null ? "--" : depot.foodVarietyName) + '</span></div>';
- html += '<div class="bifo-field"><span class="t">绮绛夌骇</span>';
+ html += '<div class="bifo-field"><span class="t">绮补绛夌骇</span>';
html += '<span class="val">' + (depot.foodLevelName == null ? "--" : depot.foodLevelName) + '</span></div></div>';
html += '<div class="basic-info-sub"><div class="basic-info"><div class="bifo-field">';
@@ -48,13 +48,13 @@
html += '<div class="status-succ">姝ｅ父</div>';
html += '<div class="num-tit"><div class="t">鏆傛棤浠撳簱淇℃伅</div></div>';
- html += '<div class="basic-info"><div class="bifo-field"><span class="t">绮鎬ц川</span>';
+ html += '<div class="basic-info"><div class="bifo-field"><span class="t">绮补鎬ц川</span>';
html += '<span class="val">--</span></div>';
- html += '<div class="bifo-field"><span class="t">绮鍝佺</span>';
+ html += '<div class="bifo-field"><span class="t">绮补鍝佺</span>';
html += '<span class="val">--</span></div>';
- html += '<div class="bifo-field"><span class="t">绮绛夌骇</span>';
+ html += '<div class="bifo-field"><span class="t">绮补绛夌骇</span>';
html += '<span class="val">--</span></div></div>';
html += '<div class="basic-info-sub"><div class="basic-info"><div class="bifo-field">';
diff --git a/igds-web/src/main/resources/static/admin/inout/in-check.js b/igds-web/src/main/resources/static/admin/inout/in-check.js
index bbc1403..af71497 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-check.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-check.js
@@ -362,7 +362,8 @@
title: '澶囨敞璇存槑',
align: 'center',
edit: 'text'
- }]]
+ }]],
+ limit: this.curCheckItems.length //鏄剧ず鐨勬暟閲�
});
$("thead tr").css({
@@ -490,6 +491,7 @@
//淇濆瓨鎻愪氦
function submit() {
+
if (curCheckData.checkStatus == "NONE" || curCheckData.checkStatus == "NONE2") {
layer.alert("璇风‘璁ゅ寲楠岀粨鏋滐紒锛�");
return;
@@ -500,6 +502,10 @@
}
if (!curCheckData.foodLevel) {
layer.alert("璇风‘璁ょ伯椋熺瓑绾э紒锛�");
+ return;
+ }
+ if (!curCheckData.foodType) {
+ layer.alert("璇风‘璁ょ伯椋熸�ц川锛侊紒");
return;
}
if (!curCheckData.price) {
@@ -615,9 +621,14 @@
width: '10%',
style: 'color: #f67d06;font-weight: bold'
}, {
+ field: 'plateNum',
+ title: '杞︾墝鍙�',
+ width: '9%',
+ style: 'font-weight: bold'
+ }, {
field: 'registerTime',
title: '鐧昏鏃堕棿',
- width: '15%',
+ width: '13%',
style: 'font-weight: bold'
}, {
field: 'sampleStatus',
@@ -642,12 +653,12 @@
}, {
field: 'sampleTime',
title: '鎵︽牱鏃堕棿',
- width: '15%',
+ width: '13%',
style: 'font-weight: bold'
}, {
field: 'foodVariety',
title: '绮鍝佺',
- width: '11%',
+ width: '9%',
templet: function (item) {
var result = item.foodVariety;
$.each(listFoodVariety, function (index, data) {
@@ -661,7 +672,7 @@
}, {
field: 'depotId',
title: '瑁呭嵏浠撳簱',
- width: '11%',
+ width: '10%',
templet: function (item) {
var result = item.depotId;
$.each(listDepot, function (index, data) {
diff --git a/igds-web/src/main/resources/static/admin/inout/in-ship-register.js b/igds-web/src/main/resources/static/admin/inout/in-ship-register.js
index 062e06a..53d665d 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-ship-register.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-ship-register.js
@@ -16,12 +16,12 @@
});
//鐩戝惉鍝佺
- layui.form.on('select(select_foodVariety)',function (data) {
+ layui.form.on('select(select_foodVariety)', function (data) {
updateFoodVariety(data.value);
});
//鐩戝惉鍖栭獙缁撴灉鍗曞～鍐欐暟鎹�,骞剁粰鍑烘彁绀虹粨鏋�
- table.on('edit(tableCheckItem)',function (obj) {
+ table.on('edit(tableCheckItem)', function (obj) {
getResult(obj);
});
});
@@ -147,7 +147,7 @@
/**
* 寮瑰嚭鍖栭獙鍗曚俊鎭�
*/
-function showCheckDetail(){
+function showCheckDetail() {
// 璧嬪��
var data = form.val("form-data");
data.checkUser = checkUser;
@@ -165,7 +165,7 @@
yes: function () {
curCheckData = form.val("form-detail");
- if(null == curCheckData.foodVariety){
+ if (null == curCheckData.foodVariety) {
notify("璇峰～鍐欑伯椋熷搧绉嶏紒");
return;
}
@@ -210,12 +210,12 @@
var index = layer.load();
$.ajax({
- type : "POST",
- url : "../../basic/inout/get-check-item",
- dataType : "json",
- contentType : "application/json;charset=UTF-8",
- data : JSON.stringify(data),
- success : function(result) {
+ type: "POST",
+ url: "../../basic/inout/get-check-item",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(data),
+ success: function (result) {
if (result.code != "0000") {
layer.msg(result.msg);
} else {
@@ -225,7 +225,7 @@
layer.close(index);
}
},
- error : function() {
+ error: function () {
layer.close(index);
layer.msg("鍚庡彴寮傚父锛岃閲嶈瘯鎴栬�呰仈绯荤鐞嗗憳锛侊紒");
}
@@ -239,11 +239,11 @@
// 娓呯┖鏁版嵁
$("#tableCheckItem").empty();
table.render({
- elem : '#tableCheckItem',
- data : curCheckItems,
- page : false,
+ elem: '#tableCheckItem',
+ data: curCheckItems,
+ page: false,
// skin: 'line',
- even : true,
+ even: true,
cols: [[{
field: 'standardName',
title: '鍖栭獙椤圭洰',
@@ -274,8 +274,8 @@
});
$("thead tr").css({
- "border-bottom" : "2px solid #53adce",
- "background" : "#eff4f6"
+ "border-bottom": "2px solid #53adce",
+ "background": "#eff4f6"
});
}
@@ -387,25 +387,32 @@
// 娓叉煋寰�鏉ュ崟浣嶅垪琛�
table.render({
elem: '#tableNotice',
- url: '../../basic/inout/list-notice鈥攊n',
+ url: '../../basic/inout/list-notice-in',
page: false,
even: true,
method: 'POST',
contentType: "application/json;charset=UTF-8",
cols: [[{
+ field: 'name',
+ title: '閫氱煡鍗曞悕绉�',
+ width: '15%'
+ }, {
field: 'customerName',
- title: '閫佽揣鍗曚綅'
+ title: '鍙戣揣鍗曚綅'
}, {
field: 'foodVarietyName',
title: '绮鍝佺',
- width: '15%'
+ width: '12%'
}, {
field: 'year',
title: '骞翠唤',
- width: '15%'
+ width: '10%'
}, {
- field: 'unitName',
- title: '鏀惰揣鍗曚綅'
+ field: 'depotName',
+ title: "鎵�娑変粨搴�"
+ }, {
+ field: 'contractName',
+ title: '鎵�灞炲悎鍚�'
}]],
where: param,
parseData: function (res) {
@@ -443,7 +450,7 @@
layer.open({
type: 1,
title: "鍏ュ簱閫氱煡鍗�",
- area: ['700px', '600px'],
+ area: ['850px', '600px'],
shade: 0,
content: $('#listNotice'),
btn: 0,
@@ -461,54 +468,54 @@
var index = layer.load();
// 娓叉煋寰�鏉ュ崟浣嶅垪琛�
table.render({
- elem : '#tableFoodLoaction',
- url : '../../basic/common/page-food-location',
- page : false,
- toolbar : '#toolbarFoodLocaton',
- even : true,
- method : 'POST',
- contentType : "application/json;charset=UTF-8",
- cols : [ [ {
- field : 'code',
- title : '缂栫爜'
+ elem: '#tableFoodLoaction',
+ url: '../../basic/common/page-dicArea',
+ page: false,
+ toolbar: '#toolbarFoodLocaton',
+ even: true,
+ method: 'POST',
+ contentType: "application/json;charset=UTF-8",
+ cols: [[{
+ field: 'code',
+ title: '缂栫爜'
}, {
- field : 'simple',
- title : '绠�鎷�'
+ field: 'simple',
+ title: '绠�鎷�'
}, {
- field : 'name',
- title : '鍚嶇О',
- width : '60%'
- } ] ],
- where : {
- "page" : 1,
- "limit" : 100
+ field: 'name',
+ title: '鍚嶇О',
+ width: '60%'
+ }]],
+ where: {
+ "page": 1,
+ "limit": 100
},
- parseData : function(res) {
+ parseData: function (res) {
if ("0000" == res.code) {
return {
- "code" : "0",
- "msg" : res.msg,
- "count" : res.data.total,
- "data" : res.data.records
+ "code": "0",
+ "msg": res.msg,
+ "count": res.data.total,
+ "data": res.data.records
}
} else {
return {
- "code" : "1",
- "msg" : res.msg
+ "code": "1",
+ "msg": res.msg
}
}
},
- done : function(res) {
+ done: function (res) {
layer.close(index);
}
});
//鍙屽嚮鏄剧ず閫変腑鏁版嵁
- table.on('rowDouble(tableFoodLoaction)', function(obj){
+ table.on('rowDouble(tableFoodLoaction)', function (obj) {
var data = obj.data;
// 璧嬪��
form.val("form-data", {
- foodLocation : data.name
+ foodLocation: data.name
});
// 鍏抽棴
layer.close(index2);
@@ -516,18 +523,18 @@
// 寮瑰嚭瀵硅瘽妗�
var index2 = layer.open({
- type : 1,
- title : "閫夋嫨绮骇鍦�",
- area : [ '600px', '600px' ],
- shade : 0,
- content : $('#listFoodLocation'),
- btn : 0,
- btn : [ '鍙栨秷' ],
- yes : function() {
+ type: 1,
+ title: "閫夋嫨绮骇鍦�",
+ area: ['600px', '600px'],
+ shade: 0,
+ content: $('#listFoodLocation'),
+ btn: 0,
+ btn: ['鍙栨秷'],
+ yes: function () {
// 鍏抽棴
layer.close(index2);
},
- closeBtn : 0
+ closeBtn: 0
});
}
@@ -536,11 +543,11 @@
function flushFoodLocation() {
var key = $("#key2").val();
table.reload('tableFoodLoaction', {
- url : "../../basic/common/page-food-location",
- where : {
- key : key
+ url: "../../basic/common/page-dicArea",
+ where: {
+ key: key
},
- done : function(res) {
+ done: function (res) {
if (key) {
$("#key2").val(key);
}
diff --git a/igds-web/src/main/resources/static/admin/inout/in-weight.js b/igds-web/src/main/resources/static/admin/inout/in-weight.js
index 93b01f3..09d4c79 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-weight.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-weight.js
@@ -20,7 +20,6 @@
elem: '#test1',
theme: '#7b8e9f'
});
-
// 鍙充笅瑙掓坊鍔犲浐瀹氫俊鎭�
util.fixbar({
bar1: true,
@@ -45,6 +44,16 @@
}
}
});
+
+ //鐩戝惉閫夋嫨鏁版嵁浜嬩欢
+ table.on('tool(tableListProgressData)', function (obj) {
+ var data = obj.data;
+ if (obj.event === 'select') {
+ flushData(data.intelCard, null);
+ layer.closeAll();
+ }
+ });
+
});
//鏄剧ず娴佺▼鐜妭
@@ -243,7 +252,7 @@
alertError("娌℃湁璇诲彇鍒拌韩浠借瘉淇℃伅锛�");
return;
}
- paramIdCard = data;
+ paramIdCard = data.idNum;
$("#text-param").text("璇嗗埆韬唤璇侊細" + paramIdCard);
flushData(null, paramIdCard);
},
@@ -255,8 +264,38 @@
}
function flushByHand() {
- flushData(null, null);
+ var intelCard = $("#intelCard").val();
+ flushData(intelCard, null);
}
+
+/**
+ * 鎵嬪姩閫夋嫨锛岃幏鍙栧緟绉伴噸鐨勬暟鎹紝寮瑰嚭閫夋嫨
+ */
+function selectByHand() {
+ var param = {
+ deptId: deptId,
+ type: type,
+ timer: Math.random()
+ };
+ $.ajax({
+ type: "POST",
+ url: "../../basic/inout/list-only-progress",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(param),
+ success: function (result) {
+ if (result.code != "0000") {
+ layer.msg(result.msg);
+ } else {
+ renderTableProgressData(result.data);
+ }
+ },
+ error: function () {
+ layer.msg("绯荤粺鑾峰彇鏁版嵁鍑虹幇寮傚父锛岄噸鏂板皾璇�");
+ }
+ });
+}
+
function flushWeight() {
$.ajax({
@@ -454,10 +493,8 @@
return;
}
}
-
//鍚堝苟鏁版嵁
Object.assign(recordData, data);
-
// 鑾峰彇鐓х墖
var files = [{
fileName: snapData.fileName1
@@ -467,7 +504,6 @@
fileName: snapData.fileName3
}];
recordData.files = files;
-
var index = layer.load();
$.ajax({
type: "POST",
@@ -496,10 +532,8 @@
alertError("娌℃湁涓氬姟鏁版嵁淇℃伅锛屾墽琛岃鎷掔粷");
return;
}
-
// 鑾峰彇鍖栭獙椤逛俊鎭�
flushCheckItem();
-
layer.open({
type: 1,
title: "璐ㄦ璇︾粏",
@@ -520,7 +554,6 @@
* 鍒锋柊鍖栭獙缁撴灉椤�
*/
function flushCheckItem() {
-
curCheckItems = null;
$.ajax({
type: "POST",
@@ -657,4 +690,42 @@
"border-bottom": "2px solid #53adce",
"background": "#eff4f6"
});
+}
+
+function renderTableProgressData(list) {
+ // 娓呯┖鏁版嵁
+ $("#tableListProgressData").empty();
+ layer.open({
+ type: 1,
+ title: "閫夋嫨娴佺▼涓溅杈�",
+ offset: ['120px', '100px'],
+ area: ['1000px', '520px'],
+ shade: 0,
+ content: $('#listProgressData'),
+ closeBtn: 1
+ });
+ table.render({
+ elem: '#tableListProgressData',
+ data: list,
+ page: false,
+ even: true,
+ cols: [[
+ {type: 'numbers'}, {
+ field: 'id',
+ title: '鍗曟嵁鍙�',
+ align: 'center'
+ }, {
+ field: 'userName',
+ title: '鎵胯繍浜�',
+ align: 'center'
+ }, {
+ field: 'plateNum',
+ title: '杞︾墝鍙�',
+ align: 'center'
+ }, {fixed: 'right', title: '閫夋嫨鎿嶄綔', align: 'center', toolbar: '#barSelectProgress'}]]
+ });
+ $("thead tr").css({
+ "border-bottom": "2px solid #53adce",
+ "background": "#eff4f6"
+ });
}
\ No newline at end of file
diff --git a/igds-web/src/main/resources/static/admin/inout/out-ship-register.js b/igds-web/src/main/resources/static/admin/inout/out-ship-register.js
index 5f7315c..8a79147 100644
--- a/igds-web/src/main/resources/static/admin/inout/out-ship-register.js
+++ b/igds-web/src/main/resources/static/admin/inout/out-ship-register.js
@@ -16,7 +16,7 @@
});
// 鐩戝惉浠撳簱閫夋嫨锛岄�夋嫨鍚庤嚜鍔ㄨ皟鐢ㄤ粨搴撶殑绮搧绉嶅拰浜у湴淇℃伅
- form.on('select(select_depotId)', function(obj) {
+ form.on('select(select_depotId)', function (obj) {
updateFoodVarietyByDepot(obj.value);
});
});
@@ -207,7 +207,7 @@
// 娓叉煋寰�鏉ュ崟浣嶅垪琛�
table.render({
elem: '#tableNotice',
- url: '../../basic/inout/list-notice鈥攐ut',
+ url: '../../basic/inout/list-notice-out',
page: false,
// skin : "nob",
// size : 'sm',
@@ -215,20 +215,26 @@
method: 'POST',
contentType: "application/json;charset=UTF-8",
cols: [[{
- field: 'customerName',
- title: '鏀惰揣鍗曚綅'
+ field: 'name',
+ title: '閫氱煡鍗曞悕绉�',
+ width: '15%'
}, {
- field: 'depotName',
- title: '浠撳簱鍚嶇О',
- width: '20%'
+ field: 'customerName',
+ title: '鍙戣揣鍗曚綅'
}, {
field: 'foodVarietyName',
title: '绮鍝佺',
- width: '20%'
+ width: '12%'
}, {
field: 'year',
title: '骞翠唤',
- width: '15%'
+ width: '10%'
+ }, {
+ field: 'depotName',
+ title: "鎵�娑変粨搴�"
+ }, {
+ field: 'contractName',
+ title: '鎵�灞炲悎鍚�'
}]],
where: param,
parseData: function (res) {
@@ -270,7 +276,7 @@
layer.open({
type: 1,
title: "鍑哄簱閫氱煡鍗�",
- area: ['700px', '600px'],
+ area: ['850px', '600px'],
shade: 0,
content: $('#listNotice'),
btn: 0,
@@ -288,54 +294,54 @@
var index = layer.load();
// 娓叉煋寰�鏉ュ崟浣嶅垪琛�
table.render({
- elem : '#tableFoodLoaction',
- url : '../../basic/common/page-food-location',
- page : false,
- toolbar : '#toolbarFoodLocaton',
- even : true,
- method : 'POST',
- contentType : "application/json;charset=UTF-8",
- cols : [ [ {
- field : 'code',
- title : '缂栫爜'
+ elem: '#tableFoodLoaction',
+ url: '../../basic/common/page-dicArea',
+ page: false,
+ toolbar: '#toolbarFoodLocaton',
+ even: true,
+ method: 'POST',
+ contentType: "application/json;charset=UTF-8",
+ cols: [[{
+ field: 'code',
+ title: '缂栫爜'
}, {
- field : 'simple',
- title : '绠�鎷�'
+ field: 'simple',
+ title: '绠�鎷�'
}, {
- field : 'name',
- title : '鍚嶇О',
- width : '60%'
- } ] ],
- where : {
- "page" : 1,
- "limit" : 100
+ field: 'name',
+ title: '鍚嶇О',
+ width: '60%'
+ }]],
+ where: {
+ "page": 1,
+ "limit": 100
},
- parseData : function(res) {
+ parseData: function (res) {
if ("0000" == res.code) {
return {
- "code" : "0",
- "msg" : res.msg,
- "count" : res.data.total,
- "data" : res.data.records
+ "code": "0",
+ "msg": res.msg,
+ "count": res.data.total,
+ "data": res.data.records
}
} else {
return {
- "code" : "1",
- "msg" : res.msg
+ "code": "1",
+ "msg": res.msg
}
}
},
- done : function(res) {
+ done: function (res) {
layer.close(index);
}
});
//鍙屽嚮鏄剧ず閫変腑鏁版嵁
- table.on('rowDouble(tableFoodLoaction)', function(obj){
+ table.on('rowDouble(tableFoodLoaction)', function (obj) {
var data = obj.data;
// 璧嬪��
form.val("form-data", {
- foodLocation : data.name,
+ foodLocation: data.name,
});
// 鍏抽棴
layer.close(index2);
@@ -343,18 +349,18 @@
// 寮瑰嚭瀵硅瘽妗�
var index2 = layer.open({
- type : 1,
- title : "閫夋嫨绮骇鍦�",
- area : [ '600px', '600px' ],
- shade : 0,
- content : $('#listFoodLocation'),
- btn : 0,
- btn : [ '鍙栨秷' ],
- yes : function() {
+ type: 1,
+ title: "閫夋嫨绮骇鍦�",
+ area: ['600px', '600px'],
+ shade: 0,
+ content: $('#listFoodLocation'),
+ btn: 0,
+ btn: ['鍙栨秷'],
+ yes: function () {
// 鍏抽棴
layer.close(index2);
},
- closeBtn : 0
+ closeBtn: 0
});
}
@@ -363,11 +369,11 @@
function flushFoodLocation() {
var key = $("#key2").val();
table.reload('tableFoodLoaction', {
- url : "../../basic/common/page-food-location",
- where : {
- key : key
+ url: "../../basic/common/page-dicArea",
+ where: {
+ key: key
},
- done : function(res) {
+ done: function (res) {
if (key) {
$("#key2").val(key);
}
diff --git a/igds-web/src/main/resources/static/admin/inout/out-weight.js b/igds-web/src/main/resources/static/admin/inout/out-weight.js
index 5edb8da..699e2cc 100644
--- a/igds-web/src/main/resources/static/admin/inout/out-weight.js
+++ b/igds-web/src/main/resources/static/admin/inout/out-weight.js
@@ -41,6 +41,15 @@
}
}
});
+
+ //鐩戝惉閫夋嫨鏁版嵁浜嬩欢
+ table.on('tool(tableListProgressData)', function (obj) {
+ var data = obj.data;
+ if (obj.event === 'select') {
+ flushData(data.intelCard, null);
+ layer.closeAll();
+ }
+ });
});
//鏄剧ず娴佺▼鐜妭
@@ -349,6 +358,7 @@
});
return;
}
+ paramIdCard = data.idNum;
// $("#userId").val(data.idNum);
$("#text-param").text("璇嗗埆韬唤璇侊細" + paramIdCard);
@@ -782,4 +792,71 @@
// });
// }
//
-// // ---------------------------閫氱煡鍗� -缁撴潫 -------------------//
\ No newline at end of file
+// // ---------------------------閫氱煡鍗� -缁撴潫 -------------------//
+
+/**
+ * 鎵嬪姩閫夋嫨锛岃幏鍙栧緟绉伴噸鐨勬暟鎹紝寮瑰嚭閫夋嫨
+ */
+function selectByHand() {
+ var param = {
+ deptId: deptId,
+ type: type,
+ timer: Math.random()
+ };
+ $.ajax({
+ type: "POST",
+ url: "../../basic/inout/list-only-progress",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(param),
+ success: function (result) {
+ if (result.code != "0000") {
+ layer.msg(result.msg);
+ } else {
+ renderTableProgressData(result.data);
+ }
+ },
+ error: function () {
+ layer.msg("绯荤粺鑾峰彇鏁版嵁鍑虹幇寮傚父锛岄噸鏂板皾璇�");
+ }
+ });
+}
+
+function renderTableProgressData(list) {
+ // 娓呯┖鏁版嵁
+ $("#tableListProgressData").empty();
+ layer.open({
+ type: 1,
+ title: "閫夋嫨娴佺▼涓溅杈�",
+ offset: ['120px', '100px'],
+ area: ['1000px', '520px'],
+ shade: 0,
+ content: $('#listProgressData'),
+ closeBtn: 1
+ });
+
+ table.render({
+ elem: '#tableListProgressData',
+ data: list,
+ page: false,
+ even: true,
+ cols: [[
+ {type: 'numbers'}, {
+ field: 'id',
+ title: '鍗曟嵁鍙�',
+ align: 'center'
+ }, {
+ field: 'userName',
+ title: '鎵胯繍浜�',
+ align: 'center'
+ }, {
+ field: 'plateNum',
+ title: '杞︾墝鍙�',
+ align: 'center'
+ }, {fixed: 'right', title: '閫夋嫨鎿嶄綔', align: 'center', toolbar: '#barSelectProgress'}]]
+ });
+ $("thead tr").css({
+ "border-bottom": "2px solid #53adce",
+ "background": "#eff4f6"
+ });
+}
\ No newline at end of file
diff --git a/igds-web/src/main/resources/static/admin/quantity/quantity.js b/igds-web/src/main/resources/static/admin/quantity/quantity.js
index 69b7218..6d13c42 100644
--- a/igds-web/src/main/resources/static/admin/quantity/quantity.js
+++ b/igds-web/src/main/resources/static/admin/quantity/quantity.js
@@ -205,7 +205,7 @@
// 閰嶇疆浠撳簱鍗＄墖淇℃伅
var depotData = quantityData.depotData;
$("#depotTypeName").text(depotData.depotTypeName);
- $("#storeKeeperName").text(depotData.storeKeeperName == null ? "淇濈鍛�":item.storeKeeperName);
+ $("#storeKeeperName").text(depotData.storeKeeperName == null ? "淇濈鍛�":depotData.storeKeeperName);
$("#storageReal").text(depotData.storageReal);
$("#foodVarietyName").text(depotData.foodVarietyName);
$("#foodLevelName").text(depotData.foodLevelName);
diff --git a/igds-web/src/main/resources/static/css/bootstrap.min.css b/igds-web/src/main/resources/static/css/bootstrap.min.css
index f7bca0a..3e8b94d 100644
--- a/igds-web/src/main/resources/static/css/bootstrap.min.css
+++ b/igds-web/src/main/resources/static/css/bootstrap.min.css
@@ -3,4 +3,3 @@
* Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-plus:before{content:"\002b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control::-ms-expand{background-color:transparent;border:0}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=time].form-control,input[type=datetime-local].form-control,input[type=month].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:11px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled.focus,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled].focus,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled.focus,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled].focus,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled.focus,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled].focus,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled.focus,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled].focus,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled.focus,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled].focus,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled.focus,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled].focus,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group .form-control:focus{z-index:3}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:2;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:3;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{padding-right:15px;padding-left:15px;border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;filter:alpha(opacity=0);opacity:0;line-break:auto}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);line-break:auto}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);background-color:rgba(0,0,0,0);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000\9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-10px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.modal-header:after,.modal-header:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.modal-header:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}}
-/*# sourceMappingURL=bootstrap.min.css.map */
diff --git a/igds-web/src/main/resources/static/img/aerial-5001.png b/igds-web/src/main/resources/static/img/aerial-5001.png
deleted file mode 100644
index 0bd75b7..0000000
--- a/igds-web/src/main/resources/static/img/aerial-5001.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/aerial-5009.png b/igds-web/src/main/resources/static/img/aerial-5009.png
deleted file mode 100644
index 696b06d..0000000
--- a/igds-web/src/main/resources/static/img/aerial-5009.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/aerial-5012_001.png b/igds-web/src/main/resources/static/img/aerial-5012_001.png
deleted file mode 100644
index 559140e..0000000
--- a/igds-web/src/main/resources/static/img/aerial-5012_001.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/aerial-5013_001.png b/igds-web/src/main/resources/static/img/aerial-5013_001.png
deleted file mode 100644
index 3bf0aac..0000000
--- a/igds-web/src/main/resources/static/img/aerial-5013_001.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/aerial-5013_002.png b/igds-web/src/main/resources/static/img/aerial-5013_002.png
deleted file mode 100644
index aabdb7b..0000000
--- a/igds-web/src/main/resources/static/img/aerial-5013_002.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/aerial-5016_001.png b/igds-web/src/main/resources/static/img/aerial-5016_001.png
deleted file mode 100644
index f83b7f8..0000000
--- a/igds-web/src/main/resources/static/img/aerial-5016_001.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/aerial-5303_001.png b/igds-web/src/main/resources/static/img/aerial-5303_001.png
deleted file mode 100644
index 741c0b4..0000000
--- a/igds-web/src/main/resources/static/img/aerial-5303_001.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/aerial-5305_001.png b/igds-web/src/main/resources/static/img/aerial-5305_001.png
deleted file mode 100644
index 1261bfc..0000000
--- a/igds-web/src/main/resources/static/img/aerial-5305_001.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/aerial-5308_001.png b/igds-web/src/main/resources/static/img/aerial-5308_001.png
deleted file mode 100644
index a13dcb6..0000000
--- a/igds-web/src/main/resources/static/img/aerial-5308_001.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/aerial-5317_001.png b/igds-web/src/main/resources/static/img/aerial-5317_001.png
deleted file mode 100644
index 2ae77e3..0000000
--- a/igds-web/src/main/resources/static/img/aerial-5317_001.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/aerial-5317_001_1.png b/igds-web/src/main/resources/static/img/aerial-5317_001_1.png
deleted file mode 100644
index 05d7536..0000000
--- a/igds-web/src/main/resources/static/img/aerial-5317_001_1.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/aerial-5318_001.png b/igds-web/src/main/resources/static/img/aerial-5318_001.png
deleted file mode 100644
index 105a3e3..0000000
--- a/igds-web/src/main/resources/static/img/aerial-5318_001.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/aerial-5320_001.png b/igds-web/src/main/resources/static/img/aerial-5320_001.png
deleted file mode 100644
index 4f7e2d7..0000000
--- a/igds-web/src/main/resources/static/img/aerial-5320_001.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/aerial-5324_001.png b/igds-web/src/main/resources/static/img/aerial-5324_001.png
deleted file mode 100644
index 04cddbd..0000000
--- a/igds-web/src/main/resources/static/img/aerial-5324_001.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/aerial-5325_001.png b/igds-web/src/main/resources/static/img/aerial-5325_001.png
deleted file mode 100644
index 6929eb8..0000000
--- a/igds-web/src/main/resources/static/img/aerial-5325_001.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/aerial-5326_001.png b/igds-web/src/main/resources/static/img/aerial-5326_001.png
deleted file mode 100644
index 9bfa615..0000000
--- a/igds-web/src/main/resources/static/img/aerial-5326_001.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/aerial-5328_001.png b/igds-web/src/main/resources/static/img/aerial-5328_001.png
deleted file mode 100644
index 6f396b5..0000000
--- a/igds-web/src/main/resources/static/img/aerial-5328_001.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-1000.png b/igds-web/src/main/resources/static/img/logo-1000.png
deleted file mode 100644
index bf6f3e8..0000000
--- a/igds-web/src/main/resources/static/img/logo-1000.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-4001.png b/igds-web/src/main/resources/static/img/logo-4001.png
deleted file mode 100644
index 71c8124..0000000
--- a/igds-web/src/main/resources/static/img/logo-4001.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-4002.png b/igds-web/src/main/resources/static/img/logo-4002.png
deleted file mode 100644
index 0758230..0000000
--- a/igds-web/src/main/resources/static/img/logo-4002.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-4003.png b/igds-web/src/main/resources/static/img/logo-4003.png
deleted file mode 100644
index af06fda..0000000
--- a/igds-web/src/main/resources/static/img/logo-4003.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-4004-2.png b/igds-web/src/main/resources/static/img/logo-4004-2.png
deleted file mode 100644
index ef1298a..0000000
--- a/igds-web/src/main/resources/static/img/logo-4004-2.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-4005-1.png b/igds-web/src/main/resources/static/img/logo-4005-1.png
deleted file mode 100644
index c1c6eee..0000000
--- a/igds-web/src/main/resources/static/img/logo-4005-1.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-4007.png b/igds-web/src/main/resources/static/img/logo-4007.png
deleted file mode 100644
index b11cc9c..0000000
--- a/igds-web/src/main/resources/static/img/logo-4007.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-4008.png b/igds-web/src/main/resources/static/img/logo-4008.png
deleted file mode 100644
index d1ea772..0000000
--- a/igds-web/src/main/resources/static/img/logo-4008.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5000-2.png b/igds-web/src/main/resources/static/img/logo-5000-2.png
deleted file mode 100644
index bf6f3e8..0000000
--- a/igds-web/src/main/resources/static/img/logo-5000-2.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5001.png b/igds-web/src/main/resources/static/img/logo-5001.png
deleted file mode 100644
index b34c34b..0000000
--- a/igds-web/src/main/resources/static/img/logo-5001.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5004.png b/igds-web/src/main/resources/static/img/logo-5004.png
deleted file mode 100644
index 96854aa..0000000
--- a/igds-web/src/main/resources/static/img/logo-5004.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5005.png b/igds-web/src/main/resources/static/img/logo-5005.png
deleted file mode 100644
index 6cf1ef9..0000000
--- a/igds-web/src/main/resources/static/img/logo-5005.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5006.png b/igds-web/src/main/resources/static/img/logo-5006.png
deleted file mode 100644
index d57e028..0000000
--- a/igds-web/src/main/resources/static/img/logo-5006.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5007.png b/igds-web/src/main/resources/static/img/logo-5007.png
deleted file mode 100644
index 804c038..0000000
--- a/igds-web/src/main/resources/static/img/logo-5007.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5008.png b/igds-web/src/main/resources/static/img/logo-5008.png
deleted file mode 100644
index ba00bde..0000000
--- a/igds-web/src/main/resources/static/img/logo-5008.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5009.png b/igds-web/src/main/resources/static/img/logo-5009.png
deleted file mode 100644
index 0a8df7c..0000000
--- a/igds-web/src/main/resources/static/img/logo-5009.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5010-2.png b/igds-web/src/main/resources/static/img/logo-5010-2.png
deleted file mode 100644
index c4673dd..0000000
--- a/igds-web/src/main/resources/static/img/logo-5010-2.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5011.png b/igds-web/src/main/resources/static/img/logo-5011.png
deleted file mode 100644
index 14c0f21..0000000
--- a/igds-web/src/main/resources/static/img/logo-5011.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5012.png b/igds-web/src/main/resources/static/img/logo-5012.png
deleted file mode 100644
index 6cf1ef9..0000000
--- a/igds-web/src/main/resources/static/img/logo-5012.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5013-1.png b/igds-web/src/main/resources/static/img/logo-5013-1.png
deleted file mode 100644
index 1f88d38..0000000
--- a/igds-web/src/main/resources/static/img/logo-5013-1.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5013-2.png b/igds-web/src/main/resources/static/img/logo-5013-2.png
deleted file mode 100644
index 26ab61f..0000000
--- a/igds-web/src/main/resources/static/img/logo-5013-2.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5016.png b/igds-web/src/main/resources/static/img/logo-5016.png
deleted file mode 100644
index 0db6d71..0000000
--- a/igds-web/src/main/resources/static/img/logo-5016.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5102.png b/igds-web/src/main/resources/static/img/logo-5102.png
deleted file mode 100644
index af06fda..0000000
--- a/igds-web/src/main/resources/static/img/logo-5102.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5301.png b/igds-web/src/main/resources/static/img/logo-5301.png
deleted file mode 100644
index 4313f57..0000000
--- a/igds-web/src/main/resources/static/img/logo-5301.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5303.png b/igds-web/src/main/resources/static/img/logo-5303.png
deleted file mode 100644
index c4f8bf4..0000000
--- a/igds-web/src/main/resources/static/img/logo-5303.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5304.png b/igds-web/src/main/resources/static/img/logo-5304.png
deleted file mode 100644
index af06fda..0000000
--- a/igds-web/src/main/resources/static/img/logo-5304.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5305.png b/igds-web/src/main/resources/static/img/logo-5305.png
deleted file mode 100644
index b2ea8d5..0000000
--- a/igds-web/src/main/resources/static/img/logo-5305.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5306.png b/igds-web/src/main/resources/static/img/logo-5306.png
deleted file mode 100644
index bf6f3e8..0000000
--- a/igds-web/src/main/resources/static/img/logo-5306.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5307.png b/igds-web/src/main/resources/static/img/logo-5307.png
deleted file mode 100644
index af06fda..0000000
--- a/igds-web/src/main/resources/static/img/logo-5307.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5308-b.png b/igds-web/src/main/resources/static/img/logo-5308-b.png
deleted file mode 100644
index 3f3d7bc..0000000
--- a/igds-web/src/main/resources/static/img/logo-5308-b.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5308.png b/igds-web/src/main/resources/static/img/logo-5308.png
deleted file mode 100644
index 1f88d38..0000000
--- a/igds-web/src/main/resources/static/img/logo-5308.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5309.png b/igds-web/src/main/resources/static/img/logo-5309.png
deleted file mode 100644
index af06fda..0000000
--- a/igds-web/src/main/resources/static/img/logo-5309.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5310.png b/igds-web/src/main/resources/static/img/logo-5310.png
deleted file mode 100644
index af06fda..0000000
--- a/igds-web/src/main/resources/static/img/logo-5310.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5312-1.png b/igds-web/src/main/resources/static/img/logo-5312-1.png
deleted file mode 100644
index 1f88d38..0000000
--- a/igds-web/src/main/resources/static/img/logo-5312-1.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5312.png b/igds-web/src/main/resources/static/img/logo-5312.png
deleted file mode 100644
index af06fda..0000000
--- a/igds-web/src/main/resources/static/img/logo-5312.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5314.png b/igds-web/src/main/resources/static/img/logo-5314.png
deleted file mode 100644
index af06fda..0000000
--- a/igds-web/src/main/resources/static/img/logo-5314.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5315.png b/igds-web/src/main/resources/static/img/logo-5315.png
deleted file mode 100644
index af06fda..0000000
--- a/igds-web/src/main/resources/static/img/logo-5315.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5317.png b/igds-web/src/main/resources/static/img/logo-5317.png
deleted file mode 100644
index 0db6d71..0000000
--- a/igds-web/src/main/resources/static/img/logo-5317.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5319.png b/igds-web/src/main/resources/static/img/logo-5319.png
deleted file mode 100644
index 0db6d71..0000000
--- a/igds-web/src/main/resources/static/img/logo-5319.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5320.png b/igds-web/src/main/resources/static/img/logo-5320.png
deleted file mode 100644
index 0db6d71..0000000
--- a/igds-web/src/main/resources/static/img/logo-5320.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-5325.png b/igds-web/src/main/resources/static/img/logo-5325.png
deleted file mode 100644
index d2c753c..0000000
--- a/igds-web/src/main/resources/static/img/logo-5325.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-title-4002.png b/igds-web/src/main/resources/static/img/logo-title-4002.png
deleted file mode 100644
index b9ff0e1..0000000
--- a/igds-web/src/main/resources/static/img/logo-title-4002.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-title-4004-2.png b/igds-web/src/main/resources/static/img/logo-title-4004-2.png
deleted file mode 100644
index 6784252..0000000
--- a/igds-web/src/main/resources/static/img/logo-title-4004-2.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-title-4005-1.png b/igds-web/src/main/resources/static/img/logo-title-4005-1.png
deleted file mode 100644
index 88a649c..0000000
--- a/igds-web/src/main/resources/static/img/logo-title-4005-1.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-title-4008.png b/igds-web/src/main/resources/static/img/logo-title-4008.png
deleted file mode 100644
index d1ea772..0000000
--- a/igds-web/src/main/resources/static/img/logo-title-4008.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-title-5000-2.png b/igds-web/src/main/resources/static/img/logo-title-5000-2.png
deleted file mode 100644
index b23c912..0000000
--- a/igds-web/src/main/resources/static/img/logo-title-5000-2.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-title-5004.png b/igds-web/src/main/resources/static/img/logo-title-5004.png
deleted file mode 100644
index fe36c1d..0000000
--- a/igds-web/src/main/resources/static/img/logo-title-5004.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-title-5010-2.png b/igds-web/src/main/resources/static/img/logo-title-5010-2.png
deleted file mode 100644
index 6d8e628..0000000
--- a/igds-web/src/main/resources/static/img/logo-title-5010-2.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-title-5012.png b/igds-web/src/main/resources/static/img/logo-title-5012.png
deleted file mode 100644
index 8aae54a..0000000
--- a/igds-web/src/main/resources/static/img/logo-title-5012.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-title-5013-1.png b/igds-web/src/main/resources/static/img/logo-title-5013-1.png
deleted file mode 100644
index 1f88d38..0000000
--- a/igds-web/src/main/resources/static/img/logo-title-5013-1.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-title-5013-2.png b/igds-web/src/main/resources/static/img/logo-title-5013-2.png
deleted file mode 100644
index 464fdb9..0000000
--- a/igds-web/src/main/resources/static/img/logo-title-5013-2.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-title-5016.png b/igds-web/src/main/resources/static/img/logo-title-5016.png
deleted file mode 100644
index b23c912..0000000
--- a/igds-web/src/main/resources/static/img/logo-title-5016.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-title-5301.png b/igds-web/src/main/resources/static/img/logo-title-5301.png
deleted file mode 100644
index ef4fbcc..0000000
--- a/igds-web/src/main/resources/static/img/logo-title-5301.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-title-5303.png b/igds-web/src/main/resources/static/img/logo-title-5303.png
deleted file mode 100644
index 091df44..0000000
--- a/igds-web/src/main/resources/static/img/logo-title-5303.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-title-5305.png b/igds-web/src/main/resources/static/img/logo-title-5305.png
deleted file mode 100644
index d3e6465..0000000
--- a/igds-web/src/main/resources/static/img/logo-title-5305.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-title-5308.png b/igds-web/src/main/resources/static/img/logo-title-5308.png
deleted file mode 100644
index 1f88d38..0000000
--- a/igds-web/src/main/resources/static/img/logo-title-5308.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-title-5312.png b/igds-web/src/main/resources/static/img/logo-title-5312.png
deleted file mode 100644
index 1f88d38..0000000
--- a/igds-web/src/main/resources/static/img/logo-title-5312.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-title-5317.png b/igds-web/src/main/resources/static/img/logo-title-5317.png
deleted file mode 100644
index b23c912..0000000
--- a/igds-web/src/main/resources/static/img/logo-title-5317.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-title-5319.png b/igds-web/src/main/resources/static/img/logo-title-5319.png
deleted file mode 100644
index b23c912..0000000
--- a/igds-web/src/main/resources/static/img/logo-title-5319.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/img/logo-title-5320.png b/igds-web/src/main/resources/static/img/logo-title-5320.png
deleted file mode 100644
index b23c912..0000000
--- a/igds-web/src/main/resources/static/img/logo-title-5320.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/js/constant.js b/igds-web/src/main/resources/static/js/constant.js
index cfe4740..f609ad5 100644
--- a/igds-web/src/main/resources/static/js/constant.js
+++ b/igds-web/src/main/resources/static/js/constant.js
@@ -13,29 +13,29 @@
ZERO: "ZERO"
};
-// 璁惧绫诲瀷
+// 璁惧绫诲瀷01-椋庣獥 "02-杞存祦椋庣獥"),"03-绂诲績椋庢満"),"04-鐜祦椋庢満"),"05-绌鸿皟"),"06-鐓ф槑"),"07-鏅�氶榾闂�"),"08-姘旀车"),"09-涓婚榾闂�"),"0B-閫氶鍙�"),"0C-娣锋祦椋庢満"),"0D-鍔犲帇椋庢満");
var DeviceType = {
- TYPE_01: "01",// 01-椋庣獥
- TYPE_02: "02", // "02-杞存祦椋庣獥"),
- TYPE_03: "03", // "03-绂诲績椋庢満"),
- TYPE_04: "04", // "04-鐜祦椋庢満"),
- TYPE_05: "05", // "05-绌鸿皟"),
- TYPE_06: "06", // "06-鐓ф槑"),
- TYPE_07: "07", // "07-鏅�氶榾闂�"),
- TYPE_08: "08", // "08-姘旀车"),
- TYPE_09: "09", // "09-涓婚榾闂�"),
- TYPE_0B: "0B", // "0B-閫氶鍙�"),
- TYPE_0C: "0C", // "0C-娣锋祦椋庢満"),
- TYPE_0D: "0D" // "0D-鍔犲帇椋庢満");
+ TYPE_01: "01",
+ TYPE_02: "02",
+ TYPE_03: "03",
+ TYPE_04: "04",
+ TYPE_05: "05",
+ TYPE_06: "06",
+ TYPE_07: "07",
+ TYPE_08: "08",
+ TYPE_09: "09",
+ TYPE_0B: "0B",
+ TYPE_0C: "0C",
+ TYPE_0D: "0D"
};
-// 璁惧绫诲瀷
+// 璁惧绫诲瀷 01-姝ｉ潰 "02-鑳岄潰"), "03-宸︿晶"), "04-鍙充晶"), "05-浠撳唴"),
var DeviceLocation = {
- L_01: "01",// 01-姝ｉ潰
- L_02: "02", // "02-鑳岄潰"),
- L_03: "03", // "03-宸︿晶"),
- L_04: "04", // "04-鍙充晶"),
- L_05: "05" // "05-浠撳唴"),
+ L_01: "01",
+ L_02: "02",
+ L_03: "03",
+ L_04: "04",
+ L_05: "05"
};
// 鍑哄叆搴�-娴佺▼
@@ -51,13 +51,13 @@
RECORD: "RECORD"
};
-// 浠撳簱绫诲瀷
+// 浠撳簱绫诲瀷//骞虫柟浠�//娴呭渾浠�//娌圭綈//绔嬬瓛浠�//鍏朵粬绫诲瀷
var DepotType = {
- T_01: "01", //骞虫柟浠�
- T_02: "02",//娴呭渾浠�
- T_03: "03",//娌圭綈
- T_04: "04",//绔嬬瓛浠�
- T_99: "99"//鍏朵粬绫诲瀷
+ T_01: "01",
+ T_02: "02",
+ T_03: "03",
+ T_04: "04",
+ T_99: "99"
};
// 浠撳簱鐘舵��
diff --git a/igds-web/src/main/resources/static/testImg/cn/cn001.png b/igds-web/src/main/resources/static/testImg/cn/cn001.png
deleted file mode 100644
index 2e623eb..0000000
--- a/igds-web/src/main/resources/static/testImg/cn/cn001.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/cn/cn002.png b/igds-web/src/main/resources/static/testImg/cn/cn002.png
deleted file mode 100644
index 7ae6f26..0000000
--- a/igds-web/src/main/resources/static/testImg/cn/cn002.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/cn/cn003.png b/igds-web/src/main/resources/static/testImg/cn/cn003.png
deleted file mode 100644
index 102908f..0000000
--- a/igds-web/src/main/resources/static/testImg/cn/cn003.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/cn/cn004.png b/igds-web/src/main/resources/static/testImg/cn/cn004.png
deleted file mode 100644
index e46d638..0000000
--- a/igds-web/src/main/resources/static/testImg/cn/cn004.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/cn/cn005.png b/igds-web/src/main/resources/static/testImg/cn/cn005.png
deleted file mode 100644
index 76b2952..0000000
--- a/igds-web/src/main/resources/static/testImg/cn/cn005.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/cn/cn006.png b/igds-web/src/main/resources/static/testImg/cn/cn006.png
deleted file mode 100644
index 5abc09f..0000000
--- a/igds-web/src/main/resources/static/testImg/cn/cn006.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/cn/cn007.png b/igds-web/src/main/resources/static/testImg/cn/cn007.png
deleted file mode 100644
index 1887285..0000000
--- a/igds-web/src/main/resources/static/testImg/cn/cn007.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/cn/cn008.png b/igds-web/src/main/resources/static/testImg/cn/cn008.png
deleted file mode 100644
index 0996d55..0000000
--- a/igds-web/src/main/resources/static/testImg/cn/cn008.png
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/dj/dj001.jpg b/igds-web/src/main/resources/static/testImg/dj/dj001.jpg
deleted file mode 100644
index 47b3ded..0000000
--- a/igds-web/src/main/resources/static/testImg/dj/dj001.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/dj/dj002.jpg b/igds-web/src/main/resources/static/testImg/dj/dj002.jpg
deleted file mode 100644
index e37da52..0000000
--- a/igds-web/src/main/resources/static/testImg/dj/dj002.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/dj/dj003.jpg b/igds-web/src/main/resources/static/testImg/dj/dj003.jpg
deleted file mode 100644
index 0f495cd..0000000
--- a/igds-web/src/main/resources/static/testImg/dj/dj003.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/dj/dj004.jpg b/igds-web/src/main/resources/static/testImg/dj/dj004.jpg
deleted file mode 100644
index b005a90..0000000
--- a/igds-web/src/main/resources/static/testImg/dj/dj004.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/dj/dj005.jpg b/igds-web/src/main/resources/static/testImg/dj/dj005.jpg
deleted file mode 100644
index ce8f59e..0000000
--- a/igds-web/src/main/resources/static/testImg/dj/dj005.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/dj/dj006.jpg b/igds-web/src/main/resources/static/testImg/dj/dj006.jpg
deleted file mode 100644
index 0aa24ee..0000000
--- a/igds-web/src/main/resources/static/testImg/dj/dj006.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/dj/dj007.jpg b/igds-web/src/main/resources/static/testImg/dj/dj007.jpg
deleted file mode 100644
index c4d5127..0000000
--- a/igds-web/src/main/resources/static/testImg/dj/dj007.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/dj/dj008.jpg b/igds-web/src/main/resources/static/testImg/dj/dj008.jpg
deleted file mode 100644
index a50288e..0000000
--- a/igds-web/src/main/resources/static/testImg/dj/dj008.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/dj/dj009.jpg b/igds-web/src/main/resources/static/testImg/dj/dj009.jpg
deleted file mode 100644
index 2e93b0c..0000000
--- a/igds-web/src/main/resources/static/testImg/dj/dj009.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/dj/dj010.jpg b/igds-web/src/main/resources/static/testImg/dj/dj010.jpg
deleted file mode 100644
index 5b43933..0000000
--- a/igds-web/src/main/resources/static/testImg/dj/dj010.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/dj/dj011.jpg b/igds-web/src/main/resources/static/testImg/dj/dj011.jpg
deleted file mode 100644
index 3ac16cb..0000000
--- a/igds-web/src/main/resources/static/testImg/dj/dj011.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/dj/dj012.jpg b/igds-web/src/main/resources/static/testImg/dj/dj012.jpg
deleted file mode 100644
index 84b9338..0000000
--- a/igds-web/src/main/resources/static/testImg/dj/dj012.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/dj/dj013.jpg b/igds-web/src/main/resources/static/testImg/dj/dj013.jpg
deleted file mode 100644
index 5af77cb..0000000
--- a/igds-web/src/main/resources/static/testImg/dj/dj013.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/io/io001.jpg b/igds-web/src/main/resources/static/testImg/io/io001.jpg
deleted file mode 100644
index e9ef706..0000000
--- a/igds-web/src/main/resources/static/testImg/io/io001.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/io/io002.jpg b/igds-web/src/main/resources/static/testImg/io/io002.jpg
deleted file mode 100644
index fdb5046..0000000
--- a/igds-web/src/main/resources/static/testImg/io/io002.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/io/io003.jpg b/igds-web/src/main/resources/static/testImg/io/io003.jpg
deleted file mode 100644
index 593fe12..0000000
--- a/igds-web/src/main/resources/static/testImg/io/io003.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/io/io004.jpg b/igds-web/src/main/resources/static/testImg/io/io004.jpg
deleted file mode 100644
index 76e2553..0000000
--- a/igds-web/src/main/resources/static/testImg/io/io004.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/io/io005.jpg b/igds-web/src/main/resources/static/testImg/io/io005.jpg
deleted file mode 100644
index 84196df..0000000
--- a/igds-web/src/main/resources/static/testImg/io/io005.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/io/io006.jpg b/igds-web/src/main/resources/static/testImg/io/io006.jpg
deleted file mode 100644
index 31c8e6f..0000000
--- a/igds-web/src/main/resources/static/testImg/io/io006.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/io/io007.jpg b/igds-web/src/main/resources/static/testImg/io/io007.jpg
deleted file mode 100644
index 2d199ba..0000000
--- a/igds-web/src/main/resources/static/testImg/io/io007.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/io/io008.jpg b/igds-web/src/main/resources/static/testImg/io/io008.jpg
deleted file mode 100644
index c683685..0000000
--- a/igds-web/src/main/resources/static/testImg/io/io008.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/io/io009.jpg b/igds-web/src/main/resources/static/testImg/io/io009.jpg
deleted file mode 100644
index 6c8c238..0000000
--- a/igds-web/src/main/resources/static/testImg/io/io009.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/io/io010.jpg b/igds-web/src/main/resources/static/testImg/io/io010.jpg
deleted file mode 100644
index fd4fe2c..0000000
--- a/igds-web/src/main/resources/static/testImg/io/io010.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/io/io011.jpg b/igds-web/src/main/resources/static/testImg/io/io011.jpg
deleted file mode 100644
index ed17fe2..0000000
--- a/igds-web/src/main/resources/static/testImg/io/io011.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/io/io012.jpg b/igds-web/src/main/resources/static/testImg/io/io012.jpg
deleted file mode 100644
index dde988a..0000000
--- a/igds-web/src/main/resources/static/testImg/io/io012.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/io/io013.jpg b/igds-web/src/main/resources/static/testImg/io/io013.jpg
deleted file mode 100644
index b646e04..0000000
--- a/igds-web/src/main/resources/static/testImg/io/io013.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/io/io014.jpg b/igds-web/src/main/resources/static/testImg/io/io014.jpg
deleted file mode 100644
index fdb1f30..0000000
--- a/igds-web/src/main/resources/static/testImg/io/io014.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/io/io015.jpg b/igds-web/src/main/resources/static/testImg/io/io015.jpg
deleted file mode 100644
index 82ed13e..0000000
--- a/igds-web/src/main/resources/static/testImg/io/io015.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/io/io016.jpg b/igds-web/src/main/resources/static/testImg/io/io016.jpg
deleted file mode 100644
index 858d562..0000000
--- a/igds-web/src/main/resources/static/testImg/io/io016.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/io/io017.jpg b/igds-web/src/main/resources/static/testImg/io/io017.jpg
deleted file mode 100644
index 5b9a774..0000000
--- a/igds-web/src/main/resources/static/testImg/io/io017.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/io/io018.jpg b/igds-web/src/main/resources/static/testImg/io/io018.jpg
deleted file mode 100644
index bf1bcea..0000000
--- a/igds-web/src/main/resources/static/testImg/io/io018.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/user/user.jpg b/igds-web/src/main/resources/static/testImg/user/user.jpg
deleted file mode 100644
index d96ca44..0000000
--- a/igds-web/src/main/resources/static/testImg/user/user.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/user/user1.jpg b/igds-web/src/main/resources/static/testImg/user/user1.jpg
deleted file mode 100644
index b42a8ae..0000000
--- a/igds-web/src/main/resources/static/testImg/user/user1.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/user/user2.jpg b/igds-web/src/main/resources/static/testImg/user/user2.jpg
deleted file mode 100644
index c72c107..0000000
--- a/igds-web/src/main/resources/static/testImg/user/user2.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/user/user3.jpg b/igds-web/src/main/resources/static/testImg/user/user3.jpg
deleted file mode 100644
index 665a11d..0000000
--- a/igds-web/src/main/resources/static/testImg/user/user3.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/static/testImg/user/user4.jpg b/igds-web/src/main/resources/static/testImg/user/user4.jpg
deleted file mode 100644
index c94cf95..0000000
--- a/igds-web/src/main/resources/static/testImg/user/user4.jpg
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/templates/admin/grain/grain-check3.html b/igds-web/src/main/resources/templates/admin/grain/grain-check3.html
index f798085..94d7420 100644
--- a/igds-web/src/main/resources/templates/admin/grain/grain-check3.html
+++ b/igds-web/src/main/resources/templates/admin/grain/grain-check3.html
@@ -218,23 +218,23 @@
<p>
<span id="tempAve">--</span>鈩�
</p>
- <h4>绮潎娓�</h4>
+ <h4>娌瑰潎娓�</h4>
</div>
<div class="layui-col-lg4 lq-cTop-item">
<p>
<span id="tempMax">--</span>鈩�
</p>
- <h4>绮珮娓�</h4>
+ <h4>娌归珮娓�</h4>
</div>
<div class="layui-col-lg4 lq-cTop-item">
<p>
<span id="tempMin">--</span>鈩�
</p>
- <h4>绮綆娓�</h4>
+ <h4>娌逛綆娓�</h4>
</div>
</div>
</div>
- <div class="lq-cTop-2">
+ <div class="lq-cTop-2" style="display:none;" >
<div class="layui-row">
<div class="layui-col-lg4 lq-cTop-item">
<p>
diff --git a/igds-web/src/main/resources/templates/admin/home.html b/igds-web/src/main/resources/templates/admin/home.html
index a0499e0..1f20896 100644
--- a/igds-web/src/main/resources/templates/admin/home.html
+++ b/igds-web/src/main/resources/templates/admin/home.html
@@ -130,12 +130,6 @@
<!-- <span class="text-muted text-xs block" th:text="${loginUser.cname}">绠＄悊鍛�<b class="caret"></b></span>-->
</span>
</a>
-<!-- <ul class="dropdown-menu animated fadeInRight m-t-xs">-->
-<!-- <li><a class="J_menuItem"-->
-<!-- href="./com.ld.igds.sys.UserCenter.d">涓汉涓績</a></li>-->
-<!-- <li class="divider"></li>-->
-<!-- <li><a href="./log-out">瀹夊叏閫�鍑�</a></li>-->
-<!-- </ul>-->
</div>
<div class="logo-element">绮簱</div>
</li>
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-check.html b/igds-web/src/main/resources/templates/admin/inout/in-check.html
index 144956c..dbc2da0 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-check.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-check.html
@@ -350,6 +350,8 @@
var companyId = [[${loginUser.companyId}]];
//鍝佺
var listFoodVariety = [[${listFoodVariety}]];
+ //鎬ц川
+ var listFoodType = [[${listFoodType}]];
var startTime = [[${startTime}]];
var endTime = [[${endTime}]];
var foodYear = [[${foodYear}]];
@@ -515,25 +517,19 @@
</div>
</div>
</div>
- <!-- <div class="layui-col-xs4">-->
- <!-- <div class="layui-form-item">-->
- <!-- <label class="layui-form-label red">绮骞翠唤</label>-->
- <!-- <div class="layui-input-block">-->
- <!-- <input type="text" name="foodYear" placeholder="璇疯緭鍏�"-->
- <!-- class="layui-input rkbk-search-input bg-date" id="foodYear">-->
-
- <!-- </div>-->
- <!-- </div>-->
- <!-- </div>-->
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">澶囨敞璇存槑</label>
+ <label class="layui-form-label red">绮鎬ц川</label>
<div class="layui-input-block">
- <input type="text" name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
- class="layui-input">
+ <select id="foodType" name="foodType" lay-filter="select_foodType">
+ <option value=""></option>
+ <option th:each="dic,dicSet:${listFoodType}"
+ th:value="${dic.code}" th:text="${dic.name}"></option>
+ </select>
</div>
</div>
</div>
+
<div class="layui-col-xs4">
<div class="layui-form-item">
<label class="layui-form-label red">鍖栭獙缁撴灉</label>
@@ -546,6 +542,15 @@
</div>
</div>
</div>
+ <div class="layui-col-xs12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞璇存槑</label>
+ <div class="layui-input-block">
+ <input type="text" name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
+ class="layui-input">
+ </div>
+ </div>
+ </div>
<div class="layui-col-xs12" style="margin-bottom: 10px">
<div style="padding-left: 50px; color: #2ab5ad;">
<span style="font-weight: bold; margin-right: 10px;">澶囨敞璇存槑锛�1.缁撴灉鍒ゅ畾锛氱郴缁熸牴鎹悇鍖栭獙椤圭粨鏋滃垽瀹氾紝鏈�鍚庡寲楠岀粨鏋滈渶鎵嬪姩閫夋嫨纭锛�2.鏍哥畻瀹氫环锛氭牴鎹寲楠岄」閰嶇疆璁＄畻鐩稿叧澧炴墸浠凤紝鏈�鍚庡崟浠烽渶鎵嬪姩纭銆�</span>
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-ship-register.html b/igds-web/src/main/resources/templates/admin/inout/in-ship-register.html
index 1b7f686..689c1bb 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-ship-register.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-ship-register.html
@@ -37,18 +37,21 @@
}
.rkbk-right-form .layui-input-block {
- margin-right: unset;
+ margin-right: unset;
}
+
.layui-form-item .layui-input-inline {
width: unset;
}
- .rkbk-search-input{
+ .rkbk-search-input {
background: #FFF !important;
}
+
.rkbk-search-input.bg-date {
background: #FFF !important;
}
+
.layui-select-disabled .layui-disabled {
color: #000 !important;
}
@@ -61,6 +64,7 @@
padding: 10px;
color: blue;
}
+
.layui-form-selected dl {
max-height: 150px;
}
@@ -164,7 +168,8 @@
<!--rk-form-left end-->
<div class="rkbk-photo">
- <a href="#"><img id="id_img_pers" th:src="@{../../static/images/rkbk-photo_03.png}"/></a>
+ <a href="#"><img id="id_img_pers"
+ th:src="@{../../static/images/rkbk-photo_03.png}"/></a>
</div>
</div>
@@ -257,6 +262,9 @@
</select>
</div>
</div>
+ <div class="layui-form-item display-none">
+ <input type="text" name="foodLocationId">
+ </div>
<div class="layui-form-item">
<label class="layui-form-label">瑁呭嵏浠撳簱锛�</label>
<div class="layui-input-block">
@@ -311,6 +319,8 @@
var listDepot = [[${listDepot}]];
//褰撳墠鑺傜偣
+ //鍝佺
+ var listFoodVariety = [[${listFoodVariety}]];
//涓氬姟姝ラ
var bizType = [[${bizType}]];
var checkUser = [[${checkUser}]];
@@ -320,13 +330,13 @@
var userId = [[${loginUser.username}]];
var companyId = [[${loginUser.companyId}]];
//杞︾墝璇嗗埆
- var listFoodVariety = [[${listFoodVariety}]];
</script>
<script th:src="@{../../static/plugins/layui/layui.js}"></script>
<script th:src="@{../../static/js/jquery.min.js}"></script>
<script th:src="@{../../static/js/constant.js}"></script>
<script th:src="@{../../static/js/igds-common.js}"></script>
+<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
<script th:src="@{../../static/admin/inout/in-ship-register.js}"></script>
<!-- 寮瑰嚭閫氱煡鍗� -->
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-weight.html b/igds-web/src/main/resources/templates/admin/inout/in-weight.html
index 85339ce..ad5cbaf 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-weight.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-weight.html
@@ -264,8 +264,8 @@
<input type="button" value="璇昏韩浠借瘉"
class="rkbk-search-btn layui-btn r-120"
onclick="flushIdCard()">
- <input type="button" value="鎵嬪姩鏌ヨ"
- class="rkbk-search-btn layui-btn" onclick="flushByHand()">
+ <input type="button" value="鎵嬪姩閫夋嫨"
+ class="rkbk-search-btn layui-btn" onclick="selectByHand()">
</div>
</div>
@@ -293,10 +293,10 @@
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label color-red">鏅烘収鍗″彿</label>
+ <label class="layui-form-label">鏅烘収鍗″彿</label>
<div class="layui-input-block">
<input type="text" name="intelCard" id="intelCard"
- placeholder="鍒峰崱/鎵嬪姩褰曞叆" autocomplete="off" class="layui-input">
+ placeholder="鏅烘収鍗″彿" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -305,7 +305,7 @@
<div class="layui-form-item">
<label class="layui-form-label color-red">杞︾墝鍙�</label>
<div class="layui-input-block">
- <input type="text" name="plateNum" id="plateNum" placeholder="鑷姩甯﹀叆/鎵嬪姩褰曞叆"
+ <input type="text" name="plateNum" id="plateNum" placeholder="鑷姩甯﹀叆"
autocomplete="off" class="layui-input">
</div>
</div>
@@ -737,17 +737,7 @@
<!-- 鍖栭獙缁撴灉淇℃伅 -->
<table class="layui-table tableCheckItem" id="tableCheckItem"
lay-filter="tableCheckItem">
- <colgroup>
- <col width="10%">
- <col width="10%">
- <col width="10%">
- <col width="10%">
- <col width="10%">
- <col width="10%">
- <col width="10%">
- <col width="10%">
- <col width="10%">
- <col width="">
+ <colgroup><col><col><col><col><col><col><col><col><col><col>
</colgroup>
<thead>
<tr class="qyzj-table-tit">
@@ -766,14 +756,26 @@
<tbody>
</tbody>
</table>
-
+</div>
+<!-- 娴佺▼鏁版嵁淇℃伅 -->
+<div class="layui-tab-content" id="listProgressData" style="display: none;">
+ <table class="layui-table tableListProgressData" id="tableListProgressData"
+ lay-filter="tableListProgressData">
+ <thead>
+ <tr class="qyzj-table-tit">
+ <th>鍗曟嵁鍙�</th><th>鎵胯繍浜�</th><th>杞︾墝鍙�</th><th>鎿嶄綔</th>
+ </tr>
+ </thead>
+ <tbody>
+ </tbody>
+ </table>
</div>
<!-- 寮瑰嚭妗嗙殑淇℃伅 -->
<div class="layui-tab-content" id="dialog-from-notify" style="display: none;">
<table class="layui-table">
<colgroup>
- <col width="100">
+ <col>
</colgroup>
<tbody>
<tr>
@@ -811,4 +813,8 @@
</div>
</script>
+<script type="text/html" id="barSelectProgress">
+ <a class="layui-btn layui-btn-xs" lay-event="select">閫夋嫨绉伴噸</a>
+</script>
+
</html>
\ No newline at end of file
diff --git a/igds-web/src/main/resources/templates/admin/inout/out-ship-register.html b/igds-web/src/main/resources/templates/admin/inout/out-ship-register.html
index 140af84..be0af73 100644
--- a/igds-web/src/main/resources/templates/admin/inout/out-ship-register.html
+++ b/igds-web/src/main/resources/templates/admin/inout/out-ship-register.html
@@ -33,17 +33,21 @@
}
.rkbk-right-form .layui-input-block {
- margin-right: unset;
+ margin-right: unset;
}
+
.layui-form-item .layui-input-inline {
width: unset;
}
- .rkbk-search-input{
+
+ .rkbk-search-input {
background: #FFF !important;
}
+
.rkbk-search-input.bg-date {
background: #FFF !important;
}
+
.layui-select-disabled .layui-disabled {
color: #000 !important;
}
@@ -51,6 +55,7 @@
.layui-table td {
font-weight: bold;
}
+
.layui-form-selected dl {
max-height: 150px;
}
@@ -300,6 +305,7 @@
var userId = [[${loginUser.username}]];
var companyId = [[${loginUser.companyId}]];
//杞︾墝璇嗗埆
+ //鍝佺
var listFoodVariety = [[${listFoodVariety}]];
</script>
@@ -307,6 +313,7 @@
<script th:src="@{../../static/js/jquery.min.js}"></script>
<script th:src="@{../../static/js/constant.js}"></script>
<script th:src="@{../../static/js/igds-common.js}"></script>
+<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
<script th:src="@{../../static/admin/inout/out-ship-register.js}"></script>
<!-- 寮瑰嚭閫氱煡鍗� -->
diff --git a/igds-web/src/main/resources/templates/admin/inout/out-weight.html b/igds-web/src/main/resources/templates/admin/inout/out-weight.html
index abc679c..31bff3a 100644
--- a/igds-web/src/main/resources/templates/admin/inout/out-weight.html
+++ b/igds-web/src/main/resources/templates/admin/inout/out-weight.html
@@ -251,8 +251,8 @@
class="rkbk-search-btn layui-btn r-120"
onclick="flushIdCard()">
- <input type="button" value="鎵嬪姩鏌ヨ"
- class="rkbk-search-btn layui-btn" onclick="flushData()">
+ <input type="button" value="鎵嬪姩閫夋嫨"
+ class="rkbk-search-btn layui-btn" onclick="selectByHand()">
</div>
</div>
@@ -291,7 +291,7 @@
<label class="layui-form-label color-red">鏅烘収鍗″彿</label>
<div class="layui-input-block">
<input type="text" name="intelCard" id="intelCard"
- placeholder="鍒峰崱/鎵嬪姩褰曞叆" autocomplete="off" class="layui-input">
+ placeholder="鏅烘収鍗″彿" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -300,7 +300,7 @@
<div class="layui-form-item">
<label class="layui-form-label color-red">杞︾墝鍙�</label>
<div class="layui-input-block">
- <input type="text" name="plateNum" id="plateNum" placeholder="鑷姩褰曞叆/鎵嬪姩褰曞叆"
+ <input type="text" name="plateNum" id="plateNum" placeholder="鑷姩褰曞叆"
autocomplete="off" class="layui-input">
</div>
</div>
@@ -785,6 +785,20 @@
lay-filter="tableFoodLoaction" style="margin: 0px;"></table>
</div>
+<!-- 娴佺▼鏁版嵁淇℃伅 -->
+<div class="layui-tab-content" id="listProgressData" style="display: none;">
+ <table class="layui-table tableListProgressData" id="tableListProgressData"
+ lay-filter="tableListProgressData">
+ <thead>
+ <tr class="qyzj-table-tit">
+ <th>鍗曟嵁鍙�</th><th>鎵胯繍浜�</th><th>杞︾墝鍙�</th><th>鎿嶄綔</th>
+ </tr>
+ </thead>
+ <tbody>
+ </tbody>
+ </table>
+</div>
+
<!-- 寮瑰嚭妗嗙殑淇℃伅 -->
<div class="layui-tab-content" id="dialog-from-notify" style="display: none;">
<table class="layui-table">
@@ -827,4 +841,8 @@
</div>
</script>
+<script type="text/html" id="barSelectProgress">
+ <a class="layui-btn layui-btn-xs" lay-event="select">閫夋嫨绉伴噸</a>
+</script>
+
</html>
\ No newline at end of file
diff --git a/igds-web/src/main/resources/templates/index/index-5303.html b/igds-web/src/main/resources/templates/index/index-5303.html
index 9607dd1..31b9ac7 100644
--- a/igds-web/src/main/resources/templates/index/index-5303.html
+++ b/igds-web/src/main/resources/templates/index/index-5303.html
@@ -112,9 +112,9 @@
<P>鏅鸿兘姘旇皟</P>
</a>
</span> <span class="i-menu-item i-menu4 i-navBg4"> <a
- href="javascript:;" onclick="openByTag('hlxz')"> <i><img
+ href="javascript:;" onclick="openByTag('warn')"> <i><img
th:src="@{/static/images/i-icon-hlzx.png}"/></i>
- <P>鐜祦鐔忚捀</P>
+ <P>鏅鸿兘棰勮</P>
</a>
</span> <span class="i-menu-item i-menu5 i-navBg5">
<a href="javascript:;" onclick="openQuantity()"> <i><img
diff --git a/igds-web/src/main/resources/templates/index/index-5326.html b/igds-web/src/main/resources/templates/index/index-5326.html
new file mode 100644
index 0000000..09b35d2
--- /dev/null
+++ b/igds-web/src/main/resources/templates/index/index-5326.html
@@ -0,0 +1,223 @@
+<!DOCTYPE html>
+<html lang="zh-cn" xmlns:th=http://www.thymeleaf.org>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1, maximum-scale=1">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="renderer" content="webkit">
+ <title>鏅烘収浠撳簱绠＄悊绯荤粺 -棣栭〉</title>
+ <meta name="description" content="鏅烘収浠撳簱绠＄悊绯荤粺">
+
+ <link rel="shortcut icon" th:href="@{/static/favicon.ico}"/>
+ <link th:href="@{/static/plugins/layui/css/layui.css}" rel="stylesheet"
+ type="text/css">
+ <link th:href="@{/static/index/index.css}" rel="stylesheet"
+ type="text/css">
+
+</head>
+<style>
+ .i-footer p {
+ line-height: 24px;
+ /* color: #8a99a6; */
+ color: #FFF;
+ font-size: 16px;
+ }
+
+ .i-tit img {
+ height: 96px;
+ }
+ .dis-none{
+ display: none !important;
+ }
+</style>
+
+<body>
+<div class="i-bodyBg">
+ <img th:src="@{/static/images/i-body2.png}"/>
+</div>
+
+<div class="i-container ">
+ <div class="i-top layui-row">
+ <div class="layui-col-lg6">
+ <h1 class="i-logo">
+ <img th:src="${logoTitle}"/>
+ </h1>
+ </div>
+ <div class="i-top-r">
+ <a id="menu-group" href="./home-group" target="_self" class="i-top-btn dis-none">
+ <i class="i-icon">
+ <img th:src="@{/static/images/i-icon-sy.png}" style="height: 28px;width: 28px;"/>
+ </i>
+ 棣栭〉
+ </a>
+ <a href="./basic/common/help-center" target="_blank" class="i-top-btn">
+ <i class="i-icon">
+ <img th:src="@{/static/images/i-icon-help.png}"/>
+ </i>
+ 甯姪
+ </a>
+ <a href="./basic/databoard/index-gateway" target="_blank" class="i-top-btn">
+ <i class="i-icon">
+ <img th:src="@{/static/images/i-icon-dpm.png}"/>
+ </i>
+ 缁煎悎澶у睆
+ </a>
+ <a href="./basic/databoard/inout" target="_blank" class="i-top-btn">
+ <i class="i-icon">
+ <img th:src="@{/static/images/i-icon-dpm.png}"/>
+ </i>
+ 鍑哄叆搴撳ぇ灞�
+ </a>
+ <a href="./log-out" class="i-top-btn">
+ <i class="i-icon">
+ <img th:src="@{/static/images/i-icon-tc.png}"/>
+ </i>
+ 閫�鍑虹櫥褰�
+ </a>
+ </div>
+ </div>
+
+</div>
+<!--i-top end-->
+
+<h2 class="i-tit">
+<!-- <img th:src="@{/static/images/login-titimg2.png}"/>-->
+ <span style="font-size: 46px;color: #FFFFFF;font-weight: 600;">鎯� 鏂� 浠� 鍌� 鏈� 闄� 鍏� 鍙� 鏅� 鎱� 绮� 搴� 绠� 鐞� 绯� 缁�</span>
+
+</h2>
+
+<div class="i-main layui-row">
+ <div class="layui-col-lg6">
+ <div class="i-menuBox">
+ <span class="i-menu-item i-menu-tit"> <img
+ th:src="@{/static/images/i-bg-tit1.png}"/>
+ </span> <span class="i-menu-item i-menu1 i-navBg1"> <a
+ href="javascript:;" onclick="openByTag('grain')"> <i><img
+ th:src="@{/static/images/i-icon-lq.png}"/></i>
+ <P>澶氬弬鏁扮伯鎯�</P>
+ </a>
+ </span> <span class="i-menu-item i-menu2 i-navBg2"> <a
+ href="javascript:;" onclick="openByTag('verb')"> <i><img
+ th:src="@{/static/images/i-icon-zntf.png}"/></i>
+ <P>鏅鸿兘閫氶</P>
+ </a>
+ </span> <span class="i-menu-item i-menu3 i-navBg3"> <a
+ href="javascript:;" onclick="openByTag('n2')"> <i><img
+ th:src="@{/static/images/i-icon-znqd.png}"/></i>
+ <P>鏅鸿兘姘旇皟</P>
+ </a>
+ </span> <span class="i-menu-item i-menu4 i-navBg4"> <a
+ href="javascript:;" onclick="openByTag('warn')"> <i><img
+ th:src="@{/static/images/i-icon-ai.png}"/></i>
+ <P>鏅鸿兘棰勮</P>
+ </a>
+ </span> <span class="i-menu-item i-menu5 i-navBg5">
+ <a href="javascript:;" onclick="openQuantity()"> <i><img
+ th:src="@{/static/images/i-icon-sljc.png}"/></i>
+ <P>绮鏁伴噺妫�娴�</P>
+ </a>
+ </span> <span class="i-menu-item i-menu6 i-navBg6"> <a
+ href="javascript:;" onclick="openByTag('temp')"> <i><img
+ th:src="@{/static/images/i-icon-wkgl.png}"/></i>
+ <P>鍐呯幆娴佹俯鎺�</P>
+ </a>
+ </span>
+ </div>
+ <!--i-menuBox end-->
+
+ </div>
+
+ <div class="layui-col-lg6">
+ <div class="i-menuBox">
+ <span class="i-menu-item i-menu-tit"> <img
+ th:src="@{/static/images/i-bg-tit2.png}"/>
+ </span> <span class="i-menu-item i-menu1 i-navBg6"> <a
+ href="javascript:;" onclick="openByTag('inout')"> <i><img
+ th:src="@{/static/images/i-icon-crkgl.png}"/></i>
+ <P>鍑哄叆搴撶鐞�</P>
+ </a>
+ </span> <span class="i-menu-item i-menu2 i-navBg3"> <a
+ href="javascript:;" onclick="openByTag('manager')"> <i><img
+ th:src="@{/static/images/i-icon-zhyw.png}"/></i>
+ <P>缁煎悎涓氬姟</P>
+ </a>
+ </span> <span class="i-menu-item i-menu3 i-navBg4"> <a
+ href="javascript:;" onClick="open3d()"> <i><img
+ th:src="@{/static/images/i-icon-swzs.png}"/></i>
+ <P>涓夌淮灞曠ず</P>
+ </a>
+ </span> <span class="i-menu-item i-menu4 i-navBg5"> <a
+ href="javascript:;" onclick="openByTag('sys')"> <i><img
+ th:src="@{/static/images/i-icon-xtgl.png}"/></i>
+ <P>绯荤粺绠＄悊</P>
+ </a>
+ </span> <span class="i-menu-item i-menu5 i-navBg2"> <a
+ href="javascript:;" onclick="openByTag('es')"> <i><img
+ th:src="@{/static/images/i-icon-nhgl.png}"/></i>
+ <P>鑳借�楃鐞�</P>
+ </a>
+ </span> <span class="i-menu-item i-menu6 i-navBg1"> <a
+ href="javascript:;" onclick="openByTag('security')"> <i><img
+ th:src="@{/static/images/i-icon-afgl.png}"/></i>
+ <P>瀹夐槻绠＄悊</P>
+ </a>
+ </span>
+ </div>
+ <!--i-menuBox end-->
+ </div>
+</div>
+
+<!--i-main end-->
+<div class="i-footer">
+ <p th:text=${support}>鎶�鏈敮鎸�: 椋庢鑷磋繙淇℃伅鎶�鏈偂浠芥湁闄愬叕鍙�</p>
+</div>
+
+<script th:src="@{/static/js/jquery.min.js}"></script>
+
+<script th:inline="javascript">
+ //瀹氫箟鍙橀噺
+ var companyId = [[${loginUser.companyId}]];
+ //userId
+ var userId = [[${loginUser.username}]];
+
+ //鏁伴噺妫�娴嬭闂湴鍧�
+ var quantityPath = [[${quantityPath}]];
+
+ //涓夌淮璺緞
+ var threePath = [[${threePath}]];
+
+ var groupTag = [[${groupTag}]];//鏄惁闆嗗洟鎴栬�呭叕鍙哥敤鎴疯繘鍏�
+
+ window.onload = function () {
+ //琛ㄧず闆嗗洟/鍏徃鐢ㄦ埛杩涘叆
+ if(1 == groupTag){
+ $("#menu-group").removeClass("dis-none");
+ }
+ };
+
+ function openByTag(tag) {
+ window.open("./home?t="+tag+"&g="+groupTag, "_self");
+ };
+
+ //鎵撳紑璐ㄩ噺妫�
+ function openQuantity() {
+ if ("#" == quantityPath) {
+ openByTag("quantity")
+ } else {
+ window.open(quantityPath, "_blank");
+ }
+ };
+
+ //鎵撳紑璐ㄩ噺妫�娴�
+ function open3d() {
+ if ("#" == threePath) {
+ window.open("#", "_self");
+ } else {
+ window.open(threePath, "_blank");
+ }
+ };
+</script>
+</body>
+
+</html>
diff --git a/igds-web/src/main/resources/templates/index/index-5327.html b/igds-web/src/main/resources/templates/index/index-5327.html
index 549e7d2..17b73d5 100644
--- a/igds-web/src/main/resources/templates/index/index-5327.html
+++ b/igds-web/src/main/resources/templates/index/index-5327.html
@@ -27,9 +27,10 @@
.i-tit img {
height: 96px;
}
- .dis-none{
- display: none !important;
- }
+
+ .dis-none {
+ display: none !important;
+ }
</style>
<body>
@@ -45,34 +46,34 @@
</h1>
</div>
<div class="i-top-r">
- <a id="menu-group" href="./home-group" target="_self" class="i-top-btn dis-none">
- <i class="i-icon">
- <img th:src="@{/static/images/i-icon-sy.png}" style="height: 28px;width: 28px;"/>
- </i>
- 棣栭〉
- </a>
- <a href="./basic/common/help-center" target="_blank" class="i-top-btn">
- <i class="i-icon">
- <img th:src="@{/static/images/i-icon-help.png}"/>
- </i>
- 甯姪
+ <a id="menu-group" href="./home-group" target="_self" class="i-top-btn dis-none">
+ <i class="i-icon">
+ <img th:src="@{/static/images/i-icon-sy.png}" style="height: 28px;width: 28px;"/>
+ </i>
+ 棣栭〉
</a>
- <a href="./basic/databoard/index-gateway" target="_blank" class="i-top-btn">
- <i class="i-icon">
- <img th:src="@{/static/images/i-icon-dpm.png}"/>
- </i>
- 缁煎悎澶у睆
- </a>
+ <a href="./basic/common/help-center" target="_blank" class="i-top-btn">
+ <i class="i-icon">
+ <img th:src="@{/static/images/i-icon-help.png}"/>
+ </i>
+ 甯姪
+ </a>
+ <a href="./basic/databoard/index-gateway" target="_blank" class="i-top-btn">
+ <i class="i-icon">
+ <img th:src="@{/static/images/i-icon-dpm.png}"/>
+ </i>
+ 缁煎悎澶у睆
+ </a>
<a href="./basic/databoard/inout" target="_blank" class="i-top-btn">
<i class="i-icon">
- <img th:src="@{/static/images/i-icon-dpm.png}"/>
- </i>
- 鍑哄叆搴撳ぇ灞�
+ <img th:src="@{/static/images/i-icon-dpm.png}"/>
+ </i>
+ 鍑哄叆搴撳ぇ灞�
</a>
<a href="./log-out" class="i-top-btn">
- <i class="i-icon">
- <img th:src="@{/static/images/i-icon-tc.png}"/>
- </i>
+ <i class="i-icon">
+ <img th:src="@{/static/images/i-icon-tc.png}"/>
+ </i>
閫�鍑虹櫥褰�
</a>
</div>
@@ -82,45 +83,51 @@
<!--i-top end-->
<h2 class="i-tit">
- <img th:src="@{/static/images/login-titimg2.png}"/>
+ <span style="font-size: 46px;color: #FFFFFF;font-weight: 600;">鍐� 绮� 渚� 搴� 绠� 鐞� 缁� 鍚� 淇� 鎭� 骞� 鍙�</span>
</h2>
<div class="i-main layui-row">
<div class="layui-col-lg6">
<div class="i-menuBox">
- <span class="i-menu-item i-menu-tit"> <img
- th:src="@{/static/images/i-bg-tit1.png}"/>
- </span> <span class="i-menu-item i-menu1 i-navBg1"> <a
- href="javascript:;" onclick="openByTag('grain')"> <i><img
- th:src="@{/static/images/i-icon-lq.png}"/></i>
- <P>绮儏娴嬫帶</P>
+ <span class="i-menu-item i-menu-tit">
+ <img th:src="@{/static/images/i-bg-tit1.png}"/>
+ </span>
+ <span class="i-menu-item i-menu1 i-navBg1">
+ <a href="javascript:;" onclick="openByTag('grain')">
+ <i><img th:src="@{/static/images/i-icon-lq.png}"/></i>
+ <P>绮儏娴嬫帶</P>
</a>
- </span> <span class="i-menu-item i-menu2 i-navBg2"> <a
- href="javascript:;" onclick="openByTag('verb')"> <i><img
- th:src="@{/static/images/i-icon-zntf.png}"/></i>
- <P>鏅鸿兘閫氶</P>
+ </span>
+ <span class="i-menu-item i-menu2 i-navBg2">
+ <a href="javascript:;" onclick="openByTag('verb')">
+ <i><img th:src="@{/static/images/i-icon-zntf.png}"/></i>
+ <P>鏅鸿兘閫氶</P>
</a>
- </span> <span class="i-menu-item i-menu3 i-navBg3"> <a
- href="javascript:;" onclick="openByTag('es')"> <i><img
- th:src="@{/static/images/i-icon-nhgl.png}"/></i>
- <P>鑳借�楃洃娴�</P>
+ </span>
+ <span class="i-menu-item i-menu3 i-navBg3">
+ <a href="javascript:;" onclick="openByTag('es')">
+ <i><img th:src="@{/static/images/i-icon-nhgl.png}"/></i>
+ <P>鑳借�楃洃娴�</P>
</a>
- </span> <span class="i-menu-item i-menu4 i-navBg4"> <a
- href="javascript:;" onclick="openByTag('warn')"> <i><img
- th:src="@{/static/images/i-icon-ai.png}"/></i>
- <P>閰嶉�佽窡韪�</P>
+ </span>
+ <span class="i-menu-item i-menu4 i-navBg4">
+ <a href="javascript:;" onclick="openByTag('warn')">
+ <i><img th:src="@{/static/images/i-icon-ai.png}"/></i>
+ <P>閰嶉�佽窡韪�</P>
</a>
- </span> <span class="i-menu-item i-menu5 i-navBg5">
- <a href="javascript:;" onclick="openQuantity()"> <i><img
- th:src="@{/static/images/i-icon-sljc.png}"/></i>
- <P>鐪佸钩鍙板鎺�</P>
+ </span>
+ <span class="i-menu-item i-menu5 i-navBg5">
+ <a href="javascript:;" onclick="openQuantity()">
+ <i><img th:src="@{/static/images/i-icon-sljc.png}"/></i>
+ <P>鐪佸钩鍙板鎺�</P>
</a>
- </span> <span class="i-menu-item i-menu6 i-navBg6"> <a
- href="javascript:;" onclick="openByTag('temp')"> <i><img
- th:src="@{/static/images/i-icon-wkgl.png}"/></i>
- <P>鏅鸿兘娓╂帶</P>
+ </span>
+ <span class="i-menu-item i-menu6 i-navBg6">
+ <a href="javascript:;" onclick="openByTag('temp')">
+ <i><img th:src="@{/static/images/i-icon-wkgl.png}"/></i>
+ <P>鏅鸿兘娓╂帶</P>
</a>
- </span>
+ </span>
</div>
<!--i-menuBox end-->
@@ -128,39 +135,45 @@
<div class="layui-col-lg6">
<div class="i-menuBox">
- <span class="i-menu-item i-menu-tit"> <img
- th:src="@{/static/images/i-bg-tit2.png}"/>
- </span> <span class="i-menu-item i-menu1 i-navBg6"> <a
- href="javascript:;" onclick="openByTag('inout')"> <i><img
- th:src="@{/static/images/i-icon-crkgl.png}"/></i>
- <P>鍑哄叆搴撶墿娴佺鐞�</P>
+ <span class="i-menu-item i-menu-tit">
+ <img th:src="@{/static/images/i-bg-tit2.png}"/>
+ </span>
+ <span class="i-menu-item i-menu1 i-navBg6">
+ <a href="javascript:;" onclick="openByTag('inout')">
+ <i><img th:src="@{/static/images/i-icon-crkgl.png}"/></i>
+ <P>鍑哄叆搴撶墿娴佺鐞�</P>
</a>
- </span> <span class="i-menu-item i-menu2 i-navBg3"> <a
- href="javascript:;" onclick="openByTag('manager')"> <i><img
- th:src="@{/static/images/i-icon-zhyw.png}"/></i>
- <P>涓氬姟绠＄悊</P>
+ </span>
+ <span class="i-menu-item i-menu2 i-navBg3">
+ <a href="javascript:;" onclick="openByTag('manager')">
+ <i><img th:src="@{/static/images/i-icon-zhyw.png}"/></i>
+ <P>涓氬姟绠＄悊</P>
</a>
- </span> <span class="i-menu-item i-menu3 i-navBg4"> <a
- href="javascript:;" onClick="open3d()"> <i><img
- th:src="@{/static/images/i-icon-swzs.png}"/></i>
- <P>涓夌淮灞曠ず</P>
+ </span>
+ <span class="i-menu-item i-menu3 i-navBg4">
+ <a href="javascript:;" onClick="open3d()">
+ <i><img th:src="@{/static/images/i-icon-swzs.png}"/></i>
+ <P>涓夌淮灞曠ず</P>
</a>
- </span> <span class="i-menu-item i-menu4 i-navBg5"> <a
- href="javascript:;" onclick="openByTag('sys')"> <i><img
- th:src="@{/static/images/i-icon-xtgl.png}"/></i>
- <P>绯荤粺绠＄悊</P>
+ </span>
+ <span class="i-menu-item i-menu4 i-navBg5">
+ <a href="javascript:;" onclick="openByTag('sys')">
+ <i><img th:src="@{/static/images/i-icon-xtgl.png}"/></i>
+ <P>绯荤粺绠＄悊</P>
</a>
- </span> <span class="i-menu-item i-menu5 i-navBg2"> <a
- href="javascript:;" onclick="openByTag('n2')"> <i><img
- th:src="@{/static/images/i-icon-znqd.png}"/></i>
- <P>鐜板満绠℃帶</P>
+ </span>
+ <span class="i-menu-item i-menu5 i-navBg2">
+ <a href="javascript:;" onclick="openByTag('n2')">
+ <i><img th:src="@{/static/images/i-icon-znqd.png}"/></i>
+ <P>鐜板満绠℃帶</P>
</a>
- </span> <span class="i-menu-item i-menu6 i-navBg1"> <a
- href="javascript:;" onclick="openByTag('security')"> <i><img
- th:src="@{/static/images/i-icon-afgl.png}"/></i>
+ </span>
+ <span class="i-menu-item i-menu6 i-navBg1">
+ <a href="javascript:;" onclick="openByTag('security')">
+ <i><img th:src="@{/static/images/i-icon-afgl.png}"/></i>
<P>鏅鸿兘瀹夐槻</P>
</a>
- </span>
+ </span>
</div>
<!--i-menuBox end-->
</div>
@@ -185,27 +198,27 @@
//涓夌淮璺緞
var threePath = [[${threePath}]];
- var groupTag = [[${groupTag}]];//鏄惁闆嗗洟鎴栬�呭叕鍙哥敤鎴疯繘鍏�
+ var groupTag = [[${groupTag}]];//鏄惁闆嗗洟鎴栬�呭叕鍙哥敤鎴疯繘鍏�
- window.onload = function () {
- //琛ㄧず闆嗗洟/鍏徃鐢ㄦ埛杩涘叆
- if(1 == groupTag){
- $("#menu-group").removeClass("dis-none");
- }
- };
+ window.onload = function () {
+ //琛ㄧず闆嗗洟/鍏徃鐢ㄦ埛杩涘叆
+ if (1 == groupTag) {
+ $("#menu-group").removeClass("dis-none");
+ }
+ };
- function openByTag(tag) {
- window.open("./home?t="+tag+"&g="+groupTag, "_self");
- };
+ function openByTag(tag) {
+ window.open("./home?t=" + tag + "&g=" + groupTag, "_self");
+ }
//鎵撳紑璐ㄩ噺妫�
function openQuantity() {
if ("#" == quantityPath) {
- openByTag("quantity")
+ openByTag("quantity")
} else {
window.open(quantityPath, "_blank");
}
- };
+ }
//鎵撳紑璐ㄩ噺妫�娴�
function open3d() {
@@ -214,7 +227,7 @@
} else {
window.open(threePath, "_blank");
}
- };
+ }
</script>
</body>
diff --git a/igds-web/src/main/resources/templates/index/index-5329.html b/igds-web/src/main/resources/templates/index/index-5329.html
new file mode 100644
index 0000000..3cec265
--- /dev/null
+++ b/igds-web/src/main/resources/templates/index/index-5329.html
@@ -0,0 +1,224 @@
+<!DOCTYPE html>
+<html lang="zh-cn" xmlns:th=http://www.thymeleaf.org>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1, maximum-scale=1">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="renderer" content="webkit">
+ <title>鏅烘収浠撳簱绠＄悊绯荤粺 -棣栭〉</title>
+ <meta name="description" content="鏅烘収浠撳簱绠＄悊绯荤粺">
+
+ <link rel="shortcut icon" th:href="@{/static/favicon.ico}"/>
+ <link th:href="@{/static/plugins/layui/css/layui.css}" rel="stylesheet"
+ type="text/css">
+ <link th:href="@{/static/index/index.css}" rel="stylesheet"
+ type="text/css">
+
+</head>
+<style>
+ .i-footer p {
+ line-height: 24px;
+ /* color: #8a99a6; */
+ color: #FFF;
+ font-size: 16px;
+ }
+
+ .i-tit img {
+ height: 96px;
+ }
+
+ .dis-none {
+ display: none !important;
+ }
+</style>
+
+<body>
+<div class="i-bodyBg">
+ <img th:src="@{/static/images/i-body2.png}"/>
+</div>
+
+<div class="i-container ">
+ <div class="i-top layui-row">
+ <div class="layui-col-lg6">
+ <h1 class="i-logo">
+ <img th:src="${logoTitle}"/>
+ </h1>
+ </div>
+ <div class="i-top-r">
+ <a id="menu-group" href="./home-group" target="_self" class="i-top-btn dis-none">
+ <i class="i-icon">
+ <img th:src="@{/static/images/i-icon-sy.png}" style="height: 28px;width: 28px;"/>
+ </i>
+ 棣栭〉
+ </a>
+ <!-- <a href="./basic/common/help-center" target="_blank" class="i-top-btn">-->
+ <!-- <i class="i-icon">-->
+ <!-- <img th:src="@{/static/images/i-icon-help.png}"/>-->
+ <!-- </i>-->
+ <!-- 甯姪-->
+ <!-- </a>-->
+ <a href="./basic/databoard/index-gateway" target="_blank" class="i-top-btn">
+ <i class="i-icon">
+ <img th:src="@{/static/images/i-icon-dpm.png}"/>
+ </i>
+ 缁煎悎澶у睆
+ </a>
+ <a href="./basic/databoard/inout" target="_blank" class="i-top-btn">
+ <i class="i-icon">
+ <img th:src="@{/static/images/i-icon-dpm.png}"/>
+ </i>
+ 鍑哄叆搴撳ぇ灞�
+ </a>
+ <a href="./log-out" class="i-top-btn">
+ <i class="i-icon">
+ <img th:src="@{/static/images/i-icon-tc.png}"/>
+ </i>
+ 閫�鍑虹櫥褰�
+ </a>
+ </div>
+ </div>
+
+</div>
+<!--i-top end-->
+
+<h2 class="i-tit">
+ <img th:src="@{/static/images/login-titimg2.png}"/>
+</h2>
+
+<div class="i-main layui-row">
+ <div class="layui-col-lg6">
+ <div class="i-menuBox">
+ <span class="i-menu-item i-menu-tit"> <img
+ th:src="@{/static/images/i-bg-tit1.png}"/>
+ </span> <span class="i-menu-item i-menu1 i-navBg1"> <a
+ href="javascript:;" onclick="openByTag('grain')"> <i><img
+ th:src="@{/static/images/i-icon-lq.png}"/></i>
+ <P>澶氬弬鏁扮伯鎯�</P>
+ </a>
+ </span> <span class="i-menu-item i-menu2 i-navBg2"> <a
+ href="javascript:;" onclick="openByTag('temp')"> <i><img
+ th:src="@{/static/images/i-icon-wkgl.png}"/></i>
+ <P>鍐呯幆娴佹俯鎺�</P>
+ </a>
+ </span> <span class="i-menu-item i-menu3 i-navBg3"> <a
+ href="javascript:;" onclick=""> <i></i>
+ <P></P>
+ </a>
+ </span> <span class="i-menu-item i-menu4 i-navBg4"> <a
+ href="javascript:;" onclick="openByTag('warn')"> <i><img
+ th:src="@{/static/images/i-icon-ai.png}"/></i>
+ <P>鏅鸿兘棰勮</P>
+ </a>
+ </span> <span class="i-menu-item i-menu5 i-navBg5">
+ <a href="javascript:;" onClick="openHelp()">
+ <i><img th:src="@{/static/images/i-icon-help1.png}"/></i>
+ <P>甯姪涓績</P>
+ </a>
+ </span> <span class="i-menu-item i-menu6 i-navBg6"> <a
+ href="javascript:;" onclick="openByTag('temp')"> <i></i>
+ <P></P>
+ </a>
+ </span>
+ </div>
+ <!--i-menuBox end-->
+
+ </div>
+
+ <div class="layui-col-lg6">
+ <div class="i-menuBox">
+ <span class="i-menu-item i-menu-tit"> <img
+ th:src="@{/static/images/i-bg-tit2.png}"/>
+ </span> <span class="i-menu-item i-menu1 i-navBg6"> <a
+ href="javascript:;" onclick="openByTag('inout')"> <i><img
+ th:src="@{/static/images/i-icon-crkgl.png}"/></i>
+ <P>鍑哄叆搴撶鐞�</P>
+ </a>
+ </span> <span class="i-menu-item i-menu2 i-navBg3"> <a
+ href="javascript:;" onclick="openByTag('manager')"> <i><img
+ th:src="@{/static/images/i-icon-zhyw.png}"/></i>
+ <P>缁煎悎涓氬姟</P>
+ </a>
+ </span> <span class="i-menu-item i-menu3 i-navBg4"> <a
+ href="javascript:;" onClick="open3d()"> <i><img
+ th:src="@{/static/images/i-icon-swzs.png}"/></i>
+ <P>涓夌淮灞曠ず</P>
+ </a>
+ </span> <span class="i-menu-item i-menu4 i-navBg5"> <a
+ href="javascript:;" onclick="openByTag('sys')"> <i><img
+ th:src="@{/static/images/i-icon-xtgl.png}"/></i>
+ <P>绯荤粺绠＄悊</P>
+ </a>
+ </span> <span class="i-menu-item i-menu5 i-navBg2"> <a
+ href="javascript:;" onclick="openByTag('es')"> <i><img
+ th:src="@{/static/images/i-icon-nhgl.png}"/></i>
+ <P>鑳借�楃鐞�</P>
+ </a>
+ </span> <span class="i-menu-item i-menu6 i-navBg1"> <a
+ href="javascript:;" onclick="openByTag('security')"> <i><img
+ th:src="@{/static/images/i-icon-afgl.png}"/></i>
+ <P>瀹夐槻绠＄悊</P>
+ </a>
+ </span>
+ </div>
+ <!--i-menuBox end-->
+ </div>
+</div>
+
+<!--i-main end-->
+<div class="i-footer">
+ <p th:text=${support}>鎶�鏈敮鎸�: 椋庢鑷磋繙淇℃伅鎶�鏈偂浠芥湁闄愬叕鍙�</p>
+</div>
+
+<script th:src="@{/static/js/jquery.min.js}"></script>
+
+<script th:inline="javascript">
+ //瀹氫箟鍙橀噺
+ var companyId = [[${loginUser.companyId}]];
+ //userId
+ var userId = [[${loginUser.username}]];
+
+ //鏁伴噺妫�娴嬭闂湴鍧�
+ var quantityPath = [[${quantityPath}]];
+
+ //涓夌淮璺緞
+ var threePath = [[${threePath}]];
+
+ var groupTag = [[${groupTag}]];//鏄惁闆嗗洟鎴栬�呭叕鍙哥敤鎴疯繘鍏�
+
+ window.onload = function () {
+ //琛ㄧず闆嗗洟/鍏徃鐢ㄦ埛杩涘叆
+ if (1 == groupTag) {
+ $("#menu-group").removeClass("dis-none");
+ }
+ };
+
+ function openByTag(tag) {
+ window.open("./home?t=" + tag + "&g=" + groupTag, "_self");
+ };
+
+ //鎵撳紑璐ㄩ噺妫�
+ function openQuantity() {
+ if ("#" == quantityPath) {
+ openByTag("quantity")
+ } else {
+ window.open(quantityPath, "_blank");
+ }
+ };
+
+ //鎵撳紑璐ㄩ噺妫�娴�
+ function open3d() {
+ if ("#" == threePath) {
+ window.open("#", "_self");
+ } else {
+ window.open(threePath, "_blank");
+ }
+ };
+
+ function openHelp() {
+ window.open("./basic/common/help-center", "_blank");
+ };
+</script>
+</body>
+
+</html>
diff --git a/igds-web/src/main/resources/templates/index/index.html b/igds-web/src/main/resources/templates/index/index.html
index 96aae90..a14ecce 100644
--- a/igds-web/src/main/resources/templates/index/index.html
+++ b/igds-web/src/main/resources/templates/index/index.html
@@ -47,7 +47,7 @@
<div class="i-top-r">
<a id="menu-group" href="./home-group" target="_self" class="i-top-btn dis-none">
<i class="i-icon">
- <img th:src="@{/static/images/i-icon-sy.png}" style="height: 28px;width: 28px;"/>
+ <img th:src="@{/static/images/i-icon-sy.png}" style="height:28px;width: 28px;"/>
</i>
棣栭〉
</a>
diff --git a/igds-web/src/main/resources/verb-conf.properties b/igds-web/src/main/resources/verb-conf.properties
index ec28a0f..0175a67 100644
--- a/igds-web/src/main/resources/verb-conf.properties
+++ b/igds-web/src/main/resources/verb-conf.properties
@@ -2,12 +2,10 @@
## 5000_001
verb.mapImg.5000_001.a=default_pfc_a.png
verb.mapImg.5000_001.b=default_pfc_b.png
-
verb.mapImg.5000_0137.a=default_qyc_a.png
verb.mapImg.5000_0137.b=default_qyc_b.png
verb.mapImg.5000_0138.a=default_qyc_a.png
verb.mapImg.5000_0138.b=default_qyc_b.png
-
## 5013_001 \u5206\u5E93\u7F16\u7801
verb.mapImg.5013_001.a=default_pfc_a.png
verb.mapImg.5013_001.b=default_pfc_b.png
@@ -142,13 +140,9 @@
## 5307_001
verb.mapImg.5307_001.a=default_qyc_a.png
verb.mapImg.5307_001.b=default_qyc_b.png
-
-
## 5322_001 广东徐闻
verb.mapImg.5322_001.a=default_pfc_a.png
verb.mapImg.5322_001.b=default_pfc_b.png
-
-
## 5322_001 广东徐闻
verb.mapImg.5324_001.a=default_pfc_a.png
verb.mapImg.5324_001.b=default_pfc_b.png
@@ -174,8 +168,6 @@
verb.mapImg.5324_10.b=pfc_b.png
verb.mapImg.5324_11.a=pfc_a.png
verb.mapImg.5324_11.b=pfc_b.png
-
-
## 5325_001 江西赣州-大公
verb.mapImg.5325_001.a=default_pfc2_a.png
verb.mapImg.5325_001.b=default_pfc2_b.png
@@ -191,11 +183,21 @@
verb.mapImg.5325_Q010501.b=default_qyc_b.png
verb.mapImg.5325_Q010601.a=default_qyc_a.png
verb.mapImg.5325_Q010601.b=default_qyc_b.png
-
+## 5326_001
+verb.mapImg.5326_001.a=default_pfc2_a.png
+verb.mapImg.5326_001.b=default_pfc2_b.png
+verb.mapImg.5327_001.a=default_pfc2_a.png
+verb.mapImg.5327_001.b=default_pfc2_b.png
## 5328_001
verb.mapImg.5328_001.a=default_pfc_a.png
verb.mapImg.5328_001.b=default_pfc_b.png
-
## 5329_001
verb.mapImg.5329_001.a=default_qyc_a.png
-verb.mapImg.5329_001.b=default_qyc_b.png
\ No newline at end of file
+verb.mapImg.5329_001.b=default_qyc_b.png
+
+## 5330_001
+verb.mapImg.5330_001.a=default_pfc2_a.png
+verb.mapImg.5330_001.b=default_pfc2_b.png
+## 5333_001 \u5206\u5E93\u7F16\u7801
+verb.mapImg.5333_001.a=default_pfc2_a.png
+verb.mapImg.5333_001.b=default_pfc2_b.png
\ No newline at end of file
--
Gitblit v1.9.3