From d5449236ef0b3adafb3e4cc872f50479efa0ce7b Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 11 三月 2025 16:10:29 +0800
Subject: [PATCH] 配置信息
---
src/main/java/com/zy/asrs/domain/dto/WorkChartAxis.java | 45
src/main/java/com/zy/core/thread/BarcodeThread.java | 2
src/main/java/com/zy/asrs/controller/ApiLogController.java | 45
src/main/java/com/zy/asrs/controller/LocMastController.java | 56
src/main/java/com/zy/asrs/task/core/WcsDispatcher.java | 4
src/main/java/com/zy/common/entity/Parameter.java | 29
src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java | 123
src/main/java/com/zy/asrs/mapper/TaskWrkReportMapper.java | 13
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 143
src/main/java/com/zy/asrs/service/CommandInfoLogService.java | 2
src/main/java/com/zy/asrs/utils/CommandUtils.java | 6
src/main/java/com/zy/system/entity/UserLogin.java | 23
src/main/java/com/zy/asrs/controller/StaDescController.java | 38
src/main/java/com/zy/asrs/utils/Utils.java | 148
src/main/java/com/zy/asrs/service/TaskWrkService.java | 1
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 367
src/main/java/com/zy/system/entity/license/LicenseCheckListener.java | 4
src/main/java/com/zy/asrs/controller/BasLocStsController.java | 42
src/main/java/com/zy/system/controller/UserController.java | 38
src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java | 2
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 84
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 4
src/main/java/com/zy/common/Main.java | 76
src/main/java/com/zy/system/entity/license/LicenseVerify.java | 42
src/main/java/com/zy/asrs/entity/param/StorageEscalationParam.java | 4
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 215
src/main/java/com/zy/asrs/mapper/CommandInfoLogMapper.java | 2
src/main/java/com/zy/asrs/controller/BasErrLogController.java | 38
src/main/java/com/zy/system/controller/HostController.java | 32
src/main/java/com/zy/asrs/controller/CommandInfoController.java | 59
src/main/java/com/zy/asrs/mapper/DataResourceMapper.java | 2
src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java | 42
src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java | 11
src/main/java/com/zy/common/utils/Struct.java | 902 +-
src/main/java/com/zy/asrs/service/TaskWrkReportLogService.java | 9
src/main/java/com/zy/asrs/controller/ApiConfigController.java | 45
src/main/java/com/zy/asrs/mapper/BasCrnOptMapper.java | 2
src/main/java/com/zy/system/controller/LicenseCreatorController.java | 10
src/main/java/com/zy/system/controller/UserLoginController.java | 32
src/main/java/com/zy/asrs/entity/BasDevp.java | 122
src/main/java/com/zy/asrs/entity/MatCode.java | 141
src/main/java/com/zy/common/web/BaseController.java | 20
src/main/java/com/zy/asrs/controller/MonitorController.java | 139
src/main/java/com/zy/system/entity/Permission.java | 33
src/main/java/com/zy/asrs/controller/BasCrnpController.java | 40
src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java | 8
src/main/java/com/zy/asrs/entity/WrkLastno.java | 71
src/main/java/com/zy/common/utils/Synchro.java | 4
src/main/java/com/zy/asrs/entity/ViewWorkInBean.java | 240
src/main/java/com/zy/asrs/controller/BasCrnErrorController.java | 39
src/main/java/com/zy/common/web/RouterController.java | 30
src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java | 25
src/main/java/com/zy/asrs/entity/ViewLocMapDto.java | 2
src/main/java/com/zy/asrs/entity/BasPlcerror.java | 63
src/main/java/com/zy/asrs/service/impl/DataResourceServiceImpl.java | 8
src/main/java/com/zy/system/entity/OperateLog.java | 23
src/main/java/com/zy/core/DevpThread.java | 2
src/main/java/com/zy/core/netty/cache/ChannelCache.java | 17
src/main/java/com/zy/common/utils/YamlUtils.java | 59
src/main/java/com/zy/core/netty/handle/ProtocolDecoder.java | 12
src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 53
src/main/java/com/zy/common/model/annotations/expr.java | 6
src/main/java/com/zy/core/enums/CrnStatusType.java | 3
src/main/java/com/zy/asrs/entity/WaitPakin.java | 52
src/main/java/com/zy/asrs/entity/BasLocSts.java | 63
src/main/java/com/zy/asrs/entity/CommandInfoLog.java | 79
src/main/java/com/zy/asrs/service/impl/CommonServiceImpl.java | 1545 +++++
src/main/resources/mapper/TaskWrkReportLogMapper.xml | 31
src/main/java/com/zy/system/entity/Resource.java | 49
src/main/java/com/zy/common/config/AdminInterceptor.java | 25
src/main/java/com/zy/common/model/annotations/flag.java | 6
src/main/java/com/zy/asrs/service/BasPlcerrorLogService.java | 2
src/main/java/com/zy/asrs/entity/ViewInOutBean.java | 129
src/main/java/com/zy/system/controller/ConfigController.java | 67
src/main/java/com/zy/asrs/task/core/ReturnT.java | 2
src/main/java/com/zy/asrs/mapper/ApiLogMapper.java | 2
src/main/java/com/zy/asrs/entity/ToWmsDTO.java | 5
src/main/java/com/zy/asrs/entity/WrkDetl.java | 128
src/main/java/com/zy/common/utils/ReflectUtils.java | 16
src/main/java/com/zy/asrs/entity/BasCrnStatus.java | 63
src/main/java/com/zy/asrs/service/impl/BasPlcerrorServiceImpl.java | 6
src/main/java/com/zy/core/cache/MessageQueue.java | 5
src/main/java/com/zy/core/netty/OnlineServer.java | 12
src/main/java/com/zy/common/CodeBuilder.java | 10
src/main/java/com/zy/system/controller/OperateLogController.java | 32
src/main/java/com/zy/common/model/PageParam.java | 4
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 2
src/main/java/com/zy/asrs/entity/DeviceError.java | 36
src/main/java/com/zy/asrs/controller/WrkLastnoController.java | 40
src/main/java/com/zy/asrs/service/impl/ApiConfigServiceImpl.java | 6
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 20
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 53
src/main/java/com/zy/asrs/controller/DataResourceController.java | 51
src/main/java/com/zy/common/utils/Http.java | 2
src/main/java/com/zy/common/utils/CommonUtils.java | 26
src/main/java/com/zy/core/cache/SlaveConnection.java | 6
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 67
src/main/java/com/zy/asrs/service/impl/DeviceErrorServiceImpl.java | 8
src/main/java/com/zy/asrs/service/ApiLogService.java | 2
src/main/java/com/zy/asrs/mapper/DeviceErrorMapper.java | 2
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 29
src/main/java/com/zy/asrs/controller/OpenController.java | 408
src/main/java/com/zy/asrs/mapper/CommandInfoMapper.java | 2
src/main/java/com/zy/common/utils/HttpHandler.java | 40
src/main/java/com/zy/core/enums/CrnLiftPosType.java | 1
src/main/java/com/zy/common/model/annotations/little.java | 7
src/main/java/com/zy/core/netty/AbstractInboundHandler.java | 2
src/main/java/com/zy/asrs/service/impl/BasCrnOptServiceImpl.java | 6
src/main/java/com/zy/core/enums/CrnTaskModeType.java | 1
src/main/java/com/zy/asrs/controller/WrkDetlController.java | 20
src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java | 6
src/main/java/com/zy/common/utils/RedisUtil.java | 1
src/main/java/com/zy/core/enums/CrnFingerPosType.java | 1
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 38
src/main/java/com/zy/common/utils/CollectionUtils.java | 4
src/main/java/com/zy/core/model/command/CommandPackage.java | 3
src/main/java/com/zy/asrs/service/CommandInfoService.java | 2
src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java | 4
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 402
src/main/java/com/zy/asrs/entity/StaDesc.java | 115
src/main/java/com/zy/asrs/entity/param/WMSAndAGVInterfaceParam.java | 10
src/main/java/com/zy/asrs/service/impl/CommandInfoLogServiceImpl.java | 6
src/main/java/com/zy/asrs/controller/SiteController.java | 122
src/main/java/com/zy/common/config/WebConfig.java | 2
src/main/resources/application-prod.yml | 23
src/main/java/com/zy/asrs/entity/BasCrnp.java | 154
src/main/java/com/zy/asrs/controller/TaskWrkLogController.java | 57
src/main/java/com/zy/core/thread/ScaleThread.java | 29
src/main/java/com/zy/asrs/entity/TaskWrkLog.java | 137
src/main/java/com/zy/asrs/domain/vo/LocChartPie.java | 56
src/main/java/com/zy/asrs/service/impl/BasErrLogServiceImpl.java | 6
src/main/java/com/zy/common/web/AuthController.java | 46
src/main/java/com/zy/asrs/entity/TaskWrkReportLog.java | 337 +
src/main/java/com/zy/common/model/annotations/bit.java | 6
src/main/java/com/zy/core/netty/HandlerInitializer.java | 2
src/main/java/com/zy/system/entity/Api.java | 61
src/main/java/com/zy/common/service/CommonService.java | 91
src/main/java/com/zy/system/controller/RoleController.java | 32
src/main/java/com/zy/common/utils/QrCode.java | 3
src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java | 222
src/main/java/com/zy/common/model/annotations/size.java | 6
src/main/java/com/zy/asrs/mapper/BasErrLogMapper.java | 2
src/main/java/com/zy/asrs/entity/BasWrkIotype.java | 67
src/main/java/com/zy/asrs/entity/LocDetl.java | 128
src/main/java/com/zy/asrs/service/StaDescService.java | 2
src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java | 4
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 173
src/main/java/com/zy/system/entity/license/AbstractServerInfos.java | 20
src/main/java/com/zy/common/model/Shelves.java | 38
src/main/java/com/zy/asrs/mapper/ApiConfigMapper.java | 2
src/main/java/com/zy/common/utils/excel/ExcelUtils.java | 24
src/main/java/com/zy/core/thread/LedThread.java | 404
src/main/java/com/zy/asrs/entity/TaskWrk.java | 134
src/main/java/com/zy/asrs/service/TaskWrkReportService.java | 9
src/main/java/com/zy/system/entity/license/CustomLicenseManager.java | 65
src/main/java/com/zy/asrs/controller/WrkMastLogController.java | 46
src/main/java/com/zy/asrs/service/BasPlcerrorService.java | 2
src/main/java/com/zy/asrs/entity/BasErrLog.java | 147
src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java | 22
src/main/java/com/zy/asrs/entity/DataResource.java | 38
src/main/java/com/zy/asrs/service/impl/BasPlcerrorLogServiceImpl.java | 6
src/main/java/com/zy/system/entity/Config.java | 37
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 90
src/main/resources/mapper/TaskWrkReportMapper.xml | 32
src/main/java/com/zy/asrs/entity/ApiConfig.java | 69
src/main/java/com/zy/asrs/entity/BasCrnOpt.java | 91
src/main/java/com/zy/system/entity/Role.java | 43
src/main/java/com/zy/asrs/controller/BasPlcerrorController.java | 50
src/main/java/com/zy/asrs/service/DataResourceService.java | 2
src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java | 44
src/main/java/com/zy/asrs/controller/CrnController.java | 168
src/main/java/com/zy/asrs/entity/ChartBean.java | 34
src/main/java/com/zy/core/netty/handle/PackageServerHandler.java | 31
src/main/java/com/zy/asrs/entity/ApiLog.java | 80
src/main/java/com/zy/asrs/domain/dto/AxisBean.java | 34
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 1164 ++--
src/main/java/com/zy/asrs/entity/CommandInfo.java | 61
src/main/java/com/zy/system/entity/license/WindowsServerInfos.java | 12
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 96
src/main/java/com/zy/asrs/entity/ViewStockUseBean.java | 151
src/main/java/com/zy/system/entity/User.java | 62
src/main/java/com/zy/asrs/entity/BasWrkStatus.java | 65
src/main/java/com/zy/core/netty/handle/ProtocolEncoder.java | 2
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 13
src/main/java/com/zy/asrs/mapper/BasPlcerrorLogMapper.java | 2
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 12
src/main/java/com/zy/asrs/controller/CommandInfoLogController.java | 65
src/main/java/com/zy/asrs/entity/LocMast.java | 123
src/main/java/com/zy/asrs/service/DeviceErrorService.java | 2
src/main/java/com/zy/asrs/controller/BasDevpController.java | 42
src/main/java/com/zy/asrs/service/impl/MainCpServiceImpl.java | 1558 +++++
src/main/java/com/zy/asrs/entity/BasCrnError.java | 63
src/main/java/com/zy/system/entity/license/LicenseCreator.java | 28
src/main/java/com/zy/core/enums/CrnForkPosType.java | 1
src/main/java/com/zy/core/MainCpProcess.java | 8
src/main/java/com/zy/core/enums/CrnModeType.java | 1
src/main/java/com/zy/core/ServerBootstrap.java | 11
src/main/java/com/zy/system/controller/HomeController.java | 33
src/main/java/com/zy/asrs/controller/BasCrnStatusController.java | 40
src/main/java/com/zy/system/controller/ApiController.java | 32
src/main/java/com/zy/system/entity/Host.java | 45
src/main/java/com/zy/asrs/controller/MapController.java | 9
src/main/java/com/zy/system/controller/PermissionController.java | 32
src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java | 2
src/main/java/com/zy/asrs/utils/VersionUtils.java | 5
src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java | 2
src/main/java/com/zy/system/controller/ResourceController.java | 49
src/main/java/com/zy/asrs/controller/DeviceErrorController.java | 45
src/main/java/com/zy/asrs/controller/BasWrkStatusController.java | 42
src/main/java/com/zy/asrs/controller/WorkController.java | 2
src/main/java/com/zy/asrs/controller/WrkMastController.java | 52
src/main/java/com/zy/asrs/service/OpenService.java | 5
src/main/java/com/zy/asrs/task/TaskReportScheduler.java | 98
src/main/java/com/zy/asrs/task/AbstractHandler.java | 4
src/main/java/com/zy/core/netty/handle/ProtectorHandler.java | 4
src/main/java/com/zy/asrs/mapper/TaskWrkLogMapper.java | 2
src/main/java/com/zy/core/enums/SlaveType.java | 2
src/main/java/com/zy/asrs/mapper/TaskWrkReportLogMapper.java | 12
src/main/java/com/zy/system/entity/RolePermission.java | 29
src/main/java/com/zy/asrs/controller/BasPlcerrorLogController.java | 50
src/main/java/com/zy/asrs/controller/LocDetlController.java | 48
src/main/java/com/zy/asrs/entity/WrkMast.java | 204
src/main/java/com/zy/common/utils/RandomValidateCodeUtil.java | 4
src/main/java/com/zy/core/model/command/CrnCommand.java | 24
src/main/java/com/zy/asrs/entity/RowLastno.java | 77
src/main/java/com/zy/asrs/entity/TaskWrkReport.java | 337 +
src/main/java/com/zy/asrs/service/impl/TaskWrkLogServiceImpl.java | 6
src/main/java/com/zy/asrs/entity/param/TaskStatusFeedbackParam.java | 21
src/main/java/com/zy/asrs/utils/PostMesDataUtils.java | 24
src/main/java/com/zy/asrs/controller/ConsoleController.java | 68
src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java | 13
231 files changed, 10,098 insertions(+), 6,060 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ApiConfigController.java b/src/main/java/com/zy/asrs/controller/ApiConfigController.java
index 41e40ad..e3b4c0e 100644
--- a/src/main/java/com/zy/asrs/controller/ApiConfigController.java
+++ b/src/main/java/com/zy/asrs/controller/ApiConfigController.java
@@ -1,17 +1,16 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.ApiConfig;
-import com.zy.asrs.service.ApiConfigService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.ApiConfig;
+import com.zy.asrs.service.ApiConfigService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -32,22 +31,24 @@
@RequestMapping(value = "/apiConfig/list/auth")
// @ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<ApiConfig> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(apiConfigService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -68,10 +69,10 @@
return R.ok();
}
- @RequestMapping(value = "/apiConfig/update/auth")
- @ManagerAuth
- public R update(ApiConfig apiConfig){
- if (Cools.isEmpty(apiConfig) || null==apiConfig.getId()){
+ @RequestMapping(value = "/apiConfig/update/auth")
+ @ManagerAuth
+ public R update(ApiConfig apiConfig) {
+ if (Cools.isEmpty(apiConfig) || null == apiConfig.getId()) {
return R.error();
}
apiConfig.setUpdateBy(getUserId());
@@ -82,8 +83,8 @@
@RequestMapping(value = "/apiConfig/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
apiConfigService.deleteById(id);
}
return R.ok();
@@ -91,7 +92,7 @@
@RequestMapping(value = "/apiConfig/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<ApiConfig> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("apiConfig"));
@@ -107,7 +108,7 @@
wrapper.like("id", condition);
Page<ApiConfig> page = apiConfigService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (ApiConfig apiConfig : page.getRecords()){
+ for (ApiConfig apiConfig : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", apiConfig.getId());
map.put("value", apiConfig.getId());
@@ -120,7 +121,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<ApiConfig> wrapper = new EntityWrapper<ApiConfig>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != apiConfigService.selectOne(wrapper)){
+ if (null != apiConfigService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(ApiConfig.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/ApiLogController.java b/src/main/java/com/zy/asrs/controller/ApiLogController.java
index cea9e87..81eabd4 100644
--- a/src/main/java/com/zy/asrs/controller/ApiLogController.java
+++ b/src/main/java/com/zy/asrs/controller/ApiLogController.java
@@ -1,17 +1,16 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.ApiLog;
-import com.zy.asrs.service.ApiLogService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.ApiLog;
+import com.zy.asrs.service.ApiLogService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -32,23 +31,25 @@
@RequestMapping(value = "/apiLog/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<ApiLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
wrapper.orderDesc(Collections.singleton("create_time"));
return R.ok(apiLogService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -65,10 +66,10 @@
return R.ok();
}
- @RequestMapping(value = "/apiLog/update/auth")
- @ManagerAuth
- public R update(ApiLog apiLog){
- if (Cools.isEmpty(apiLog) || null==apiLog.getId()){
+ @RequestMapping(value = "/apiLog/update/auth")
+ @ManagerAuth
+ public R update(ApiLog apiLog) {
+ if (Cools.isEmpty(apiLog) || null == apiLog.getId()) {
return R.error();
}
apiLogService.updateById(apiLog);
@@ -77,8 +78,8 @@
@RequestMapping(value = "/apiLog/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
apiLogService.deleteById(id);
}
return R.ok();
@@ -86,7 +87,7 @@
@RequestMapping(value = "/apiLog/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<ApiLog> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("apiLog"));
@@ -102,7 +103,7 @@
wrapper.like("uuid", condition);
Page<ApiLog> page = apiLogService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (ApiLog apiLog : page.getRecords()){
+ for (ApiLog apiLog : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", apiLog.getId());
map.put("value", apiLog.getId());
@@ -115,7 +116,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<ApiLog> wrapper = new EntityWrapper<ApiLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != apiLogService.selectOne(wrapper)){
+ if (null != apiLogService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(ApiLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java b/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java
index d99ba7f..72c41ab 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java
@@ -32,22 +32,24 @@
@RequestMapping(value = "/basCrnError/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<BasCrnError> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basCrnErrorService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -56,6 +58,7 @@
}
}
}
+
@RequestMapping(value = "/basCrnError/add/auth")
@ManagerAuth(memo = "鍫嗗灈鏈哄紓甯哥爜娣诲姞")
public R add(BasCrnError basCrnError) {
@@ -67,10 +70,10 @@
return R.ok();
}
- @RequestMapping(value = "/basCrnError/update/auth")
+ @RequestMapping(value = "/basCrnError/update/auth")
@ManagerAuth(memo = "鍫嗗灈鏈哄紓甯哥爜淇敼")
- public R update(BasCrnError basCrnError){
- if (Cools.isEmpty(basCrnError) || null==basCrnError.getErrorCode()){
+ public R update(BasCrnError basCrnError) {
+ if (Cools.isEmpty(basCrnError) || null == basCrnError.getErrorCode()) {
return R.error();
}
basCrnError.setModiUser(getUserId());
@@ -81,12 +84,12 @@
@RequestMapping(value = "/basCrnError/delete/auth")
@ManagerAuth(memo = "鍫嗗灈鏈哄紓甯哥爜鍒犻櫎")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<BasCrnError> list = JSONArray.parseArray(param, BasCrnError.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasCrnError entity : list){
+ for (BasCrnError entity : list) {
basCrnErrorService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -94,7 +97,7 @@
@RequestMapping(value = "/basCrnError/export/auth")
@ManagerAuth(memo = "鍫嗗灈鏈哄紓甯哥爜瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasCrnError> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basCrnError"));
@@ -110,7 +113,7 @@
wrapper.like("err_name", condition);
Page<BasCrnError> page = basCrnErrorService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasCrnError basCrnError : page.getRecords()){
+ for (BasCrnError basCrnError : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basCrnError.getErrorCode());
map.put("value", basCrnError.getErrName());
@@ -123,7 +126,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasCrnError> wrapper = new EntityWrapper<BasCrnError>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basCrnErrorService.selectOne(wrapper)){
+ if (null != basCrnErrorService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasCrnError.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
index c9eec6d..991e6fc 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
@@ -32,24 +32,26 @@
@RequestMapping(value = "/basCrnStatus/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false, defaultValue = "stsNo")String orderByField,
- @RequestParam(required = false, defaultValue = "asc")String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false, defaultValue = "stsNo") String orderByField,
+ @RequestParam(required = false, defaultValue = "asc") String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<BasCrnStatus> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("sts_no", true);
}
return R.ok(basCrnStatusService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -70,10 +72,10 @@
return R.ok();
}
- @RequestMapping(value = "/basCrnStatus/update/auth")
- @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佷慨鏀�")
- public R update(BasCrnStatus basCrnStatus){
- if (Cools.isEmpty(basCrnStatus) || null==basCrnStatus.getStsNo()){
+ @RequestMapping(value = "/basCrnStatus/update/auth")
+ @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佷慨鏀�")
+ public R update(BasCrnStatus basCrnStatus) {
+ if (Cools.isEmpty(basCrnStatus) || null == basCrnStatus.getStsNo()) {
return R.error();
}
basCrnStatus.setModiUser(getUserId());
@@ -84,12 +86,12 @@
@RequestMapping(value = "/basCrnStatus/delete/auth")
@ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佸垹闄�")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<BasCrnStatus> list = JSONArray.parseArray(param, BasCrnStatus.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasCrnStatus entity : list){
+ for (BasCrnStatus entity : list) {
basCrnStatusService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -97,7 +99,7 @@
@RequestMapping(value = "/basCrnStatus/export/auth")
@ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佸鍑�")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasCrnStatus> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basCrnStatus"));
@@ -113,7 +115,7 @@
wrapper.like("sts_desc", condition);
Page<BasCrnStatus> page = basCrnStatusService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasCrnStatus basCrnStatus : page.getRecords()){
+ for (BasCrnStatus basCrnStatus : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basCrnStatus.getStsNo());
map.put("value", basCrnStatus.getStsDesc());
@@ -126,7 +128,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasCrnStatus> wrapper = new EntityWrapper<BasCrnStatus>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basCrnStatusService.selectOne(wrapper)){
+ if (null != basCrnStatusService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasCrnStatus.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnpController.java b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
index e95f0b7..0b6b225 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
@@ -32,22 +32,24 @@
@RequestMapping(value = "/basCrnp/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<BasCrnp> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basCrnpService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -68,10 +70,10 @@
return R.ok();
}
- @RequestMapping(value = "/basCrnp/update/auth")
- @ManagerAuth(memo = "鍫嗗灈鏈轰慨鏀�")
- public R update(BasCrnp basCrnp){
- if (Cools.isEmpty(basCrnp) || null==basCrnp.getCrnNo()){
+ @RequestMapping(value = "/basCrnp/update/auth")
+ @ManagerAuth(memo = "鍫嗗灈鏈轰慨鏀�")
+ public R update(BasCrnp basCrnp) {
+ if (Cools.isEmpty(basCrnp) || null == basCrnp.getCrnNo()) {
return R.error();
}
basCrnp.setModiUser(getUserId());
@@ -82,12 +84,12 @@
@RequestMapping(value = "/basCrnp/delete/auth")
@ManagerAuth(memo = "鍫嗗灈鏈哄垹闄�")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<BasCrnp> list = JSONArray.parseArray(param, BasCrnp.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasCrnp entity : list){
+ for (BasCrnp entity : list) {
basCrnpService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -95,7 +97,7 @@
@RequestMapping(value = "/basCrnp/export/auth")
@ManagerAuth(memo = "鍫嗗灈鏈哄鍑�")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasCrnp> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basCrnp"));
@@ -111,7 +113,7 @@
wrapper.like("crn_no", condition);
Page<BasCrnp> page = basCrnpService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasCrnp basCrnp : page.getRecords()){
+ for (BasCrnp basCrnp : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basCrnp.getCrnNo());
map.put("value", basCrnp.getCrnNo());
@@ -124,7 +126,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasCrnp> wrapper = new EntityWrapper<BasCrnp>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basCrnpService.selectOne(wrapper)){
+ if (null != basCrnpService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasCrnp.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasDevpController.java b/src/main/java/com/zy/asrs/controller/BasDevpController.java
index cd74388..f139b6d 100644
--- a/src/main/java/com/zy/asrs/controller/BasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasDevpController.java
@@ -32,22 +32,24 @@
@RequestMapping(value = "/basDevp/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basDevpService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -68,10 +70,10 @@
return R.ok();
}
- @RequestMapping(value = "/basDevp/update/auth")
- @ManagerAuth(memo = "绔欑偣淇敼")
- public R update(BasDevp basDevp){
- if (Cools.isEmpty(basDevp) || null==basDevp.getDevNo()){
+ @RequestMapping(value = "/basDevp/update/auth")
+ @ManagerAuth(memo = "绔欑偣淇敼")
+ public R update(BasDevp basDevp) {
+ if (Cools.isEmpty(basDevp) || null == basDevp.getDevNo()) {
return R.error();
}
basDevp.setModiUser(getUserId());
@@ -82,12 +84,12 @@
@RequestMapping(value = "/basDevp/delete/auth")
@ManagerAuth(memo = "绔欑偣鍒犻櫎")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<BasDevp> list = JSONArray.parseArray(param, BasDevp.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasDevp entity : list){
+ for (BasDevp entity : list) {
basDevpService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -95,7 +97,7 @@
@RequestMapping(value = "/basDevp/export/auth")
@ManagerAuth(memo = "绔欑偣瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basDevp"));
@@ -111,7 +113,7 @@
wrapper.like("dev_no", condition);
Page<BasDevp> page = basDevpService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasDevp basDevp : page.getRecords()){
+ for (BasDevp basDevp : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basDevp.getDevNo());
map.put("value", basDevp.getDevNo());
@@ -124,7 +126,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasDevp> wrapper = new EntityWrapper<BasDevp>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basDevpService.selectOne(wrapper)){
+ if (null != basDevpService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasDevp.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -133,7 +135,7 @@
@RequestMapping(value = "/basDevp/weigh/auth")
@ManagerAuth(memo = "绔欑偣绉伴噸鏌ヨ")
public Double weigh(Integer dev_no) {
- BasDevp basDevp=basDevpService.selectById(dev_no);
+ BasDevp basDevp = basDevpService.selectById(dev_no);
return basDevp.getGrossWt();
}
diff --git a/src/main/java/com/zy/asrs/controller/BasErrLogController.java b/src/main/java/com/zy/asrs/controller/BasErrLogController.java
index 026db32..dfe3304 100644
--- a/src/main/java/com/zy/asrs/controller/BasErrLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasErrLogController.java
@@ -35,15 +35,15 @@
@RequestMapping(value = "/basErrLog/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<BasErrLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){
+ if (!Cools.isEmpty(orderByField)) {
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
} else {
wrapper.orderBy("create_time", false);
@@ -51,10 +51,10 @@
return R.ok(basErrLogService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -71,10 +71,10 @@
return R.ok();
}
- @RequestMapping(value = "/basErrLog/update/auth")
- @ManagerAuth
- public R update(BasErrLog basErrLog){
- if (Cools.isEmpty(basErrLog) || null==basErrLog.getId()){
+ @RequestMapping(value = "/basErrLog/update/auth")
+ @ManagerAuth
+ public R update(BasErrLog basErrLog) {
+ if (Cools.isEmpty(basErrLog) || null == basErrLog.getId()) {
return R.error();
}
basErrLogService.updateById(basErrLog);
@@ -83,12 +83,12 @@
@RequestMapping(value = "/basErrLog/delete/auth")
@ManagerAuth
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<BasErrLog> list = JSONArray.parseArray(param, BasErrLog.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasErrLog entity : list){
+ for (BasErrLog entity : list) {
basErrLogService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -96,7 +96,7 @@
@RequestMapping(value = "/basErrLog/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<BasErrLog> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basErrLog"));
@@ -112,7 +112,7 @@
wrapper.like("id", condition);
Page<BasErrLog> page = basErrLogService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasErrLog basErrLog : page.getRecords()){
+ for (BasErrLog basErrLog : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basErrLog.getId());
map.put("value", basErrLog.getId());
@@ -125,7 +125,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasErrLog> wrapper = new EntityWrapper<BasErrLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basErrLogService.selectOne(wrapper)){
+ if (null != basErrLogService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasErrLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasLocStsController.java b/src/main/java/com/zy/asrs/controller/BasLocStsController.java
index 03a38c6..1672414 100644
--- a/src/main/java/com/zy/asrs/controller/BasLocStsController.java
+++ b/src/main/java/com/zy/asrs/controller/BasLocStsController.java
@@ -32,22 +32,24 @@
@RequestMapping(value = "/basLocSts/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<BasLocSts> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basLocStsService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -60,10 +62,10 @@
@RequestMapping(value = "/basLocSts/edit/auth")
@ManagerAuth
public R edit(BasLocSts basLocSts) {
- if (Cools.isEmpty(basLocSts)){
+ if (Cools.isEmpty(basLocSts)) {
return R.error();
}
- if (null == basLocSts.getLocSts()){
+ if (null == basLocSts.getLocSts()) {
basLocStsService.insert(basLocSts);
} else {
basLocStsService.updateById(basLocSts);
@@ -82,10 +84,10 @@
return R.ok();
}
- @RequestMapping(value = "/basLocSts/update/auth")
+ @RequestMapping(value = "/basLocSts/update/auth")
@ManagerAuth(memo = "搴撲綅鐘舵�佷慨鏀�")
- public R update(BasLocSts basLocSts){
- if (Cools.isEmpty(basLocSts) || null==basLocSts.getLocSts()){
+ public R update(BasLocSts basLocSts) {
+ if (Cools.isEmpty(basLocSts) || null == basLocSts.getLocSts()) {
return R.error();
}
basLocSts.setModiUser(getUserId());
@@ -96,12 +98,12 @@
@RequestMapping(value = "/basLocSts/delete/auth")
@ManagerAuth(memo = "搴撲綅鐘舵�佸垹闄�")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<BasLocSts> list = JSONArray.parseArray(param, BasLocSts.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasLocSts entity : list){
+ for (BasLocSts entity : list) {
basLocStsService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -109,7 +111,7 @@
@RequestMapping(value = "/basLocSts/export/auth")
@ManagerAuth(memo = "搴撲綅鐘舵�佸鍑�")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasLocSts> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basLocSts"));
@@ -125,7 +127,7 @@
wrapper.like("loc_desc", condition);
Page<BasLocSts> page = basLocStsService.selectPage(new Page<>(0, 32), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasLocSts basLocSts : page.getRecords()){
+ for (BasLocSts basLocSts : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basLocSts.getLocSts());
map.put("value", basLocSts.getLocDesc());
@@ -138,7 +140,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasLocSts> wrapper = new EntityWrapper<BasLocSts>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basLocStsService.selectOne(wrapper)){
+ if (null != basLocStsService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasLocSts.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasPlcerrorController.java b/src/main/java/com/zy/asrs/controller/BasPlcerrorController.java
index 998ff6e..b78f919 100644
--- a/src/main/java/com/zy/asrs/controller/BasPlcerrorController.java
+++ b/src/main/java/com/zy/asrs/controller/BasPlcerrorController.java
@@ -1,22 +1,24 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.BasPlcerror;
-import com.zy.asrs.service.BasPlcerrorService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.BasPlcerror;
+import com.zy.asrs.service.BasPlcerrorService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class BasPlcerrorController extends BaseController {
@@ -32,22 +34,24 @@
@RequestMapping(value = "/basPlcerror/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<BasPlcerror> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basPlcerrorService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -66,10 +70,10 @@
return R.ok();
}
- @RequestMapping(value = "/basPlcerror/update/auth")
- @ManagerAuth
- public R update(BasPlcerror basPlcerror){
- if (Cools.isEmpty(basPlcerror) || null==basPlcerror.getErrorCode()){
+ @RequestMapping(value = "/basPlcerror/update/auth")
+ @ManagerAuth
+ public R update(BasPlcerror basPlcerror) {
+ if (Cools.isEmpty(basPlcerror) || null == basPlcerror.getErrorCode()) {
return R.error();
}
basPlcerror.setAppeUser(getUserId());
@@ -80,8 +84,8 @@
@RequestMapping(value = "/basPlcerror/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Integer[] ids){
- for (Integer id : ids){
+ public R delete(@RequestParam(value = "ids[]") Integer[] ids) {
+ for (Integer id : ids) {
basPlcerrorService.deleteById(id);
}
return R.ok();
@@ -89,7 +93,7 @@
@RequestMapping(value = "/basPlcerror/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<BasPlcerror> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basPlcerror"));
@@ -105,7 +109,7 @@
wrapper.like("id", condition);
Page<BasPlcerror> page = basPlcerrorService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasPlcerror basPlcerror : page.getRecords()){
+ for (BasPlcerror basPlcerror : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basPlcerror.getErrorCode());
map.put("value", basPlcerror.getErrorCode());
@@ -118,7 +122,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasPlcerror> wrapper = new EntityWrapper<BasPlcerror>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basPlcerrorService.selectOne(wrapper)){
+ if (null != basPlcerrorService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasPlcerror.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasPlcerrorLogController.java b/src/main/java/com/zy/asrs/controller/BasPlcerrorLogController.java
index b09664f..291cd57 100644
--- a/src/main/java/com/zy/asrs/controller/BasPlcerrorLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasPlcerrorLogController.java
@@ -1,22 +1,24 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.BasPlcerrorLog;
-import com.zy.asrs.service.BasPlcerrorLogService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.BasPlcerrorLog;
+import com.zy.asrs.service.BasPlcerrorLogService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class BasPlcerrorLogController extends BaseController {
@@ -32,22 +34,24 @@
@RequestMapping(value = "/basPlcerrorLog/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<BasPlcerrorLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basPlcerrorLogService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -64,10 +68,10 @@
return R.ok();
}
- @RequestMapping(value = "/basPlcerrorLog/update/auth")
- @ManagerAuth
- public R update(BasPlcerrorLog basPlcerrorLog){
- if (Cools.isEmpty(basPlcerrorLog) || null==basPlcerrorLog.getId()){
+ @RequestMapping(value = "/basPlcerrorLog/update/auth")
+ @ManagerAuth
+ public R update(BasPlcerrorLog basPlcerrorLog) {
+ if (Cools.isEmpty(basPlcerrorLog) || null == basPlcerrorLog.getId()) {
return R.error();
}
basPlcerrorLogService.updateById(basPlcerrorLog);
@@ -76,8 +80,8 @@
@RequestMapping(value = "/basPlcerrorLog/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
basPlcerrorLogService.deleteById(id);
}
return R.ok();
@@ -85,7 +89,7 @@
@RequestMapping(value = "/basPlcerrorLog/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<BasPlcerrorLog> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basPlcerrorLog"));
@@ -101,7 +105,7 @@
wrapper.like("id", condition);
Page<BasPlcerrorLog> page = basPlcerrorLogService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasPlcerrorLog basPlcerrorLog : page.getRecords()){
+ for (BasPlcerrorLog basPlcerrorLog : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basPlcerrorLog.getId());
map.put("value", basPlcerrorLog.getId());
@@ -114,7 +118,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasPlcerrorLog> wrapper = new EntityWrapper<BasPlcerrorLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basPlcerrorLogService.selectOne(wrapper)){
+ if (null != basPlcerrorLogService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasPlcerrorLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java b/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
index b06ff19..c56f06c 100644
--- a/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
@@ -32,22 +32,24 @@
@RequestMapping(value = "/basWrkIotype/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<BasWrkIotype> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basWrkIotypeService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -60,10 +62,10 @@
@RequestMapping(value = "/basWrkIotype/edit/auth")
@ManagerAuth
public R edit(BasWrkIotype basWrkIotype) {
- if (Cools.isEmpty(basWrkIotype)){
+ if (Cools.isEmpty(basWrkIotype)) {
return R.error();
}
- if (null == basWrkIotype.getIoType()){
+ if (null == basWrkIotype.getIoType()) {
basWrkIotypeService.insert(basWrkIotype);
} else {
basWrkIotypeService.updateById(basWrkIotype);
@@ -82,10 +84,10 @@
return R.ok();
}
- @RequestMapping(value = "/basWrkIotype/update/auth")
+ @RequestMapping(value = "/basWrkIotype/update/auth")
@ManagerAuth(memo = "鍏ュ嚭搴撶被鍨嬩慨鏀�")
- public R update(BasWrkIotype basWrkIotype){
- if (Cools.isEmpty(basWrkIotype) || null==basWrkIotype.getIoType()){
+ public R update(BasWrkIotype basWrkIotype) {
+ if (Cools.isEmpty(basWrkIotype) || null == basWrkIotype.getIoType()) {
return R.error();
}
basWrkIotype.setModiUser(getUserId());
@@ -96,12 +98,12 @@
@RequestMapping(value = "/basWrkIotype/delete/auth")
@ManagerAuth(memo = "鍏ュ嚭搴撶被鍨嬪垹闄�")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<BasWrkIotype> list = JSONArray.parseArray(param, BasWrkIotype.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasWrkIotype entity : list){
+ for (BasWrkIotype entity : list) {
basWrkIotypeService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -109,7 +111,7 @@
@RequestMapping(value = "/basWrkIotype/export/auth")
@ManagerAuth(memo = "鍏ュ嚭搴撶被鍨嬪鍑�")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasWrkIotype> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basWrkIotype"));
@@ -125,7 +127,7 @@
wrapper.like("io_desc", condition);
Page<BasWrkIotype> page = basWrkIotypeService.selectPage(new Page<>(0, 20), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasWrkIotype basWrkIotype : page.getRecords()){
+ for (BasWrkIotype basWrkIotype : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basWrkIotype.getIoType());
map.put("value", basWrkIotype.getIoDesc());
@@ -138,7 +140,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasWrkIotype> wrapper = new EntityWrapper<BasWrkIotype>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basWrkIotypeService.selectOne(wrapper)){
+ if (null != basWrkIotypeService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasWrkIotype.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
index caaec40..ed8b736 100644
--- a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
@@ -32,22 +32,24 @@
@RequestMapping(value = "/basWrkStatus/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<BasWrkStatus> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basWrkStatusService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -60,10 +62,10 @@
@RequestMapping(value = "/basWrkStatus/edit/auth")
@ManagerAuth
public R edit(BasWrkStatus basWrkStatus) {
- if (Cools.isEmpty(basWrkStatus)){
+ if (Cools.isEmpty(basWrkStatus)) {
return R.error();
}
- if (null == basWrkStatus.getWrkSts()){
+ if (null == basWrkStatus.getWrkSts()) {
basWrkStatusService.insert(basWrkStatus);
} else {
basWrkStatusService.updateById(basWrkStatus);
@@ -82,10 +84,10 @@
return R.ok();
}
- @RequestMapping(value = "/basWrkStatus/update/auth")
+ @RequestMapping(value = "/basWrkStatus/update/auth")
@ManagerAuth(memo = "宸ヤ綔鐘舵�佷慨鏀�")
- public R update(BasWrkStatus basWrkStatus){
- if (Cools.isEmpty(basWrkStatus) || null==basWrkStatus.getWrkSts()){
+ public R update(BasWrkStatus basWrkStatus) {
+ if (Cools.isEmpty(basWrkStatus) || null == basWrkStatus.getWrkSts()) {
return R.error();
}
basWrkStatus.setModiUser(getUserId());
@@ -96,12 +98,12 @@
@RequestMapping(value = "/basWrkStatus/delete/auth")
@ManagerAuth(memo = "宸ヤ綔鐘舵�佸垹闄�")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<BasWrkStatus> list = JSONArray.parseArray(param, BasWrkStatus.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasWrkStatus entity : list){
+ for (BasWrkStatus entity : list) {
basWrkStatusService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -109,7 +111,7 @@
@RequestMapping(value = "/basWrkStatus/export/auth")
@ManagerAuth(memo = "宸ヤ綔鐘舵�佸鍑�")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasWrkStatus> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basWrkStatus"));
@@ -125,7 +127,7 @@
wrapper.like("wrk_desc", condition);
Page<BasWrkStatus> page = basWrkStatusService.selectPage(new Page<>(0, 20), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasWrkStatus basWrkStatus : page.getRecords()){
+ for (BasWrkStatus basWrkStatus : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basWrkStatus.getWrkSts());
map.put("value", basWrkStatus.getWrkDesc());
@@ -138,7 +140,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasWrkStatus> wrapper = new EntityWrapper<BasWrkStatus>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basWrkStatusService.selectOne(wrapper)){
+ if (null != basWrkStatusService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasWrkStatus.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/CommandInfoController.java b/src/main/java/com/zy/asrs/controller/CommandInfoController.java
index 26e7ce6..88d5d98 100644
--- a/src/main/java/com/zy/asrs/controller/CommandInfoController.java
+++ b/src/main/java/com/zy/asrs/controller/CommandInfoController.java
@@ -1,18 +1,17 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.CommandInfo;
-import com.zy.asrs.service.CommandInfoService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.CommandInfo;
+import com.zy.asrs.service.CommandInfoService;
import com.zy.common.web.BaseController;
import com.zy.core.cache.MessageQueue;
import com.zy.core.enums.CommandStatusType;
@@ -40,36 +39,40 @@
@RequestMapping(value = "/commandInfo/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<CommandInfo> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(commandInfoService.selectPage(new Page<>(curr, limit), wrapper));
}
@RequestMapping(value = "/commandInfo/listLog/auth")
@ManagerAuth
- public R listLog(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R listLog(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<CommandInfo> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(commandInfoService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -86,10 +89,10 @@
return R.ok();
}
- @RequestMapping(value = "/commandInfo/update/auth")
- @ManagerAuth
- public R update(CommandInfo commandInfo){
- if (Cools.isEmpty(commandInfo) || null==commandInfo.getId()){
+ @RequestMapping(value = "/commandInfo/update/auth")
+ @ManagerAuth
+ public R update(CommandInfo commandInfo) {
+ if (Cools.isEmpty(commandInfo) || null == commandInfo.getId()) {
return R.error();
}
commandInfoService.updateById(commandInfo);
@@ -98,8 +101,8 @@
@RequestMapping(value = "/commandInfo/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
commandInfoService.deleteById(id);
}
return R.ok();
@@ -107,7 +110,7 @@
@RequestMapping(value = "/commandInfo/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<CommandInfo> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("commandInfo"));
@@ -123,7 +126,7 @@
wrapper.like("id", condition);
Page<CommandInfo> page = commandInfoService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (CommandInfo commandInfo : page.getRecords()){
+ for (CommandInfo commandInfo : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", commandInfo.getId());
map.put("value", commandInfo.getId());
@@ -136,7 +139,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<CommandInfo> wrapper = new EntityWrapper<CommandInfo>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != commandInfoService.selectOne(wrapper)){
+ if (null != commandInfoService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(CommandInfo.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/CommandInfoLogController.java b/src/main/java/com/zy/asrs/controller/CommandInfoLogController.java
index 32dafd9..96095c1 100644
--- a/src/main/java/com/zy/asrs/controller/CommandInfoLogController.java
+++ b/src/main/java/com/zy/asrs/controller/CommandInfoLogController.java
@@ -1,23 +1,24 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.CommandInfo;
-import com.zy.asrs.entity.CommandInfoLog;
-import com.zy.asrs.service.CommandInfoLogService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.CommandInfoLog;
+import com.zy.asrs.service.CommandInfoLogService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class CommandInfoLogController extends BaseController {
@@ -27,15 +28,17 @@
@RequestMapping(value = "/commandInfoLog/listLog/auth")
@ManagerAuth
- public R listLog(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R listLog(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<CommandInfoLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(commandInfoLogService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -47,22 +50,24 @@
@RequestMapping(value = "/commandInfoLog/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<CommandInfoLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(commandInfoLogService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -79,10 +84,10 @@
return R.ok();
}
- @RequestMapping(value = "/commandInfoLog/update/auth")
- @ManagerAuth
- public R update(CommandInfoLog commandInfoLog){
- if (Cools.isEmpty(commandInfoLog) || null==commandInfoLog.getId()){
+ @RequestMapping(value = "/commandInfoLog/update/auth")
+ @ManagerAuth
+ public R update(CommandInfoLog commandInfoLog) {
+ if (Cools.isEmpty(commandInfoLog) || null == commandInfoLog.getId()) {
return R.error();
}
commandInfoLogService.updateById(commandInfoLog);
@@ -91,8 +96,8 @@
@RequestMapping(value = "/commandInfoLog/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
commandInfoLogService.deleteById(id);
}
return R.ok();
@@ -100,7 +105,7 @@
@RequestMapping(value = "/commandInfoLog/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<CommandInfoLog> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("commandInfoLog"));
@@ -116,7 +121,7 @@
wrapper.like("id", condition);
Page<CommandInfoLog> page = commandInfoLogService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (CommandInfoLog commandInfoLog : page.getRecords()){
+ for (CommandInfoLog commandInfoLog : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", commandInfoLog.getId());
map.put("value", commandInfoLog.getId());
@@ -129,7 +134,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<CommandInfoLog> wrapper = new EntityWrapper<CommandInfoLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != commandInfoLogService.selectOne(wrapper)){
+ if (null != commandInfoLogService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(CommandInfoLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index d56f44d..d7da4a6 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -73,26 +73,26 @@
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
- public R systemRunningStatus(){
+ public R systemRunningStatus() {
return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
}
@PostMapping("/system/switch")
@ManagerAuth(memo = "绯荤粺杩愯寮�鍏虫搷浣�")
public R systemSwitch(SystemSwitchParam param) throws InterruptedException {
- if (Cools.isEmpty(param.getOperatorType())){
+ if (Cools.isEmpty(param.getOperatorType())) {
return R.error();
}
if (param.getOperatorType() == 0) {
- if (Cools.isEmpty(param.getPassword())){
+ if (Cools.isEmpty(param.getPassword())) {
return R.error("璇疯緭鍏ュ彛浠�");
}
- if (!param.getPassword().equals(SystemProperties.WCS_PASSWORD)){
+ if (!param.getPassword().equals(SystemProperties.WCS_PASSWORD)) {
return R.error("鍙ｄ护閿欒");
}
}
Thread.sleep(200L);
- SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType()==1?Boolean.TRUE:Boolean.FALSE);
+ SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType() == 1 ? Boolean.TRUE : Boolean.FALSE);
return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
}
@@ -102,7 +102,7 @@
@PostMapping("/latest/data/site")
@ManagerAuth(memo = "绔欑偣瀹炴椂鏁版嵁")
- public R siteLatestData(){
+ public R siteLatestData() {
List<SiteLatestDataVo> vos = new ArrayList<>();
Map<Integer, StaProtocol> stations = new HashMap<>();
for (DevpSlave devp : slaveProperties.getDevp()) {
@@ -125,7 +125,7 @@
@PostMapping("/latest/data/crn")
@ManagerAuth(memo = "鍫嗗灈鏈哄疄鏃舵暟鎹�")
- public R crnLatestData(){
+ public R crnLatestData() {
List<CrnLatestDataVo> vos = new ArrayList<>();
for (CrnSlave crn : slaveProperties.getCrn()) {
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
@@ -150,15 +150,15 @@
if (crnProtocol.getAlarm1() > 0) {
vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
} else {
- if (crnProtocol.getTaskNo()>0) {
+ if (crnProtocol.getTaskNo() > 0) {
WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
if (wrkMast != null) {
vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
} else {
- vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
+ vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO) ? CrnStatusType.MACHINE_AUTO : CrnStatusType.MACHINE_UN_AUTO);
}
} else {
- vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
+ vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO) ? CrnStatusType.MACHINE_AUTO : CrnStatusType.MACHINE_UN_AUTO);
}
}
vos.add(vo);
@@ -169,7 +169,7 @@
@PostMapping("/latest/data/barcode")
@ManagerAuth(memo = "鏉＄爜鎵弿浠疄鏃舵暟鎹�")
- public R barcodeLatestData(){
+ public R barcodeLatestData() {
List<BarcodeDataVo> list = new ArrayList<>();
for (Slave barcode : slaveProperties.getBarcode()) {
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcode.getId());
@@ -186,7 +186,7 @@
@PostMapping("/latest/data/scale")
@ManagerAuth(memo = "纾呯Г瀹炴椂鏁版嵁")
- public R scaleLatestData(){
+ public R scaleLatestData() {
List<ScaleDataVo> list = new ArrayList<>();
for (Slave scale : slaveProperties.getScale()) {
ScaleThread scaleThread = (ScaleThread) SlaveConnection.get(SlaveType.Scale, scale.getId());
@@ -261,8 +261,8 @@
@PostMapping("/site/detail")
@ManagerAuth(memo = "杈撻�佽澶囨暟鎹鎯�")
- public R siteDetail(@RequestParam Integer siteId){
- if (Cools.isEmpty(siteId)){
+ public R siteDetail(@RequestParam Integer siteId) {
+ if (Cools.isEmpty(siteId)) {
return R.parse(CodeRes.EMPTY);
}
SiteDetailVo vo = new SiteDetailVo();
@@ -290,8 +290,8 @@
}
}
- vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
- vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
+ vo.setAutoing(staProtocol.isAutoing() ? "Y" : "N"); // 鑷姩
+ vo.setLoading(staProtocol.isLoading() ? "Y" : "N"); // 鏈夌墿
vo.setCanining(basDevp.getCanining()); // 鑳藉叆
vo.setCanouting(basDevp.getCanouting()); // 鑳藉嚭
@@ -306,8 +306,8 @@
@PostMapping("/crn/detail")
@ManagerAuth(memo = "鍫嗗灈鏈鸿澶囨暟鎹鎯�")
- public R crnDetail(@RequestParam Integer crnNo){
- if (Cools.isEmpty(crnNo)){
+ public R crnDetail(@RequestParam Integer crnNo) {
+ if (Cools.isEmpty(crnNo)) {
return R.parse(CodeRes.EMPTY);
}
CrnDetailVo vo = new CrnDetailVo();
@@ -353,19 +353,19 @@
@Deprecated
@PostMapping("/site/update")
@ManagerAuth(memo = "杈撻�佽澶囨暟鎹慨鏀�")
- public R updateSite(){
+ public R updateSite() {
return R.ok();
}
@Deprecated
@PostMapping("/crn/update")
@ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹慨鏀�")
- public R updateCrn(){
+ public R updateCrn() {
return R.ok();
}
@GetMapping("/barcode/output/site")
- public R crnOutput(){
+ public R crnOutput() {
ArrayList<JSONObject> jsonObjects = new ArrayList<>(OutputQueue.SCALE);
jsonObjects.sort(new Comparator<JSONObject>() {
@Override
@@ -379,12 +379,12 @@
}
@PostMapping("loc/pie/charts")
- public R dsa(){
- Map<String,Object> map=new HashMap<String, Object>();
- List<ChartBean> list = new ArrayList<ChartBean>();
+ public R dsa() {
+ Map<String, Object> map = new HashMap<String, Object>();
+ List<ChartBean> list = new ArrayList<ChartBean>();
LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
- if(locUseRate!=null) {
+ if (locUseRate != null) {
ChartBean fqty = new ChartBean();
fqty.setName("鍦ㄥ簱搴撲綅");
fqty.setY(locUseRate.getFqty());
@@ -405,37 +405,37 @@
xqty.setY(locUseRate.getXqty());
list.add(xqty);
}
- map.put("rows",list);
+ map.put("rows", list);
return R.ok(map);
}
@PostMapping("locIo/line/charts")
- public R locIoLineCharts(){
- Map<String,Object> map=new HashMap<String, Object>();
+ public R locIoLineCharts() {
+ Map<String, Object> map = new HashMap<String, Object>();
List<AxisBean> list = new ArrayList<AxisBean>();
List<WorkChartAxis> listChart = reportQueryMapper.getChartAxis();
- if(listChart!=null) {
+ if (listChart != null) {
ArrayList<Integer> data1 = new ArrayList<Integer>();
ArrayList<Integer> data2 = new ArrayList<Integer>();
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DATE, -12);
- for(int i=0;i<12;i++) {
+ for (int i = 0; i < 12; i++) {
boolean flag = true;
calendar.add(Calendar.DATE, 1);
String str = sf.format(calendar.getTime());
- for(WorkChartAxis workChart : listChart) {
- if(str.equals(workChart.getYmd())) {
+ for (WorkChartAxis workChart : listChart) {
+ if (str.equals(workChart.getYmd())) {
data1.add(workChart.getInqty());
data2.add(workChart.getOutqty());
flag = false;
break;
}
}
- if(flag) {
+ if (flag) {
data1.add(0);
data2.add(0);
}
@@ -451,7 +451,7 @@
outqty.setData(data2.toArray(array2));
list.add(outqty);
}
- map.put("rows",list);
+ map.put("rows", list);
return R.ok(map);
}
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 4844ff3..07253ac 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -13,7 +13,10 @@
import com.zy.asrs.domain.vo.CrnListVo;
import com.zy.asrs.domain.vo.CrnMsgTableVo;
import com.zy.asrs.domain.vo.CrnStateTableVo;
-import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.BasCrnError;
+import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.LocMastService;
@@ -39,7 +42,6 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -59,7 +61,6 @@
private String movePath;
-
@Autowired
private SlaveProperties slaveProperties;
@Autowired
@@ -76,7 +77,7 @@
@ManagerAuth(memo = "杩涜涓殑鍛戒护")
@PostMapping("/crn/command/ongoing")
- public R ongoingCommand(){
+ public R ongoingCommand() {
List<CommandLogVo> list = new ArrayList<>();
for (CrnSlave crn : slaveProperties.getCrn()) {
CommandLogVo vo = new CommandLogVo();
@@ -95,7 +96,7 @@
vo.setStatus(1); // 鐘舵��
Task task = MessageQueue.peek(SlaveType.Crn, crn.getId());
if (task != null) {
- vo.setCommand(JSON.toJSONString((CrnCommand)task.getData()));
+ vo.setCommand(JSON.toJSONString((CrnCommand) task.getData()));
}
}
return R.ok().add(list);
@@ -103,7 +104,7 @@
@PostMapping("/crn/table/crn/state")
@ManagerAuth(memo = "鍫嗗灈鏈轰俊鎭〃")
- public R crnStateTable(){
+ public R crnStateTable() {
List<CrnStateTableVo> list = new ArrayList<>();
List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no"));
for (BasCrnp basCrnp : crnps) {
@@ -129,11 +130,11 @@
vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆
vo.setLiftPos(crnProtocol.getLiftPosType().desc);
- vo.setWalkPos(crnProtocol.getWalkPos()==1?"涓嶅湪瀹氫綅":"鍦ㄥ畾浣�");
+ vo.setWalkPos(crnProtocol.getWalkPos() == 1 ? "涓嶅湪瀹氫綅" : "鍦ㄥ畾浣�");
vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1()));
if (crnProtocol.getAlarm() > 0) {
BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
- vo.setAlarm(crnError==null?"鏈煡寮傚父":crnError.getErrName());
+ vo.setAlarm(crnError == null ? "鏈煡寮傚父" : crnError.getErrName());
}
}
return R.ok().add(list);
@@ -141,7 +142,7 @@
@PostMapping("/crn/table/crn/{id}/state")
@ManagerAuth(memo = "鍫嗗灈鏈轰俊鎭〃")
- public R crnStateTable(@PathVariable("id") Integer id){
+ public R crnStateTable(@PathVariable("id") Integer id) {
BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", id).orderBy("crn_no"));
// 琛ㄦ牸琛�
CrnStateTableVo vo = new CrnStateTableVo();
@@ -164,18 +165,18 @@
vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆
vo.setLiftPos(crnProtocol.getLiftPosType().desc);
- vo.setWalkPos(crnProtocol.getWalkPos()==1?"涓嶅湪瀹氫綅":"鍦ㄥ畾浣�");
+ vo.setWalkPos(crnProtocol.getWalkPos() == 1 ? "涓嶅湪瀹氫綅" : "鍦ㄥ畾浣�");
vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1()));
if (crnProtocol.getAlarm1() > 0) {
BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
- vo.setAlarm(crnError==null?"鏈煡寮傚父":crnError.getErrName());
+ vo.setAlarm(crnError == null ? "鏈煡寮傚父" : crnError.getErrName());
}
return R.ok().add(vo);
}
@PostMapping("/crn/table/crn/msg")
@ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹〃")
- public R crnMsgTable(){
+ public R crnMsgTable() {
List<CrnMsgTableVo> list = new ArrayList<>();
List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no"));
for (BasCrnp basCrnp : crnps) {
@@ -194,7 +195,7 @@
}
vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙�
- if (crnProtocol.getTaskNo()>0) {
+ if (crnProtocol.getTaskNo() > 0) {
WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
if (wrkMast != null) {
vo.setStatus(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵��
@@ -204,7 +205,7 @@
vo.setLocNo(wrkMast.getLocNo()); // 鐩爣搴撲綅
}
} else {
- vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
+ vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO) ? CrnStatusType.MACHINE_AUTO.getDesc() : CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
}
vo.setXspeed(crnProtocol.getXSpeed()); // 璧拌閫熷害锛坢/min)
vo.setYspeed(crnProtocol.getYSpeed()); // 鍗囬檷閫熷害锛坢/min)
@@ -219,7 +220,7 @@
@PostMapping("/crn/table/crn/{id}/msg")
@ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹〃")
- public R crnMsgTable(@PathVariable("id") Integer id){
+ public R crnMsgTable(@PathVariable("id") Integer id) {
BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", id).orderBy("crn_no"));
// 琛ㄦ牸琛�
CrnMsgTableVo vo = new CrnMsgTableVo();
@@ -235,7 +236,7 @@
}
vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙�
- if (crnProtocol.getTaskNo()>0) {
+ if (crnProtocol.getTaskNo() > 0) {
WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
if (wrkMast != null) {
vo.setStatus(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵��
@@ -245,7 +246,7 @@
vo.setLocNo(wrkMast.getLocNo()); // 鐩爣搴撲綅
}
} else {
- vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
+ vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO) ? CrnStatusType.MACHINE_AUTO.getDesc() : CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
}
vo.setXspeed(crnProtocol.getXSpeed()); // 璧拌閫熷害锛坢/min)
vo.setYspeed(crnProtocol.getYSpeed()); // 鍗囬檷閫熷害锛坢/min)
@@ -259,7 +260,7 @@
@GetMapping("/crn/list/auth")
@ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹〃")
- public R crnList(){
+ public R crnList() {
List<CrnListVo> list = new ArrayList<>();
List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no"));
for (BasCrnp basCrnp : crnps) {
@@ -278,7 +279,7 @@
}
vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙�
- if (crnProtocol.getTaskNo()>0) {
+ if (crnProtocol.getTaskNo() > 0) {
WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
if (wrkMast != null) {
vo.setDeviceStatus(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵��
@@ -288,7 +289,7 @@
vo.setLocNo(wrkMast.getLocNo()); // 鐩爣搴撲綅
}
} else {
- vo.setDeviceStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
+ vo.setDeviceStatus(crnProtocol.modeType.equals(CrnModeType.AUTO) ? CrnStatusType.MACHINE_AUTO.getDesc() : CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
}
vo.setXspeed(crnProtocol.getXSpeed()); // 璧拌閫熷害锛坢/min)
vo.setYspeed(crnProtocol.getYSpeed()); // 鍗囬檷閫熷害锛坢/min)
@@ -306,11 +307,11 @@
vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆
vo.setLiftPos(crnProtocol.getLiftPosType().desc);
- vo.setWalkPos(crnProtocol.getWalkPos()==1?"涓嶅湪瀹氫綅":"鍦ㄥ畾浣�");
+ vo.setWalkPos(crnProtocol.getWalkPos() == 1 ? "涓嶅湪瀹氫綅" : "鍦ㄥ畾浣�");
vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1()));
if (crnProtocol.getAlarm1() > 0) {
BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
- vo.setAlarm(crnError==null?"鏈煡寮傚父":crnError.getErrName());
+ vo.setAlarm(crnError == null ? "鏈煡寮傚父" : crnError.getErrName());
}
vo.setInEnable(basCrnp.getInEnable());
vo.setOutEnable(basCrnp.getOutEnable());
@@ -320,11 +321,11 @@
@PostMapping("/crn/output/site")
@ManagerAuth(memo = "鍫嗗灈鏈烘姤鏂囨棩蹇楄緭鍑�")
- public R crnOutput(){
+ public R crnOutput() {
StringBuilder str = new StringBuilder();
String s;
int i = 0;
- while((s = OutputQueue.CRN.poll()) != null && i <=10) {
+ while ((s = OutputQueue.CRN.poll()) != null && i <= 10) {
str.append("\n").append(s);
i++;
}
@@ -333,7 +334,7 @@
@GetMapping("/crn/demo/status")
- public R demoStatus(){
+ public R demoStatus() {
List<Map<String, Object>> res = new ArrayList<>();
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
Map<String, Object> map = new HashMap<>();
@@ -348,13 +349,13 @@
@PostMapping("/crn/demo/switch")
@ManagerAuth(memo = "鍫嗗灈鏈烘紨绀�")
public R crnDemo(CrnDemoParam param) throws InterruptedException {
- if (Cools.isEmpty(param.getCrnId())){
+ if (Cools.isEmpty(param.getCrnId())) {
return R.error();
}
- if (Cools.isEmpty(param.getPassword())){
+ if (Cools.isEmpty(param.getPassword())) {
return R.error("璇疯緭鍏ュ彛浠�");
}
- if (!param.getPassword().equals(SystemProperties.WCS_PASSWORD)){
+ if (!param.getPassword().equals(SystemProperties.WCS_PASSWORD)) {
return R.error("鍙ｄ护閿欒");
}
Thread.sleep(200L);
@@ -368,14 +369,13 @@
}
-
/****************************************************************/
/************************** 鎵嬪姩鎿嶄綔 ******************************/
/****************************************************************/
@ManagerAuth(memo = "鍏ュ簱")
@PostMapping("/crn/operator/put")
- public R crnPut(CrnOperatorParam param){
+ public R crnPut(CrnOperatorParam param) {
// // 绯荤粺杩愯鐘舵�佸垽鏂�
// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
@@ -391,13 +391,13 @@
command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
- command.setCommand((short)1);
- return crnControl(command)?R.ok():R.error();
+ command.setCommand((short) 1);
+ return crnControl(command) ? R.ok() : R.error();
}
@ManagerAuth(memo = "鍑哄簱")
@PostMapping("/crn/operator/take")
- public R crnTake(CrnOperatorParam param){
+ public R crnTake(CrnOperatorParam param) {
// 绯荤粺杩愯鐘舵�佸垽鏂�
// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
@@ -413,13 +413,13 @@
command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
- command.setCommand((short)1);
- return crnControl(command)?R.ok():R.error();
+ command.setCommand((short) 1);
+ return crnControl(command) ? R.ok() : R.error();
}
@ManagerAuth(memo = "搴撲綅杞Щ")
@PostMapping("/crn/operator/stockMove")
- public R crnStockMove(CrnOperatorParam param){
+ public R crnStockMove(CrnOperatorParam param) {
// 绯荤粺杩愯鐘舵�佸垽鏂�
// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
@@ -435,18 +435,18 @@
command.setDestinationPosZ(param.getRow()); // 鐩爣搴撲綅鎺�
command.setDestinationPosX(param.getBay()); // 鐩爣搴撲綅鍒�
command.setDestinationPosY(param.getLev()); // 鐩爣搴撲綅灞�
- command.setCommand((short)1);
+ command.setCommand((short) 1);
LocMast sourceLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getSourcePosX())
.eq("bay1", command.getSourcePosY()).eq("lev1", command.getSourcePosZ()));
LocMast loc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getDestinationPosX())
.eq("bay1", command.getDestinationPosY()).eq("lev1", command.getDestinationPosZ()));
VersionUtils.locMoveCheckLocType(sourceLoc, loc);
- return crnControl(command)?R.ok():R.error();
+ return crnControl(command) ? R.ok() : R.error();
}
@ManagerAuth(memo = "绔欏埌绔�")
@PostMapping("/crn/operator/siteMove")
- public R crnSiteMove(CrnOperatorParam param){
+ public R crnSiteMove(CrnOperatorParam param) {
// 绯荤粺杩愯鐘舵�佸垽鏂�
// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
@@ -462,12 +462,12 @@
command.setDestinationPosX(param.getStaNo()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
- return crnControl(command)?R.ok():R.error();
+ return crnControl(command) ? R.ok() : R.error();
}
@ManagerAuth(memo = "鍥炲師鐐�")
@PostMapping("/crn/operator/bacOrigin")
- public R crnBacOrigin(CrnOperatorParam param){
+ public R crnBacOrigin(CrnOperatorParam param) {
// 绯荤粺杩愯鐘舵�佸垽鏂�
// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
@@ -483,12 +483,12 @@
command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞�
- return crnControl(command)?R.ok():R.error();
+ return crnControl(command) ? R.ok() : R.error();
}
@ManagerAuth(memo = "鍙嶅師鐐�")
@PostMapping("/crn/operator/reverseOrigin")
- public R reverseOrigin(CrnOperatorParam param){
+ public R reverseOrigin(CrnOperatorParam param) {
// 绯荤粺杩愯鐘舵�佸垽鏂�
// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
@@ -504,7 +504,7 @@
command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
command.setDestinationPosY((short) 22); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
- return crnControl(command)?R.ok():R.error();
+ return crnControl(command) ? R.ok() : R.error();
}
// @ManagerAuth(memo = "鍧愭爣绉诲姩")
@@ -527,7 +527,7 @@
@ManagerAuth(memo = "浠诲姟瀹屾垚")
@PostMapping("/crn/operator/taskComplete")
- public R crnTaskComplete(CrnOperatorParam param){
+ public R crnTaskComplete(CrnOperatorParam param) {
// 绯荤粺杩愯鐘舵�佸垽鏂�
// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
@@ -543,8 +543,8 @@
command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞�
- command.setCommand((short)0);
- return crnControl(command)?R.ok():R.error();
+ command.setCommand((short) 0);
+ return crnControl(command) ? R.ok() : R.error();
}
// @ManagerAuth(memo = "鏆傚仠")
@@ -561,7 +561,7 @@
@ManagerAuth(memo = "娓呴櫎鍛戒护")
@PostMapping("/crn/operator/clearCommand")
- public R crnClearCommand(CrnOperatorParam param){
+ public R crnClearCommand(CrnOperatorParam param) {
// 绯荤粺杩愯鐘舵�佸垽鏂�
// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
@@ -580,7 +580,7 @@
command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞�
- return crnControl(command)?R.ok():R.error();
+ return crnControl(command) ? R.ok() : R.error();
}
@ManagerAuth(memo = "鎵嬪姩澶嶄綅")
@@ -627,7 +627,7 @@
@ManagerAuth(memo = "鍒囨崲鑱旀満妯″紡")
@PostMapping("/crn/operator/auto")
- public R crnAuto(CrnOperatorParam param){
+ public R crnAuto(CrnOperatorParam param) {
// 绯荤粺杩愯鐘舵�佸垽鏂�
// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
@@ -636,13 +636,14 @@
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
- command.setAuto((short)1);
+ command.setAuto((short) 1);
- return crnControl2(command)?R.ok():R.error();
+ return crnControl2(command) ? R.ok() : R.error();
}
+
@ManagerAuth(memo = "鍒囨崲鍗婃墜鍔ㄦā寮�")
@PostMapping("/crn/operator/semiAutomatic")
- public R crnsemiAutomatic(CrnOperatorParam param){
+ public R crnsemiAutomatic(CrnOperatorParam param) {
// 绯荤粺杩愯鐘舵�佸垽鏂�
// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
@@ -651,13 +652,14 @@
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
- command.setAuto((short)2);
+ command.setAuto((short) 2);
- return crnControl2(command)?R.ok():R.error();
+ return crnControl2(command) ? R.ok() : R.error();
}
+
@ManagerAuth(memo = "鍒囨崲鎵嬪姩妯″紡")
@PostMapping("/crn/operator/hand")
- public R onlineWrk1(CrnOperatorParam param){
+ public R onlineWrk1(CrnOperatorParam param) {
// 绯荤粺杩愯鐘舵�佸垽鏂�
// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
@@ -666,13 +668,14 @@
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
- command.setAuto((short)3);
+ command.setAuto((short) 3);
- return crnControl2(command)?R.ok():R.error();
+ return crnControl2(command) ? R.ok() : R.error();
}
+
@ManagerAuth(memo = "鐢宠瀹屾垚浠诲姟")
@PostMapping("/crn/operator/onlineWrk1")
- public R onlineWrk2(CrnOperatorParam param){
+ public R onlineWrk2(CrnOperatorParam param) {
// 绯荤粺杩愯鐘舵�佸垽鏂�
// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
@@ -681,13 +684,14 @@
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
- command.setOnlineWrk1((short)1);
+ command.setOnlineWrk1((short) 1);
- return crnControl2(command)?R.ok():R.error();
+ return crnControl2(command) ? R.ok() : R.error();
}
+
@ManagerAuth(memo = "鐢宠鍙栨秷浠诲姟")
@PostMapping("/crn/operator/onlineWrk2")
- public R onlineWrk3(CrnOperatorParam param){
+ public R onlineWrk3(CrnOperatorParam param) {
// 绯荤粺杩愯鐘舵�佸垽鏂�
// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
@@ -696,13 +700,14 @@
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
- command.setOnlineWrk2((short)1);
+ command.setOnlineWrk2((short) 1);
- return crnControl2(command)?R.ok():R.error();
+ return crnControl2(command) ? R.ok() : R.error();
}
+
@ManagerAuth(memo = "娓呴櫎鑱旀満浠诲姟")
@PostMapping("/crn/operator/onlineWrk3")
- public R onlineWrk4(CrnOperatorParam param){
+ public R onlineWrk4(CrnOperatorParam param) {
// 绯荤粺杩愯鐘舵�佸垽鏂�
// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
@@ -711,13 +716,14 @@
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
- command.setOnlineWrk3((short)1);
+ command.setOnlineWrk3((short) 1);
- return crnControl2(command)?R.ok():R.error();
+ return crnControl2(command) ? R.ok() : R.error();
}
+
@ManagerAuth(memo = "鎭㈠鑱旀満浠诲姟")
@PostMapping("/crn/operator/onlineWrk4")
- public R crnHand(CrnOperatorParam param){
+ public R crnHand(CrnOperatorParam param) {
// 绯荤粺杩愯鐘舵�佸垽鏂�
// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
@@ -726,14 +732,14 @@
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
- command.setOnlineWrk4((short)1);
+ command.setOnlineWrk4((short) 1);
- return crnControl2(command)?R.ok():R.error();
+ return crnControl2(command) ? R.ok() : R.error();
}
@ManagerAuth(memo = "澶嶄綅")
@PostMapping("/crn/operator/reset")
- public R crnReset(CrnOperatorParam param){
+ public R crnReset(CrnOperatorParam param) {
// 绯荤粺杩愯鐘舵�佸垽鏂�
// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
@@ -742,14 +748,13 @@
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
- command.setReset((short)1);
+ command.setReset((short) 1);
- return crnControl2(command)?R.ok():R.error();
+ return crnControl2(command) ? R.ok() : R.error();
}
-
- private boolean crnControl2(CrnCommand command){
+ private boolean crnControl2(CrnCommand command) {
if (command.getCrnNo() == null) {
throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�");
}
@@ -780,10 +785,7 @@
}
-
-
-
- private boolean crnControl(CrnCommand command){
+ private boolean crnControl(CrnCommand command) {
if (command.getCrnNo() == null) {
throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�");
}
@@ -813,8 +815,8 @@
return false;
}
- private void staNoProcess(CrnOperatorParam param, CrnCommand command){
- if (param.getSourceStaNo()!=null) {
+ private void staNoProcess(CrnOperatorParam param, CrnCommand command) {
+ if (param.getSourceStaNo() != null) {
if (param.getSourceStaNo() == 5) {
command.setSourcePosX((short) 2); // 婧愬簱浣嶆帓
command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
@@ -825,7 +827,7 @@
command.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰
}
}
- if (param.getStaNo()!=null) {
+ if (param.getStaNo() != null) {
if (param.getStaNo() == 5) {
command.setDestinationPosX((short) 2); // 鐩爣搴撲綅鎺�
command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
@@ -841,7 +843,7 @@
// /crn/list/auth
@RequestMapping(value = "/crnListQuery/auth")
@ManagerAuth
- public R listQuery(String condition){
+ public R listQuery(String condition) {
ArrayList<HashMap<String, Object>> list = new ArrayList<>();
for (CrnSlave crn : slaveProperties.getCrn()) {
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
diff --git a/src/main/java/com/zy/asrs/controller/DataResourceController.java b/src/main/java/com/zy/asrs/controller/DataResourceController.java
index a7f01d0..2da542e 100644
--- a/src/main/java/com/zy/asrs/controller/DataResourceController.java
+++ b/src/main/java/com/zy/asrs/controller/DataResourceController.java
@@ -4,19 +4,22 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.DataResource;
-import com.zy.asrs.service.DataResourceService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.DataResource;
+import com.zy.asrs.service.DataResourceService;
import com.zy.common.utils.YamlUtils;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class DataResourceController extends BaseController {
@@ -34,28 +37,30 @@
@RequestMapping(value = "/dataResource/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<DataResource> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(dataResourceService.selectPage(new Page<>(curr, limit), wrapper));
}
@RequestMapping(value = "/dataResource/tree/auth")
@ManagerAuth
- public R tree(){
+ public R tree() {
return R.parse("0-鎿嶄綔鎴愬姛").add(dataResourceService.selectAll());
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -72,10 +77,10 @@
return R.ok();
}
- @RequestMapping(value = "/dataResource/update/auth")
- @ManagerAuth
- public R update(DataResource dataResource){
- if (Cools.isEmpty(dataResource) || null==dataResource.getId()){
+ @RequestMapping(value = "/dataResource/update/auth")
+ @ManagerAuth
+ public R update(DataResource dataResource) {
+ if (Cools.isEmpty(dataResource) || null == dataResource.getId()) {
return R.error();
}
dataResourceService.updateById(dataResource);
@@ -84,8 +89,8 @@
@RequestMapping(value = "/dataResource/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Integer[] ids){
- for (Integer id : ids){
+ public R delete(@RequestParam(value = "ids[]") Integer[] ids) {
+ for (Integer id : ids) {
dataResourceService.deleteById(id);
}
return R.ok();
@@ -93,7 +98,7 @@
@RequestMapping(value = "/dataResource/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<DataResource> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("dataResource"));
@@ -109,7 +114,7 @@
wrapper.like("id", condition);
Page<DataResource> page = dataResourceService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (DataResource dataResource : page.getRecords()){
+ for (DataResource dataResource : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", dataResource.getId());
map.put("value", dataResource.getId());
@@ -122,7 +127,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<DataResource> wrapper = new EntityWrapper<DataResource>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != dataResourceService.selectOne(wrapper)){
+ if (null != dataResourceService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(DataResource.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/DeviceErrorController.java b/src/main/java/com/zy/asrs/controller/DeviceErrorController.java
index 54b03a2..74641cf 100644
--- a/src/main/java/com/zy/asrs/controller/DeviceErrorController.java
+++ b/src/main/java/com/zy/asrs/controller/DeviceErrorController.java
@@ -1,17 +1,16 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.DeviceError;
-import com.zy.asrs.service.DeviceErrorService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.DeviceError;
+import com.zy.asrs.service.DeviceErrorService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -32,22 +31,24 @@
@RequestMapping(value = "/deviceError/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<DeviceError> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(deviceErrorService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -65,10 +66,10 @@
return R.ok();
}
- @RequestMapping(value = "/deviceError/update/auth")
- @ManagerAuth
- public R update(DeviceError deviceError){
- if (Cools.isEmpty(deviceError) || null==deviceError.getId()){
+ @RequestMapping(value = "/deviceError/update/auth")
+ @ManagerAuth
+ public R update(DeviceError deviceError) {
+ if (Cools.isEmpty(deviceError) || null == deviceError.getId()) {
return R.error();
}
deviceErrorService.updateById(deviceError);
@@ -77,8 +78,8 @@
@RequestMapping(value = "/deviceError/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
deviceErrorService.deleteById(id);
}
return R.ok();
@@ -86,7 +87,7 @@
@RequestMapping(value = "/deviceError/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<DeviceError> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("deviceError"));
@@ -102,7 +103,7 @@
wrapper.like("id", condition);
Page<DeviceError> page = deviceErrorService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (DeviceError deviceError : page.getRecords()){
+ for (DeviceError deviceError : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", deviceError.getId());
map.put("value", deviceError.getId());
@@ -115,7 +116,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<DeviceError> wrapper = new EntityWrapper<DeviceError>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != deviceErrorService.selectOne(wrapper)){
+ if (null != deviceErrorService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(DeviceError.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 93d4845..6eedbc7 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -35,7 +35,7 @@
@RequestMapping(value = "/locDetl/auth")
@ManagerAuth
- public R stockOutList(@RequestParam(value = "locNos[]") List<String> locNos){
+ public R stockOutList(@RequestParam(value = "locNos[]") List<String> locNos) {
if (!locNos.isEmpty()) {
List<LocDetl> res = new ArrayList<>();
for (String locNo : new HashSet<>(locNos)) {
@@ -51,25 +51,27 @@
@RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 鎺ュ彛闂
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(LocDetl.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -94,10 +96,10 @@
return R.ok();
}
- @RequestMapping(value = "/locDetl/update/auth")
- @ManagerAuth(memo = "搴撲綅鏄庣粏淇敼")
- public R update(LocDetl locDetl){
- if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){
+ @RequestMapping(value = "/locDetl/update/auth")
+ @ManagerAuth(memo = "搴撲綅鏄庣粏淇敼")
+ public R update(LocDetl locDetl) {
+ if (Cools.isEmpty(locDetl) || null == locDetl.getMatnr()) {
return R.error();
}
locDetl.setModiUser(getUserId());
@@ -108,12 +110,12 @@
@RequestMapping(value = "/locDetl/delete/auth")
@ManagerAuth(memo = "搴撲綅鏄庣粏鍒犻櫎")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<LocDetl> list = JSONArray.parseArray(param, LocDetl.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (LocDetl entity : list){
+ for (LocDetl entity : list) {
locDetlService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -121,7 +123,7 @@
@RequestMapping(value = "/locDetl/export/auth")
@ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("locDetl"));
@@ -131,15 +133,15 @@
if (chooseRow.length() == 1) {
row = "0" + chooseRow;
map.remove("row");
- }else {
+ } else {
row = chooseRow;
map.remove("row");
}
}
convert(map, wrapper);
- if (!row.equals("")){
+ if (!row.equals("")) {
wrapper.and()
- .where("loc_no like '" +row +"%'");
+ .where("loc_no like '" + row + "%'");
}
List<LocDetl> list = locDetlService.selectList(wrapper);
return R.ok(exportSupport(list, fields));
@@ -152,7 +154,7 @@
wrapper.like("matnr", condition);
Page<LocDetl> page = locDetlService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (LocDetl locDetl : page.getRecords()){
+ for (LocDetl locDetl : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", locDetl.getMatnr());
map.put("value", locDetl.getMatnr());
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 84e79dd..e60aa1f 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -10,13 +10,11 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.common.entity.Parameter;
-import com.zy.common.model.Shelves;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -53,22 +51,24 @@
@RequestMapping(value = "/locMast/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper.eq("status",0)));
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
+ return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper.eq("status", 0)));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -91,12 +91,12 @@
@RequestMapping(value = "/locMast/delete/auth")
@ManagerAuth(memo = "搴撲綅鍒犻櫎")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<LocMast> list = JSONArray.parseArray(param, LocMast.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (LocMast entity : list){
+ for (LocMast entity : list) {
locMastService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -104,7 +104,7 @@
@RequestMapping(value = "/locMast/export/auth")
@ManagerAuth(memo = "搴撲綅瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("locMast"));
@@ -120,7 +120,7 @@
wrapper.like("loc_no", condition);
Page<LocMast> page = locMastService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (LocMast locMast : page.getRecords()){
+ for (LocMast locMast : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", locMast.getLocNo());
map.put("value", locMast.getLocNo());
@@ -133,7 +133,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != locMastService.selectOne(wrapper)){
+ if (null != locMastService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(LocMast.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -141,20 +141,20 @@
@RequestMapping(value = "/locMast/update/auth")
@ManagerAuth(memo = "搴撲綅淇敼")
- public R update(LocMast locMast){
- if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
+ public R update(LocMast locMast) {
+ if (Cools.isEmpty(locMast) || null == locMast.getLocNo()) {
return R.error();
}
- if (!Cools.isEmpty(locMast.getContainerCode())){
+ if (!Cools.isEmpty(locMast.getContainerCode())) {
locMast.setBarcode(locMast.getContainerCode());
}
- if (locMast.getEmptyContainer$().equals("N") ){
- if (locMast.getContainerCode().isEmpty() || locMast.getContainerTypeCode().isEmpty()){
+ if (locMast.getEmptyContainer$().equals("N")) {
+ if (locMast.getContainerCode().isEmpty() || locMast.getContainerTypeCode().isEmpty()) {
return R.error("瀹瑰櫒缂栫爜鎴栧鍣ㄧ被鍨嬫湁璇�");
}
}
- if (locMast.getLocSts().equals("O")){
+ if (locMast.getLocSts().equals("O")) {
locMast.setBarcode(null);
}
locMast.setModiUser(getUserId());
@@ -169,9 +169,9 @@
// @Transactional
public R init(LocMastInitParam param) {
List<LocMast> list = new ArrayList<>();
- for (int r=param.getStartRow(); r<=param.getEndRow(); r++){
- for (int b=param.getStartBay(); b<=param.getEndBay(); b++) {
- for (int l=param.getStartLev(); l<=param.getEndLev(); l++) {
+ for (int r = param.getStartRow(); r <= param.getEndRow(); r++) {
+ for (int b = param.getStartBay(); b <= param.getEndBay(); b++) {
+ for (int l = param.getStartLev(); l <= param.getEndLev(); l++) {
// 鑾峰彇搴撲綅鍙�
String locNo = String.format("%02d", r) + String.format("%03d", b) + String.format("%02d", l);
// 鑾峰彇鍫嗗灈鏈哄彿
@@ -183,7 +183,7 @@
// break;
// }
// }
- Date now = new Date();
+ Date now = new Date();
LocMast locMast = new LocMast();
locMast.setLocNo(locNo);
locMast.setLocSts("O");
diff --git a/src/main/java/com/zy/asrs/controller/MapController.java b/src/main/java/com/zy/asrs/controller/MapController.java
index 7489168..f30bc7a 100644
--- a/src/main/java/com/zy/asrs/controller/MapController.java
+++ b/src/main/java/com/zy/asrs/controller/MapController.java
@@ -7,7 +7,9 @@
import com.zy.asrs.service.LocMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
import java.io.*;
import java.util.ArrayList;
@@ -19,11 +21,10 @@
public class MapController extends BaseController {
- @Autowired
- private LocMastService locMastService;
-
private static final List<String> DISABLE_LOC_NO = new ArrayList<String>() {{
}};
+ @Autowired
+ private LocMastService locMastService;
@GetMapping("/map/getData/{lev}/auth")
@ManagerAuth
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 508f0d0..eaea9c2 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -30,7 +30,7 @@
@RequestMapping("/monitor")
public class MonitorController {
- private static final String[] WEEK = {"鏄熸湡鏃�","鏄熸湡涓�","鏄熸湡浜�","鏄熸湡涓�","鏄熸湡鍥�","鏄熸湡浜�","鏄熸湡鍏�"};
+ private static final String[] WEEK = {"鏄熸湡鏃�", "鏄熸湡涓�", "鏄熸湡浜�", "鏄熸湡涓�", "鏄熸湡鍥�", "鏄熸湡浜�", "鏄熸湡鍏�"};
@Autowired
private ReportQueryMapper reportQueryMapper;
@@ -45,12 +45,12 @@
calendar.setTime(now);
return R.ok(
Cools.add("year", calendar.get(Calendar.YEAR))
- .add("month", CommonService.zerofill(String.valueOf(calendar.get(Calendar.MONTH)+1), 2))
- .add("day", CommonService.zerofill(String.valueOf(calendar.get(Calendar.DATE)), 2))
- .add("hour", CommonService.zerofill(String.valueOf(calendar.get(Calendar.HOUR_OF_DAY)), 2))
- .add("minute", CommonService.zerofill(String.valueOf(calendar.get(Calendar.MINUTE)), 2))
- .add("second", CommonService.zerofill(String.valueOf(calendar.get(Calendar.SECOND)) , 2))
- .add("week", WEEK[calendar.get(Calendar.DAY_OF_WEEK)-1])
+ .add("month", CommonService.zerofill(String.valueOf(calendar.get(Calendar.MONTH) + 1), 2))
+ .add("day", CommonService.zerofill(String.valueOf(calendar.get(Calendar.DATE)), 2))
+ .add("hour", CommonService.zerofill(String.valueOf(calendar.get(Calendar.HOUR_OF_DAY)), 2))
+ .add("minute", CommonService.zerofill(String.valueOf(calendar.get(Calendar.MINUTE)), 2))
+ .add("second", CommonService.zerofill(String.valueOf(calendar.get(Calendar.SECOND)), 2))
+ .add("week", WEEK[calendar.get(Calendar.DAY_OF_WEEK) - 1])
);
}
@@ -105,15 +105,15 @@
return R.ok(
Cools.add("xSpeed", Arith.multiplys(1, Math.abs(xSpeed), 1)) // 琛岃蛋閫熷害
- .add("ySpeed", Arith.multiplys(1, Math.abs(ySpeed), 1)) // 鍗囬檷閫熷害
- .add("zSpeed", Arith.multiplys(1, Math.abs(zSpeed), 1)) // 鍙夌墮閫熷害
- .add("forkPos", forkPos) // 鍙夌墮閫熷害
- .add("xDistance", Arith.multiplys(1, Math.abs(xDistance), 1)) // 绱璧拌璺濈km
- .add("yDistance", Arith.multiplys(1, Math.abs(yDistance), 1)) // 绱鍗囬檷璺濈km
- .add("xDuration", Arith.multiplys(1, Math.abs(xDuration), 1)) // 绱璧拌鏃堕暱h
- .add("yDuration", Arith.multiplys(1, Math.abs(yDuration), 1)) // 绱鍗囬檷鏃堕暱h
- .add("isShow", !Cools.isEmpty(ledContent)) // 鏄惁鏄剧ず鍐呭
- .add("content", ledContent) // 鏄剧ず鍐呭
+ .add("ySpeed", Arith.multiplys(1, Math.abs(ySpeed), 1)) // 鍗囬檷閫熷害
+ .add("zSpeed", Arith.multiplys(1, Math.abs(zSpeed), 1)) // 鍙夌墮閫熷害
+ .add("forkPos", forkPos) // 鍙夌墮閫熷害
+ .add("xDistance", Arith.multiplys(1, Math.abs(xDistance), 1)) // 绱璧拌璺濈km
+ .add("yDistance", Arith.multiplys(1, Math.abs(yDistance), 1)) // 绱鍗囬檷璺濈km
+ .add("xDuration", Arith.multiplys(1, Math.abs(xDuration), 1)) // 绱璧拌鏃堕暱h
+ .add("yDuration", Arith.multiplys(1, Math.abs(yDuration), 1)) // 绱鍗囬檷鏃堕暱h
+ .add("isShow", !Cools.isEmpty(ledContent)) // 鏄惁鏄剧ず鍐呭
+ .add("content", ledContent) // 鏄剧ず鍐呭
);
}
@@ -122,11 +122,11 @@
*/
@RateLimit(2)
@GetMapping("/pakin/rep")
- public R monitorPakinRep(){
+ public R monitorPakinRep() {
// 鍏ュ簱
List<Map<String, Object>> pakinRep = reportQueryMapper.queryPakinRep();
for (Map<String, Object> map : pakinRep) {
- if (map.get("node")!=null) {
+ if (map.get("node") != null) {
map.put("node", String.valueOf(map.get("node")).substring(5, 10));
}
}
@@ -137,32 +137,32 @@
@RateLimit(2)
@GetMapping("/line/charts")
- public R locIoLineCharts(){
- Map<String,Object> map=new HashMap<String, Object>();
+ public R locIoLineCharts() {
+ Map<String, Object> map = new HashMap<String, Object>();
List<AxisBean> list = new ArrayList<AxisBean>();
List<WorkChartAxis> listChart = reportQueryMapper.getChartAxis();
- if(listChart!=null) {
+ if (listChart != null) {
ArrayList<Integer> data1 = new ArrayList<Integer>();
ArrayList<Integer> data2 = new ArrayList<Integer>();
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DATE, -12);
- for(int i=0;i<12;i++) {
+ for (int i = 0; i < 12; i++) {
boolean flag = true;
calendar.add(Calendar.DATE, 1);
String str = sf.format(calendar.getTime());
- for(WorkChartAxis workChart : listChart) {
- if(str.equals(workChart.getYmd())) {
+ for (WorkChartAxis workChart : listChart) {
+ if (str.equals(workChart.getYmd())) {
data1.add(workChart.getInqty());
data2.add(workChart.getOutqty());
flag = false;
break;
}
}
- if(flag) {
+ if (flag) {
data1.add(0);
data2.add(0);
}
@@ -178,7 +178,7 @@
outqty.setData(data2.toArray(array2));
list.add(outqty);
}
- map.put("rows",list);
+ map.put("rows", list);
return R.ok(map);
}
@@ -188,11 +188,11 @@
*/
@RateLimit(2)
@GetMapping("/loc/rep")
- public R monitorLocRep(){
+ public R monitorLocRep() {
List<Map<String, Object>> pie = new ArrayList<>();
LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
- if(locUseRate!=null) {
+ if (locUseRate != null) {
Map<String, Object> map = new HashMap<>();
map.put("name", "鍦ㄥ簱");
map.put("value", locUseRate.getFqty());
@@ -224,70 +224,28 @@
return R.ok(
Cools.add("pie", pie)
- .add("stockCunt", locUseRate.getFqty())
- .add("emptyCount", locUseRate.getOqty())
- .add("noneCount", locUseRate.getXqty())
- .add("total", total)
- .add("used", used)
- .add("usedPr", usedPr)
+ .add("stockCunt", locUseRate.getFqty())
+ .add("emptyCount", locUseRate.getOqty())
+ .add("noneCount", locUseRate.getXqty())
+ .add("total", total)
+ .add("used", used)
+ .add("usedPr", usedPr)
);
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
/**
* 鑷姩琛ラ浂
*/
- private List<Map<String, Object>> fill(List<Map<String, Object>> list, int start, int end){
- for (int i = start ; i <= end; i++){
+ private List<Map<String, Object>> fill(List<Map<String, Object>> list, int start, int end) {
+ for (int i = start; i <= end; i++) {
boolean exist = false;
- for (Map seq : list){
- if (Integer.parseInt(String.valueOf(seq.get("node"))) == i){
+ for (Map seq : list) {
+ if (Integer.parseInt(String.valueOf(seq.get("node"))) == i) {
exist = true;
}
}
- if (!exist){
+ if (!exist) {
HashMap<String, Object> map = new HashMap<>();
map.put("node", i);
map.put("val", 0);
@@ -302,12 +260,12 @@
* x杞村崟浣嶈浆鎹�
* @param dot y杞存暟鍊间繚鐣欏皬鏁颁綅
*/
- private List<Map<String, Object>> convert(List<Map<String, Object>> list, StatsType statsType, int dot){
- for (Map<String, Object> map : list){
+ private List<Map<String, Object>> convert(List<Map<String, Object>> list, StatsType statsType, int dot) {
+ for (Map<String, Object> map : list) {
Object val = map.get("val");
map.put("val", Arith.multiplys(dot, 1, (Number) val));
Object node = map.get("node");
- switch (statsType){
+ switch (statsType) {
case MONTH:
map.put("node", node + "鍙�");
break;
@@ -321,15 +279,16 @@
return list;
}
- enum StatsType{
+ enum StatsType {
- YEAR(1,1, 12),
- MONTH(2,1, 30),
+ YEAR(1, 1, 12),
+ MONTH(2, 1, 30),
;
int id;
int start;
int end;
+
StatsType(int id, int start, int end) {
this.id = id;
this.start = start;
@@ -338,8 +297,8 @@
static StatsType get(int id) {
StatsType[] values = StatsType.values();
- for (StatsType statsType : values){
- if (statsType.id == id){
+ for (StatsType statsType : values) {
+ if (statsType.id == id) {
return statsType;
}
}
@@ -347,8 +306,6 @@
}
}
-
-
}
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 9a16f6c..cc090c7 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -8,7 +8,6 @@
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
-import com.fasterxml.jackson.databind.ObjectMapper;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
@@ -23,15 +22,20 @@
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.lang.reflect.Field;
-import java.util.*;
-
-import static org.apache.ibatis.ognl.OgnlRuntime.setFieldValue;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@Slf4j
@RestController
@RequestMapping("/open")
public class OpenController extends BaseController {
+ public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
+ add("ea1f0459efc02a79f046f982767939ae");
+ }};
+ private static final boolean auth = true;
@Autowired
private OpenService openService;
@Autowired
@@ -52,29 +56,70 @@
private LocMastService locMastService;
@Autowired
private BasCrnErrorService basCrnErrorService;
-
@Value("${wms.url}")
private String wmsUrl;
- private static final boolean auth = true;
+ public static <T> List<T> convertListMapToListObject(List<HashMap<String, Object>> listMap, Class<T> clazz) throws Exception {
+ List<T> list = new ArrayList<>();
- public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
- add("ea1f0459efc02a79f046f982767939ae");
- }};
+ for (Map<String, Object> map : listMap) {
+ T obj = clazz.getDeclaredConstructor().newInstance();
+
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ String key = entry.getKey();
+ Object value = entry.getValue();
+
+ try {
+ Field field = clazz.getDeclaredField(key);
+ field.setAccessible(true);
+ setFieldValue(obj, field, value);
+ } catch (NoSuchFieldException e) {
+ System.out.println("No such field: " + key + " in class " + clazz.getName());
+ }
+ }
+
+ list.add(obj);
+ }
+
+ return list;
+ }
+
+ private static void setFieldValue(Object obj, Field field, Object value) throws IllegalAccessException {
+ Class<?> fieldType = field.getType();
+
+ if (fieldType.isAssignableFrom(value.getClass())) {
+ field.set(obj, value);
+ } else if (fieldType == int.class || fieldType == Integer.class) {
+ field.set(obj, ((Number) value).intValue());
+ } else if (fieldType == long.class || fieldType == Long.class) {
+ field.set(obj, ((Number) value).longValue());
+ } else if (fieldType == double.class || fieldType == Double.class) {
+ field.set(obj, ((Number) value).doubleValue());
+ } else if (fieldType == float.class || fieldType == Float.class) {
+ field.set(obj, ((Number) value).floatValue());
+ } else if (fieldType == boolean.class || fieldType == Boolean.class) {
+ field.set(obj, (Boolean) value);
+ } else if (fieldType == String.class) {
+ field.set(obj, String.valueOf(value));
+ } else {
+ System.out.println("Unsupported field type: " + fieldType.getName());
+ }
+ }
+
//agv浠诲姟瀹屾垚
@PostMapping("/toAgvTaskOver")
@AppAuth(memo = "agv浠诲姟瀹屾垚鎺ュ彛")
public R getAgvTaskOver(@RequestHeader String appkey,
- @RequestBody TaskOverParam param,
- HttpServletRequest request){
+ @RequestBody TaskOverParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- if (Cools.isEmpty(param.getWharfCode())){
+ if (Cools.isEmpty(param.getWharfCode())) {
return R.error("鐮佸ご[wharfCode]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getStatus())){
+ if (Cools.isEmpty(param.getStatus())) {
return R.error("瀹屾垚鏍囪[status]涓嶈兘涓虹┖");
}
openService.getAgvTaskOver(param);
@@ -85,10 +130,10 @@
@PostMapping("/taskCreate")
@Transactional
public R taskCreate(@RequestHeader String appkey,
- @RequestBody List<TaskCreateParam> param1,
- HttpServletRequest request) {
+ @RequestBody List<TaskCreateParam> param1,
+ HttpServletRequest request) {
auth(appkey, param1, request);
- try{
+ try {
List<TaskCreateParam> paramList = new ArrayList<>();
List<String> locNoList = new ArrayList<>();
for (TaskCreateParam param : param1) {
@@ -104,42 +149,42 @@
if (Cools.isEmpty(param.getBarcode())) {
return R.error("鏉＄爜[barcode]涓嶈兘涓虹┖");
}
- String locNo=null;
- if(param.getIoType()==1){
- locNo=param.getTargetPoint();
- }else{
- locNo=param.getStartPoint();
+ String locNo = null;
+ if (param.getIoType() == 1) {
+ locNo = param.getTargetPoint();
+ } else {
+ locNo = param.getStartPoint();
}
- try{
+ try {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", locNo).ne("loc_sts","X"));
- if (Cools.isEmpty(locMast)){
- log.error("搴撲綅鍙蜂笉瀛樺湪"+locNo);
- return R.error("搴撲綅鍙蜂笉瀛樺湪"+locNo).add("搴撲綅鍙蜂笉瀛樺湪"+locNo);
+ .eq("loc_no", locNo).ne("loc_sts", "X"));
+ if (Cools.isEmpty(locMast)) {
+ log.error("搴撲綅鍙蜂笉瀛樺湪" + locNo);
+ return R.error("搴撲綅鍙蜂笉瀛樺湪" + locNo).add("搴撲綅鍙蜂笉瀛樺湪" + locNo);
}
- }catch (Exception e){
- log.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�"+e);
- return R.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�").add("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�"+e);
+ } catch (Exception e) {
+ log.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�" + e);
+ return R.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�").add("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�" + e);
}
- LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_sts","F")
- .eq("loc_no",locNo)
- .eq("barcode",param.getBarcode()));
- if(Cools.isEmpty(locMast)){
- return R.error("璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢"+param.getTargetPoint());
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "F")
+ .eq("loc_no", locNo)
+ .eq("barcode", param.getBarcode()));
+ if (Cools.isEmpty(locMast)) {
+ return R.error("璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢" + param.getTargetPoint());
}
- if (!locNoList.contains(locMast.getLocNo())){
+ if (!locNoList.contains(locMast.getLocNo())) {
locNoList.add(locMast.getLocNo());
paramList.add(param);
- }else {
- return R.error("璇ュ簱浣嶄笉鑳藉悓鏃朵笅鍙戜袱绗斾换鍔�"+locMast.getLocNo());
+ } else {
+ return R.error("璇ュ簱浣嶄笉鑳藉悓鏃朵笅鍙戜袱绗斾换鍔�" + locMast.getLocNo());
}
}
- for (TaskCreateParam param : paramList){
+ for (TaskCreateParam param : paramList) {
openService.taskCreate(param);
}
- }catch (Exception e){
- log.error("浠诲姟涓嬪彂寮傚父"+e);
+ } catch (Exception e) {
+ log.error("浠诲姟涓嬪彂寮傚父" + e);
return R.error();
}
return R.ok();
@@ -162,16 +207,16 @@
@PostMapping("/pick/and/place/v1")
@AppAuth(memo = "agv鍙栨斁璐х敵璇�")
public R getAgvPickAndPlaceV1(@RequestHeader String appkey,
- @RequestBody TaskOverParam param,
- HttpServletRequest request){
+ @RequestBody TaskOverParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- if (Cools.isEmpty(param.getStaNo())){
+ if (Cools.isEmpty(param.getStaNo())) {
return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getType())){
+ if (Cools.isEmpty(param.getType())) {
return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
}
return openService.getAgvPickAndPlaceV1(param);
@@ -182,15 +227,15 @@
@AppAuth(memo = "agv鍙栨斁璐у畬鎴愬弽棣�")
public R getAgvPickAndPlaceV2(@RequestHeader String appkey,
@RequestBody TaskOverParam param,
- HttpServletRequest request){
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- if (Cools.isEmpty(param.getStaNo())){
+ if (Cools.isEmpty(param.getStaNo())) {
return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getType())){
+ if (Cools.isEmpty(param.getType())) {
return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
}
return openService.getAgvPickAndPlaceV2(param);
@@ -228,27 +273,27 @@
public R targetWharfApply(@RequestHeader String appkey,
@RequestBody WMSAndAGVInterfaceParam param,
HttpServletRequest request) throws IOException {
- auth(appkey,param,request);
+ auth(appkey, param, request);
- if (Cools.isEmpty(param)){
+ if (Cools.isEmpty(param)) {
return R.error("鍙傛暟涓虹┖锛�");
- } else if (Cools.isEmpty(param.getTaskNo())){
+ } else if (Cools.isEmpty(param.getTaskNo())) {
return R.error("宸ヤ綔鍙蜂负绌猴紒");
- } else if (Cools.isEmpty(param.getContainerCode())){
+ } else if (Cools.isEmpty(param.getContainerCode())) {
return R.error("鎵樼洏缂栫爜涓虹┖锛�");
- } else if (Cools.isEmpty(param.getWharfSource())){
+ } else if (Cools.isEmpty(param.getWharfSource())) {
return R.error("婧愮爜澶翠负绌猴紒");
- } else if (Cools.isEmpty(param.getFreeWharfs()) || param.getFreeWharfs().size()==0){
+ } else if (Cools.isEmpty(param.getFreeWharfs()) || param.getFreeWharfs().size() == 0) {
return R.error("绌洪棽鐨勫叆搴撶爜澶达紙AGV锛変负绌猴紒");
}
R r = openService.AgvToWCSToWms(param);
apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
- ,request.getRemoteAddr()+request.getRequestURI()
- ,appkey
- ,request.getRemoteAddr()
- ,JSON.toJSONString(param)
- ,r.toString()
- ,true
+ , request.getRemoteAddr() + request.getRequestURI()
+ , appkey
+ , request.getRemoteAddr()
+ , JSON.toJSONString(param)
+ , r.toString()
+ , true
);
return r;
}
@@ -257,61 +302,66 @@
@PostMapping("/agvTaskRequest")
@AppAuth(memo = "AGV璇锋眰鍔ㄤ綔鎺ュ彛")
public R agvTaskRequest(@RequestHeader String appkey,
- @RequestBody WMSAndAGVInterfaceParam param,
- HttpServletRequest request) {
+ @RequestBody WMSAndAGVInterfaceParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
- if (Cools.isEmpty(param)){
+ if (Cools.isEmpty(param)) {
return R.error("鍙傛暟涓虹┖锛�");
- } else if (Cools.isEmpty(param.getRequestType())){
+ } else if (Cools.isEmpty(param.getRequestType())) {
return R.error("璇锋眰绫诲瀷涓虹┖锛�");
- } else if (Cools.isEmpty(param.getWharfCode())){
+ } else if (Cools.isEmpty(param.getWharfCode())) {
return R.error("鐮佸ご缂栧彿涓虹┖锛�");
}
- Map<String,Integer> map = new HashMap<>();
- map.put("J-1102",102);map.put("J-1101",101);
- map.put("J-1103",105);map.put("J-1104",106);
- map.put("J-1105",109);map.put("J-1106",110);
- map.put("J-1107",113);map.put("J-1108",114);
- map.put("J-1109",117);map.put("J-1110",118);
- map.put("J-1111",121);map.put("J-1112",122);
- map.put("H-1102",300);map.put("H-1101",305);
- map.put("G-1102",400);map.put("G-1101",405);
+ Map<String, Integer> map = new HashMap<>();
+ map.put("J-1102", 102);
+ map.put("J-1101", 101);
+ map.put("J-1103", 105);
+ map.put("J-1104", 106);
+ map.put("J-1105", 109);
+ map.put("J-1106", 110);
+ map.put("J-1107", 113);
+ map.put("J-1108", 114);
+ map.put("J-1109", 117);
+ map.put("J-1110", 118);
+ map.put("J-1111", 121);
+ map.put("J-1112", 122);
+ map.put("H-1102", 300);
+ map.put("H-1101", 305);
+ map.put("G-1102", 400);
+ map.put("G-1101", 405);
// StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
// .eq("stn_desc", param.getWharfCode()));
//
// if (Cools.isEmpty(staDesc)){
// return R.error("绋嬪簭鎶ラ敊锛屾湭鏌ヨ鍒扮珯鐐�");
// }
- if (Cools.isEmpty(map.get(param.getWharfCode()))){
+ if (Cools.isEmpty(map.get(param.getWharfCode()))) {
return R.error("鏈煡璇㈠埌绔欑偣");
}
BasDevp basDevp = basDevpService.selectById(map.get(param.getWharfCode()));
// BasDevp basDevp = basDevpService.selectById(staDesc.getStnNo());
- if (basDevp.getAutoing().equals("Y") && (basDevp.getInEnable().equals("Y") || basDevp.getOutEnable().equals("Y"))){
+ if (basDevp.getAutoing().equals("Y") && (basDevp.getInEnable().equals("Y") || basDevp.getOutEnable().equals("Y"))) {
apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
- ,request.getRemoteAddr()+request.getRequestURI()
- ,appkey
- ,request.getRemoteAddr()
- ,JSON.toJSONString(param)
- ,R.ok().toString()
- ,true
+ , request.getRemoteAddr() + request.getRequestURI()
+ , appkey
+ , request.getRemoteAddr()
+ , JSON.toJSONString(param)
+ , R.ok().toString()
+ , true
);
return R.ok("鍙叆");
- }else {
+ } else {
apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
- ,request.getRemoteAddr()+request.getRequestURI()
- ,appkey
- ,request.getRemoteAddr()
- ,JSON.toJSONString(param)
- ,R.error("绔欑偣鐘舵�佷笉鍙叆").toString()
- ,true
+ , request.getRemoteAddr() + request.getRequestURI()
+ , appkey
+ , request.getRemoteAddr()
+ , JSON.toJSONString(param)
+ , R.error("绔欑偣鐘舵�佷笉鍙叆").toString()
+ , true
);
return R.error("绔欑偣鐘舵�佷笉鍙叆");
}
-
-
-
}
@@ -319,125 +369,125 @@
//浠诲姟涓嬪彂鎺ュ彛
@PostMapping("/outboundTaskSend")
@Transactional
- public HashMap<String, Object> outboundTaskSend(@RequestBody HashMap<String,Object> hashMap) {
+ public HashMap<String, Object> outboundTaskSend(@RequestBody HashMap<String, Object> hashMap) {
String jsonString = JSON.toJSONString(hashMap.get("TaskList"));
- List<CarryParam> params= JSONObject.parseArray(jsonString,CarryParam.class);
+ List<CarryParam> params = JSONObject.parseArray(jsonString, CarryParam.class);
HashMap<String, Object> map = new HashMap<>();
- List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
- for (CarryParam param:params){
- if (Cools.isEmpty(param)){
- map.put("Code","0");
- map.put("Msg","鍙傛暟涓虹┖锛�");
+ List<WMSAndAGVInterfaceParam> params1 = new ArrayList<>();
+ for (CarryParam param : params) {
+ if (Cools.isEmpty(param)) {
+ map.put("Code", "0");
+ map.put("Msg", "鍙傛暟涓虹┖锛�");
return map;
- } else if (Cools.isEmpty(param.getTaskNo())){
- map.put("Code","0");
- map.put("Msg","浠诲姟鍙蜂负绌猴紒");
+ } else if (Cools.isEmpty(param.getTaskNo())) {
+ map.put("Code", "0");
+ map.put("Msg", "浠诲姟鍙蜂负绌猴紒");
return map;
- } else if (Cools.isEmpty(param.getStereoscopicTaskType())){
- map.put("Code","0");
- map.put("Msg","浠诲姟绫诲瀷涓虹┖锛�");
+ } else if (Cools.isEmpty(param.getStereoscopicTaskType())) {
+ map.put("Code", "0");
+ map.put("Msg", "浠诲姟绫诲瀷涓虹┖锛�");
return map;
}
String fusion = Utils.Fusion(param.getOriginalRowNo(), param.getOriginalFloorNo(), param.getOriginalColumnNo());
param.setStartPoint(fusion);
LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
- if(Cools.isEmpty(locMast)){
- map.put("Code","0");
- map.put("Msg","鍒濆搴撲綅鏃犳硶鎵惧埌锛�");
+ if (Cools.isEmpty(locMast)) {
+ map.put("Code", "0");
+ map.put("Msg", "鍒濆搴撲綅鏃犳硶鎵惧埌锛�");
return map;
}
- HashMap<String,Object> r = new HashMap<>();
+ HashMap<String, Object> r = new HashMap<>();
- if(param.getStereoscopicTaskType() == 2){
+ if (param.getStereoscopicTaskType() == 2) {
//鍑哄簱浠诲姟鍒涘缓
StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("type_no",2)
- .eq("crn_no",locMast.getCrnNo())
- .eq("stn_no",param.getTerminalNo()));
- if(Cools.isEmpty(staDesc)){
- map.put("Code","0");
- map.put("Msg","鍑哄簱璺姴涓嶅瓨鍦紒");
+ .eq("type_no", 2)
+ .eq("crn_no", locMast.getCrnNo())
+ .eq("stn_no", param.getTerminalNo()));
+ if (Cools.isEmpty(staDesc)) {
+ map.put("Code", "0");
+ map.put("Msg", "鍑哄簱璺姴涓嶅瓨鍦紒");
return map;
}
- r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo()));
- if(r.get("Code").equals("0")){
+ r = openService.taskCreate(new TaskCreateParam(param, staDesc.getCrnNo()));
+ if (r.get("Code").equals("0")) {
return r;
}
- }else if (param.getStereoscopicTaskType() == 3){
+ } else if (param.getStereoscopicTaskType() == 3) {
String fusion1 = Utils.Fusion(param.getGoalRowNo(), param.getGoalFloorNo(), param.getGoalColumnNo());
param.setTerminalNo(fusion1);
//绉诲簱浠诲姟鍒涘缓
- r = openService.taskCreate(new TaskCreateParam(param,locMast.getCrnNo()));
- if(r.get("Code").equals("0")){
+ r = openService.taskCreate(new TaskCreateParam(param, locMast.getCrnNo()));
+ if (r.get("Code").equals("0")) {
return r;
}
}
apiLogService.save("Wms浠诲姟涓嬪彂鎺ュ彛"
- ,request.getRemoteAddr()+request.getRequestURI()
- ,""
- ,request.getRemoteAddr()
- ,JSON.toJSONString(param)
- ,r.toString()
- ,true
+ , request.getRemoteAddr() + request.getRequestURI()
+ , ""
+ , request.getRemoteAddr()
+ , JSON.toJSONString(param)
+ , r.toString()
+ , true
);
}
- map.put("Code","1");
- map.put("Msg","ok");
+ map.put("Code", "1");
+ map.put("Msg", "ok");
return map;
}
//浠诲姟鍙栨秷鎺ュ彛
@PostMapping("/taskCancel")
public R taskCancel(@RequestHeader String appkey,
- @RequestBody WMSAndAGVInterfaceParam param,
- HttpServletRequest request) {
+ @RequestBody WMSAndAGVInterfaceParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
- if (Cools.isEmpty(param)){
+ if (Cools.isEmpty(param)) {
return R.error("鍙傛暟涓虹┖锛�");
- } else if (Cools.isEmpty(param.getTaskNo())){
+ } else if (Cools.isEmpty(param.getTaskNo())) {
return R.error("宸ヤ綔鍙蜂负绌猴紒");
- } else if (Cools.isEmpty(param.getIoType())){
+ } else if (Cools.isEmpty(param.getIoType())) {
return R.error("鎿嶄綔绫诲瀷涓虹┖锛�");
- } else if (Cools.isEmpty(param.getBarcode())){
+ } else if (Cools.isEmpty(param.getBarcode())) {
return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒");
}
TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>()
.eq("task_no", param.getTaskNo())
- .eq("io_type",param.getIoType())
- .eq("barcode",param.getBarcode()));
- if (Cools.isEmpty(taskWrk)){
- return R.error("鏈煡鍒板綋鍓嶄换鍔�---"+param);
+ .eq("io_type", param.getIoType())
+ .eq("barcode", param.getBarcode()));
+ if (Cools.isEmpty(taskWrk)) {
+ return R.error("鏈煡鍒板綋鍓嶄换鍔�---" + param);
}
- boolean sign =false;
- switch (param.getTaskStatus()){
+ boolean sign = false;
+ switch (param.getTaskStatus()) {
case 1://姝ｅ父鍙栨秷
- if (taskWrk.getStatus()>1){
+ if (taskWrk.getStatus() > 1) {
return R.error("浠诲姟宸插紑濮嬫墽琛�");
}
break;
case 2://姝ｅ父瀹屾垚
- if (taskWrk.getStatus()>1){
+ if (taskWrk.getStatus() > 1) {
return R.error("浠诲姟宸插紑濮嬫墽琛�");
}
- sign=true;
+ sign = true;
break;
default:
return R.error("鏈煡鎿嶄綔");
}
- return taskWrkOperate(taskWrk,sign);
+ return taskWrkOperate(taskWrk, sign);
}
//浠诲姟鎿嶄綔
- private R taskWrkOperate(TaskWrk taskWrk,boolean sign){
- try{
- if (sign){//瀹屾垚
+ private R taskWrkOperate(TaskWrk taskWrk, boolean sign) {
+ try {
+ if (sign) {//瀹屾垚
return taskWrkController.complete(taskWrk.getTaskNo());
- }else {//鍙栨秷
+ } else {//鍙栨秷
return taskWrkController.cancel(taskWrk.getTaskNo());
}
- }catch (Exception e){
+ } catch (Exception e) {
return R.error();
}
}
@@ -446,68 +496,22 @@
@GetMapping("/deviceStatus")
@Transactional
public R deviceStatus() {
- List<CrnStatusParam> crnStatusParams=new ArrayList<>();
+ List<CrnStatusParam> crnStatusParams = new ArrayList<>();
List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
- for (BasCrnp basCrnp:basCrnps){
- CrnStatusParam crnStatusParam=new CrnStatusParam();
+ for (BasCrnp basCrnp : basCrnps) {
+ CrnStatusParam crnStatusParam = new CrnStatusParam();
crnStatusParam.setCrnNo(basCrnp.getCrnNo());
crnStatusParam.setCrnSts(basCrnp.getCrnSts());
crnStatusParam.setErrorCode(basCrnp.getCrnErr());
- BasCrnError error=basCrnErrorService.selectOne(new EntityWrapper<BasCrnError>().eq("error_code",basCrnp.getCrnErr()));
- if(Cools.isEmpty(error)){
+ BasCrnError error = basCrnErrorService.selectOne(new EntityWrapper<BasCrnError>().eq("error_code", basCrnp.getCrnErr()));
+ if (Cools.isEmpty(error)) {
crnStatusParam.setErrorMsg("");
- }else {
+ } else {
crnStatusParam.setErrorMsg(error.getErrName());
}
crnStatusParams.add(crnStatusParam);
}
return R.ok(crnStatusParams);
- }
-
- public static <T> List<T> convertListMapToListObject(List<HashMap<String, Object>> listMap, Class<T> clazz) throws Exception {
- List<T> list = new ArrayList<>();
-
- for (Map<String, Object> map : listMap) {
- T obj = clazz.getDeclaredConstructor().newInstance();
-
- for (Map.Entry<String, Object> entry : map.entrySet()) {
- String key = entry.getKey();
- Object value = entry.getValue();
-
- try {
- Field field = clazz.getDeclaredField(key);
- field.setAccessible(true);
- setFieldValue(obj, field, value);
- } catch (NoSuchFieldException e) {
- System.out.println("No such field: " + key + " in class " + clazz.getName());
- }
- }
-
- list.add(obj);
- }
-
- return list;
- }
- private static void setFieldValue(Object obj, Field field, Object value) throws IllegalAccessException {
- Class<?> fieldType = field.getType();
-
- if (fieldType.isAssignableFrom(value.getClass())) {
- field.set(obj, value);
- } else if (fieldType == int.class || fieldType == Integer.class) {
- field.set(obj, ((Number) value).intValue());
- } else if (fieldType == long.class || fieldType == Long.class) {
- field.set(obj, ((Number) value).longValue());
- } else if (fieldType == double.class || fieldType == Double.class) {
- field.set(obj, ((Number) value).doubleValue());
- } else if (fieldType == float.class || fieldType == Float.class) {
- field.set(obj, ((Number) value).floatValue());
- } else if (fieldType == boolean.class || fieldType == Boolean.class) {
- field.set(obj, (Boolean) value);
- } else if (fieldType == String.class) {
- field.set(obj, String.valueOf(value));
- } else {
- System.out.println("Unsupported field type: " + fieldType.getName());
- }
}
}
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index cd42ffc..e4410e0 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -29,221 +29,221 @@
@RequestMapping("/report")
public class ReportQueryController extends BaseController {
- @Autowired
- private LocDetlService locDetlService;
- @Autowired
- private ReportQueryMapper reportQueryMapper;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private ReportQueryMapper reportQueryMapper;
- //------------------搴撲綅浣跨敤缁熻--------------------------------------
- @RequestMapping("/viewStockUseList.action")
- public R queryViewStockUseListByPages(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- ViewStockUseBean bean = new ViewStockUseBean();
- bean.setPageSize(limit);
- bean.setPageNumber(curr);
- List<ViewStockUseBean> list= reportQueryMapper.queryViewStockUseList(bean);
- int count = reportQueryMapper.getViewStockUseCount(bean);
- Page<ViewStockUseBean> page = new Page<>();
- page.setRecords(list);
- page.setTotal(count);
- return R.ok(page);
- }
+ //------------------搴撲綅浣跨敤缁熻--------------------------------------
+ @RequestMapping("/viewStockUseList.action")
+ public R queryViewStockUseListByPages(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
+ ViewStockUseBean bean = new ViewStockUseBean();
+ bean.setPageSize(limit);
+ bean.setPageNumber(curr);
+ List<ViewStockUseBean> list = reportQueryMapper.queryViewStockUseList(bean);
+ int count = reportQueryMapper.getViewStockUseCount(bean);
+ Page<ViewStockUseBean> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
+ }
- // 瀵煎嚭
- @RequestMapping(value = "/viewStockUseExport.action")
- @ManagerAuth(memo = "搴撲綅浣跨敤缁熻瀵煎嚭")
- public R viewStockUseExport(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- List<ViewStockUseBean> list = reportQueryMapper.getViewStockUseAll(new ViewStockUseBean());
- return R.ok(exportSupport(list, fields));
- }
+ // 瀵煎嚭
+ @RequestMapping(value = "/viewStockUseExport.action")
+ @ManagerAuth(memo = "搴撲綅浣跨敤缁熻瀵煎嚭")
+ public R viewStockUseExport(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ List<ViewStockUseBean> list = reportQueryMapper.getViewStockUseAll(new ViewStockUseBean());
+ return R.ok(exportSupport(list, fields));
+ }
- //------------------搴撳瓨婊炵暀缁熻--------------------------------------
- @RequestMapping("/viewStayTimeList.action")
- public Map<String,Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- ViewStayTimeBean bean = new ViewStayTimeBean();
- bean.setPageSize(limit);
- bean.setPageNumber(curr);
- String locNo = String.valueOf(param.get("loc_no"));
- if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
- bean.setLoc_no(locNo);
- }
- List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
- int count = reportQueryMapper.getViewStayTimeCount(bean);
- Page<ViewStayTimeBean> page = new Page<>();
- page.setRecords(list);
- page.setTotal(count);
- return R.ok(page);
- }
+ //------------------搴撳瓨婊炵暀缁熻--------------------------------------
+ @RequestMapping("/viewStayTimeList.action")
+ public Map<String, Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
+ ViewStayTimeBean bean = new ViewStayTimeBean();
+ bean.setPageSize(limit);
+ bean.setPageNumber(curr);
+ String locNo = String.valueOf(param.get("loc_no"));
+ if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+ bean.setLoc_no(locNo);
+ }
+ List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
+ int count = reportQueryMapper.getViewStayTimeCount(bean);
+ Page<ViewStayTimeBean> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
+ }
- // 瀵煎嚭
- @RequestMapping(value = "/viewStayTimeExport.action")
- @ManagerAuth(memo = "搴撳瓨婊炵暀缁熻瀵煎嚭")
- public R viewStayTimeExport(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(new ViewStayTimeBean());
- return R.ok(exportSupport(list, fields));
- }
+ // 瀵煎嚭
+ @RequestMapping(value = "/viewStayTimeExport.action")
+ @ManagerAuth(memo = "搴撳瓨婊炵暀缁熻瀵煎嚭")
+ public R viewStayTimeExport(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(new ViewStayTimeBean());
+ return R.ok(exportSupport(list, fields));
+ }
- //-----------------搴撳瓨MAP鍥�--------------------------------------
- @RequestMapping("/viewLocMapList/rows.action")
- public R queryViewLocMapRows(){
- return R.ok().add(reportQueryMapper.getViewLocRowTotal());
- }
+ //-----------------搴撳瓨MAP鍥�--------------------------------------
+ @RequestMapping("/viewLocMapList/rows.action")
+ public R queryViewLocMapRows() {
+ return R.ok().add(reportQueryMapper.getViewLocRowTotal());
+ }
- @RequestMapping("/viewLocMapList.action")
- public R queryViewLocMapListByPages(@RequestParam(defaultValue = "1")Integer row){
- // 鑾峰彇鎺掔骇鏁版嵁
- // 琛ㄦ牸鏍囬锛氬垪 ===>> 鍗囧簭
- List<String> bays = reportQueryMapper.getViewLocBayCount(row);
- // 锛佽〃鏍肩涓�鍒楁斁灞傜骇鏁�
- bays.add(0, "");
- // 琛ㄦ牸琛岋細灞� ====>> 鍊掑簭
- List<String> levs = reportQueryMapper.getViewLocLevCount(row);
- List<Map<String, Object>> body = new ArrayList<>();
- for (String lev : levs){
- // 鑾峰彇灞傜骇鏁版嵁
- List<ViewLocMapDto> dtos = reportQueryMapper.getViewLocBays(row, Integer.parseInt(lev));
- // 锛佽〃鏍肩涓�鍒楁斁灞傜骇鏁�
- dtos.add(0, new ViewLocMapDto(null ,null, lev));
- Map<String, Object> map = new HashMap<>();
- map.put("loc", dtos);
- body.add(map);
- }
- Map<String, Object> result = new HashMap<>();
- result.put("title", bays);
- result.put("body", body);
- return R.ok(result);
- }
+ @RequestMapping("/viewLocMapList.action")
+ public R queryViewLocMapListByPages(@RequestParam(defaultValue = "1") Integer row) {
+ // 鑾峰彇鎺掔骇鏁版嵁
+ // 琛ㄦ牸鏍囬锛氬垪 ===>> 鍗囧簭
+ List<String> bays = reportQueryMapper.getViewLocBayCount(row);
+ // 锛佽〃鏍肩涓�鍒楁斁灞傜骇鏁�
+ bays.add(0, "");
+ // 琛ㄦ牸琛岋細灞� ====>> 鍊掑簭
+ List<String> levs = reportQueryMapper.getViewLocLevCount(row);
+ List<Map<String, Object>> body = new ArrayList<>();
+ for (String lev : levs) {
+ // 鑾峰彇灞傜骇鏁版嵁
+ List<ViewLocMapDto> dtos = reportQueryMapper.getViewLocBays(row, Integer.parseInt(lev));
+ // 锛佽〃鏍肩涓�鍒楁斁灞傜骇鏁�
+ dtos.add(0, new ViewLocMapDto(null, null, lev));
+ Map<String, Object> map = new HashMap<>();
+ map.put("loc", dtos);
+ body.add(map);
+ }
+ Map<String, Object> result = new HashMap<>();
+ result.put("title", bays);
+ result.put("body", body);
+ return R.ok(result);
+ }
- //------------------绔欑偣鏃ュ叆鍑哄簱娆℃暟缁熻--------------------------------------
- @RequestMapping("/viewInOutList.action")
- public Map<String,Object> viewInOutList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- ViewInOutBean bean = new ViewInOutBean();
- bean.setPageSize(limit);
- bean.setPageNumber(curr);
- List<ViewInOutBean> list = reportQueryMapper.queryViewInOutList(bean);
- int count = reportQueryMapper.getViewInOutCount(bean);
- Page<ViewInOutBean> page = new Page<>();
- page.setRecords(list);
- page.setTotal(count);
- return R.ok(page);
- }
+ //------------------绔欑偣鏃ュ叆鍑哄簱娆℃暟缁熻--------------------------------------
+ @RequestMapping("/viewInOutList.action")
+ public Map<String, Object> viewInOutList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
+ ViewInOutBean bean = new ViewInOutBean();
+ bean.setPageSize(limit);
+ bean.setPageNumber(curr);
+ List<ViewInOutBean> list = reportQueryMapper.queryViewInOutList(bean);
+ int count = reportQueryMapper.getViewInOutCount(bean);
+ Page<ViewInOutBean> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
+ }
- //excel瀵煎嚭
- @RequestMapping("/viewInOutExport.action")
- @ManagerAuth(memo = "绔欑偣鏃ュ叆鍑哄簱娆℃暟缁熻瀵煎嚭")
- public R viewInOutExport(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- List<ViewInOutBean> list = reportQueryMapper.getViewInOutAll(new ViewInOutBean());
- return R.ok(exportSupport(list, fields));
- }
+ //excel瀵煎嚭
+ @RequestMapping("/viewInOutExport.action")
+ @ManagerAuth(memo = "绔欑偣鏃ュ叆鍑哄簱娆℃暟缁熻瀵煎嚭")
+ public R viewInOutExport(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ List<ViewInOutBean> list = reportQueryMapper.getViewInOutAll(new ViewInOutBean());
+ return R.ok(exportSupport(list, fields));
+ }
- //------------------鏃ュ叆搴撴槑缁嗙粺璁�--------------------------------------
- @RequestMapping("/viewWorkInList.action")
- public Map<String,Object> viewWorkInList(ViewWorkInBean bean){
- List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(bean);
- int count = reportQueryMapper.getViewWorkInCount(bean);
- Page<ViewWorkInBean> page = new Page<>();
- page.setRecords(list);
- page.setTotal(count);
- return R.ok(page);
- }
+ //------------------鏃ュ叆搴撴槑缁嗙粺璁�--------------------------------------
+ @RequestMapping("/viewWorkInList.action")
+ public Map<String, Object> viewWorkInList(ViewWorkInBean bean) {
+ List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(bean);
+ int count = reportQueryMapper.getViewWorkInCount(bean);
+ Page<ViewWorkInBean> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
+ }
- /**
- * 鏃ュ叆搴撴眹鎬绘煡璇�
- * @return
- */
- @RequestMapping("/viewWorkCountInList.action")
- public R viewWorkCountInList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- String startTime = "1970.1.2";
- String endTime = "2099.1.2";
- if (!Cools.isEmpty(param.get("query_date"))) {
- String queryDate = (String) param.get("query_date");
- String[] split = queryDate.split(" - ");
- startTime= split[0].split(" ")[0].replace("-",".");
- endTime = split[1].split(" ")[0].replace("-",".");
- }
- List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountIn(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")), (String) param.get("matnr"), startTime,endTime);
- Integer total = reportQueryMapper.selectWorkCountInTotal((String) param.get("matnr"), startTime,endTime);
- Page<ViewWorkCountInView> page = new Page<>();
- page.setRecords(allCountIn);
- page.setTotal(total);
- Integer sum = reportQueryMapper.selectWorkCountInSum((String) param.get("matnr"), startTime,endTime);
- HashMap<String, Object> result = new HashMap<>();
- result.put("page",page);
- result.put("sum",sum);
- return R.ok(result);
- }
+ /**
+ * 鏃ュ叆搴撴眹鎬绘煡璇�
+ * @return
+ */
+ @RequestMapping("/viewWorkCountInList.action")
+ public R viewWorkCountInList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
+ String startTime = "1970.1.2";
+ String endTime = "2099.1.2";
+ if (!Cools.isEmpty(param.get("query_date"))) {
+ String queryDate = (String) param.get("query_date");
+ String[] split = queryDate.split(" - ");
+ startTime = split[0].split(" ")[0].replace("-", ".");
+ endTime = split[1].split(" ")[0].replace("-", ".");
+ }
+ List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountIn(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")), (String) param.get("matnr"), startTime, endTime);
+ Integer total = reportQueryMapper.selectWorkCountInTotal((String) param.get("matnr"), startTime, endTime);
+ Page<ViewWorkCountInView> page = new Page<>();
+ page.setRecords(allCountIn);
+ page.setTotal(total);
+ Integer sum = reportQueryMapper.selectWorkCountInSum((String) param.get("matnr"), startTime, endTime);
+ HashMap<String, Object> result = new HashMap<>();
+ result.put("page", page);
+ result.put("sum", sum);
+ return R.ok(result);
+ }
- /**
- * 鏃ュ嚭搴撴眹鎬�
- */
- @RequestMapping("/viewWorkCountOutList.action")
- public R viewWorkCountOutList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- String startTime = "1970.1.2";
- String endTime = "2099.1.2";
- if (!Cools.isEmpty(param.get("query_date"))) {
- String queryDate = (String) param.get("query_date");
- String[] split = queryDate.split(" - ");
- startTime= split[0].split(" ")[0].replace("-",".");
- endTime = split[1].split(" ")[0].replace("-",".");
- }
- List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountOut(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")), (String) param.get("matnr"), startTime,endTime);
- Integer total = reportQueryMapper.selectWorkCountOutTotal((String) param.get("matnr"), startTime,endTime);
- Page<ViewWorkCountInView> page = new Page<>();
- page.setRecords(allCountIn);
- page.setTotal(total);
- Integer sum = reportQueryMapper.selectWorkCountOutSum((String) param.get("matnr"), startTime,endTime);
- HashMap<String, Object> result = new HashMap<>();
- result.put("page",page);
- result.put("sum",sum);
- return R.ok(result);
- }
+ /**
+ * 鏃ュ嚭搴撴眹鎬�
+ */
+ @RequestMapping("/viewWorkCountOutList.action")
+ public R viewWorkCountOutList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
+ String startTime = "1970.1.2";
+ String endTime = "2099.1.2";
+ if (!Cools.isEmpty(param.get("query_date"))) {
+ String queryDate = (String) param.get("query_date");
+ String[] split = queryDate.split(" - ");
+ startTime = split[0].split(" ")[0].replace("-", ".");
+ endTime = split[1].split(" ")[0].replace("-", ".");
+ }
+ List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountOut(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")), (String) param.get("matnr"), startTime, endTime);
+ Integer total = reportQueryMapper.selectWorkCountOutTotal((String) param.get("matnr"), startTime, endTime);
+ Page<ViewWorkCountInView> page = new Page<>();
+ page.setRecords(allCountIn);
+ page.setTotal(total);
+ Integer sum = reportQueryMapper.selectWorkCountOutSum((String) param.get("matnr"), startTime, endTime);
+ HashMap<String, Object> result = new HashMap<>();
+ result.put("page", page);
+ result.put("sum", sum);
+ return R.ok(result);
+ }
- //excel瀵煎嚭
- @RequestMapping("/viewWorkInExport.action")
- @ManagerAuth(memo = "鏃ュ叆搴撴槑缁嗙粺璁″鍑�")
- public R viewWorkInExport(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- @SuppressWarnings("unchecked")
- ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
- bean.setQuery_date(bean.getQuery_date());
- List<ViewWorkInBean> list = reportQueryMapper.getViewWorkInAll(bean);
- return R.ok(exportSupport(list, fields));
- }
+ //excel瀵煎嚭
+ @RequestMapping("/viewWorkInExport.action")
+ @ManagerAuth(memo = "鏃ュ叆搴撴槑缁嗙粺璁″鍑�")
+ public R viewWorkInExport(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ @SuppressWarnings("unchecked")
+ ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
+ bean.setQuery_date(bean.getQuery_date());
+ List<ViewWorkInBean> list = reportQueryMapper.getViewWorkInAll(bean);
+ return R.ok(exportSupport(list, fields));
+ }
- //------------------鏃ュ嚭搴撴槑缁嗙粺璁�--------------------------------------
- @RequestMapping("/viewWorkOutList.action")
- public R viewWorkOutList(ViewWorkInBean bean){
- List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(bean);
- int count = reportQueryMapper.getViewWorkOutCount(bean);
- Page<ViewWorkInBean> page = new Page<>();
- page.setRecords(list);
- page.setTotal(count);
- return R.ok(page);
- }
+ //------------------鏃ュ嚭搴撴槑缁嗙粺璁�--------------------------------------
+ @RequestMapping("/viewWorkOutList.action")
+ public R viewWorkOutList(ViewWorkInBean bean) {
+ List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(bean);
+ int count = reportQueryMapper.getViewWorkOutCount(bean);
+ Page<ViewWorkInBean> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
+ }
- //excel瀵煎嚭
- @RequestMapping("/viewWorkOutExport.action")
- @ManagerAuth(memo = "鏃ュ嚭搴撴槑缁嗙粺璁″鍑�")
- public R viewWorkOutExport(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- @SuppressWarnings("unchecked")
- ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
- bean.setQuery_date(bean.getQuery_date());
- List<ViewWorkInBean> list = reportQueryMapper.getViewWorkOutAll(bean);
- return R.ok(exportSupport(list, fields));
- }
+ //excel瀵煎嚭
+ @RequestMapping("/viewWorkOutExport.action")
+ @ManagerAuth(memo = "鏃ュ嚭搴撴槑缁嗙粺璁″鍑�")
+ public R viewWorkOutExport(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ @SuppressWarnings("unchecked")
+ ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
+ bean.setQuery_date(bean.getQuery_date());
+ List<ViewWorkInBean> list = reportQueryMapper.getViewWorkOutAll(bean);
+ return R.ok(exportSupport(list, fields));
+ }
}
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 45efdff..e04adf5 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -9,7 +9,7 @@
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.utils.CommandUtils;
-import com.zy.core.cache.MessageQueue;
+import com.zy.core.DevpThread;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
@@ -17,12 +17,14 @@
import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
-import com.zy.core.DevpThread;
import com.zy.core.thread.SiemensDevpThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* 杈撻�佽澶囨帴鍙�
@@ -40,7 +42,7 @@
@GetMapping("/io/mode/info/site")
@ManagerAuth(memo = "鍏ュ嚭搴撴ā寮�")
- public R ioMode(){
+ public R ioMode() {
List<Map<String, Object>> res = new ArrayList<>();
for (DevpSlave devp : slaveProperties.getDevp()) {
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
@@ -55,7 +57,7 @@
@PostMapping("/table/site")
@ManagerAuth(memo = "绔欑偣淇℃伅琛�")
- public R siteTable(){
+ public R siteTable() {
List<SiteTableVo> list = new ArrayList<>();
// 鍐呭瓨鏁版嵁
Map<Integer, StaProtocol> station = new HashMap<>();
@@ -70,24 +72,26 @@
vo.setDevNo(devp.getDevNo()); // 绔欑偣缂栧彿
list.add(vo);
StaProtocol staProtocol = station.get(devp.getDevNo());
- if (null == staProtocol) { continue; }
+ if (null == staProtocol) {
+ continue;
+ }
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
- vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
- vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆
- vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 鍙嚭
- vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
- vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
+ vo.setAutoing(staProtocol.isAutoing() ? "Y" : "N"); // 鑷姩
+ vo.setLoading(staProtocol.isLoading() ? "Y" : "N"); // 鏈夌墿
+ vo.setInEnable(staProtocol.isInEnable() ? "Y" : "N"); // 鍙叆
+ vo.setOutEnable(staProtocol.isOutEnable() ? "Y" : "N"); // 鍙嚭
+ vo.setPakMk(staProtocol.isPakMk() ? "Y" : "N"); // 鍏ュ簱鏍囪
+ vo.setEmptyMk(staProtocol.isEmptyMk() ? "Y" : "N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
- vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
+ vo.setLocType1(devp.getDevNo() == 102 ? "楂�" : "浣�");
}
return R.ok().add(list);
}
@GetMapping("/list/auth")
@ManagerAuth(memo = "绔欑偣淇℃伅琛�")
- public R crnList(){
+ public R crnList() {
List<SiteTableVo> list = new ArrayList<>();
// 鍐呭瓨鏁版嵁
Map<Integer, StaProtocol> station = new HashMap<>();
@@ -102,32 +106,34 @@
vo.setDevNo(devp.getDevNo()); // 绔欑偣缂栧彿
list.add(vo);
StaProtocol staProtocol = station.get(devp.getDevNo());
- if (null == staProtocol) { continue; }
+ if (null == staProtocol) {
+ continue;
+ }
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
- vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
- vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆
- vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 鍙嚭
- vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
- vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
+ vo.setAutoing(staProtocol.isAutoing() ? "Y" : "N"); // 鑷姩
+ vo.setLoading(staProtocol.isLoading() ? "Y" : "N"); // 鏈夌墿
+ vo.setInEnable(staProtocol.isInEnable() ? "Y" : "N"); // 鍙叆
+ vo.setOutEnable(staProtocol.isOutEnable() ? "Y" : "N"); // 鍙嚭
+ vo.setPakMk(staProtocol.isPakMk() ? "Y" : "N"); // 鍏ュ簱鏍囪
+ vo.setEmptyMk(staProtocol.isEmptyMk() ? "Y" : "N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
- vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
+ vo.setLocType1(devp.getDevNo() == 102 ? "楂�" : "浣�");
}
return R.ok().add(list);
}
@PostMapping("/table/plc/errors")
@ManagerAuth(memo = "杈撻�佽澶噋lc寮傚父淇℃伅琛�")
- public R plcErrorTable(){
+ public R plcErrorTable() {
List<PlcErrorTableVo> list = new ArrayList<>();
for (DevpSlave devp : slaveProperties.getDevp()) {
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
Map<Integer, StaProtocol> station = devpThread.getStation();
- for(Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
- if (!Cools.isEmpty(staPlcErr(entry))){
- list.add(staPlcErr(entry).get(0)) ;
+ for (Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
+ if (!Cools.isEmpty(staPlcErr(entry))) {
+ list.add(staPlcErr(entry).get(0));
}
}
@@ -137,11 +143,11 @@
@PostMapping("/output/site")
@ManagerAuth(memo = "绔欑偣璁惧鎶ユ枃鏃ュ織杈撳嚭")
- public R siteOutput(){
+ public R siteOutput() {
StringBuilder str = new StringBuilder();
String s;
int i = 0;
- while((s = OutputQueue.DEVP.poll()) != null && i <=10) {
+ while ((s = OutputQueue.DEVP.poll()) != null && i <= 10) {
str.append("\n").append(s);
i++;
}
@@ -153,7 +159,7 @@
/****************************************************************/
@GetMapping("/detl/{siteId}")
- public R siteDetl(@PathVariable("siteId") Integer siteId){
+ public R siteDetl(@PathVariable("siteId") Integer siteId) {
SiteTableVo vo = new SiteTableVo();
for (DevpSlave devp : slaveProperties.getDevp()) {
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
@@ -163,15 +169,15 @@
StaProtocol staProtocol = entry.getValue();
vo.setDevNo(entry.getKey()); // 绔欑偣缂栧彿
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
- vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
- vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆
- vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 鍙嚭
- vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 闇�姹�1
- vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
+ vo.setAutoing(staProtocol.isAutoing() ? "Y" : "N"); // 鑷姩
+ vo.setLoading(staProtocol.isLoading() ? "Y" : "N"); // 鏈夌墿
+ vo.setInEnable(staProtocol.isInEnable() ? "Y" : "N"); // 鍙叆
+ vo.setOutEnable(staProtocol.isOutEnable() ? "Y" : "N"); // 鍙嚭
+ vo.setPakMk(staProtocol.isPakMk() ? "Y" : "N"); // 闇�姹�1
+ vo.setEmptyMk(staProtocol.isEmptyMk() ? "Y" : "N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
- vo.setCar(staProtocol.isCar() ? "鏈�": "鏃�");
+ vo.setCar(staProtocol.isCar() ? "鏈�" : "鏃�");
return R.ok().add(vo);
}
}
@@ -232,14 +238,15 @@
}
return R.error("鏇存柊澶辫触");
}
+
@PostMapping("/detl/out")
@ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
public R siteDetlout(@RequestParam Integer devNo,
- @RequestParam Short workNo,
- @RequestParam Short staNo,
- @RequestParam(required = false) String pakMk,
- @RequestParam(required = false) Boolean inEnable,
- @RequestParam(required = false) Boolean outEnable
+ @RequestParam Short workNo,
+ @RequestParam Short staNo,
+ @RequestParam(required = false) String pakMk,
+ @RequestParam(required = false) Boolean inEnable,
+ @RequestParam(required = false) Boolean outEnable
) {
BasDevp basDevp = basDevpService.selectById(devNo);
if (basDevp == null) {
@@ -281,6 +288,7 @@
}
return R.error("鏇存柊澶辫触");
}
+
@PostMapping("/detl/in")
@ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
public R siteDetlint(@RequestParam Integer devNo,
@@ -297,7 +305,7 @@
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鍏ュ簱鍙�
for (DevpSlave.Sta inSta : devp.getInSta()) {
- if (!devNo.equals(inSta.getBackSta()) ){
+ if (!devNo.equals(inSta.getBackSta())) {
continue;
}
// 鑾峰彇鍏ュ簱绔欎俊鎭�
@@ -321,24 +329,24 @@
return R.error("鏇存柊澶辫触");
}
- public List<PlcErrorTableVo> staPlcErr(Map.Entry<Integer, StaProtocol> entry){
+ public List<PlcErrorTableVo> staPlcErr(Map.Entry<Integer, StaProtocol> entry) {
List<PlcErrorTableVo> list = new ArrayList<>();
StaProtocol staProtocol = entry.getValue();
- if (staProtocol.getBreakerErr()){
+ if (staProtocol.getBreakerErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setNo(entry.getKey()); // 搴忓彿
vo.setPlcDesc("鏂矾鍣ㄦ晠闅�");
vo.setError("鏂矾鍣ㄦ晠闅�");
list.add(vo);
}
- if (staProtocol.getInfraredErr()){
+ if (staProtocol.getInfraredErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setNo(entry.getKey()); // 搴忓彿
vo.setPlcDesc("鍏夌數寮傚父");
vo.setError("鍏夌數寮傚父");
list.add(vo);
}
- if (staProtocol.getOutTimeErr()){
+ if (staProtocol.getOutTimeErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setNo(entry.getKey()); // 搴忓彿
@@ -346,7 +354,7 @@
vo.setError("杩愯瓒呮椂");
list.add(vo);
}
- if (staProtocol.getSeizeSeatErr()){
+ if (staProtocol.getSeizeSeatErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setNo(entry.getKey()); // 搴忓彿
@@ -354,7 +362,7 @@
vo.setError("鍗犱綅瓒呮椂");
list.add(vo);
}
- if (staProtocol.getWrkYgoodsN()){
+ if (staProtocol.getWrkYgoodsN()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setNo(entry.getKey()); // 搴忓彿
@@ -362,7 +370,7 @@
vo.setError("鏈変换鍔℃棤璐ф晠闅�");
list.add(vo);
}
- if (staProtocol.getInverterErr()){
+ if (staProtocol.getInverterErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setNo(entry.getKey()); // 搴忓彿
@@ -370,7 +378,7 @@
vo.setError("鍙橀鍣ㄦ晠闅�");
list.add(vo);
}
- if (staProtocol.getContactErr()){
+ if (staProtocol.getContactErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setNo(entry.getKey()); // 搴忓彿
@@ -378,7 +386,7 @@
vo.setError("鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
list.add(vo);
}
- if (staProtocol.getUpcontactErr()){
+ if (staProtocol.getUpcontactErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setNo(entry.getKey()); // 搴忓彿
@@ -386,42 +394,42 @@
vo.setError("椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
list.add(vo);
}
- if (staProtocol.isFrontErr()){
+ if (staProtocol.isFrontErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setNo(entry.getKey()); // 搴忓彿
vo.setPlcDesc("鍓嶈秴闄�");
vo.setError("鍓嶈秴闄�");
list.add(vo);
}
- if (staProtocol.isBackErr()){
+ if (staProtocol.isBackErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setNo(entry.getKey()); // 搴忓彿
vo.setPlcDesc("鍚庤秴闄�");
vo.setError("鍚庤秴闄�");
list.add(vo);
}
- if (staProtocol.isHighErr()){
+ if (staProtocol.isHighErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setNo(entry.getKey()); // 搴忓彿
vo.setPlcDesc("楂樿秴闄�");
vo.setError("楂樿秴闄�");
list.add(vo);
}
- if (staProtocol.isLeftErr()){
+ if (staProtocol.isLeftErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setNo(entry.getKey()); // 搴忓彿
vo.setPlcDesc("宸﹁秴闄�");
vo.setError("宸﹁秴闄�");
list.add(vo);
}
- if (staProtocol.isRightErr()){
+ if (staProtocol.isRightErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setNo(entry.getKey()); // 搴忓彿
vo.setPlcDesc("鍙宠秴闄�");
vo.setError("鍙宠秴闄�");
list.add(vo);
}
- if (staProtocol.isBarcodeErr()){
+ if (staProtocol.isBarcodeErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setNo(entry.getKey()); // 搴忓彿
vo.setPlcDesc("鎵爜澶辫触");
diff --git a/src/main/java/com/zy/asrs/controller/StaDescController.java b/src/main/java/com/zy/asrs/controller/StaDescController.java
index f4c8c7e..a8ed5e8 100644
--- a/src/main/java/com/zy/asrs/controller/StaDescController.java
+++ b/src/main/java/com/zy/asrs/controller/StaDescController.java
@@ -32,25 +32,25 @@
@RequestMapping(value = "/staDesc/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){
+ if (!Cools.isEmpty(orderByField)) {
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
}
wrapper.orderAsc(Collections.singleton("crn_no"));
return R.ok(staDescService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -79,10 +79,10 @@
return R.ok();
}
- @RequestMapping(value = "/staDesc/update/auth")
- @ManagerAuth(memo = "绔欑偣璺緞淇敼")
- public R update(StaDesc staDesc){
- if (Cools.isEmpty(staDesc) || null==staDesc.getTypeId()){
+ @RequestMapping(value = "/staDesc/update/auth")
+ @ManagerAuth(memo = "绔欑偣璺緞淇敼")
+ public R update(StaDesc staDesc) {
+ if (Cools.isEmpty(staDesc) || null == staDesc.getTypeId()) {
return R.error();
}
staDesc.setModiUser(getUserId());
@@ -93,12 +93,12 @@
@RequestMapping(value = "/staDesc/delete/auth")
@ManagerAuth(memo = "绔欑偣璺緞鍒犻櫎")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<StaDesc> list = JSONArray.parseArray(param, StaDesc.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (StaDesc entity : list){
+ for (StaDesc entity : list) {
staDescService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -106,7 +106,7 @@
@RequestMapping(value = "/staDesc/export/auth")
@ManagerAuth(memo = "绔欑偣璺緞瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("staDesc"));
@@ -122,7 +122,7 @@
wrapper.like("crn_no", condition);
Page<StaDesc> page = staDescService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (StaDesc staDesc : page.getRecords()){
+ for (StaDesc staDesc : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", staDesc.getCrnNo());
map.put("value", staDesc.getCrnNo());
@@ -135,7 +135,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != staDescService.selectOne(wrapper)){
+ if (null != staDescService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(StaDesc.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index e9a44f2..e1740ef 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -5,21 +5,18 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
import com.core.common.DateUtils;
-import com.core.exception.CoolException;
+import com.core.common.R;
import com.zy.asrs.domain.enums.TaskStatusType;
-import com.zy.asrs.entity.CommandInfo;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.entity.param.TaskOverToWms;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.CommandInfoService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.TaskWrkService;
-import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -51,6 +48,19 @@
@Autowired
private ApiLogService apiLogService;
+ public static String getTaskType(Integer paramIoType) {
+ switch (paramIoType) {
+ case 1:
+ return "RK";
+ case 2:
+ return "CK";
+ case 3:
+ return "YK";
+ default:
+ return "鏈煡";
+ }
+ }
+
@RequestMapping(value = "/taskWrk/{wrkNo}/auth")
@ManagerAuth
public R get(@PathVariable("wrkNo") Integer wrkNo) {
@@ -59,22 +69,24 @@
@RequestMapping(value = "/taskWrk/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<TaskWrk> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(taskWrkService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -91,9 +103,9 @@
return R.ok();
}
- @RequestMapping(value = "/taskWrk/update/auth")
- @ManagerAuth
- public R update(TaskWrk taskWrk){
+ @RequestMapping(value = "/taskWrk/update/auth")
+ @ManagerAuth
+ public R update(TaskWrk taskWrk) {
if (Cools.isEmpty(taskWrk) || null == taskWrk.getTaskNo()) {
return R.error();
}
@@ -103,7 +115,7 @@
@RequestMapping(value = "/taskWrk/updatePoint/auth")
@ManagerAuth
- public R updatePoint(TaskWrk taskWrk){
+ public R updatePoint(TaskWrk taskWrk) {
if (Cools.isEmpty(taskWrk) || null == taskWrk.getTaskNo()) {
return R.error();
}
@@ -121,8 +133,8 @@
@RequestMapping(value = "/taskWrk/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
taskWrkService.deleteById(id);
}
return R.ok();
@@ -130,7 +142,7 @@
@RequestMapping(value = "/taskWrk/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<TaskWrk> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("taskWrk"));
@@ -146,7 +158,7 @@
wrapper.like("id", condition);
Page<TaskWrk> page = taskWrkService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (TaskWrk taskWrk : page.getRecords()){
+ for (TaskWrk taskWrk : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", taskWrk.getTaskNo());
map.put("value", taskWrk.getTaskNo());
@@ -159,7 +171,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<TaskWrk> wrapper = new EntityWrapper<TaskWrk>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != taskWrkService.selectOne(wrapper)){
+ if (null != taskWrkService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(TaskWrk.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -176,47 +188,47 @@
@ManagerAuth(memo = "鎵嬪姩瀹屾垚浠诲姟")
public R complete(@RequestParam String taskNo) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
- if (Cools.isEmpty(taskWrk) || taskWrk.getStatus()>=3){
- return R.error("宸插畬缁撴垨宸插彇娑�") ;
+ if (Cools.isEmpty(taskWrk) || taskWrk.getStatus() >= 3) {
+ return R.error("宸插畬缁撴垨宸插彇娑�");
}
- LocMast locMast=new LocMast();
- if(taskWrk.getIoType()==1){//鍏ュ簱浠诲姟瀹屾垚搴撲綅涓篎
- locMast=locMastService.selectByLocNo(taskWrk.getTargetPoint());
- if(Cools.isEmpty(locMast)){
- R.error("娌℃湁鎵惧埌璇ュ簱浣�") ;
+ LocMast locMast = new LocMast();
+ if (taskWrk.getIoType() == 1) {//鍏ュ簱浠诲姟瀹屾垚搴撲綅涓篎
+ locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ if (Cools.isEmpty(locMast)) {
+ R.error("娌℃湁鎵惧埌璇ュ簱浣�");
}
locMast.setLocSts("F");
locMast.setModiTime(new Date());
locMast.setBarcode(taskWrk.getBarcode());
- }else if(taskWrk.getIoType()==2){//鍑哄簱浠诲姟瀹屾垚搴撲綅涓篛
- locMast=locMastService.selectByLocNo(taskWrk.getStartPoint());
- if(Cools.isEmpty(locMast)){
- R.error("娌℃湁鎵惧埌璇ュ簱浣�") ;
+ } else if (taskWrk.getIoType() == 2) {//鍑哄簱浠诲姟瀹屾垚搴撲綅涓篛
+ locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ if (Cools.isEmpty(locMast)) {
+ R.error("娌℃湁鎵惧埌璇ュ簱浣�");
}
locMast.setLocSts("O");
locMast.setModiTime(new Date());
- }else if(taskWrk.getIoType()==3){
- locMast=locMastService.selectByLocNo(taskWrk.getStartPoint());
- if(Cools.isEmpty(locMast)){
- R.error("娌℃湁鎵惧埌璇ュ簱浣�") ;
+ } else if (taskWrk.getIoType() == 3) {
+ locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ if (Cools.isEmpty(locMast)) {
+ R.error("娌℃湁鎵惧埌璇ュ簱浣�");
}
locMast.setLocSts("O");
locMast.setModiTime(new Date());
locMastService.updateById(locMast);
- locMast=locMastService.selectByLocNo(taskWrk.getTargetPoint());
- if(Cools.isEmpty(locMast)){
- R.error("娌℃湁鎵惧埌璇ュ簱浣�") ;
+ locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ if (Cools.isEmpty(locMast)) {
+ R.error("娌℃湁鎵惧埌璇ュ簱浣�");
}
locMast.setLocSts("F");
locMast.setModiTime(new Date());
locMast.setBarcode(taskWrk.getBarcode());
}
- String response="";
- try{
+ String response = "";
+ try {
HashMap<String, Object> headParam = new HashMap<>();
- headParam.put("TaskNo",taskWrk.getTaskNo());
- headParam.put("Result",1);
+ headParam.put("TaskNo", taskWrk.getTaskNo());
+ headParam.put("Result", 1);
// headParam.put("reportTime",new Date());
log.info("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms={}", taskWrk);
response = new HttpHandler.Builder()
@@ -229,15 +241,15 @@
JSONObject jsonObject = JSON.parseObject(response);
apiLogService.save("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms"
- ,wmsUrl+TaskExecCallback
- ,null
- ,"127.0.0.1"
- ,JSON.toJSONString(headParam)
- ,response
- ,true
+ , wmsUrl + TaskExecCallback
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(headParam)
+ , response
+ , true
);
- }catch (Exception e){
- log.error("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶眥},杩斿洖鍊�={}", taskWrk,response);
+ } catch (Exception e) {
+ log.error("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶眥},杩斿洖鍊�={}", taskWrk, response);
// throw new CoolException(e);
}
locMastService.updateById(locMast);
@@ -251,20 +263,20 @@
@ManagerAuth(memo = "閲嶆柊缁欏爢鍨涙満涓嬪彂浠诲姟")
public R returnWorkingCondition(@RequestParam String taskNo) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
- if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==12){
+ if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts() == 12) {
taskWrk.setWrkSts(11);
- if(!taskWrkService.updateById(taskWrk)){
+ if (!taskWrkService.updateById(taskWrk)) {
return R.error("鏇存柊浠诲姟鐘舵�佸け璐�");
}
return R.ok();
- } else if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==3) {
+ } else if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts() == 3) {
taskWrk.setWrkSts(2);
taskWrkService.updateById(taskWrk);
- if(!taskWrkService.updateById(taskWrk)){
+ if (!taskWrkService.updateById(taskWrk)) {
return R.error("鏇存柊浠诲姟鐘舵�佸け璐�");
}
return R.ok();
- }else{
+ } else {
return R.error("浠诲姟鐘舵�佷笉瀵规棤娉曢噸鏂扮粰鍫嗗灈鏈轰笅鍙戜换鍔�");
}
@@ -283,16 +295,16 @@
Date now = new Date();
taskWrk.setStatus(TaskStatusType.CANCEL.id);
taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
- try{
+ try {
taskWrk.setModiUser(getUserId());//鎿嶄綔鍛�
- }catch (Exception e){
+ } catch (Exception e) {
taskWrk.setModiUser(9999L);//鎿嶄綔鍛�
}
- String response="";
- try{
+ String response = "";
+ try {
HashMap<String, Object> headParam = new HashMap<>();
- headParam.put("TaskNo",taskWrk.getTaskNo());
- headParam.put("Result",0);
+ headParam.put("TaskNo", taskWrk.getTaskNo());
+ headParam.put("Result", 0);
// headParam.put("reportTime",new Date());
log.info("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wm={}", taskWrk);
@@ -305,15 +317,15 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
apiLogService.save("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms"
- ,wmsUrl+TaskExecCallback
- ,null
- ,"127.0.0.1"
- ,JSON.toJSONString(headParam)
- ,response
- ,true
+ , wmsUrl + TaskExecCallback
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(headParam)
+ , response
+ , true
);
- }catch (Exception e){
- log.error("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms澶辫触={},杩斿洖鍊�={}", taskWrk,response);
+ } catch (Exception e) {
+ log.error("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms澶辫触={},杩斿洖鍊�={}", taskWrk, response);
// throw new CoolException(e);
}
taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
@@ -334,19 +346,6 @@
taskWrk.setModiUser(getUserId());//鎿嶄綔鍛�
taskWrkService.updateById(taskWrk);
return R.ok();
- }
-
- public static String getTaskType(Integer paramIoType){
- switch (paramIoType){
- case 1:
- return "RK";
- case 2:
- return "CK";
- case 3:
- return "YK";
- default:
- return "鏈煡";
- }
}
}
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
index 0096e15..a12b7b1 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
@@ -1,21 +1,19 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
import com.core.common.DateUtils;
-import com.core.exception.CoolException;
+import com.core.common.R;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.TaskWrkLog;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.TaskWrkLogService;
-import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -24,6 +22,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.*;
+
@Slf4j
@RestController
public class TaskWrkLogController extends BaseController {
@@ -46,23 +45,25 @@
@RequestMapping(value = "/taskWrkLog/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<TaskWrkLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
wrapper.orderDesc(Collections.singleton("create_time"));
return R.ok(taskWrkLogService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -79,10 +80,10 @@
return R.ok();
}
- @RequestMapping(value = "/taskWrkLog/update/auth")
- @ManagerAuth
- public R update(TaskWrkLog taskWrkLog){
- if (Cools.isEmpty(taskWrkLog)){
+ @RequestMapping(value = "/taskWrkLog/update/auth")
+ @ManagerAuth
+ public R update(TaskWrkLog taskWrkLog) {
+ if (Cools.isEmpty(taskWrkLog)) {
return R.error();
}
taskWrkLogService.updateById(taskWrkLog);
@@ -91,8 +92,8 @@
@RequestMapping(value = "/taskWrkLog/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
taskWrkLogService.deleteById(id);
}
return R.ok();
@@ -100,7 +101,7 @@
@RequestMapping(value = "/taskWrkLog/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<TaskWrkLog> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("taskWrkLog"));
@@ -116,7 +117,7 @@
wrapper.like("id", condition);
Page<TaskWrkLog> page = taskWrkLogService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (TaskWrkLog taskWrkLog : page.getRecords()){
+ for (TaskWrkLog taskWrkLog : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", taskWrkLog.getTaskNo());
map.put("value", taskWrkLog.getTaskNo());
@@ -129,7 +130,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<TaskWrkLog> wrapper = new EntityWrapper<TaskWrkLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != taskWrkLogService.selectOne(wrapper)){
+ if (null != taskWrkLogService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(TaskWrkLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -137,9 +138,9 @@
@RequestMapping(value = "/taskWrkLog/resubmitTheTask/auth")
@ManagerAuth(memo = "閲嶆柊涓婃姤浠诲姟瀹岀粨")
- public R resubmitTheTask(@RequestParam String taskNo){
+ public R resubmitTheTask(@RequestParam String taskNo) {
TaskWrkLog taskWrk = taskWrkLogService.selectOne(new EntityWrapper<TaskWrkLog>().eq("task_no", taskNo));
- if(!Cools.isEmpty(taskWrk)){
+ if (!Cools.isEmpty(taskWrk)) {
HashMap<String, Object> headParam = new HashMap<>();
if (taskWrk.getStatus().equals(TaskStatusType.OVER.id)) {//瀹屾垚
headParam.put("Result", 1);
@@ -160,12 +161,12 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- if(jsonObject.get("ReturnStatus").equals(0)){
+ if (jsonObject.get("ReturnStatus").equals(0)) {
bool = true;
}
} catch (Exception e) {
log.error("閲嶆柊涓婃姤浠诲姟瀹岀粨澶辫触{},杩斿洖鍊�={}", taskWrk, response);
- }finally {
+ } finally {
apiLogService.save("閲嶆柊涓婃姤浠诲姟瀹岀粨"
, wmsUrl + TaskExecCallback
, null
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 7bb57fc..d1f02b4 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -23,7 +23,7 @@
@RequestMapping("/hand/control/wrkMast")
@ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
public R handControlWrkMast(@RequestParam String workNo,
- @RequestParam Integer type){
+ @RequestParam Integer type) {
if (type == 1) {
workService.completeWrkMast(workNo, getUserId());
return R.ok("浠诲姟宸插畬鎴�");
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlController.java b/src/main/java/com/zy/asrs/controller/WrkDetlController.java
index fbb34d4..c32564d 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlController.java
@@ -78,17 +78,17 @@
return R.ok(wrkDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
if (entry.getKey().equals("io_time")) {
wrapper.eq("io_time", DateUtils.convert(val, DateUtils.yyyyMMddHHmmsssss_F));
- }else {
+ } else {
wrapper.like(entry.getKey(), val);
}
}
@@ -104,12 +104,12 @@
@RequestMapping(value = "/wrkDetl/delete/auth")
@ManagerAuth(memo = "宸ヤ綔妗ｆ槑缁嗗垹闄�")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<WrkDetl> list = JSONArray.parseArray(param, WrkDetl.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (WrkDetl entity : list){
+ for (WrkDetl entity : list) {
wrkDetlService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -117,7 +117,7 @@
@RequestMapping(value = "/wrkDetl/export/auth")
@ManagerAuth(memo = "宸ヤ綔妗ｆ槑缁嗗鍑�")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<WrkDetl> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("wrkDetl"));
@@ -133,7 +133,7 @@
wrapper.like("id", condition);
Page<WrkDetl> page = wrkDetlService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (WrkDetl wrkDetl : page.getRecords()){
+ for (WrkDetl wrkDetl : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", wrkDetl.getWrkNo());
map.put("value", wrkDetl.getWrkNo());
@@ -146,7 +146,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkDetlService.selectOne(wrapper)){
+ if (null != wrkDetlService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(WrkDetl.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
index 517e54d..02f6aa6 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -38,15 +38,15 @@
*/
@RequestMapping(value = "/wrkDetlLogByMast/list/auth")
@ManagerAuth
- public R list1(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
+ public R list1(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
@RequestParam Integer wrk_no,
- @RequestParam String ioTime){
+ @RequestParam String ioTime) {
EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
- if(!Cools.isEmpty(wrk_no) && wrk_no != 0){
- wrapper.eq("wrk_no",wrk_no);
+ if (!Cools.isEmpty(wrk_no) && wrk_no != 0) {
+ wrapper.eq("wrk_no", wrk_no);
}
- if(!Cools.isEmpty(ioTime)){
+ if (!Cools.isEmpty(ioTime)) {
wrapper.eq("io_time", DateUtils.convert(ioTime, DateUtils.yyyyMMddHHmmsssss_F));
}
return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
@@ -54,25 +54,26 @@
@RequestMapping(value = "/wrkDetlLog/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("modi_time", false);
}
return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -89,10 +90,10 @@
return R.ok();
}
- @RequestMapping(value = "/wrkDetlLog/update/auth")
- @ManagerAuth
- public R update(WrkDetlLog wrkDetlLog){
- if (Cools.isEmpty(wrkDetlLog) || null==wrkDetlLog.getWrkNo()){
+ @RequestMapping(value = "/wrkDetlLog/update/auth")
+ @ManagerAuth
+ public R update(WrkDetlLog wrkDetlLog) {
+ if (Cools.isEmpty(wrkDetlLog) || null == wrkDetlLog.getWrkNo()) {
return R.error();
}
wrkDetlLogService.updateById(wrkDetlLog);
@@ -101,12 +102,12 @@
@RequestMapping(value = "/wrkDetlLog/delete/auth")
@ManagerAuth
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<WrkDetlLog> list = JSONArray.parseArray(param, WrkDetlLog.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (WrkDetlLog entity : list){
+ for (WrkDetlLog entity : list) {
wrkDetlLogService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -114,7 +115,7 @@
@RequestMapping(value = "/wrkDetlLog/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("wrkDetlLog"));
@@ -130,7 +131,7 @@
wrapper.like("id", condition);
Page<WrkDetlLog> page = wrkDetlLogService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (WrkDetlLog wrkDetlLog : page.getRecords()){
+ for (WrkDetlLog wrkDetlLog : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", wrkDetlLog.getWrkNo());
map.put("value", wrkDetlLog.getWrkNo());
@@ -143,7 +144,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<WrkDetlLog> wrapper = new EntityWrapper<WrkDetlLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkDetlLogService.selectOne(wrapper)){
+ if (null != wrkDetlLogService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(WrkDetlLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/WrkLastnoController.java b/src/main/java/com/zy/asrs/controller/WrkLastnoController.java
index 0ee6a4e..51461dd 100644
--- a/src/main/java/com/zy/asrs/controller/WrkLastnoController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkLastnoController.java
@@ -32,22 +32,24 @@
@RequestMapping(value = "/wrkLastno/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<WrkLastno> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(wrkLastnoService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -68,10 +70,10 @@
return R.ok();
}
- @RequestMapping(value = "/wrkLastno/update/auth")
- @ManagerAuth(memo = "宸ヤ綔搴忓彿淇敼")
- public R update(WrkLastno wrkLastno){
- if (Cools.isEmpty(wrkLastno) || null==wrkLastno.getWrkMk()){
+ @RequestMapping(value = "/wrkLastno/update/auth")
+ @ManagerAuth(memo = "宸ヤ綔搴忓彿淇敼")
+ public R update(WrkLastno wrkLastno) {
+ if (Cools.isEmpty(wrkLastno) || null == wrkLastno.getWrkMk()) {
return R.error();
}
wrkLastno.setModiUser(getUserId());
@@ -82,12 +84,12 @@
@RequestMapping(value = "/wrkLastno/delete/auth")
@ManagerAuth(memo = "宸ヤ綔搴忓彿鍒犻櫎")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<WrkLastno> list = JSONArray.parseArray(param, WrkLastno.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (WrkLastno entity : list){
+ for (WrkLastno entity : list) {
wrkLastnoService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -95,7 +97,7 @@
@RequestMapping(value = "/wrkLastno/export/auth")
@ManagerAuth(memo = "宸ヤ綔搴忓彿瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<WrkLastno> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("wrkLastno"));
@@ -111,7 +113,7 @@
wrapper.like("wrk_mk", condition);
Page<WrkLastno> page = wrkLastnoService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (WrkLastno wrkLastno : page.getRecords()){
+ for (WrkLastno wrkLastno : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", wrkLastno.getWrkMk());
map.put("value", wrkLastno.getWrkMk());
@@ -124,7 +126,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<WrkLastno> wrapper = new EntityWrapper<WrkLastno>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkLastnoService.selectOne(wrapper)){
+ if (null != wrkLastnoService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(WrkLastno.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index 8a30b90..6988ced 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -35,31 +35,31 @@
@RequestMapping(value = "/wrkMast/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
convert(param, wrapper);
allLike(WrkMast.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){
- if (orderByField.endsWith("$")){
- orderByField = orderByField.substring(0, orderByField.length()-1);
+ if (!Cools.isEmpty(orderByField)) {
+ if (orderByField.endsWith("$")) {
+ orderByField = orderByField.substring(0, orderByField.length() - 1);
}
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
- }else {
+ } else {
wrapper.orderBy("io_time", false);
}
return R.ok(wrkMastService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -80,10 +80,10 @@
return R.ok();
}
- @RequestMapping(value = "/wrkMast/update/auth")
- @ManagerAuth(memo = "宸ヤ綔妗ｄ慨鏀�")
- public R update(WrkMast wrkMast){
- if (Cools.isEmpty(wrkMast) || null==wrkMast.getWrkNo()){
+ @RequestMapping(value = "/wrkMast/update/auth")
+ @ManagerAuth(memo = "宸ヤ綔妗ｄ慨鏀�")
+ public R update(WrkMast wrkMast) {
+ if (Cools.isEmpty(wrkMast) || null == wrkMast.getWrkNo()) {
return R.error();
}
wrkMast.setModiUser(getUserId());
@@ -94,12 +94,12 @@
@RequestMapping(value = "/wrkMast/delete/auth")
@ManagerAuth(memo = "宸ヤ綔妗ｅ垹闄�")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<WrkMast> list = JSONArray.parseArray(param, WrkMast.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (WrkMast entity : list){
+ for (WrkMast entity : list) {
wrkMastService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -107,7 +107,7 @@
@RequestMapping(value = "/wrkMast/export/auth")
@ManagerAuth(memo = "宸ヤ綔妗ｅ鍑�")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMast"));
@@ -123,7 +123,7 @@
wrapper.like("wrk_no", condition);
Page<WrkMast> page = wrkMastService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (WrkMast wrkMast : page.getRecords()){
+ for (WrkMast wrkMast : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", wrkMast.getWrkNo());
map.put("value", wrkMast.getWrkNo());
@@ -136,7 +136,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<WrkMast> wrapper = new EntityWrapper<WrkMast>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkMastService.selectOne(wrapper)){
+ if (null != wrkMastService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(WrkMast.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -148,8 +148,8 @@
if (list.isEmpty()) {
return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
}
- for (WrkMast entity : list){
- entity.setIoPri(entity.getIoPri() + 1);
+ for (WrkMast entity : list) {
+ entity.setIoPri(entity.getIoPri() + 1);
}
wrkMastService.updateBatchById(list);
return R.ok();
@@ -161,7 +161,7 @@
if (list.isEmpty()) {
return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
}
- for (WrkMast entity : list){
+ for (WrkMast entity : list) {
entity.setIoPri(entity.getIoPri() - 1);
}
wrkMastService.updateBatchById(list);
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
index 7e0bec4..7d83c8d 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
@@ -35,31 +35,31 @@
@RequestMapping(value = "/wrkMastLog/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
convert(param, wrapper);
allLike(WrkMastLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){
- if (orderByField.endsWith("$")){
- orderByField = orderByField.substring(0, orderByField.length()-1);
+ if (!Cools.isEmpty(orderByField)) {
+ if (orderByField.endsWith("$")) {
+ orderByField = orderByField.substring(0, orderByField.length() - 1);
}
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
- }else {
+ } else {
wrapper.orderBy("modi_time", false);
}
return R.ok(wrkMastLogService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -80,10 +80,10 @@
return R.ok();
}
- @RequestMapping(value = "/wrkMastLog/update/auth")
- @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｄ慨鏀�")
- public R update(WrkMastLog wrkMastLog){
- if (Cools.isEmpty(wrkMastLog) || null==wrkMastLog.getId()){
+ @RequestMapping(value = "/wrkMastLog/update/auth")
+ @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｄ慨鏀�")
+ public R update(WrkMastLog wrkMastLog) {
+ if (Cools.isEmpty(wrkMastLog) || null == wrkMastLog.getId()) {
return R.error();
}
wrkMastLogService.updateById(wrkMastLog);
@@ -92,12 +92,12 @@
@RequestMapping(value = "/wrkMastLog/delete/auth")
@ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｅ垹闄�")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<WrkMastLog> list = JSONArray.parseArray(param, WrkMastLog.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (WrkMastLog entity : list){
+ for (WrkMastLog entity : list) {
wrkMastLogService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -105,7 +105,7 @@
@RequestMapping(value = "/wrkMastLog/export/auth")
@ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｅ鍑�")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastLog"));
@@ -121,7 +121,7 @@
wrapper.like("id", condition);
Page<WrkMastLog> page = wrkMastLogService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (WrkMastLog wrkMastLog : page.getRecords()){
+ for (WrkMastLog wrkMastLog : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", wrkMastLog.getId());
map.put("value", wrkMastLog.getId());
@@ -134,7 +134,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<WrkMastLog> wrapper = new EntityWrapper<WrkMastLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkMastLogService.selectOne(wrapper)){
+ if (null != wrkMastLogService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(WrkMastLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/domain/dto/AxisBean.java b/src/main/java/com/zy/asrs/domain/dto/AxisBean.java
index 4b86146..6a7bbbe 100644
--- a/src/main/java/com/zy/asrs/domain/dto/AxisBean.java
+++ b/src/main/java/com/zy/asrs/domain/dto/AxisBean.java
@@ -6,19 +6,23 @@
*
*/
public class AxisBean {
- private String name;
- private Integer[] data;
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
- public Integer[] getData() {
- return data;
- }
- public void setData(Integer[] data) {
- this.data = data;
- }
-
+ private String name;
+ private Integer[] data;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer[] getData() {
+ return data;
+ }
+
+ public void setData(Integer[] data) {
+ this.data = data;
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/domain/dto/WorkChartAxis.java b/src/main/java/com/zy/asrs/domain/dto/WorkChartAxis.java
index cbb46b7..0d0d9b9 100644
--- a/src/main/java/com/zy/asrs/domain/dto/WorkChartAxis.java
+++ b/src/main/java/com/zy/asrs/domain/dto/WorkChartAxis.java
@@ -6,26 +6,31 @@
* @date 2018骞�12鏈�12鏃�
*/
public class WorkChartAxis {
- private String ymd;
+ private String ymd;
private int inqty;
private int outqty;
-
- public String getYmd() {
- return ymd;
- }
- public void setYmd(String ymd) {
- this.ymd = ymd;
- }
- public int getInqty() {
- return inqty;
- }
- public void setInqty(int inqty) {
- this.inqty = inqty;
- }
- public int getOutqty() {
- return outqty;
- }
- public void setOutqty(int outqty) {
- this.outqty = outqty;
- }
+
+ public String getYmd() {
+ return ymd;
+ }
+
+ public void setYmd(String ymd) {
+ this.ymd = ymd;
+ }
+
+ public int getInqty() {
+ return inqty;
+ }
+
+ public void setInqty(int inqty) {
+ this.inqty = inqty;
+ }
+
+ public int getOutqty() {
+ return outqty;
+ }
+
+ public void setOutqty(int outqty) {
+ this.outqty = outqty;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java b/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
index 99b6d01..80436fe 100644
--- a/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
@@ -24,22 +24,15 @@
;
private String desc;
- CrnStatusType(String desc){
+
+ CrnStatusType(String desc) {
this.desc = desc;
}
- public String getDesc() {
- return desc;
- }
-
- public void setDesc(String desc) {
- this.desc = desc;
- }
-
- public static CrnStatusType process(Integer ioType){
- if (ioType>100) {
+ public static CrnStatusType process(Integer ioType) {
+ if (ioType > 100) {
return MACHINE_PAKOUT;
- } else if (ioType < 100 && ioType!=3 && ioType!=6 && ioType!=11) {
+ } else if (ioType < 100 && ioType != 3 && ioType != 6 && ioType != 11) {
return MACHINE_PAKIN;
} else if (ioType == 3) {
return MACHINE_SITE_MOVE;
@@ -50,4 +43,12 @@
}
}
+ public String getDesc() {
+ return desc;
+ }
+
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java b/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java
index b3adb37..60abd58 100644
--- a/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java
@@ -21,7 +21,7 @@
;
- public static SiteStatusType process(StaProtocol staProtocol){
+ public static SiteStatusType process(StaProtocol staProtocol) {
if (staProtocol == null) {
return null;
}
diff --git a/src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java b/src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java
index 248701c..c588955 100644
--- a/src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java
@@ -2,17 +2,16 @@
public enum TaskStatusType {
- RECEIVE(1,"鎺ユ敹"),
- DISTRIBUTE(2,"娲惧彂"),
- COMPLETE(3,"鍛戒护瀹屾垚"),
- CANCEL(4,"鍙栨秷"),
- OVER(5,"瀹岀粨")
- ;
+ RECEIVE(1, "鎺ユ敹"),
+ DISTRIBUTE(2, "娲惧彂"),
+ COMPLETE(3, "鍛戒护瀹屾垚"),
+ CANCEL(4, "鍙栨秷"),
+ OVER(5, "瀹岀粨");
public Integer id;
public String desc;
- TaskStatusType(Integer id, String desc){
+ TaskStatusType(Integer id, String desc) {
this.id = id;
this.desc = desc;
}
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
index 3200202..6b600a8 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
@@ -21,7 +21,7 @@
private CrnStatusType crnStatus;
- public String getCrnStatus(){
+ public String getCrnStatus() {
return crnStatus.toString().toLowerCase().replaceAll("_", "-");
}
diff --git a/src/main/java/com/zy/asrs/domain/vo/LocChartPie.java b/src/main/java/com/zy/asrs/domain/vo/LocChartPie.java
index 1492d1b..339ed51 100644
--- a/src/main/java/com/zy/asrs/domain/vo/LocChartPie.java
+++ b/src/main/java/com/zy/asrs/domain/vo/LocChartPie.java
@@ -10,28 +10,36 @@
private int oqty;
private int uqty;
private int xqty;
- public int getFqty() {
- return fqty;
- }
- public void setFqty(int fqty) {
- this.fqty = fqty;
- }
- public int getOqty() {
- return oqty;
- }
- public void setOqty(int oqty) {
- this.oqty = oqty;
- }
- public int getUqty() {
- return uqty;
- }
- public void setUqty(int uqty) {
- this.uqty = uqty;
- }
- public int getXqty() {
- return xqty;
- }
- public void setXqty(int xqty) {
- this.xqty = xqty;
- }
+
+ public int getFqty() {
+ return fqty;
+ }
+
+ public void setFqty(int fqty) {
+ this.fqty = fqty;
+ }
+
+ public int getOqty() {
+ return oqty;
+ }
+
+ public void setOqty(int oqty) {
+ this.oqty = oqty;
+ }
+
+ public int getUqty() {
+ return uqty;
+ }
+
+ public void setUqty(int uqty) {
+ this.uqty = uqty;
+ }
+
+ public int getXqty() {
+ return xqty;
+ }
+
+ public void setXqty(int xqty) {
+ this.xqty = xqty;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/entity/ApiConfig.java b/src/main/java/com/zy/asrs/entity/ApiConfig.java
index 22c9703..66828ba 100644
--- a/src/main/java/com/zy/asrs/entity/ApiConfig.java
+++ b/src/main/java/com/zy/asrs/entity/ApiConfig.java
@@ -1,24 +1,20 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableField;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
import com.zy.system.entity.User;
-import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("wcs_api_config")
@@ -26,61 +22,62 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* api鍦板潃
*/
- @ApiModelProperty(value= "api鍦板潃")
+ @ApiModelProperty(value = "api鍦板潃")
private String url;
/**
* 鐘舵�� 0: 姝ｅ父 1: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 0: 姝ｅ父 1: 绂佺敤 ")
+ @ApiModelProperty(value = "鐘舵�� 0: 姝ｅ父 1: 绂佺敤 ")
private Integer status;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 鍒涘缓鏃堕棿
*/
- @ApiModelProperty(value= "鍒涘缓鏃堕棿")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 鏇存柊鏃堕棿
*/
- @ApiModelProperty(value= "鏇存柊鏃堕棿")
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
@TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("create_by")
private Long createBy;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
- public ApiConfig() {}
+ public ApiConfig() {
+ }
- public ApiConfig(String url,Integer status,String memo,Date createTime,Date updateTime,Long createBy,Long updateBy) {
+ public ApiConfig(String url, Integer status, String memo, Date createTime, Date updateTime, Long createBy, Long updateBy) {
this.url = url;
this.status = status;
this.memo = memo;
@@ -100,9 +97,11 @@
// null // 淇敼浜哄憳
// );
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 0:
return "姝ｅ父";
case 1:
@@ -112,33 +111,33 @@
}
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
- public String getCreateBy$(){
+ public String getCreateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
diff --git a/src/main/java/com/zy/asrs/entity/ApiLog.java b/src/main/java/com/zy/asrs/entity/ApiLog.java
index 78fa188..cbdf787 100644
--- a/src/main/java/com/zy/asrs/entity/ApiLog.java
+++ b/src/main/java/com/zy/asrs/entity/ApiLog.java
@@ -1,18 +1,17 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("man_api_log")
@@ -23,102 +22,103 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 鏃ュ織缂栧彿
*/
- @ApiModelProperty(value= "鏃ュ織缂栧彿")
+ @ApiModelProperty(value = "鏃ュ織缂栧彿")
private String uuid;
/**
* 鍚嶇О绌洪棿
*/
- @ApiModelProperty(value= "鍚嶇О绌洪棿")
+ @ApiModelProperty(value = "鍚嶇О绌洪棿")
private String namespace;
/**
* 鎺ュ彛鍦板潃
*/
- @ApiModelProperty(value= "鎺ュ彛鍦板潃")
+ @ApiModelProperty(value = "鎺ュ彛鍦板潃")
private String url;
/**
* 骞冲彴瀵嗛挜
*/
- @ApiModelProperty(value= "骞冲彴瀵嗛挜")
+ @ApiModelProperty(value = "骞冲彴瀵嗛挜")
private String appkey;
/**
* 鏃堕棿鎴�
*/
- @ApiModelProperty(value= "鏃堕棿鎴�")
+ @ApiModelProperty(value = "鏃堕棿鎴�")
private String timestamp;
/**
* 瀹㈡埛绔疘P
*/
- @ApiModelProperty(value= "瀹㈡埛绔疘P")
+ @ApiModelProperty(value = "瀹㈡埛绔疘P")
@TableField("client_ip")
private String clientIp;
/**
* 璇锋眰鍐呭
*/
- @ApiModelProperty(value= "璇锋眰鍐呭")
+ @ApiModelProperty(value = "璇锋眰鍐呭")
private String request;
/**
* 鍝嶅簲鍐呭
*/
- @ApiModelProperty(value= "鍝嶅簲鍐呭")
+ @ApiModelProperty(value = "鍝嶅簲鍐呭")
private String response;
/**
* 寮傚父鍐呭
*/
- @ApiModelProperty(value= "寮傚父鍐呭")
+ @ApiModelProperty(value = "寮傚父鍐呭")
private String err;
/**
* 缁撴灉 1: 鎴愬姛 0: 澶辫触
*/
- @ApiModelProperty(value= "缁撴灉 1: 鎴愬姛 0: 澶辫触 ")
+ @ApiModelProperty(value = "缁撴灉 1: 鎴愬姛 0: 澶辫触 ")
private Integer result;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- public ApiLog() {}
+ public ApiLog() {
+ }
- public ApiLog(String uuid,String namespace,String url,String appkey,String timestamp,String clientIp,String request,String response,String err,Integer result,Integer status,Date createTime,Date updateTime,String memo) {
+ public ApiLog(String uuid, String namespace, String url, String appkey, String timestamp, String clientIp, String request, String response, String err, Integer result, Integer status, Date createTime, Date updateTime, String memo) {
this.uuid = uuid;
this.namespace = namespace;
this.url = url;
@@ -152,9 +152,11 @@
// null // 澶囨敞
// );
- public String getResult$(){
- if (null == this.result){ return null; }
- switch (this.result){
+ public String getResult$() {
+ if (null == this.result) {
+ return null;
+ }
+ switch (this.result) {
case 1:
return "鎴愬姛";
case 0:
@@ -164,9 +166,11 @@
}
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -176,15 +180,15 @@
}
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnError.java b/src/main/java/com/zy/asrs/entity/BasCrnError.java
index 8702140..cfeea1a 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnError.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnError.java
@@ -22,7 +22,7 @@
/**
* 寮傚父浠ｅ彿
*/
- @ApiModelProperty(value= "寮傚父浠ｅ彿")
+ @ApiModelProperty(value = "寮傚父浠ｅ彿")
@TableId(value = "error_code", type = IdType.AUTO)
@TableField("error_code")
private Long errorCode;
@@ -30,39 +30,40 @@
/**
* 寮傚父鎻忚堪
*/
- @ApiModelProperty(value= "寮傚父鎻忚堪")
+ @ApiModelProperty(value = "寮傚父鎻忚堪")
@TableField("err_name")
private String errName;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- public BasCrnError() {}
+ public BasCrnError() {
+ }
public BasCrnError(String errName, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
this.errName = errName;
@@ -100,64 +101,64 @@
return modiUser;
}
- public String getModiUser$(){
+ public void setModiUser(Long modiUser) {
+ this.modiUser = modiUser;
+ }
+
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
}
public Date getModiTime() {
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public void setModiTime(Date modiTime) {
+ this.modiTime = modiTime;
+ }
+
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
}
public Long getAppeUser() {
return appeUser;
}
- public String getAppeUser$(){
+ public void setAppeUser(Long appeUser) {
+ this.appeUser = appeUser;
+ }
+
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
}
public Date getAppeTime() {
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public void setAppeTime(Date appeTime) {
+ this.appeTime = appeTime;
+ }
+
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
}
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnOpt.java b/src/main/java/com/zy/asrs/entity/BasCrnOpt.java
index ed98925..9865967 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnOpt.java
@@ -22,116 +22,117 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 浠诲姟鍙�
*/
- @ApiModelProperty(value= "浠诲姟鍙�")
+ @ApiModelProperty(value = "浠诲姟鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 鍫嗗灈鏈�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈�")
+ @ApiModelProperty(value = "鍫嗗灈鏈�")
@TableField("crn_no")
private Integer crnNo;
/**
* 涓嬪彂鏃堕棿
*/
- @ApiModelProperty(value= "涓嬪彂鏃堕棿")
+ @ApiModelProperty(value = "涓嬪彂鏃堕棿")
@TableField("send_time")
private Date sendTime;
/**
* 妯″紡
*/
- @ApiModelProperty(value= "妯″紡")
+ @ApiModelProperty(value = "妯″紡")
private String mode;
/**
* 婧愭帓
*/
- @ApiModelProperty(value= "婧愭帓")
+ @ApiModelProperty(value = "婧愭帓")
@TableField("source_row")
private Integer sourceRow;
/**
* 婧愬垪
*/
- @ApiModelProperty(value= "婧愬垪")
+ @ApiModelProperty(value = "婧愬垪")
@TableField("source_bay")
private Integer sourceBay;
/**
* 婧愬眰
*/
- @ApiModelProperty(value= "婧愬眰")
+ @ApiModelProperty(value = "婧愬眰")
@TableField("source_lev")
private Integer sourceLev;
/**
* 婧愮珯
*/
- @ApiModelProperty(value= "婧愮珯")
+ @ApiModelProperty(value = "婧愮珯")
@TableField("source_sta")
private Integer sourceSta;
/**
* 鐩爣鎺�
*/
- @ApiModelProperty(value= "鐩爣鎺�")
+ @ApiModelProperty(value = "鐩爣鎺�")
@TableField("pos_row")
private Integer posRow;
/**
* 鐩爣鍒�
*/
- @ApiModelProperty(value= "鐩爣鍒�")
+ @ApiModelProperty(value = "鐩爣鍒�")
@TableField("pos_bay")
private Integer posBay;
/**
* 鐩爣灞�
*/
- @ApiModelProperty(value= "鐩爣灞�")
+ @ApiModelProperty(value = "鐩爣灞�")
@TableField("pos_lev")
private Integer posLev;
/**
* 鐩爣绔�
*/
- @ApiModelProperty(value= "鐩爣绔�")
+ @ApiModelProperty(value = "鐩爣绔�")
@TableField("pos_sta")
private Integer posSta;
/**
* 鍝嶅簲缁撴灉 1: 姝ｅ父 0: 澶辫触
*/
- @ApiModelProperty(value= "鍝嶅簲缁撴灉 1: 姝ｅ父 0: 澶辫触 ")
+ @ApiModelProperty(value = "鍝嶅簲缁撴灉 1: 姝ｅ父 0: 澶辫触 ")
private Integer response;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
private Date updateTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
- public BasCrnOpt() {}
+ public BasCrnOpt() {
+ }
- public BasCrnOpt(Integer wrkNo,Integer crnNo,Date sendTime,String mode,Integer sourceRow,Integer sourceBay,Integer sourceLev,Integer sourceSta,Integer posRow,Integer posBay,Integer posLev,Integer posSta,Integer response,Date updateTime,Long updateBy) {
+ public BasCrnOpt(Integer wrkNo, Integer crnNo, Date sendTime, String mode, Integer sourceRow, Integer sourceBay, Integer sourceLev, Integer sourceSta, Integer posRow, Integer posBay, Integer posLev, Integer posSta, Integer response, Date updateTime, Long updateBy) {
this.wrkNo = wrkNo;
this.crnNo = crnNo;
this.sendTime = sendTime;
@@ -195,15 +196,15 @@
return sendTime;
}
- public String getSendTime$(){
- if (Cools.isEmpty(this.sendTime)){
+ public void setSendTime(Date sendTime) {
+ this.sendTime = sendTime;
+ }
+
+ public String getSendTime$() {
+ if (Cools.isEmpty(this.sendTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
- }
-
- public void setSendTime(Date sendTime) {
- this.sendTime = sendTime;
}
public String getMode() {
@@ -282,9 +283,15 @@
return response;
}
- public String getResponse$(){
- if (null == this.response){ return null; }
- switch (this.response){
+ public void setResponse(Integer response) {
+ this.response = response;
+ }
+
+ public String getResponse$() {
+ if (null == this.response) {
+ return null;
+ }
+ switch (this.response) {
case 1:
return "姝ｅ父";
case 0:
@@ -294,40 +301,36 @@
}
}
- public void setResponse(Integer response) {
- this.response = response;
- }
-
public Date getUpdateTime() {
return updateTime;
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
public Long getUpdateBy() {
return updateBy;
}
- public String getUpdateBy$(){
+ public void setUpdateBy(Long updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setUpdateBy(Long updateBy) {
- this.updateBy = updateBy;
}
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnStatus.java b/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
index a0d44cf..34d7584 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
@@ -22,7 +22,7 @@
/**
* 宸ヤ綔浠ｅ彿
*/
- @ApiModelProperty(value= "鐘舵�佷唬鍙�")
+ @ApiModelProperty(value = "鐘舵�佷唬鍙�")
@TableId(value = "sts_no", type = IdType.INPUT)
@TableField("sts_no")
private String stsNo;
@@ -30,39 +30,40 @@
/**
* 鐘舵�佹弿杩�
*/
- @ApiModelProperty(value= "鐘舵�佹弿杩�")
+ @ApiModelProperty(value = "鐘舵�佹弿杩�")
@TableField("sts_desc")
private String stsDesc;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- public BasCrnStatus() {}
+ public BasCrnStatus() {
+ }
public BasCrnStatus(String stsDesc, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
this.stsDesc = stsDesc;
@@ -100,64 +101,64 @@
return modiUser;
}
- public String getModiUser$(){
+ public void setModiUser(Long modiUser) {
+ this.modiUser = modiUser;
+ }
+
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
}
public Date getModiTime() {
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public void setModiTime(Date modiTime) {
+ this.modiTime = modiTime;
+ }
+
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
}
public Long getAppeUser() {
return appeUser;
}
- public String getAppeUser$(){
+ public void setAppeUser(Long appeUser) {
+ this.appeUser = appeUser;
+ }
+
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
}
public Date getAppeTime() {
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public void setAppeTime(Date appeTime) {
+ this.appeTime = appeTime;
+ }
+
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
}
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnp.java b/src/main/java/com/zy/asrs/entity/BasCrnp.java
index 0f37f95..56e0390 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnp.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnp.java
@@ -24,7 +24,7 @@
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
@TableId(value = "crn_no", type = IdType.INPUT)
@TableField("crn_no")
private Integer crnNo;
@@ -32,125 +32,126 @@
/**
* 鍙叆
*/
- @ApiModelProperty(value= "鍙叆")
+ @ApiModelProperty(value = "鍙叆")
@TableField("in_enable")
private String inEnable;
/**
* 鍙嚭
*/
- @ApiModelProperty(value= "鍙嚭")
+ @ApiModelProperty(value = "鍙嚭")
@TableField("out_enable")
private String outEnable;
/**
* 鐘舵��
*/
- @ApiModelProperty(value= "鐘舵��")
+ @ApiModelProperty(value = "鐘舵��")
@TableField("crn_sts")
private Integer crnSts;
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 寮傚父鐮�
*/
- @ApiModelProperty(value= "寮傚父鐮�")
+ @ApiModelProperty(value = "寮傚父鐮�")
@TableField("crn_err")
private Long crnErr;
/**
* 婧愬簱浣�
*/
- @ApiModelProperty(value= "婧愬簱浣�")
+ @ApiModelProperty(value = "婧愬簱浣�")
@TableField("frm_locno")
private String frmLocno;
/**
* 婧愮珯
*/
- @ApiModelProperty(value= "婧愮珯")
+ @ApiModelProperty(value = "婧愮珯")
@TableField("frm_sta")
private Integer frmSta;
/**
* 鐩爣绔�
*/
- @ApiModelProperty(value= "鐩爣绔�")
+ @ApiModelProperty(value = "鐩爣绔�")
@TableField("to_sta")
private Integer toSta;
/**
* 鐩爣搴撲綅
*/
- @ApiModelProperty(value= "鐩爣搴撲綅")
+ @ApiModelProperty(value = "鐩爣搴撲綅")
@TableField("to_locno")
private String toLocno;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 鍒涘缓鏃堕棿
*/
- @ApiModelProperty(value= "鍒涘缓鏃堕棿")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField("appe_time")
private Date appeTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("hp_mk")
private String hpMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("retrieve_mk")
private String retrieveMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctl_hp")
private String ctlHp;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctl_rest")
private String ctlRest;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("emp_in")
private String empIn;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("tank_qty")
private Integer tankQty;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("tank_qty1")
private Integer tankQty1;
- public BasCrnp() {}
+ public BasCrnp() {
+ }
- public BasCrnp(String inEnable,String outEnable,Integer crnSts,Integer wrkNo,Long crnErr,String frmLocno,Integer frmSta,Integer toSta,String toLocno,Long appeUser,Date appeTime,Long modiUser,Date modiTime,String hpMk,String retrieveMk,String ctlHp,String ctlRest,String empIn,Integer tankQty,Integer tankQty1) {
+ public BasCrnp(String inEnable, String outEnable, Integer crnSts, Integer wrkNo, Long crnErr, String frmLocno, Integer frmSta, Integer toSta, String toLocno, Long appeUser, Date appeTime, Long modiUser, Date modiTime, String hpMk, String retrieveMk, String ctlHp, String ctlRest, String empIn, Integer tankQty, Integer tankQty1) {
this.inEnable = inEnable;
this.outEnable = outEnable;
this.crnSts = crnSts;
@@ -196,17 +197,18 @@
// null //
// );
- public String getcrnSts$(){
- if(this.crnSts==1){
+ public String getcrnSts$() {
+ if (this.crnSts == 1) {
return "鍗曟満";
- }else if(this.crnSts==2){
+ } else if (this.crnSts == 2) {
return "鎵嬪姩";
- }else if(this.crnSts==3){
+ } else if (this.crnSts == 3) {
return "鑱旀満";
- }else {
+ } else {
return "鏈煡";
}
}
+
public Integer getCrnNo() {
return crnNo;
}
@@ -259,132 +261,132 @@
return frmLocno;
}
- public String getFrmLocno$(){
+ public void setFrmLocno(String frmLocno) {
+ this.frmLocno = frmLocno;
+ }
+
+ public String getFrmLocno$() {
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.frmLocno);
- if (!Cools.isEmpty(locMast)){
+ if (!Cools.isEmpty(locMast)) {
return String.valueOf(locMast.getLocNo());
}
return null;
- }
-
- public void setFrmLocno(String frmLocno) {
- this.frmLocno = frmLocno;
}
public Integer getFrmSta() {
return frmSta;
}
- public String getFrmSta$(){
+ public void setFrmSta(Integer frmSta) {
+ this.frmSta = frmSta;
+ }
+
+ public String getFrmSta$() {
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.frmSta);
- if (!Cools.isEmpty(basDevp)){
+ if (!Cools.isEmpty(basDevp)) {
return String.valueOf(basDevp.getDevNo());
}
return null;
- }
-
- public void setFrmSta(Integer frmSta) {
- this.frmSta = frmSta;
}
public Integer getToSta() {
return toSta;
}
- public String getToSta$(){
+ public void setToSta(Integer toSta) {
+ this.toSta = toSta;
+ }
+
+ public String getToSta$() {
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.toSta);
- if (!Cools.isEmpty(basDevp)){
+ if (!Cools.isEmpty(basDevp)) {
return String.valueOf(basDevp.getDevNo());
}
return null;
- }
-
- public void setToSta(Integer toSta) {
- this.toSta = toSta;
}
public String getToLocno() {
return toLocno;
}
- public String getToLocno$(){
+ public void setToLocno(String toLocno) {
+ this.toLocno = toLocno;
+ }
+
+ public String getToLocno$() {
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.toLocno);
- if (!Cools.isEmpty(locMast)){
+ if (!Cools.isEmpty(locMast)) {
return String.valueOf(locMast.getLocNo());
}
return null;
- }
-
- public void setToLocno(String toLocno) {
- this.toLocno = toLocno;
}
public Long getAppeUser() {
return appeUser;
}
- public String getAppeUser$(){
+ public void setAppeUser(Long appeUser) {
+ this.appeUser = appeUser;
+ }
+
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
}
public Date getAppeTime() {
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public void setAppeTime(Date appeTime) {
+ this.appeTime = appeTime;
+ }
+
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
}
public Long getModiUser() {
return modiUser;
}
- public String getModiUser$(){
+ public void setModiUser(Long modiUser) {
+ this.modiUser = modiUser;
+ }
+
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
}
public Date getModiTime() {
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public void setModiTime(Date modiTime) {
+ this.modiTime = modiTime;
+ }
+
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
}
public String getHpMk() {
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index 7003eef..1851b48 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -24,7 +24,7 @@
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
@TableId(value = "dev_no", type = IdType.INPUT)
@TableField("dev_no")
private Integer devNo;
@@ -32,219 +32,221 @@
/**
* 璁惧鎻忚堪
*/
- @ApiModelProperty(value= "璁惧鎻忚堪")
+ @ApiModelProperty(value = "璁惧鎻忚堪")
@TableField("dec_desc")
private String decDesc;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
@TableField("dev_mk")
private String devMk;
/**
* 鍙叆
*/
- @ApiModelProperty(value= "鍙叆")
+ @ApiModelProperty(value = "鍙叆")
@TableField("in_enable")
private String inEnable;
/**
* 鍙嚭
*/
- @ApiModelProperty(value= "鍙嚭")
+ @ApiModelProperty(value = "鍙嚭")
@TableField("out_enable")
private String outEnable;
/**
* 鑷姩
*/
- @ApiModelProperty(value= "鑷姩")
+ @ApiModelProperty(value = "鑷姩")
private String autoing;
/**
* 鏈夌墿
*/
- @ApiModelProperty(value= "鏈夌墿")
+ @ApiModelProperty(value = "鏈夌墿")
private String loading;
/**
* 鑳藉叆
*/
- @ApiModelProperty(value= "鑳藉叆")
+ @ApiModelProperty(value = "鑳藉叆")
private String canining;
/**
* 鑳藉嚭
*/
- @ApiModelProperty(value= "鑳藉嚭")
+ @ApiModelProperty(value = "鑳藉嚭")
private String canouting;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String fronting;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String rearing;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String uping;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String downing;
/**
* 闇�姹�1
*/
- @ApiModelProperty(value= "闇�姹�1")
+ @ApiModelProperty(value = "闇�姹�1")
private String inreq1;
/**
* 闇�姹�2
*/
- @ApiModelProperty(value= "闇�姹�2")
+ @ApiModelProperty(value = "闇�姹�2")
private String inreq2;
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("wrk_no1")
private Integer wrkNo1;
/**
* 瀹瑰櫒绫诲瀷
*/
- @ApiModelProperty(value= "瀹瑰櫒绫诲瀷")
+ @ApiModelProperty(value = "瀹瑰櫒绫诲瀷")
@TableField("ctn_type")
private Integer ctnType;
/**
* 鏉″舰鐮�
*/
- @ApiModelProperty(value= "鏉″舰鐮�")
+ @ApiModelProperty(value = "鏉″舰鐮�")
private String barcode;
- @ApiModelProperty(value= "鍏ュ簱鏆傚瓨鏁�")
+ @ApiModelProperty(value = "鍏ュ簱鏆傚瓨鏁�")
@TableField("in_qty")
private Integer inQty;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private Integer row1;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("io_time")
private Date ioTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String area;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("in_ok")
private String inOk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("out_ok")
private String outOk;
- @ApiModelProperty(value= "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
+ @ApiModelProperty(value = "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
@TableField("loc_type1")
private Short locType1;
- @ApiModelProperty(value= "瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿")
+ @ApiModelProperty(value = "瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿")
@TableField("loc_type2")
private Short locType2;
- @ApiModelProperty(value= "杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿")
+ @ApiModelProperty(value = "杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿")
@TableField("loc_type3")
private Short locType3;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("std_qty")
private Double stdQty;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("min_wt")
private Double minWt;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("max_wt")
private Double maxWt;
/**
* 閲嶉噺
*/
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value = "閲嶉噺")
@TableField("gross_wt")
private Double grossWt;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("cart_pos")
private Integer cartPos;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("agv_start_pick")
private Integer agvStartPick;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("agv_target_pick")
private Integer agvTargetPick;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("agv_start_place")
private Integer agvStartPlace;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("agv_target_place")
private Integer agvTargetPlace;
- @ApiModelProperty(value= "寮傚父鐮�")
+ @ApiModelProperty(value = "寮傚父鐮�")
@TableField("sta_err")
private Integer staErr;
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.ioTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
public String getLocType1$() {
- if (null == this.locType1){ return null; }
- switch (this.locType1){
+ if (null == this.locType1) {
+ return null;
+ }
+ switch (this.locType1) {
case 0:
return "鏈煡";
case 1:
@@ -257,8 +259,10 @@
}
public String getLocType2$() {
- if (null == this.locType2){ return null; }
- switch (this.locType2){
+ if (null == this.locType2) {
+ return null;
+ }
+ switch (this.locType2) {
case 0:
return "鏈煡";
case 1:
@@ -271,8 +275,10 @@
}
public String getLocType3$() {
- if (null == this.locType3){ return null; }
- switch (this.locType3){
+ if (null == this.locType3) {
+ return null;
+ }
+ switch (this.locType3) {
case 0:
return "鏈煡";
case 1:
@@ -284,33 +290,33 @@
}
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
diff --git a/src/main/java/com/zy/asrs/entity/BasErrLog.java b/src/main/java/com/zy/asrs/entity/BasErrLog.java
index f135e6b..bd2c0b6 100644
--- a/src/main/java/com/zy/asrs/entity/BasErrLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasErrLog.java
@@ -22,155 +22,156 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
private String uuid;
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 鍙戠敓鏃堕棿
*/
- @ApiModelProperty(value= "鍙戠敓鏃堕棿")
+ @ApiModelProperty(value = "鍙戠敓鏃堕棿")
@TableField("start_time")
private Date startTime;
/**
* 缁撴潫鏃堕棿
*/
- @ApiModelProperty(value= "缁撴潫鏃堕棿")
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
@TableField("end_time")
private Date endTime;
/**
* 宸ヤ綔鐘舵��
*/
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
+ @ApiModelProperty(value = "宸ヤ綔鐘舵��")
@TableField("wrk_sts")
private Long wrkSts;
/**
* 鍏ュ嚭搴撶被鍨�
*/
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨�")
@TableField("io_type")
private Integer ioType;
/**
* 鍫嗗灈鏈�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈�")
+ @ApiModelProperty(value = "鍫嗗灈鏈�")
@TableField("crn_no")
private Integer crnNo;
/**
* plc
*/
- @ApiModelProperty(value= "plc")
+ @ApiModelProperty(value = "plc")
@TableField("plc_no")
private Integer plcNo;
/**
* 鐩爣搴撲綅
*/
- @ApiModelProperty(value= "鐩爣搴撲綅")
+ @ApiModelProperty(value = "鐩爣搴撲綅")
@TableField("loc_no")
private String locNo;
/**
* 鐩爣绔�
*/
- @ApiModelProperty(value= "鐩爣绔�")
+ @ApiModelProperty(value = "鐩爣绔�")
@TableField("sta_no")
private Integer staNo;
/**
* 婧愮珯
*/
- @ApiModelProperty(value= "婧愮珯")
+ @ApiModelProperty(value = "婧愮珯")
@TableField("source_sta_no")
private Integer sourceStaNo;
/**
* 婧愬簱浣�
*/
- @ApiModelProperty(value= "婧愬簱浣�")
+ @ApiModelProperty(value = "婧愬簱浣�")
@TableField("source_loc_no")
private String sourceLocNo;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
/**
* 寮傚父鐮�
*/
- @ApiModelProperty(value= "寮傚父鐮�")
+ @ApiModelProperty(value = "寮傚父鐮�")
@TableField("err_code")
private Integer errCode;
/**
* 寮傚父
*/
- @ApiModelProperty(value= "寮傚父")
+ @ApiModelProperty(value = "寮傚父")
private String error;
/**
* 寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶�
*/
- @ApiModelProperty(value= "寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶� ")
+ @ApiModelProperty(value = "寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶� ")
private Integer status;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
private Date createTime;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("create_by")
private Long createBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
private Date updateTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- public BasErrLog() {}
+ public BasErrLog() {
+ }
- public BasErrLog(String uuid,Integer wrkNo,Date startTime,Date endTime,Long wrkSts,Integer ioType,Integer crnNo,Integer plcNo,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String barcode,Integer errCode,String error,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ public BasErrLog(String uuid, Integer wrkNo, Date startTime, Date endTime, Long wrkSts, Integer ioType, Integer crnNo, Integer plcNo, String locNo, Integer staNo, Integer sourceStaNo, String sourceLocNo, String barcode, Integer errCode, String error, Integer status, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo) {
this.uuid = uuid;
this.wrkNo = wrkNo;
this.startTime = startTime;
@@ -246,30 +247,30 @@
return startTime;
}
- public String getStartTime$(){
- if (Cools.isEmpty(this.startTime)){
+ public void setStartTime(Date startTime) {
+ this.startTime = startTime;
+ }
+
+ public String getStartTime$() {
+ if (Cools.isEmpty(this.startTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
}
public Date getEndTime() {
return endTime;
}
- public String getEndTime$(){
- if (Cools.isEmpty(this.endTime)){
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
+
+ public String getEndTime$() {
+ if (Cools.isEmpty(this.endTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
}
public Long getWrkSts() {
@@ -364,9 +365,15 @@
return status;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "鏈鐞�";
case 2:
@@ -376,72 +383,68 @@
}
}
- public void setStatus(Integer status) {
- this.status = status;
- }
-
public Date getCreateTime() {
return createTime;
- }
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
- public Long getCreateBy() {
- return createBy;
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getCreateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
+ public Long getCreateBy() {
+ return createBy;
}
public void setCreateBy(Long createBy) {
this.createBy = createBy;
}
- public Date getUpdateTime() {
- return updateTime;
+ public String getCreateBy$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.createBy);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ public Date getUpdateTime() {
+ return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
public Long getUpdateBy() {
return updateBy;
}
- public String getUpdateBy$(){
+ public void setUpdateBy(Long updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setUpdateBy(Long updateBy) {
- this.updateBy = updateBy;
}
public String getMemo() {
diff --git a/src/main/java/com/zy/asrs/entity/BasLocSts.java b/src/main/java/com/zy/asrs/entity/BasLocSts.java
index 13d16b9..d66e169 100644
--- a/src/main/java/com/zy/asrs/entity/BasLocSts.java
+++ b/src/main/java/com/zy/asrs/entity/BasLocSts.java
@@ -22,7 +22,7 @@
/**
* 搴撲綅鐘舵�佷唬鍙�
*/
- @ApiModelProperty(value= "搴撲綅鐘舵�佷唬鍙�")
+ @ApiModelProperty(value = "搴撲綅鐘舵�佷唬鍙�")
@TableId(value = "loc_sts", type = IdType.INPUT)
@TableField("loc_sts")
private String locSts;
@@ -30,39 +30,40 @@
/**
* 搴撲綅鐘舵�佹弿杩�
*/
- @ApiModelProperty(value= "搴撲綅鐘舵�佹弿杩�")
+ @ApiModelProperty(value = "搴撲綅鐘舵�佹弿杩�")
@TableField("loc_desc")
private String locDesc;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- public BasLocSts() {}
+ public BasLocSts() {
+ }
public BasLocSts(String locDesc, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
this.locDesc = locDesc;
@@ -100,64 +101,64 @@
return modiUser;
}
- public String getModiUser$(){
+ public void setModiUser(Long modiUser) {
+ this.modiUser = modiUser;
+ }
+
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
}
public Date getModiTime() {
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public void setModiTime(Date modiTime) {
+ this.modiTime = modiTime;
+ }
+
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
}
public Long getAppeUser() {
return appeUser;
}
- public String getAppeUser$(){
+ public void setAppeUser(Long appeUser) {
+ this.appeUser = appeUser;
+ }
+
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
}
public Date getAppeTime() {
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public void setAppeTime(Date appeTime) {
+ this.appeTime = appeTime;
+ }
+
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
}
diff --git a/src/main/java/com/zy/asrs/entity/BasPlcerror.java b/src/main/java/com/zy/asrs/entity/BasPlcerror.java
index f8f681e..45de00e 100644
--- a/src/main/java/com/zy/asrs/entity/BasPlcerror.java
+++ b/src/main/java/com/zy/asrs/entity/BasPlcerror.java
@@ -22,7 +22,7 @@
/**
* 寮傚父缂栧彿
*/
- @ApiModelProperty(value= "寮傚父缂栧彿")
+ @ApiModelProperty(value = "寮傚父缂栧彿")
@TableId(value = "error_code", type = IdType.INPUT)
@TableField("error_code")
private Integer errorCode;
@@ -30,39 +30,40 @@
/**
* 寮傚父鎻忚堪
*/
- @ApiModelProperty(value= "寮傚父鎻忚堪")
+ @ApiModelProperty(value = "寮傚父鎻忚堪")
@TableField("error_desc")
private String errorDesc;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
- public BasPlcerror() {}
+ public BasPlcerror() {
+ }
public BasPlcerror(Integer errorCode, String errorDesc, Date modiTime, Long modiUser, Date appeTime, Long appeUser) {
this.errorDesc = errorDesc;
@@ -101,64 +102,64 @@
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public void setModiTime(Date modiTime) {
+ this.modiTime = modiTime;
+ }
+
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
}
public Long getModiUser() {
return modiUser;
}
- public String getModiUser$(){
+ public void setModiUser(Long modiUser) {
+ this.modiUser = modiUser;
+ }
+
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
}
public Date getAppeTime() {
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public void setAppeTime(Date appeTime) {
+ this.appeTime = appeTime;
+ }
+
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
}
public Long getAppeUser() {
return appeUser;
}
- public String getAppeUser$(){
+ public void setAppeUser(Long appeUser) {
+ this.appeUser = appeUser;
+ }
+
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
}
diff --git a/src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java b/src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java
index 8cf8b8a..b7c8bb2 100644
--- a/src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java
@@ -1,34 +1,22 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasWrkStatusService;
-import com.zy.asrs.entity.BasWrkStatus;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasWrkIotypeService;
-import com.zy.asrs.entity.BasWrkIotype;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
+import com.zy.asrs.service.BasWrkStatusService;
import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("asr_bas_plcerror_log")
@@ -36,146 +24,147 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 寮�濮嬫椂闂�
*/
- @ApiModelProperty(value= "寮�濮嬫椂闂�")
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
@TableField("start_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/**
* 缁撴潫鏃堕棿
*/
- @ApiModelProperty(value= "缁撴潫鏃堕棿")
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
@TableField("end_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
/**
* 宸ヤ綔鐘舵��
*/
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
+ @ApiModelProperty(value = "宸ヤ綔鐘舵��")
@TableField("wrk_sts")
private Long wrkSts;
/**
* 鍏ュ嚭搴撶被鍨�
*/
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨�")
@TableField("io_type")
private Integer ioType;
/**
* plc
*/
- @ApiModelProperty(value= "plc")
+ @ApiModelProperty(value = "plc")
@TableField("plc_no")
private Integer plcNo;
/**
* 鐩爣搴撲綅
*/
- @ApiModelProperty(value= "鐩爣搴撲綅")
+ @ApiModelProperty(value = "鐩爣搴撲綅")
@TableField("loc_no")
private String locNo;
/**
* 鐩爣绔�
*/
- @ApiModelProperty(value= "鐩爣绔�")
+ @ApiModelProperty(value = "鐩爣绔�")
@TableField("sta_no")
private Integer staNo;
/**
* 婧愮珯
*/
- @ApiModelProperty(value= "婧愮珯")
+ @ApiModelProperty(value = "婧愮珯")
@TableField("source_sta_no")
private Integer sourceStaNo;
/**
* 婧愬簱浣�
*/
- @ApiModelProperty(value= "婧愬簱浣�")
+ @ApiModelProperty(value = "婧愬簱浣�")
@TableField("source_loc_no")
private String sourceLocNo;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
/**
* 寮傚父缂栧彿
*/
- @ApiModelProperty(value= "寮傚父缂栧彿")
+ @ApiModelProperty(value = "寮傚父缂栧彿")
@TableField("err_code")
private Integer errCode;
/**
* 寮傚父鎻忚堪
*/
- @ApiModelProperty(value= "寮傚父鎻忚堪")
+ @ApiModelProperty(value = "寮傚父鎻忚堪")
private String err;
/**
* 寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶�
*/
- @ApiModelProperty(value= "寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶� ")
+ @ApiModelProperty(value = "寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶� ")
private Integer status;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("create_by")
private Long createBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- public BasPlcerrorLog() {}
+ public BasPlcerrorLog() {
+ }
- public BasPlcerrorLog(Integer wrkNo,Date startTime,Date endTime,Long wrkSts,Integer ioType,Integer plcNo,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String barcode,Integer errCode,String err,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ public BasPlcerrorLog(Integer wrkNo, Date startTime, Date endTime, Long wrkSts, Integer ioType, Integer plcNo, String locNo, Integer staNo, Integer sourceStaNo, String sourceLocNo, String barcode, Integer errCode, String err, Integer status, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo) {
this.wrkNo = wrkNo;
this.startTime = startTime;
this.endTime = endTime;
@@ -219,41 +208,43 @@
// null // 澶囨敞
// );
- public String getStartTime$(){
- if (Cools.isEmpty(this.startTime)){
+ public String getStartTime$() {
+ if (Cools.isEmpty(this.startTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
}
- public String getEndTime$(){
- if (Cools.isEmpty(this.endTime)){
+ public String getEndTime$() {
+ if (Cools.isEmpty(this.endTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
}
- public String getWrkSts$(){
+ public String getWrkSts$() {
BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
- if (!Cools.isEmpty(basWrkStatus)){
+ if (!Cools.isEmpty(basWrkStatus)) {
return String.valueOf(basWrkStatus.getWrkDesc());
}
return null;
}
- public String getIoType$(){
+ public String getIoType$() {
BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
BasWrkIotype basWrkIotype = service.selectById(this.ioType);
- if (!Cools.isEmpty(basWrkIotype)){
+ if (!Cools.isEmpty(basWrkIotype)) {
return String.valueOf(basWrkIotype.getIoDesc());
}
return null;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "鏈鐞�";
case 2:
@@ -263,33 +254,33 @@
}
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getCreateBy$(){
+ public String getCreateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
diff --git a/src/main/java/com/zy/asrs/entity/BasWrkIotype.java b/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
index 91fb456..4d64535 100644
--- a/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
+++ b/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
@@ -22,7 +22,7 @@
/**
* 鍏ュ嚭绫诲瀷浠ｅ彿
*/
- @ApiModelProperty(value= "鍏ュ嚭绫诲瀷浠ｅ彿")
+ @ApiModelProperty(value = "鍏ュ嚭绫诲瀷浠ｅ彿")
@TableId(value = "io_type", type = IdType.INPUT)
@TableField("io_type")
private Integer ioType;
@@ -30,48 +30,49 @@
/**
* 涓昏
*/
- @ApiModelProperty(value= "涓昏")
+ @ApiModelProperty(value = "涓昏")
@TableField("io_pri")
private String ioPri;
/**
* 鍏ュ嚭绫诲瀷鎻忚堪
*/
- @ApiModelProperty(value= "鍏ュ嚭绫诲瀷鎻忚堪")
+ @ApiModelProperty(value = "鍏ュ嚭绫诲瀷鎻忚堪")
@TableField("io_desc")
private String ioDesc;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- public BasWrkIotype() {}
+ public BasWrkIotype() {
+ }
- public BasWrkIotype(String ioPri,String ioDesc,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
+ public BasWrkIotype(String ioPri, String ioDesc, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
this.ioPri = ioPri;
this.ioDesc = ioDesc;
this.modiUser = modiUser;
@@ -117,64 +118,64 @@
return modiUser;
}
- public String getModiUser$(){
+ public void setModiUser(Long modiUser) {
+ this.modiUser = modiUser;
+ }
+
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
}
public Date getModiTime() {
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public void setModiTime(Date modiTime) {
+ this.modiTime = modiTime;
+ }
+
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
}
public Long getAppeUser() {
return appeUser;
}
- public String getAppeUser$(){
+ public void setAppeUser(Long appeUser) {
+ this.appeUser = appeUser;
+ }
+
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
}
public Date getAppeTime() {
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public void setAppeTime(Date appeTime) {
+ this.appeTime = appeTime;
+ }
+
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
}
diff --git a/src/main/java/com/zy/asrs/entity/BasWrkStatus.java b/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
index c02168d..c215fac 100644
--- a/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
+++ b/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
@@ -22,7 +22,7 @@
/**
* 浠ｅ彿
*/
- @ApiModelProperty(value= "浠ｅ彿")
+ @ApiModelProperty(value = "浠ｅ彿")
@TableId(value = "wrk_sts", type = IdType.INPUT)
@TableField("wrk_sts")
private Long wrkSts;
@@ -30,41 +30,42 @@
/**
* 鐘舵�佹弿杩�
*/
- @ApiModelProperty(value= "鐘舵�佹弿杩�")
+ @ApiModelProperty(value = "鐘舵�佹弿杩�")
@TableField("wrk_desc")
private String wrkDesc;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- public BasWrkStatus() {}
+ public BasWrkStatus() {
+ }
- public BasWrkStatus(String wrkDesc,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
+ public BasWrkStatus(String wrkDesc, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
this.wrkDesc = wrkDesc;
this.modiUser = modiUser;
this.modiTime = modiTime;
@@ -100,64 +101,64 @@
return modiUser;
}
- public String getModiUser$(){
+ public void setModiUser(Long modiUser) {
+ this.modiUser = modiUser;
+ }
+
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
}
public Date getModiTime() {
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public void setModiTime(Date modiTime) {
+ this.modiTime = modiTime;
+ }
+
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
}
public Long getAppeUser() {
return appeUser;
}
- public String getAppeUser$(){
+ public void setAppeUser(Long appeUser) {
+ this.appeUser = appeUser;
+ }
+
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
}
public Date getAppeTime() {
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public void setAppeTime(Date appeTime) {
+ this.appeTime = appeTime;
+ }
+
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
}
diff --git a/src/main/java/com/zy/asrs/entity/ChartBean.java b/src/main/java/com/zy/asrs/entity/ChartBean.java
index 5946916..7cbe9d4 100644
--- a/src/main/java/com/zy/asrs/entity/ChartBean.java
+++ b/src/main/java/com/zy/asrs/entity/ChartBean.java
@@ -1,19 +1,23 @@
package com.zy.asrs.entity;
public class ChartBean {
- private String name;
- private double y;
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
- public double getY() {
- return y;
- }
- public void setY(double y) {
- this.y = y;
- }
-
+ private String name;
+ private double y;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public double getY() {
+ return y;
+ }
+
+ public void setY(double y) {
+ this.y = y;
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/CommandInfo.java b/src/main/java/com/zy/asrs/entity/CommandInfo.java
index e49b7bc..093a18a 100644
--- a/src/main/java/com/zy/asrs/entity/CommandInfo.java
+++ b/src/main/java/com/zy/asrs/entity/CommandInfo.java
@@ -1,18 +1,18 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
import com.zy.core.enums.CommandType;
-import org.springframework.format.annotation.DateTimeFormat;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("wcs_command_info")
@@ -20,90 +20,91 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* WMS浠诲姟鍙�
*/
- @ApiModelProperty(value= "浠诲姟鍙�")
+ @ApiModelProperty(value = "浠诲姟鍙�")
@TableField("task_no")
private String taskNo;
/**
* 鎸囦护绫诲瀷{1:鍒涘缓,2:鎵ц,3:瀹屾垚}
*/
- @ApiModelProperty(value= "鎸囦护鐘舵��")
+ @ApiModelProperty(value = "鎸囦护鐘舵��")
@TableField("command_status")
private Integer commandStatus;
/**
* 寮�濮嬫椂闂�
*/
- @ApiModelProperty(value= "寮�濮嬫椂闂�")
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
@TableField("start_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/**
* 鎸囦护绫诲瀷
*/
- @ApiModelProperty(value= "鎸囦护绫诲瀷")
+ @ApiModelProperty(value = "鎸囦护绫诲瀷")
@TableField("command_type")
private Integer commandType;
/**
* 璁惧
*/
- @ApiModelProperty(value= "璁惧")
+ @ApiModelProperty(value = "璁惧")
private String device;
/**
* 璁惧鎵ц淇℃伅
*/
- @ApiModelProperty(value= "璁惧鎵ц淇℃伅")
+ @ApiModelProperty(value = "璁惧鎵ц淇℃伅")
@TableField("device_log")
private String deviceLog;
/**
* 鍛戒护鎻忚堪
*/
- @ApiModelProperty(value= "鍛戒护鎻忚堪")
+ @ApiModelProperty(value = "鍛戒护鎻忚堪")
@TableField("command_desc")
private String commandDesc;
/**
* 鍛戒护JSON
*/
- @ApiModelProperty(value= "鍛戒护JSON")
+ @ApiModelProperty(value = "鍛戒护JSON")
@TableField("command")
private String command;
/**
* 鎵ц鏃堕棿
*/
- @ApiModelProperty(value= "鎵ц鏃堕棿")
+ @ApiModelProperty(value = "鎵ц鏃堕棿")
@TableField("execute_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date executeTime;
/**
* 瀹屾垚鏃堕棿
*/
- @ApiModelProperty(value= "瀹屾垚鏃堕棿")
+ @ApiModelProperty(value = "瀹屾垚鏃堕棿")
@TableField("complete_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date completeTime;
- public CommandInfo() {}
+ public CommandInfo() {
+ }
public CommandInfo(Integer id, Integer wrkNo, String taskNo, Integer commandStatus, Date startTime, Integer commandType, String device, String deviceLog, String commandDesc, String command, Date executeTime, Date completeTime) {
this.id = id;
@@ -120,22 +121,22 @@
this.completeTime = completeTime;
}
- public String getStartTime$(){
- if (Cools.isEmpty(this.startTime)){
+ public String getStartTime$() {
+ if (Cools.isEmpty(this.startTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
}
- public String getExecuteTime$(){
- if (Cools.isEmpty(this.executeTime)){
+ public String getExecuteTime$() {
+ if (Cools.isEmpty(this.executeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.executeTime);
}
- public String getCompleteTime$(){
- if (Cools.isEmpty(this.completeTime)){
+ public String getCompleteTime$() {
+ if (Cools.isEmpty(this.completeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.completeTime);
diff --git a/src/main/java/com/zy/asrs/entity/CommandInfoLog.java b/src/main/java/com/zy/asrs/entity/CommandInfoLog.java
index 31bdbbf..275cee1 100644
--- a/src/main/java/com/zy/asrs/entity/CommandInfoLog.java
+++ b/src/main/java/com/zy/asrs/entity/CommandInfoLog.java
@@ -1,22 +1,18 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
import com.zy.core.enums.CommandType;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("wcs_command_info_log")
@@ -24,105 +20,106 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 璧风偣浣嶇疆
*/
- @ApiModelProperty(value= "璧风偣浣嶇疆")
+ @ApiModelProperty(value = "璧风偣浣嶇疆")
@TableField("start_pos")
private String startPos;
/**
* 缁堢偣浣嶇疆
*/
- @ApiModelProperty(value= "缁堢偣浣嶇疆")
+ @ApiModelProperty(value = "缁堢偣浣嶇疆")
@TableField("end_pos")
private String endPos;
/**
* 鎸囦护鐘舵�� 1: 鍒涘缓 2: 鎵ц 3: 瀹屾垚
*/
- @ApiModelProperty(value= "鎸囦护鐘舵�� 1: 鍒涘缓 2: 鎵ц 3: 瀹屾垚 ")
+ @ApiModelProperty(value = "鎸囦护鐘舵�� 1: 鍒涘缓 2: 鎵ц 3: 瀹屾垚 ")
@TableField("command_status")
private Integer commandStatus;
/**
* 鍒涘缓鏃堕棿
*/
- @ApiModelProperty(value= "鍒涘缓鏃堕棿")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField("start_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/**
* 鎸囦护绫诲瀷
*/
- @ApiModelProperty(value= "鎸囦护绫诲瀷")
+ @ApiModelProperty(value = "鎸囦护绫诲瀷")
@TableField("command_type")
private Integer commandType;
/**
* 璁惧
*/
- @ApiModelProperty(value= "璁惧")
+ @ApiModelProperty(value = "璁惧")
private String device;
/**
* 璁惧鎵ц淇℃伅
*/
- @ApiModelProperty(value= "璁惧鎵ц淇℃伅")
+ @ApiModelProperty(value = "璁惧鎵ц淇℃伅")
@TableField("device_log")
private String deviceLog;
/**
* 鍛戒护鎻忚堪
*/
- @ApiModelProperty(value= "鍛戒护鎻忚堪")
+ @ApiModelProperty(value = "鍛戒护鎻忚堪")
@TableField("command_desc")
private String commandDesc;
/**
* 鍛戒护JSON
*/
- @ApiModelProperty(value= "鍛戒护JSON")
+ @ApiModelProperty(value = "鍛戒护JSON")
private String command;
/**
* 浠诲姟鍙�
*/
- @ApiModelProperty(value= "浠诲姟鍙�")
+ @ApiModelProperty(value = "浠诲姟鍙�")
@TableField("task_no")
private String taskNo;
/**
* 鎵ц鏃堕棿
*/
- @ApiModelProperty(value= "鎵ц鏃堕棿")
+ @ApiModelProperty(value = "鎵ц鏃堕棿")
@TableField("execute_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date executeTime;
/**
* 瀹屾垚鏃堕棿
*/
- @ApiModelProperty(value= "瀹屾垚鏃堕棿")
+ @ApiModelProperty(value = "瀹屾垚鏃堕棿")
@TableField("complete_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date completeTime;
- public CommandInfoLog() {}
+ public CommandInfoLog() {
+ }
- public CommandInfoLog(Integer wrkNo,String startPos,String endPos,Integer commandStatus,Date startTime,Integer commandType,String device,String deviceLog,String commandDesc,String command,String taskNo,Date executeTime,Date completeTime) {
+ public CommandInfoLog(Integer wrkNo, String startPos, String endPos, Integer commandStatus, Date startTime, Integer commandType, String device, String deviceLog, String commandDesc, String command, String taskNo, Date executeTime, Date completeTime) {
this.wrkNo = wrkNo;
this.startPos = startPos;
this.endPos = endPos;
@@ -154,9 +151,11 @@
// null // 瀹屾垚鏃堕棿
// );
- public String getCommandStatus$(){
- if (null == this.commandStatus){ return null; }
- switch (this.commandStatus){
+ public String getCommandStatus$() {
+ if (null == this.commandStatus) {
+ return null;
+ }
+ switch (this.commandStatus) {
case 1:
return "鍒涘缓";
case 2:
@@ -168,22 +167,22 @@
}
}
- public String getStartTime$(){
- if (Cools.isEmpty(this.startTime)){
+ public String getStartTime$() {
+ if (Cools.isEmpty(this.startTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
}
- public String getExecuteTime$(){
- if (Cools.isEmpty(this.executeTime)){
+ public String getExecuteTime$() {
+ if (Cools.isEmpty(this.executeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.executeTime);
}
- public String getCompleteTime$(){
- if (Cools.isEmpty(this.completeTime)){
+ public String getCompleteTime$() {
+ if (Cools.isEmpty(this.completeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.completeTime);
diff --git a/src/main/java/com/zy/asrs/entity/DataResource.java b/src/main/java/com/zy/asrs/entity/DataResource.java
index 417bec6..c5bc163 100644
--- a/src/main/java/com/zy/asrs/entity/DataResource.java
+++ b/src/main/java/com/zy/asrs/entity/DataResource.java
@@ -1,16 +1,17 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("wcs_data_resource")
@@ -18,31 +19,32 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String data;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String name;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("resource_id")
private Integer resourceId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- public DataResource() {}
+ public DataResource() {
+ }
- public DataResource(String data,String name,Integer resourceId,Date createTime,String memo) {
+ public DataResource(String data, String name, Integer resourceId, Date createTime, String memo) {
this.data = data;
this.name = name;
this.resourceId = resourceId;
@@ -57,8 +59,8 @@
// null //
// );
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
diff --git a/src/main/java/com/zy/asrs/entity/DeviceError.java b/src/main/java/com/zy/asrs/entity/DeviceError.java
index aab93f0..0ffcf9c 100644
--- a/src/main/java/com/zy/asrs/entity/DeviceError.java
+++ b/src/main/java/com/zy/asrs/entity/DeviceError.java
@@ -1,16 +1,17 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("wcs_device_error")
@@ -18,40 +19,41 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 璁惧
*/
- @ApiModelProperty(value= "璁惧")
+ @ApiModelProperty(value = "璁惧")
private String device;
/**
* 璁惧ID
*/
- @ApiModelProperty(value= "璁惧ID")
+ @ApiModelProperty(value = "璁惧ID")
@TableField("device_id")
private Integer deviceId;
/**
* 鍒涘缓鏃堕棿
*/
- @ApiModelProperty(value= "鍒涘缓鏃堕棿")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 寮傚父淇℃伅
*/
- @ApiModelProperty(value= "寮傚父淇℃伅")
+ @ApiModelProperty(value = "寮傚父淇℃伅")
private String msg;
- public DeviceError() {}
+ public DeviceError() {
+ }
- public DeviceError(String device,Integer deviceId,Date createTime,String msg) {
+ public DeviceError(String device, Integer deviceId, Date createTime, String msg) {
this.device = device;
this.deviceId = deviceId;
this.createTime = createTime;
@@ -65,8 +67,8 @@
// null // 寮傚父淇℃伅
// );
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 87c44d8..dd37610 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -21,151 +21,153 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "搴撲綅鍙�")
+ @ApiModelProperty(value = "搴撲綅鍙�")
@TableField("loc_no")
private String locNo;
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+ @ApiModelProperty(value = "鎵樼洏鏉＄爜")
private String zpallet;
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
@ExcelProperty("鏁伴噺")
private Double anfme;
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
@ExcelProperty("鍟嗗搧缂栧彿")
private String matnr;
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
@ExcelProperty("鍟嗗搧鍚嶇О")
private String maktx;
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value = "鎵瑰彿")
@ExcelProperty("鎵瑰彿")
private String batch;
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
@ExcelProperty("鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
- @ApiModelProperty(value= "瑙勬牸")
+ @ApiModelProperty(value = "瑙勬牸")
private String specs;
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value = "鍨嬪彿")
private String model;
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value = "棰滆壊")
private String color;
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value = "鍝佺墝")
private String brand;
- @ApiModelProperty(value= "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅")
private String unit;
- @ApiModelProperty(value= "鍗曚环")
+ @ApiModelProperty(value = "鍗曚环")
private Double price;
- @ApiModelProperty(value= "sku")
+ @ApiModelProperty(value = "sku")
private String sku;
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value = "鍗曚綅閲�")
private Double units;
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value = "浜у湴")
private String origin;
- @ApiModelProperty(value= "鍘傚")
+ @ApiModelProperty(value = "鍘傚")
private String manu;
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
@TableField("manu_date")
private String manuDate;
- @ApiModelProperty(value= "鍝侀」鏁�")
+ @ApiModelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
private String itemNum;
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
@TableField("safe_qty")
private Double safeQty;
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value = "閲嶉噺")
private Double weight;
- @ApiModelProperty(value= "闀垮害")
+ @ApiModelProperty(value = "闀垮害")
private Double length;
- @ApiModelProperty(value= "浣撶Н")
+ @ApiModelProperty(value = "浣撶Н")
private Double volume;
- @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
@TableField("three_code")
private String threeCode;
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value = "渚涘簲鍟�")
private String supp;
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
@TableField("supp_code")
private String suppCode;
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
@TableField("be_batch")
private Integer beBatch;
- @ApiModelProperty(value= "淇濊川鏈�")
+ @ApiModelProperty(value = "淇濊川鏈�")
@TableField("dead_time")
private String deadTime;
- @ApiModelProperty(value= "棰勮澶╂暟")
+ @ApiModelProperty(value = "棰勮澶╂暟")
@TableField("dead_warn")
private Integer deadWarn;
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
private Integer source;
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
private Integer inspect;
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
private Integer danger;
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- public String getLocNo$(){
+ public String getLocNo$() {
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
- if (!Cools.isEmpty(locMast)){
+ if (!Cools.isEmpty(locMast)) {
return String.valueOf(locMast.getLocNo());
}
return null;
}
- public String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
+ public String getBeBatch$() {
+ if (null == this.beBatch) {
+ return null;
+ }
+ switch (this.beBatch) {
case 1:
return "鏄�";
case 0:
@@ -175,9 +177,11 @@
}
}
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
+ public String getSource$() {
+ if (null == this.source) {
+ return null;
+ }
+ switch (this.source) {
case 1:
return "鍒堕��";
case 2:
@@ -189,9 +193,11 @@
}
}
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
+ public String getInspect$() {
+ if (null == this.inspect) {
+ return null;
+ }
+ switch (this.inspect) {
case 1:
return "鏄�";
case 0:
@@ -201,9 +207,11 @@
}
}
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
+ public String getDanger$() {
+ if (null == this.danger) {
+ return null;
+ }
+ switch (this.danger) {
case 1:
return "鏄�";
case 0:
@@ -213,33 +221,33 @@
}
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 8495902..b124b4c 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -25,7 +25,7 @@
/**
* 搴撲綅鍙�
*/
- @ApiModelProperty(value= "搴撲綅鍙�")
+ @ApiModelProperty(value = "搴撲綅鍙�")
@TableId(value = "loc_no", type = IdType.INPUT)
@TableField("loc_no")
private String locNo;
@@ -33,153 +33,153 @@
/**
* 搴撲綅绫诲瀷
*/
- @ApiModelProperty(value= "搴撲綅绫诲瀷")
+ @ApiModelProperty(value = "搴撲綅绫诲瀷")
@TableField("whs_type")
private Long whsType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("plt_type")
private Integer pltType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_type")
private Integer ctnType;
- @ApiModelProperty(value= "搴撲綅鐘舵��")
+ @ApiModelProperty(value = "搴撲綅鐘舵��")
@TableField("loc_sts")
private String locSts;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("sheet_no")
private String sheetNo;
/**
* 鍫嗗灈鏈哄彿(asr_bas_crnp)
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄彿")
@TableField("crn_no")
private Integer crnNo;
/**
* 鎺�
*/
- @ApiModelProperty(value= "鎺�")
+ @ApiModelProperty(value = "鎺�")
private Integer row1;
/**
* 鍒�
*/
- @ApiModelProperty(value= "鍒�")
+ @ApiModelProperty(value = "鍒�")
private Integer bay1;
/**
* 灞�
*/
- @ApiModelProperty(value= "灞�")
+ @ApiModelProperty(value = "灞�")
private Integer lev1;
/**
* 婊℃澘
*/
- @ApiModelProperty(value= "婊℃澘")
+ @ApiModelProperty(value = "婊℃澘")
@TableField("full_plt")
private String fullPlt;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("loc_type")
private String locType;
- @ApiModelProperty(value= "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
+ @ApiModelProperty(value = "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
@TableField("loc_type1")
private Short locType1;
- @ApiModelProperty(value= "瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿")
+ @ApiModelProperty(value = "瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿")
@TableField("loc_type2")
private Short locType2;
- @ApiModelProperty(value= "杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿")
+ @ApiModelProperty(value = "杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿")
@TableField("loc_type3")
private Short locType3;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("out_enable")
private String outEnable;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("io_time")
private Date ioTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("first_time")
private Date firstTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("error_time")
private Date errorTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("error_memo")
private String errorMemo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_kind")
private Integer ctnKind;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("sc_weight")
private Double scWeight;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("inv_wh")
private String invWh;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String mk;
/**
* 鎵樼洏鐮�
*/
- @ApiModelProperty(value= "鎵樼洏鐮�")
+ @ApiModelProperty(value = "鎵樼洏鐮�")
@TableField("barcode")
private String barcode;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("Pdc_type")
private String PdcType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_no")
private String ctnNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String status;
@TableField(exist = false)
@@ -189,33 +189,36 @@
@TableField(exist = false)
private String emptyContainer;
- public String getEmptyContainer$(){
- if (Cools.isEmpty(this.emptyContainer)){
+ public String getEmptyContainer$() {
+ if (Cools.isEmpty(this.emptyContainer)) {
return "";
}
- if (this.emptyContainer.equals("1")){
+ if (this.emptyContainer.equals("1")) {
return "Y";
- }else {
+ } else {
return "N";
}
}
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
+
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.ioTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public String getFirstTime$(){
- if (Cools.isEmpty(this.firstTime)){
+ public String getFirstTime$() {
+ if (Cools.isEmpty(this.firstTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.firstTime);
}
public String getLocType1$() {
- if (null == this.locType1){ return null; }
- switch (this.locType1){
+ if (null == this.locType1) {
+ return null;
+ }
+ switch (this.locType1) {
case 0:
return "鏈煡";
case 1:
@@ -228,8 +231,10 @@
}
public String getLocType2$() {
- if (null == this.locType2){ return null; }
- switch (this.locType2){
+ if (null == this.locType2) {
+ return null;
+ }
+ switch (this.locType2) {
case 0:
return "鏈煡";
case 1:
@@ -242,8 +247,10 @@
}
public String getLocType3$() {
- if (null == this.locType3){ return null; }
- switch (this.locType3){
+ if (null == this.locType3) {
+ return null;
+ }
+ switch (this.locType3) {
case 0:
return "鏈煡";
case 1:
@@ -255,49 +262,49 @@
}
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
- public String getErrorTime$(){
- if (Cools.isEmpty(this.errorTime)){
+ public String getErrorTime$() {
+ if (Cools.isEmpty(this.errorTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
}
- public String getLocSts$(){
+ public String getLocSts$() {
BasLocStsService service = SpringUtils.getBean(BasLocStsService.class);
BasLocSts basLocSts = service.selectById(this.locSts);
- if (!Cools.isEmpty(basLocSts)){
+ if (!Cools.isEmpty(basLocSts)) {
return String.valueOf(basLocSts.getLocDesc());
}
return null;
diff --git a/src/main/java/com/zy/asrs/entity/MatCode.java b/src/main/java/com/zy/asrs/entity/MatCode.java
index e6f8431..582cde0 100644
--- a/src/main/java/com/zy/asrs/entity/MatCode.java
+++ b/src/main/java/com/zy/asrs/entity/MatCode.java
@@ -22,7 +22,7 @@
/**
* 鍟嗗搧缂栧彿
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
@TableId(value = "mat_no", type = IdType.INPUT)
@TableField("mat_no")
private String matNo;
@@ -30,143 +30,144 @@
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉″舰鐮�")
+ @ApiModelProperty(value = "鏉″舰鐮�")
private String barcode;
/**
* 鍟嗗搧鍚嶇О
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
@TableField("mat_name")
private String matName;
/**
* 鐗╂枡鍗曚綅
*/
- @ApiModelProperty(value= "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅")
private String str1;
- @ApiModelProperty(value= "瑙勬牸")
+ @ApiModelProperty(value = "瑙勬牸")
private String str2;
- @ApiModelProperty(value= "鍝侀」鏁�")
+ @ApiModelProperty(value = "鍝侀」鏁�")
private String str3;
- @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
private String str4;
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value = "鍨嬪彿")
private String str5;
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value = "鎵瑰彿")
private String str6;
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
private String str7;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String str8;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String str9;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String str10;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String str11;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String str12;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String str13;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String str14;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String str15;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String str16;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String str17;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String str18;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String str19;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String str20;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String str21;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String str22;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String str23;
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value = "閲嶉噺")
private Double num1;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private Double num2;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private Double num3;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private Double num4;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private Double num5;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private Double num6;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private Date date1;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private Short status;
- public MatCode() {}
+ public MatCode() {
+ }
- public MatCode(String barcode,String matName,String str1,String str2,String str3,String str4,String str5,String str6,String str7,String str8,String str9,String str10,String str11,String str12,String str13,String str14,String str15,String str16,String str17,String str18,String str19,String str20,String str21,String str22,String str23,Double num1,Double num2,Double num3,Double num4,Double num5,Double num6,Date date1,Long appeUser,Date appeTime,Long modiUser,Date modiTime,Short status) {
+ public MatCode(String barcode, String matName, String str1, String str2, String str3, String str4, String str5, String str6, String str7, String str8, String str9, String str10, String str11, String str12, String str13, String str14, String str15, String str16, String str17, String str18, String str19, String str20, String str21, String str22, String str23, Double num1, Double num2, Double num3, Double num4, Double num5, Double num6, Date date1, Long appeUser, Date appeTime, Long modiUser, Date modiTime, Short status) {
this.barcode = barcode;
this.matName = matName;
this.str1 = str1;
@@ -506,79 +507,79 @@
return date1;
}
- public String getDate1$(){
- if (Cools.isEmpty(this.date1)){
+ public void setDate1(Date date1) {
+ this.date1 = date1;
+ }
+
+ public String getDate1$() {
+ if (Cools.isEmpty(this.date1)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.date1);
- }
-
- public void setDate1(Date date1) {
- this.date1 = date1;
}
public Long getAppeUser() {
return appeUser;
}
- public String getAppeUser$(){
+ public void setAppeUser(Long appeUser) {
+ this.appeUser = appeUser;
+ }
+
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
}
public Date getAppeTime() {
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public void setAppeTime(Date appeTime) {
+ this.appeTime = appeTime;
+ }
+
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
}
public Long getModiUser() {
return modiUser;
}
- public String getModiUser$(){
+ public void setModiUser(Long modiUser) {
+ this.modiUser = modiUser;
+ }
+
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
}
public Date getModiTime() {
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public void setModiTime(Date modiTime) {
+ this.modiTime = modiTime;
+ }
+
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
}
public Short getStatus() {
diff --git a/src/main/java/com/zy/asrs/entity/RowLastno.java b/src/main/java/com/zy/asrs/entity/RowLastno.java
index 07107cd..16bf10f 100644
--- a/src/main/java/com/zy/asrs/entity/RowLastno.java
+++ b/src/main/java/com/zy/asrs/entity/RowLastno.java
@@ -22,7 +22,7 @@
/**
* 绫诲埆
*/
- @ApiModelProperty(value= "绫诲埆")
+ @ApiModelProperty(value = "绫诲埆")
@TableId(value = "whs_type", type = IdType.INPUT)
@TableField("whs_type")
private Integer whsType;
@@ -30,79 +30,80 @@
/**
* 褰撳墠宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "褰撳墠宸ヤ綔鍙�")
+ @ApiModelProperty(value = "褰撳墠宸ヤ綔鍙�")
@TableField("wrk_mk")
private String wrkMk;
/**
* 褰撳墠鎺掑彿
*/
- @ApiModelProperty(value= "褰撳墠鎺掑彿")
+ @ApiModelProperty(value = "褰撳墠鎺掑彿")
@TableField("current_row")
private Integer currentRow;
/**
* 璧峰鎺掑彿
*/
- @ApiModelProperty(value= "璧峰鎺掑彿")
+ @ApiModelProperty(value = "璧峰鎺掑彿")
@TableField("s_row")
private Integer sRow;
/**
* 缁堟鎺掑彿
*/
- @ApiModelProperty(value= "缁堟鎺掑彿")
+ @ApiModelProperty(value = "缁堟鎺掑彿")
@TableField("e_row")
private Integer eRow;
/**
* 鍫嗗灈鏈烘暟閲�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈烘暟閲�")
+ @ApiModelProperty(value = "鍫嗗灈鏈烘暟閲�")
@TableField("crn_qty")
private Integer crnQty;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("limint_loc")
private Integer limintLoc;
- public RowLastno() {}
+ public RowLastno() {
+ }
- public RowLastno(String wrkMk,Integer currentRow,Integer sRow,Integer eRow,Integer crnQty,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Integer limintLoc) {
+ public RowLastno(String wrkMk, Integer currentRow, Integer sRow, Integer eRow, Integer crnQty, String memo, Long modiUser, Date modiTime, Long appeUser, Date appeTime, Integer limintLoc) {
this.wrkMk = wrkMk;
this.currentRow = currentRow;
this.sRow = sRow;
@@ -190,64 +191,64 @@
return modiUser;
}
- public String getModiUser$(){
+ public void setModiUser(Long modiUser) {
+ this.modiUser = modiUser;
+ }
+
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
}
public Date getModiTime() {
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public void setModiTime(Date modiTime) {
+ this.modiTime = modiTime;
+ }
+
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
}
public Long getAppeUser() {
return appeUser;
}
- public String getAppeUser$(){
+ public void setAppeUser(Long appeUser) {
+ this.appeUser = appeUser;
+ }
+
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
}
public Date getAppeTime() {
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public void setAppeTime(Date appeTime) {
+ this.appeTime = appeTime;
+ }
+
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
}
public Integer getLimintLoc() {
diff --git a/src/main/java/com/zy/asrs/entity/StaDesc.java b/src/main/java/com/zy/asrs/entity/StaDesc.java
index e0c8241..dfe703c 100644
--- a/src/main/java/com/zy/asrs/entity/StaDesc.java
+++ b/src/main/java/com/zy/asrs/entity/StaDesc.java
@@ -25,7 +25,7 @@
/**
* 璺緞ID
*/
- @ApiModelProperty(value= "璺緞ID")
+ @ApiModelProperty(value = "璺緞ID")
@TableId(value = "type_id", type = IdType.AUTO)
@TableField("type_id")
private Long typeId;
@@ -33,7 +33,7 @@
/**
* 鍏ュ嚭搴撶被鍨�
*/
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨�")
@TableId(value = "type_no", type = IdType.INPUT)
@TableField("type_no")
private Integer typeNo;
@@ -41,14 +41,14 @@
/**
* 浣滀笟绫诲瀷
*/
- @ApiModelProperty(value= "浣滀笟绫诲瀷")
+ @ApiModelProperty(value = "浣滀笟绫诲瀷")
@TableField("type_desc")
private String typeDesc;
/**
* 浣滀笟绔欑偣
*/
- @ApiModelProperty(value= "浣滀笟绔欑偣")
+ @ApiModelProperty(value = "浣滀笟绔欑偣")
@TableId(value = "stn_no", type = IdType.INPUT)
@TableField("stn_no")
private Integer stnNo;
@@ -56,14 +56,14 @@
/**
* 绔欑偣鍚嶇О
*/
- @ApiModelProperty(value= "绔欑偣鍚嶇О")
+ @ApiModelProperty(value = "绔欑偣鍚嶇О")
@TableField("stn_desc")
private String stnDesc;
/**
* 鍫嗗灈鏈哄彿
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄彿")
@TableId(value = "crn_no", type = IdType.INPUT)
@TableField("crn_no")
private Integer crnNo;
@@ -71,47 +71,48 @@
/**
* 鍫嗗灈鏈虹珯鐐�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈虹珯鐐�")
+ @ApiModelProperty(value = "鍫嗗灈鏈虹珯鐐�")
@TableField("crn_stn")
private Integer crnStn;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- public StaDesc() {}
+ public StaDesc() {
+ }
- public StaDesc(String typeDesc,String stnDesc,Integer crnStn,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
+ public StaDesc(String typeDesc, String stnDesc, Integer crnStn, String memo, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
this.typeDesc = typeDesc;
this.stnDesc = stnDesc;
this.crnStn = crnStn;
@@ -161,17 +162,17 @@
return stnNo;
}
- public String getStnNo$(){
+ public void setStnNo(Integer stnNo) {
+ this.stnNo = stnNo;
+ }
+
+ public String getStnNo$() {
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.stnNo);
- if (!Cools.isEmpty(basDevp)){
+ if (!Cools.isEmpty(basDevp)) {
return String.valueOf(basDevp.getDevNo());
}
return null;
- }
-
- public void setStnNo(Integer stnNo) {
- this.stnNo = stnNo;
}
public String getStnDesc() {
@@ -186,34 +187,34 @@
return crnNo;
}
- public String getCrnNo$(){
+ public void setCrnNo(Integer crnNo) {
+ this.crnNo = crnNo;
+ }
+
+ public String getCrnNo$() {
BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
BasCrnp basCrnp = service.selectById(this.crnNo);
- if (!Cools.isEmpty(basCrnp)){
+ if (!Cools.isEmpty(basCrnp)) {
return String.valueOf(basCrnp.getCrnNo());
}
return null;
- }
-
- public void setCrnNo(Integer crnNo) {
- this.crnNo = crnNo;
}
public Integer getCrnStn() {
return crnStn;
}
- public String getCrnStn$(){
+ public void setCrnStn(Integer crnStn) {
+ this.crnStn = crnStn;
+ }
+
+ public String getCrnStn$() {
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.crnStn);
- if (!Cools.isEmpty(basDevp)){
+ if (!Cools.isEmpty(basDevp)) {
return String.valueOf(basDevp.getDevNo());
}
return null;
- }
-
- public void setCrnStn(Integer crnStn) {
- this.crnStn = crnStn;
}
public String getMemo() {
@@ -228,68 +229,68 @@
return modiUser;
}
- public String getModiUser$(){
+ public void setModiUser(Long modiUser) {
+ this.modiUser = modiUser;
+ }
+
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
}
public Date getModiTime() {
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public void setModiTime(Date modiTime) {
+ this.modiTime = modiTime;
+ }
+
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
}
public Long getAppeUser() {
return appeUser;
}
- public String getAppeUser$(){
+ public void setAppeUser(Long appeUser) {
+ this.appeUser = appeUser;
+ }
+
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
}
public Date getAppeTime() {
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public void setAppeTime(Date appeTime) {
+ this.appeTime = appeTime;
+ }
+
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
- }
-
public String getTypeNo$() {
- if (Cools.isEmpty(this.typeNo)){
+ if (Cools.isEmpty(this.typeNo)) {
return "";
}
BasWrkIotypeService basWrkIotypeService = SpringUtils.getBean(BasWrkIotypeService.class);
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrk.java b/src/main/java/com/zy/asrs/entity/TaskWrk.java
index b2f7261..e7d2ebb 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrk.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrk.java
@@ -1,37 +1,22 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import io.swagger.models.auth.In;
-import org.springframework.format.annotation.DateTimeFormat;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasWrkIotypeService;
-import com.zy.asrs.entity.BasWrkIotype;
-import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
import com.zy.asrs.service.BasWrkStatusService;
-import com.zy.asrs.entity.BasWrkStatus;
-
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("wcs_task_wrk")
@@ -42,7 +27,7 @@
/**
* wms浠诲姟鍙�
*/
- @ApiModelProperty(value= "wms浠诲姟鍙�")
+ @ApiModelProperty(value = "wms浠诲姟鍙�")
@TableId(value = "task_no", type = IdType.INPUT)
@TableField("task_no")
private String taskNo;
@@ -50,129 +35,129 @@
/**
* 浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷
*/
- @ApiModelProperty(value= "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 5: 瀹岀粨 4: 鍙栨秷 ")
+ @ApiModelProperty(value = "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 5: 瀹岀粨 4: 鍙栨秷 ")
private Integer status;
/**
* 浠诲姟鍙�
*/
- @ApiModelProperty(value= "浠诲姟鍙�")
+ @ApiModelProperty(value = "浠诲姟鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)
*/
- @ApiModelProperty(value= "浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)")
+ @ApiModelProperty(value = "浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 浠诲姟绫诲瀷
*/
- @ApiModelProperty(value= "浠诲姟绫诲瀷")
+ @ApiModelProperty(value = "浠诲姟绫诲瀷")
@TableField("io_type")
private Integer ioType;
/**
* 浼樺厛绾�
*/
- @ApiModelProperty(value= "浼樺厛绾�")
+ @ApiModelProperty(value = "浼樺厛绾�")
@TableField("io_pri")
private Integer ioPri;
/**
* 璧风偣
*/
- @ApiModelProperty(value= "璧风偣")
+ @ApiModelProperty(value = "璧风偣")
@TableField("start_point")
private String startPoint;
/**
* 缁堢偣
*/
- @ApiModelProperty(value= "缁堢偣")
+ @ApiModelProperty(value = "缁堢偣")
@TableField("target_point")
private String targetPoint;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modiTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
/**
* 娲惧彂鏃堕棿
*/
- @ApiModelProperty(value= "娲惧彂鏃堕棿")
+ @ApiModelProperty(value = "娲惧彂鏃堕棿")
@TableField("assign_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date assignTime;
/**
* 鎵ц鏃堕棿
*/
- @ApiModelProperty(value= "鎵ц鏃堕棿")
+ @ApiModelProperty(value = "鎵ц鏃堕棿")
@TableField("execute_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date executeTime;
/**
* 瀹岀粨鏃堕棿
*/
- @ApiModelProperty(value= "瀹岀粨鏃堕棿")
+ @ApiModelProperty(value = "瀹岀粨鏃堕棿")
@TableField("complete_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date completeTime;
/**
* 鍙栨秷鏃堕棿
*/
- @ApiModelProperty(value= "鍙栨秷鏃堕棿")
+ @ApiModelProperty(value = "鍙栨秷鏃堕棿")
@TableField("cancel_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date cancelTime;
/**
* 宸ヤ綔鐘舵��
*/
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
+ @ApiModelProperty(value = "宸ヤ綔鐘舵��")
@TableField("wrk_sts")
private Integer wrkSts;
/**
* 鍫嗗灈鏈哄彿
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄彿")
@TableField("crn_no")
private Integer crnNo;
/**
* 鎸囦护鎵ц姝ュ簭
*/
- @ApiModelProperty(value= "鎸囦护鎵ц姝ュ簭")
+ @ApiModelProperty(value = "鎸囦护鎵ц姝ュ簭")
@TableField("command_step")
private Integer commandStep = 0;
@@ -192,9 +177,10 @@
@TableField("mark_start")
private Integer markStart;
- public TaskWrk() {}
+ public TaskWrk() {
+ }
- public TaskWrk(String taskNo,Integer status,Integer wrkNo,Date createTime,Integer ioType,Integer ioPri,String startPoint,String targetPoint,Long modiUser,Date modiTime,String memo,String barcode,Date assignTime,Date executeTime,Date completeTime,Date cancelTime,Integer wrkSts) {
+ public TaskWrk(String taskNo, Integer status, Integer wrkNo, Date createTime, Integer ioType, Integer ioPri, String startPoint, String targetPoint, Long modiUser, Date modiTime, String memo, String barcode, Date assignTime, Date executeTime, Date completeTime, Date cancelTime, Integer wrkSts) {
this.taskNo = taskNo;
this.status = status;
this.wrkNo = wrkNo;
@@ -234,9 +220,11 @@
// null // 宸ヤ綔鐘舵��
// );
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "鎺ユ敹";
case 2:
@@ -252,70 +240,70 @@
}
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getIoType$(){
+ public String getIoType$() {
BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
BasWrkIotype basWrkIotype = service.selectById(this.ioType);
- if (!Cools.isEmpty(basWrkIotype)){
+ if (!Cools.isEmpty(basWrkIotype)) {
return String.valueOf(basWrkIotype.getIoDesc());
}
return null;
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAssignTime$(){
- if (Cools.isEmpty(this.assignTime)){
+ public String getAssignTime$() {
+ if (Cools.isEmpty(this.assignTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.assignTime);
}
- public String getExecuteTime$(){
- if (Cools.isEmpty(this.executeTime)){
+ public String getExecuteTime$() {
+ if (Cools.isEmpty(this.executeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.executeTime);
}
- public String getCompleteTime$(){
- if (Cools.isEmpty(this.completeTime)){
+ public String getCompleteTime$() {
+ if (Cools.isEmpty(this.completeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.completeTime);
}
- public String getCancelTime$(){
- if (Cools.isEmpty(this.cancelTime)){
+ public String getCancelTime$() {
+ if (Cools.isEmpty(this.cancelTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.cancelTime);
}
- public String getWrkSts$(){
+ public String getWrkSts$() {
BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
- if (!Cools.isEmpty(basWrkStatus)){
+ if (!Cools.isEmpty(basWrkStatus)) {
return String.valueOf(basWrkStatus.getWrkDesc());
}
return null;
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
index e926683..b615ae3 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
@@ -1,35 +1,20 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasWrkIotypeService;
-import com.zy.asrs.entity.BasWrkIotype;
-import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
import com.zy.asrs.service.BasWrkStatusService;
-import com.zy.asrs.entity.BasWrkStatus;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("wcs_task_wrk_log")
@@ -40,136 +25,136 @@
/**
* wms浠诲姟鍙�
*/
- @ApiModelProperty(value= "wms浠诲姟鍙�")
+ @ApiModelProperty(value = "wms浠诲姟鍙�")
@TableField("task_no")
private String taskNo;
/**
* 浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷
*/
- @ApiModelProperty(value= "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷 ")
+ @ApiModelProperty(value = "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷 ")
private Integer status;
/**
* 浠诲姟鍙�
*/
- @ApiModelProperty(value= "浠诲姟鍙�")
+ @ApiModelProperty(value = "浠诲姟鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)
*/
- @ApiModelProperty(value= "浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)")
+ @ApiModelProperty(value = "浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 浠诲姟绫诲瀷
*/
- @ApiModelProperty(value= "浠诲姟绫诲瀷")
+ @ApiModelProperty(value = "浠诲姟绫诲瀷")
@TableField("io_type")
private Integer ioType;
/**
* 浼樺厛绾�
*/
- @ApiModelProperty(value= "浼樺厛绾�")
+ @ApiModelProperty(value = "浼樺厛绾�")
@TableField("io_pri")
private Double ioPri;
/**
* 璧风偣
*/
- @ApiModelProperty(value= "璧风偣")
+ @ApiModelProperty(value = "璧风偣")
@TableField("start_point")
private String startPoint;
/**
* 缁堢偣
*/
- @ApiModelProperty(value= "缁堢偣")
+ @ApiModelProperty(value = "缁堢偣")
@TableField("target_point")
private String targetPoint;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modiTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
/**
* 娲惧彂鏃堕棿
*/
- @ApiModelProperty(value= "娲惧彂鏃堕棿")
+ @ApiModelProperty(value = "娲惧彂鏃堕棿")
@TableField("assign_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date assignTime;
/**
* 鎵ц鏃堕棿
*/
- @ApiModelProperty(value= "鎵ц鏃堕棿")
+ @ApiModelProperty(value = "鎵ц鏃堕棿")
@TableField("execute_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date executeTime;
/**
* 瀹岀粨鏃堕棿
*/
- @ApiModelProperty(value= "瀹岀粨鏃堕棿")
+ @ApiModelProperty(value = "瀹岀粨鏃堕棿")
@TableField("complete_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date completeTime;
/**
* 鍙栨秷鏃堕棿
*/
- @ApiModelProperty(value= "鍙栨秷鏃堕棿")
+ @ApiModelProperty(value = "鍙栨秷鏃堕棿")
@TableField("cancel_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date cancelTime;
/**
* 宸ヤ綔鐘舵��
*/
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
+ @ApiModelProperty(value = "宸ヤ綔鐘舵��")
@TableField("wrk_sts")
private Integer wrkSts;
/**
* 鍫嗗灈鏈哄彿
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄彿")
@TableField("crn_no")
private Integer crnNo;
/**
* 鎸囦护鎵ц姝ュ簭
*/
- @ApiModelProperty(value= "鎸囦护鎵ц姝ュ簭")
+ @ApiModelProperty(value = "鎸囦护鎵ц姝ュ簭")
@TableField("command_step")
private Integer commandStep;
@@ -182,9 +167,10 @@
@TableField("transfer_mark")
private Integer transferMark;
- public TaskWrkLog() {}
+ public TaskWrkLog() {
+ }
- public TaskWrkLog(String taskNo,Integer status,Integer wrkNo,Date createTime,Integer ioType,Double ioPri,String startPoint,String targetPoint,Long modiUser,Date modiTime,String memo,String barcode,Date assignTime,Date executeTime,Date completeTime,Date cancelTime,Integer wrkSts,Integer crnNo,Integer commandStep) {
+ public TaskWrkLog(String taskNo, Integer status, Integer wrkNo, Date createTime, Integer ioType, Double ioPri, String startPoint, String targetPoint, Long modiUser, Date modiTime, String memo, String barcode, Date assignTime, Date executeTime, Date completeTime, Date cancelTime, Integer wrkSts, Integer crnNo, Integer commandStep) {
this.taskNo = taskNo;
this.status = status;
this.wrkNo = wrkNo;
@@ -205,16 +191,17 @@
this.crnNo = crnNo;
this.commandStep = commandStep;
}
+
public TaskWrkLog(TaskWrk taskWrk) {
this.taskNo = taskWrk.getTaskNo();
this.status = taskWrk.getStatus();
this.wrkNo = taskWrk.getWrkNo();
this.createTime = taskWrk.getCreateTime();
this.ioType = taskWrk.getIoType();
- if (Cools.isEmpty(taskWrk.getIoPri())){
+ if (Cools.isEmpty(taskWrk.getIoPri())) {
taskWrk.setIoPri(1);
}
- this.ioPri = (double)taskWrk.getIoPri();
+ this.ioPri = (double) taskWrk.getIoPri();
this.startPoint = taskWrk.getStartPoint();
this.targetPoint = taskWrk.getTargetPoint();
this.modiUser = taskWrk.getModiUser();
@@ -252,9 +239,11 @@
// );
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "鎺ユ敹";
case 2:
@@ -270,70 +259,70 @@
}
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getIoType$(){
+ public String getIoType$() {
BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
BasWrkIotype basWrkIotype = service.selectById(this.ioType);
- if (!Cools.isEmpty(basWrkIotype)){
+ if (!Cools.isEmpty(basWrkIotype)) {
return String.valueOf(basWrkIotype.getIoDesc());
}
return null;
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAssignTime$(){
- if (Cools.isEmpty(this.assignTime)){
+ public String getAssignTime$() {
+ if (Cools.isEmpty(this.assignTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.assignTime);
}
- public String getExecuteTime$(){
- if (Cools.isEmpty(this.executeTime)){
+ public String getExecuteTime$() {
+ if (Cools.isEmpty(this.executeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.executeTime);
}
- public String getCompleteTime$(){
- if (Cools.isEmpty(this.completeTime)){
+ public String getCompleteTime$() {
+ if (Cools.isEmpty(this.completeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.completeTime);
}
- public String getCancelTime$(){
- if (Cools.isEmpty(this.cancelTime)){
+ public String getCancelTime$() {
+ if (Cools.isEmpty(this.cancelTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.cancelTime);
}
- public String getWrkSts$(){
+ public String getWrkSts$() {
BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
- if (!Cools.isEmpty(basWrkStatus)){
+ if (!Cools.isEmpty(basWrkStatus)) {
return String.valueOf(basWrkStatus.getWrkDesc());
}
return null;
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrkReport.java b/src/main/java/com/zy/asrs/entity/TaskWrkReport.java
new file mode 100644
index 0000000..3c8e551
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/TaskWrkReport.java
@@ -0,0 +1,337 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasWrkIotypeService;
+import com.zy.asrs.service.BasWrkStatusService;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Data
+@TableName("wcs_task_wrk_report")
+public class TaskWrkReport implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * wms浠诲姟鍙�
+ */
+ @ApiModelProperty(value = "wms浠诲姟鍙�")
+ @TableId(value = "task_no", type = IdType.INPUT)
+ @TableField("task_no")
+ private String taskNo;
+
+ /**
+ * 浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷
+ */
+ @ApiModelProperty(value = "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 5: 瀹岀粨 4: 鍙栨秷 ")
+ private Integer status;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ @ApiModelProperty(value = "浠诲姟鍙�")
+ @TableField("wrk_no")
+ private Integer wrkNo;
+
+ /**
+ * 浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)
+ */
+ @ApiModelProperty(value = "浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)")
+ @TableField("create_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 浠诲姟绫诲瀷
+ */
+ @ApiModelProperty(value = "浠诲姟绫诲瀷")
+ @TableField("io_type")
+ private Integer ioType;
+
+ /**
+ * 浼樺厛绾�
+ */
+ @ApiModelProperty(value = "浼樺厛绾�")
+ @TableField("io_pri")
+ private Integer ioPri;
+
+ /**
+ * 璧风偣
+ */
+ @ApiModelProperty(value = "璧风偣")
+ @TableField("start_point")
+ private String startPoint;
+
+ /**
+ * 缁堢偣
+ */
+ @ApiModelProperty(value = "缁堢偣")
+ @TableField("target_point")
+ private String targetPoint;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value = "淇敼浜哄憳")
+ @TableField("modi_user")
+ private Long modiUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ @TableField("modi_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date modiTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String memo;
+
+ /**
+ * 鏉＄爜
+ */
+ @ApiModelProperty(value = "鏉＄爜")
+ private String barcode;
+
+ /**
+ * 娲惧彂鏃堕棿
+ */
+ @ApiModelProperty(value = "娲惧彂鏃堕棿")
+ @TableField("assign_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date assignTime;
+
+ /**
+ * 鎵ц鏃堕棿
+ */
+ @ApiModelProperty(value = "鎵ц鏃堕棿")
+ @TableField("execute_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date executeTime;
+
+ /**
+ * 瀹岀粨鏃堕棿
+ */
+ @ApiModelProperty(value = "瀹岀粨鏃堕棿")
+ @TableField("complete_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date completeTime;
+
+ /**
+ * 鍙栨秷鏃堕棿
+ */
+ @ApiModelProperty(value = "鍙栨秷鏃堕棿")
+ @TableField("cancel_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date cancelTime;
+
+ /**
+ * 宸ヤ綔鐘舵��
+ */
+ @ApiModelProperty(value = "宸ヤ綔鐘舵��")
+ @TableField("wrk_sts")
+ private Integer wrkSts;
+
+ /**
+ * 鍫嗗灈鏈哄彿
+ */
+ @ApiModelProperty(value = "鍫嗗灈鏈哄彿")
+ @TableField("crn_no")
+ private Integer crnNo;
+
+ /**
+ * 鎸囦护鎵ц姝ュ簭
+ */
+ @ApiModelProperty(value = "鎸囦护鎵ц姝ュ簭")
+ @TableField("command_step")
+ private Integer commandStep = 0;
+
+ @ApiModelProperty(value = "绉诲簱鏍囪")
+ @TableField("transfer_mark")
+ private Integer transferMark;
+
+ @ApiModelProperty(value = "鍘熷璧风偣")
+ @TableField("origin_start_point")
+ private String originStartPoint;
+
+ @ApiModelProperty(value = "鍘熷璧风偣")
+ @TableField("origin_target_point")
+ private String originTargetPoint;
+
+ @ApiModelProperty(value = "寮�濮嬩换鍔℃爣璁�")
+ @TableField("mark_start")
+ private Integer markStart;
+
+ public TaskWrkReport() {
+ }
+
+ public TaskWrkReport(String taskNo, Integer status, Integer wrkNo, Date createTime, Integer ioType, Integer ioPri, String startPoint, String targetPoint, Long modiUser, Date modiTime, String memo, String barcode, Date assignTime, Date executeTime, Date completeTime, Date cancelTime, Integer wrkSts) {
+ this.taskNo = taskNo;
+ this.status = status;
+ this.wrkNo = wrkNo;
+ this.createTime = createTime;
+ this.ioType = ioType;
+ this.ioPri = ioPri;
+ this.startPoint = startPoint;
+ this.targetPoint = targetPoint;
+ this.modiUser = modiUser;
+ this.modiTime = modiTime;
+ this.memo = memo;
+ this.barcode = barcode;
+ this.assignTime = assignTime;
+ this.executeTime = executeTime;
+ this.completeTime = completeTime;
+ this.cancelTime = cancelTime;
+ this.wrkSts = wrkSts;
+ }
+
+// TaskWrk taskWrk = new TaskWrk(
+// null, // wms浠诲姟鍙穂闈炵┖]
+// null, // 浠诲姟鐘舵��
+// null, // 浠诲姟鍙�
+// null, // 浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)
+// null, // 浠诲姟绫诲瀷
+// null, // 浼樺厛绾�
+// null, // 璧风偣
+// null, // 缁堢偣
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 澶囨敞
+// null, // 鏉＄爜
+// null, // 娲惧彂鏃堕棿
+// null, // 鎵ц鏃堕棿
+// null, // 瀹岀粨鏃堕棿
+// null, // 鍙栨秷鏃堕棿
+// null // 宸ヤ綔鐘舵��
+// );
+
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
+ case 1:
+ return "鎺ユ敹";
+ case 2:
+ return "娲惧彂";
+ case 3:
+ return "姝ュ簭瀹屾垚";
+ case 4:
+ return "鍙栨秷";
+ case 5:
+ return "瀹岀粨";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getIoType$() {
+ BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
+ BasWrkIotype basWrkIotype = service.selectById(this.ioType);
+ if (!Cools.isEmpty(basWrkIotype)) {
+ return String.valueOf(basWrkIotype.getIoDesc());
+ }
+ return null;
+ }
+
+ public String getModiUser$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+ }
+
+ public String getAssignTime$() {
+ if (Cools.isEmpty(this.assignTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.assignTime);
+ }
+
+ public String getExecuteTime$() {
+ if (Cools.isEmpty(this.executeTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.executeTime);
+ }
+
+ public String getCompleteTime$() {
+ if (Cools.isEmpty(this.completeTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.completeTime);
+ }
+
+ public String getCancelTime$() {
+ if (Cools.isEmpty(this.cancelTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.cancelTime);
+ }
+
+ public String getWrkSts$() {
+ BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
+ BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
+ if (!Cools.isEmpty(basWrkStatus)) {
+ return String.valueOf(basWrkStatus.getWrkDesc());
+ }
+ return null;
+ }
+
+ /**
+ * 鑾峰彇鎸佺画鏃堕棿
+ */
+ public String getDurationTime() {
+ if (Cools.isEmpty(this.createTime)) {
+ return "";
+ }
+
+ Date endDate = new Date();
+ if (!Cools.isEmpty(this.assignTime)) {
+ endDate = this.assignTime;
+ }
+
+ //鐢ㄦ潵鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勬绉掓暟
+ long l = this.createTime.getTime() - endDate.getTime();
+
+ //鍒嗗埆璁＄畻鐩稿樊鐨勫ぉ銆佸皬鏃躲�佸垎銆佺
+ long day = l / (24 * 60 * 60 * 1000);
+ long hour = (l / (60 * 60 * 1000) - day * 24);
+ long min = ((l / (60 * 1000)) - day * 24 * 60 - hour * 60);
+ long s = (l / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
+
+ return Math.abs(day) + "澶�" + Math.abs(hour) + "灏忔椂" + Math.abs(min) + "鍒�" + Math.abs(s) + "绉�";
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrkReportLog.java b/src/main/java/com/zy/asrs/entity/TaskWrkReportLog.java
new file mode 100644
index 0000000..fde683e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/TaskWrkReportLog.java
@@ -0,0 +1,337 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasWrkIotypeService;
+import com.zy.asrs.service.BasWrkStatusService;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Data
+@TableName("wcs_task_wrk_report_log")
+public class TaskWrkReportLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * wms浠诲姟鍙�
+ */
+ @ApiModelProperty(value = "wms浠诲姟鍙�")
+ @TableId(value = "task_no", type = IdType.INPUT)
+ @TableField("task_no")
+ private String taskNo;
+
+ /**
+ * 浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷
+ */
+ @ApiModelProperty(value = "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 5: 瀹岀粨 4: 鍙栨秷 ")
+ private Integer status;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ @ApiModelProperty(value = "浠诲姟鍙�")
+ @TableField("wrk_no")
+ private Integer wrkNo;
+
+ /**
+ * 浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)
+ */
+ @ApiModelProperty(value = "浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)")
+ @TableField("create_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 浠诲姟绫诲瀷
+ */
+ @ApiModelProperty(value = "浠诲姟绫诲瀷")
+ @TableField("io_type")
+ private Integer ioType;
+
+ /**
+ * 浼樺厛绾�
+ */
+ @ApiModelProperty(value = "浼樺厛绾�")
+ @TableField("io_pri")
+ private Integer ioPri;
+
+ /**
+ * 璧风偣
+ */
+ @ApiModelProperty(value = "璧风偣")
+ @TableField("start_point")
+ private String startPoint;
+
+ /**
+ * 缁堢偣
+ */
+ @ApiModelProperty(value = "缁堢偣")
+ @TableField("target_point")
+ private String targetPoint;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value = "淇敼浜哄憳")
+ @TableField("modi_user")
+ private Long modiUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ @TableField("modi_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date modiTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String memo;
+
+ /**
+ * 鏉＄爜
+ */
+ @ApiModelProperty(value = "鏉＄爜")
+ private String barcode;
+
+ /**
+ * 娲惧彂鏃堕棿
+ */
+ @ApiModelProperty(value = "娲惧彂鏃堕棿")
+ @TableField("assign_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date assignTime;
+
+ /**
+ * 鎵ц鏃堕棿
+ */
+ @ApiModelProperty(value = "鎵ц鏃堕棿")
+ @TableField("execute_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date executeTime;
+
+ /**
+ * 瀹岀粨鏃堕棿
+ */
+ @ApiModelProperty(value = "瀹岀粨鏃堕棿")
+ @TableField("complete_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date completeTime;
+
+ /**
+ * 鍙栨秷鏃堕棿
+ */
+ @ApiModelProperty(value = "鍙栨秷鏃堕棿")
+ @TableField("cancel_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date cancelTime;
+
+ /**
+ * 宸ヤ綔鐘舵��
+ */
+ @ApiModelProperty(value = "宸ヤ綔鐘舵��")
+ @TableField("wrk_sts")
+ private Integer wrkSts;
+
+ /**
+ * 鍫嗗灈鏈哄彿
+ */
+ @ApiModelProperty(value = "鍫嗗灈鏈哄彿")
+ @TableField("crn_no")
+ private Integer crnNo;
+
+ /**
+ * 鎸囦护鎵ц姝ュ簭
+ */
+ @ApiModelProperty(value = "鎸囦护鎵ц姝ュ簭")
+ @TableField("command_step")
+ private Integer commandStep = 0;
+
+ @ApiModelProperty(value = "绉诲簱鏍囪")
+ @TableField("transfer_mark")
+ private Integer transferMark;
+
+ @ApiModelProperty(value = "鍘熷璧风偣")
+ @TableField("origin_start_point")
+ private String originStartPoint;
+
+ @ApiModelProperty(value = "鍘熷璧风偣")
+ @TableField("origin_target_point")
+ private String originTargetPoint;
+
+ @ApiModelProperty(value = "寮�濮嬩换鍔℃爣璁�")
+ @TableField("mark_start")
+ private Integer markStart;
+
+ public TaskWrkReportLog() {
+ }
+
+ public TaskWrkReportLog(String taskNo, Integer status, Integer wrkNo, Date createTime, Integer ioType, Integer ioPri, String startPoint, String targetPoint, Long modiUser, Date modiTime, String memo, String barcode, Date assignTime, Date executeTime, Date completeTime, Date cancelTime, Integer wrkSts) {
+ this.taskNo = taskNo;
+ this.status = status;
+ this.wrkNo = wrkNo;
+ this.createTime = createTime;
+ this.ioType = ioType;
+ this.ioPri = ioPri;
+ this.startPoint = startPoint;
+ this.targetPoint = targetPoint;
+ this.modiUser = modiUser;
+ this.modiTime = modiTime;
+ this.memo = memo;
+ this.barcode = barcode;
+ this.assignTime = assignTime;
+ this.executeTime = executeTime;
+ this.completeTime = completeTime;
+ this.cancelTime = cancelTime;
+ this.wrkSts = wrkSts;
+ }
+
+// TaskWrk taskWrk = new TaskWrk(
+// null, // wms浠诲姟鍙穂闈炵┖]
+// null, // 浠诲姟鐘舵��
+// null, // 浠诲姟鍙�
+// null, // 浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)
+// null, // 浠诲姟绫诲瀷
+// null, // 浼樺厛绾�
+// null, // 璧风偣
+// null, // 缁堢偣
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 澶囨敞
+// null, // 鏉＄爜
+// null, // 娲惧彂鏃堕棿
+// null, // 鎵ц鏃堕棿
+// null, // 瀹岀粨鏃堕棿
+// null, // 鍙栨秷鏃堕棿
+// null // 宸ヤ綔鐘舵��
+// );
+
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
+ case 1:
+ return "鎺ユ敹";
+ case 2:
+ return "娲惧彂";
+ case 3:
+ return "姝ュ簭瀹屾垚";
+ case 4:
+ return "鍙栨秷";
+ case 5:
+ return "瀹岀粨";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getIoType$() {
+ BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
+ BasWrkIotype basWrkIotype = service.selectById(this.ioType);
+ if (!Cools.isEmpty(basWrkIotype)) {
+ return String.valueOf(basWrkIotype.getIoDesc());
+ }
+ return null;
+ }
+
+ public String getModiUser$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+ }
+
+ public String getAssignTime$() {
+ if (Cools.isEmpty(this.assignTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.assignTime);
+ }
+
+ public String getExecuteTime$() {
+ if (Cools.isEmpty(this.executeTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.executeTime);
+ }
+
+ public String getCompleteTime$() {
+ if (Cools.isEmpty(this.completeTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.completeTime);
+ }
+
+ public String getCancelTime$() {
+ if (Cools.isEmpty(this.cancelTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.cancelTime);
+ }
+
+ public String getWrkSts$() {
+ BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
+ BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
+ if (!Cools.isEmpty(basWrkStatus)) {
+ return String.valueOf(basWrkStatus.getWrkDesc());
+ }
+ return null;
+ }
+
+ /**
+ * 鑾峰彇鎸佺画鏃堕棿
+ */
+ public String getDurationTime() {
+ if (Cools.isEmpty(this.createTime)) {
+ return "";
+ }
+
+ Date endDate = new Date();
+ if (!Cools.isEmpty(this.assignTime)) {
+ endDate = this.assignTime;
+ }
+
+ //鐢ㄦ潵鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勬绉掓暟
+ long l = this.createTime.getTime() - endDate.getTime();
+
+ //鍒嗗埆璁＄畻鐩稿樊鐨勫ぉ銆佸皬鏃躲�佸垎銆佺
+ long day = l / (24 * 60 * 60 * 1000);
+ long hour = (l / (60 * 60 * 1000) - day * 24);
+ long min = ((l / (60 * 1000)) - day * 24 * 60 - hour * 60);
+ long s = (l / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
+
+ return Math.abs(day) + "澶�" + Math.abs(hour) + "灏忔椂" + Math.abs(min) + "鍒�" + Math.abs(s) + "绉�";
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/ToWmsDTO.java b/src/main/java/com/zy/asrs/entity/ToWmsDTO.java
index 1252ec8..3fa2296 100644
--- a/src/main/java/com/zy/asrs/entity/ToWmsDTO.java
+++ b/src/main/java/com/zy/asrs/entity/ToWmsDTO.java
@@ -1,6 +1,5 @@
package com.zy.asrs.entity;
-import io.swagger.models.auth.In;
import lombok.Data;
import java.util.List;
@@ -24,13 +23,13 @@
//搴撲綅绫诲瀷
private Integer locType;
- public ToWmsDTO(String barcode, Integer stationCode, Integer locType){
+ public ToWmsDTO(String barcode, Integer stationCode, Integer locType) {
this.BoxNo = barcode;
this.stationCode = stationCode;
this.locType = locType;
}
- public ToWmsDTO(){
+ public ToWmsDTO() {
}
}
diff --git a/src/main/java/com/zy/asrs/entity/ViewInOutBean.java b/src/main/java/com/zy/asrs/entity/ViewInOutBean.java
index 27fdb86..01f8560 100644
--- a/src/main/java/com/zy/asrs/entity/ViewInOutBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewInOutBean.java
@@ -6,7 +6,7 @@
* @date 2018骞�11鏈�24鏃�
*/
public class ViewInOutBean {
- private String ymd;
+ private String ymd;
private String source_sta_no;
private Long sto_qty;
private Long ret_qty;
@@ -15,59 +15,76 @@
private int pageSize;
private String begin_date; //鏌ヨ寮�濮嬫棩鏈�
private String end_date; //鏌ヨ鎴鏃ユ湡
-
- public String getYmd() {
- return ymd;
- }
- public void setYmd(String ymd) {
- this.ymd = ymd;
- }
- public String getSource_sta_no() {
- return source_sta_no;
- }
- public void setSource_sta_no(String source_sta_no) {
- this.source_sta_no = source_sta_no;
- }
- public Long getSto_qty() {
- return sto_qty;
- }
- public void setSto_qty(Long sto_qty) {
- this.sto_qty = sto_qty;
- }
- public Long getRet_qty() {
- return ret_qty;
- }
- public void setRet_qty(Long ret_qty) {
- this.ret_qty = ret_qty;
- }
- public Long getTotal_qty() {
- return total_qty;
- }
- public void setTotal_qty(Long total_qty) {
- this.total_qty = total_qty;
- }
- public int getPageNumber() {
- return pageNumber;
- }
- public void setPageNumber(int pageNumber) {
- this.pageNumber = pageNumber;
- }
- public int getPageSize() {
- return pageSize;
- }
- public void setPageSize(int pageSize) {
- this.pageSize = pageSize;
- }
- public String getBegin_date() {
- return begin_date;
- }
- public void setBegin_date(String begin_date) {
- this.begin_date = begin_date;
- }
- public String getEnd_date() {
- return end_date;
- }
- public void setEnd_date(String end_date) {
- this.end_date = end_date;
- }
+
+ public String getYmd() {
+ return ymd;
+ }
+
+ public void setYmd(String ymd) {
+ this.ymd = ymd;
+ }
+
+ public String getSource_sta_no() {
+ return source_sta_no;
+ }
+
+ public void setSource_sta_no(String source_sta_no) {
+ this.source_sta_no = source_sta_no;
+ }
+
+ public Long getSto_qty() {
+ return sto_qty;
+ }
+
+ public void setSto_qty(Long sto_qty) {
+ this.sto_qty = sto_qty;
+ }
+
+ public Long getRet_qty() {
+ return ret_qty;
+ }
+
+ public void setRet_qty(Long ret_qty) {
+ this.ret_qty = ret_qty;
+ }
+
+ public Long getTotal_qty() {
+ return total_qty;
+ }
+
+ public void setTotal_qty(Long total_qty) {
+ this.total_qty = total_qty;
+ }
+
+ public int getPageNumber() {
+ return pageNumber;
+ }
+
+ public void setPageNumber(int pageNumber) {
+ this.pageNumber = pageNumber;
+ }
+
+ public int getPageSize() {
+ return pageSize;
+ }
+
+ public void setPageSize(int pageSize) {
+ this.pageSize = pageSize;
+ }
+
+ public String getBegin_date() {
+ return begin_date;
+ }
+
+ public void setBegin_date(String begin_date) {
+ this.begin_date = begin_date;
+ }
+
+ public String getEnd_date() {
+ return end_date;
+ }
+
+ public void setEnd_date(String end_date) {
+ this.end_date = end_date;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/entity/ViewLocMapDto.java b/src/main/java/com/zy/asrs/entity/ViewLocMapDto.java
index 53fbbc4..8752b3b 100644
--- a/src/main/java/com/zy/asrs/entity/ViewLocMapDto.java
+++ b/src/main/java/com/zy/asrs/entity/ViewLocMapDto.java
@@ -47,7 +47,7 @@
public void setLocSts(String locSts) {
this.locSts = locSts;
- switch (locSts){
+ switch (locSts) {
case "D":
this.bgc = "#00B271";
this.color = "#fff";
diff --git a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
index 0a172e0..e4eec23 100644
--- a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
@@ -19,161 +19,161 @@
@Data
public class ViewStayTimeBean {
- private int pageNumber;
- private int pageSize;
+ private int pageNumber;
+ private int pageSize;
- private int stay_time;
+ private int stay_time;
- private String begin_date;
- private String end_date;
+ private String begin_date;
+ private String end_date;
- private Integer row;
+ private Integer row;
- @ApiModelProperty(value= "搴撲綅鍙�")
- private String loc_no;
+ @ApiModelProperty(value = "搴撲綅鍙�")
+ private String loc_no;
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
- private String zpallet;
+ @ApiModelProperty(value = "鎵樼洏鏉＄爜")
+ private String zpallet;
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
+ @ApiModelProperty(value = "鏁伴噺")
+ private Double anfme;
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- private String matnr;
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
+ private String matnr;
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- private String maktx;
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
+ private String maktx;
- @ApiModelProperty(value= "鎵瑰彿")
- private String batch;
+ @ApiModelProperty(value = "鎵瑰彿")
+ private String batch;
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- @TableField("order_no")
- private String orderNo;
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
+ @ApiModelProperty(value = "瑙勬牸")
+ private String specs;
- @ApiModelProperty(value= "鍨嬪彿")
- private String model;
+ @ApiModelProperty(value = "鍨嬪彿")
+ private String model;
- @ApiModelProperty(value= "棰滆壊")
- private String color;
+ @ApiModelProperty(value = "棰滆壊")
+ private String color;
- @ApiModelProperty(value= "鍝佺墝")
- private String brand;
+ @ApiModelProperty(value = "鍝佺墝")
+ private String brand;
- @ApiModelProperty(value= "鍗曚綅")
- private String unit;
+ @ApiModelProperty(value = "鍗曚綅")
+ private String unit;
- @ApiModelProperty(value= "鍗曚环")
- private Double price;
+ @ApiModelProperty(value = "鍗曚环")
+ private Double price;
- @ApiModelProperty(value= "sku")
- private String sku;
+ @ApiModelProperty(value = "sku")
+ private String sku;
- @ApiModelProperty(value= "鍗曚綅閲�")
- private Double units;
+ @ApiModelProperty(value = "鍗曚綅閲�")
+ private Double units;
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
+ @ApiModelProperty(value = "鏉＄爜")
+ private String barcode;
- @ApiModelProperty(value= "浜у湴")
- private String origin;
+ @ApiModelProperty(value = "浜у湴")
+ private String origin;
- @ApiModelProperty(value= "鍘傚")
- private String manu;
+ @ApiModelProperty(value = "鍘傚")
+ private String manu;
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
- private String manu_date;
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
+ private String manu_date;
- @ApiModelProperty(value= "鍝侀」鏁�")
- private String item_num;
+ @ApiModelProperty(value = "鍝侀」鏁�")
+ private String item_num;
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- private Double safe_qty;
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
+ private Double safe_qty;
- @ApiModelProperty(value= "閲嶉噺")
- private Double weight;
+ @ApiModelProperty(value = "閲嶉噺")
+ private Double weight;
- @ApiModelProperty(value= "闀垮害")
- private Double length;
+ @ApiModelProperty(value = "闀垮害")
+ private Double length;
- @ApiModelProperty(value= "浣撶Н")
- private Double volume;
+ @ApiModelProperty(value = "浣撶Н")
+ private Double volume;
- @ApiModelProperty(value= "涓夋柟缂栫爜")
- private String three_code;
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
+ private String three_code;
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supp;
+ @ApiModelProperty(value = "渚涘簲鍟�")
+ private String supp;
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
- private String supp_code;
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
+ private String supp_code;
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
- private Integer be_batch;
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ private Integer be_batch;
- @ApiModelProperty(value= "淇濊川鏈�")
- private String dead_time;
+ @ApiModelProperty(value = "淇濊川鏈�")
+ private String dead_time;
- @ApiModelProperty(value= "棰勮澶╂暟")
- private Integer dead_warn;
+ @ApiModelProperty(value = "棰勮澶╂暟")
+ private Integer dead_warn;
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
- private Integer source;
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer inspect;
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
- private Integer danger;
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modi_user;
+ @ApiModelProperty(value = "淇敼浜哄憳")
+ private Long modi_user;
- @ApiModelProperty(value= "淇敼鏃堕棿")
- private Date modi_time;
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ private Date modi_time;
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appe_user;
+ @ApiModelProperty(value = "鍒涘缓鑰�")
+ private Long appe_user;
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- private Date appe_time;
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
+ private Date appe_time;
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
+ @ApiModelProperty(value = "澶囨敞")
+ private String memo;
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modi_user);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
+ public String getModiUser$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modi_user);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
- public String getModiTime$(){
- if (Cools.isEmpty(this.modi_time)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modi_time);
- }
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modi_time)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modi_time);
+ }
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appe_user);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
+ public String getAppeUser$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.appe_user);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appe_time)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appe_time);
- }
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appe_time)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appe_time);
+ }
}
diff --git a/src/main/java/com/zy/asrs/entity/ViewStockUseBean.java b/src/main/java/com/zy/asrs/entity/ViewStockUseBean.java
index 616a857..a1c4c93 100644
--- a/src/main/java/com/zy/asrs/entity/ViewStockUseBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewStockUseBean.java
@@ -6,76 +6,95 @@
* @date 2018骞�11鏈�23鏃�
*/
public class ViewStockUseBean {
- private String row1; //閽㈡灦鍙�
- private Long total_qty; //搴撲綅鎬绘暟
- private Long full_qty; //鍦ㄥ簱鏁伴噺
- private Long null_qty; //绌哄簱浣�
+ private String row1; //閽㈡灦鍙�
+ private Long total_qty; //搴撲綅鎬绘暟
+ private Long full_qty; //鍦ㄥ簱鏁伴噺
+ private Long null_qty; //绌哄簱浣�
private Long forbid_qty; //绂佺敤搴撲綅
- private Long empty_qty; //绌哄鍣�
+ private Long empty_qty; //绌哄鍣�
private String full_rate; //鍦ㄥ簱鐜�
private String occ_rate; //浣跨敤鐜�
private int pageNumber;
private int pageSize;
-
- public String getRow1() {
- return row1;
- }
- public void setRow1(String row1) {
- this.row1 = row1;
- }
- public Long getTotal_qty() {
- return total_qty;
- }
- public void setTotal_qty(Long total_qty) {
- this.total_qty = total_qty;
- }
- public Long getFull_qty() {
- return full_qty;
- }
- public void setFull_qty(Long full_qty) {
- this.full_qty = full_qty;
- }
- public Long getNull_qty() {
- return null_qty;
- }
- public void setNull_qty(Long null_qty) {
- this.null_qty = null_qty;
- }
- public Long getForbid_qty() {
- return forbid_qty;
- }
- public void setForbid_qty(Long forbid_qty) {
- this.forbid_qty = forbid_qty;
- }
- public Long getEmpty_qty() {
- return empty_qty;
- }
- public void setEmpty_qty(Long empty_qty) {
- this.empty_qty = empty_qty;
- }
- public String getFull_rate() {
- return full_rate;
- }
- public void setFull_rate(String full_rate) {
- this.full_rate = full_rate;
- }
- public String getOcc_rate() {
- return occ_rate;
- }
- public void setOcc_rate(String occ_rate) {
- this.occ_rate = occ_rate;
- }
- public int getPageNumber() {
- return pageNumber;
- }
- public void setPageNumber(int pageNumber) {
- this.pageNumber = pageNumber;
- }
- public int getPageSize() {
- return pageSize;
- }
- public void setPageSize(int pageSize) {
- this.pageSize = pageSize;
- }
+
+ public String getRow1() {
+ return row1;
+ }
+
+ public void setRow1(String row1) {
+ this.row1 = row1;
+ }
+
+ public Long getTotal_qty() {
+ return total_qty;
+ }
+
+ public void setTotal_qty(Long total_qty) {
+ this.total_qty = total_qty;
+ }
+
+ public Long getFull_qty() {
+ return full_qty;
+ }
+
+ public void setFull_qty(Long full_qty) {
+ this.full_qty = full_qty;
+ }
+
+ public Long getNull_qty() {
+ return null_qty;
+ }
+
+ public void setNull_qty(Long null_qty) {
+ this.null_qty = null_qty;
+ }
+
+ public Long getForbid_qty() {
+ return forbid_qty;
+ }
+
+ public void setForbid_qty(Long forbid_qty) {
+ this.forbid_qty = forbid_qty;
+ }
+
+ public Long getEmpty_qty() {
+ return empty_qty;
+ }
+
+ public void setEmpty_qty(Long empty_qty) {
+ this.empty_qty = empty_qty;
+ }
+
+ public String getFull_rate() {
+ return full_rate;
+ }
+
+ public void setFull_rate(String full_rate) {
+ this.full_rate = full_rate;
+ }
+
+ public String getOcc_rate() {
+ return occ_rate;
+ }
+
+ public void setOcc_rate(String occ_rate) {
+ this.occ_rate = occ_rate;
+ }
+
+ public int getPageNumber() {
+ return pageNumber;
+ }
+
+ public void setPageNumber(int pageNumber) {
+ this.pageNumber = pageNumber;
+ }
+
+ public int getPageSize() {
+ return pageSize;
+ }
+
+ public void setPageSize(int pageSize) {
+ this.pageSize = pageSize;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index a4947ff..8f87995 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -20,174 +20,174 @@
public class ViewWorkInBean {
- private int pageNumber;
- private int pageSize;
+ private int pageNumber;
+ private int pageSize;
- private int stay_time;
+ private int stay_time;
- private String begin_date;
- private String end_date;
- private String query_date;
+ private String begin_date;
+ private String end_date;
+ private String query_date;
- private Integer row;
+ private Integer row;
- private String crn_str_time;
- private String crn_end_time;
+ private String crn_str_time;
+ private String crn_end_time;
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- private Integer wrk_no;
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
+ private Integer wrk_no;
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
- private Date io_time;
+ @ApiModelProperty(value = "宸ヤ綔鏃堕棿")
+ private Date io_time;
- @ApiModelProperty(value= "搴撲綅鍙�")
- private String loc_no;
+ @ApiModelProperty(value = "搴撲綅鍙�")
+ private String loc_no;
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
- private String zpallet;
+ @ApiModelProperty(value = "鎵樼洏鏉＄爜")
+ private String zpallet;
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
+ @ApiModelProperty(value = "鏁伴噺")
+ private Double anfme;
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- private String matnr;
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
+ private String matnr;
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- private String maktx;
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
+ private String maktx;
- @ApiModelProperty(value= "鎵瑰彿")
- private String batch;
+ @ApiModelProperty(value = "鎵瑰彿")
+ private String batch;
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- @TableField("order_no")
- private String orderNo;
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
+ @ApiModelProperty(value = "瑙勬牸")
+ private String specs;
- @ApiModelProperty(value= "鍨嬪彿")
- private String model;
+ @ApiModelProperty(value = "鍨嬪彿")
+ private String model;
- @ApiModelProperty(value= "棰滆壊")
- private String color;
+ @ApiModelProperty(value = "棰滆壊")
+ private String color;
- @ApiModelProperty(value= "鍝佺墝")
- private String brand;
+ @ApiModelProperty(value = "鍝佺墝")
+ private String brand;
- @ApiModelProperty(value= "鍗曚綅")
- private String unit;
+ @ApiModelProperty(value = "鍗曚綅")
+ private String unit;
- @ApiModelProperty(value= "鍗曚环")
- private Double price;
+ @ApiModelProperty(value = "鍗曚环")
+ private Double price;
- @ApiModelProperty(value= "sku")
- private String sku;
+ @ApiModelProperty(value = "sku")
+ private String sku;
- @ApiModelProperty(value= "鍗曚綅閲�")
- private Double units;
+ @ApiModelProperty(value = "鍗曚綅閲�")
+ private Double units;
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
+ @ApiModelProperty(value = "鏉＄爜")
+ private String barcode;
- @ApiModelProperty(value= "浜у湴")
- private String origin;
+ @ApiModelProperty(value = "浜у湴")
+ private String origin;
- @ApiModelProperty(value= "鍘傚")
- private String manu;
+ @ApiModelProperty(value = "鍘傚")
+ private String manu;
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
- private String manu_date;
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
+ private String manu_date;
- @ApiModelProperty(value= "鍝侀」鏁�")
- private String item_num;
+ @ApiModelProperty(value = "鍝侀」鏁�")
+ private String item_num;
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- private Double safe_qty;
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
+ private Double safe_qty;
- @ApiModelProperty(value= "閲嶉噺")
- private Double weight;
+ @ApiModelProperty(value = "閲嶉噺")
+ private Double weight;
- @ApiModelProperty(value= "闀垮害")
- private Double length;
+ @ApiModelProperty(value = "闀垮害")
+ private Double length;
- @ApiModelProperty(value= "浣撶Н")
- private Double volume;
+ @ApiModelProperty(value = "浣撶Н")
+ private Double volume;
- @ApiModelProperty(value= "涓夋柟缂栫爜")
- private String three_code;
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
+ private String three_code;
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supp;
+ @ApiModelProperty(value = "渚涘簲鍟�")
+ private String supp;
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
- private String supp_code;
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
+ private String supp_code;
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
- private Integer be_batch;
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ private Integer be_batch;
- @ApiModelProperty(value= "淇濊川鏈�")
- private String dead_time;
+ @ApiModelProperty(value = "淇濊川鏈�")
+ private String dead_time;
- @ApiModelProperty(value= "棰勮澶╂暟")
- private Integer dead_warn;
+ @ApiModelProperty(value = "棰勮澶╂暟")
+ private Integer dead_warn;
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
- private Integer source;
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer inspect;
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
- private Integer danger;
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modi_user;
+ @ApiModelProperty(value = "淇敼浜哄憳")
+ private Long modi_user;
- @ApiModelProperty(value= "淇敼鏃堕棿")
- private Object modi_time;
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ private Object modi_time;
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appe_user;
+ @ApiModelProperty(value = "鍒涘缓鑰�")
+ private Long appe_user;
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- private Object appe_time;
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
+ private Object appe_time;
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
+ @ApiModelProperty(value = "澶囨敞")
+ private String memo;
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modi_user);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
+ public String getModiUser$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modi_user);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appe_user);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
+ public String getAppeUser$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.appe_user);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
- public String getIoTime$(){
- if (Cools.isEmpty(this.io_time)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.io_time);
- }
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.io_time)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.io_time);
+ }
- public void setQuery_date(String query_date) {
- this.query_date = query_date;
- if (query_date.contains(" - ")) {
- String[] dates = query_date.split(" - ");
- this.begin_date = dates[0];
- this.end_date = dates[1];
+ public void setQuery_date(String query_date) {
+ this.query_date = query_date;
+ if (query_date.contains(" - ")) {
+ String[] dates = query_date.split(" - ");
+ this.begin_date = dates[0];
+ this.end_date = dates[1];
- }
- }
+ }
+ }
}
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 572f0f8..965aeeb 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -19,137 +19,137 @@
/**
* 鐗╂枡
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
private String matnr;
/**
* 鐗╂枡鎻忚堪
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
private String maktx;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "瑙勬牸")
+ @ApiModelProperty(value = "瑙勬牸")
private String lgnum;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value = "鍨嬪彿")
private String type;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String color;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value = "鎵瑰彿")
private String supplier;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
private String warehouse;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鍝侀」鏁�")
+ @ApiModelProperty(value = "鍝侀」鏁�")
private String brand;
/**
* 鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
private Double anfme;
/**
* 鍗曚綅
*/
- @ApiModelProperty(value= "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅")
private String altme;
/**
* 鎵樼洏鏉＄爜
*/
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+ @ApiModelProperty(value = "鎵樼洏鏉＄爜")
private String zpallet;
/**
* 鐢ㄦ埛ID
*/
- @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
private String bname;
- @ApiModelProperty(value= "搴撲綅鍙�")
+ @ApiModelProperty(value = "搴撲綅鍙�")
@TableField("loc_no")
private String locNo;
- @ApiModelProperty(value= "鐘舵��")
+ @ApiModelProperty(value = "鐘舵��")
private String status;
- @ApiModelProperty(value= "鍏ュ嚭鐘舵��")
+ @ApiModelProperty(value = "鍏ュ嚭鐘舵��")
@TableField("io_status")
private String ioStatus;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value = "鎵瑰彿")
private String batch;
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 7f3abc4..2e383cc 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -23,255 +23,257 @@
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 宸ヤ綔鏃堕棿
*/
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
+ @ApiModelProperty(value = "宸ヤ綔鏃堕棿")
@TableField("io_time")
private Date ioTime;
/**
* 鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
private Double anfme;
/**
* 鎵樼洏鏉＄爜
*/
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+ @ApiModelProperty(value = "鎵樼洏鏉＄爜")
private String zpallet;
/**
* 鐗╂枡
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
private String matnr;
/**
* 鐗╂枡鎻忚堪
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
private String maktx;
/**
* 鎵瑰彿
*/
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value = "鎵瑰彿")
private String batch;
/**
* 鍗曟嵁缂栧彿
*/
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
/**
* 瑙勬牸
*/
- @ApiModelProperty(value= "瑙勬牸")
+ @ApiModelProperty(value = "瑙勬牸")
private String specs;
/**
* 鍨嬪彿
*/
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value = "鍨嬪彿")
private String model;
/**
* 棰滆壊
*/
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value = "棰滆壊")
private String color;
/**
* 鍝佺墝
*/
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value = "鍝佺墝")
private String brand;
/**
* 鍗曚綅
*/
- @ApiModelProperty(value= "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅")
private String unit;
/**
* 鍗曚环
*/
- @ApiModelProperty(value= "鍗曚环")
+ @ApiModelProperty(value = "鍗曚环")
private Double price;
/**
* sku
*/
- @ApiModelProperty(value= "sku")
+ @ApiModelProperty(value = "sku")
private String sku;
/**
* 鍗曚綅閲�
*/
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value = "鍗曚綅閲�")
private Double units;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
/**
* 浜у湴
*/
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value = "浜у湴")
private String origin;
/**
* 鍘傚
*/
- @ApiModelProperty(value= "鍘傚")
+ @ApiModelProperty(value = "鍘傚")
private String manu;
/**
* 鐢熶骇鏃ユ湡
*/
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
@TableField("manu_date")
private String manuDate;
/**
* 瀹夊叏搴撳瓨閲�
*/
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
@TableField("safe_qty")
private Double safeQty;
/**
* 閲嶉噺
*/
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value = "閲嶉噺")
private Double weight;
/**
* 闀垮害
*/
- @ApiModelProperty(value= "闀垮害")
+ @ApiModelProperty(value = "闀垮害")
private Double length;
/**
* 浣撶Н
*/
- @ApiModelProperty(value= "浣撶Н")
+ @ApiModelProperty(value = "浣撶Н")
private Double volume;
/**
* 涓夋柟缂栫爜
*/
- @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
@TableField("three_code")
private String threeCode;
/**
* 渚涘簲鍟�
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value = "渚涘簲鍟�")
private String supp;
/**
* 渚涘簲鍟嗙紪鐮�
*/
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
@TableField("supp_code")
private String suppCode;
/**
* 鏄惁鎵规 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
@TableField("be_batch")
private Integer beBatch;
/**
* 淇濊川鏈�
*/
- @ApiModelProperty(value= "淇濊川鏈�")
+ @ApiModelProperty(value = "淇濊川鏈�")
@TableField("dead_time")
private String deadTime;
/**
* 棰勮澶╂暟
*/
- @ApiModelProperty(value= "棰勮澶╂暟")
+ @ApiModelProperty(value = "棰勮澶╂暟")
@TableField("dead_warn")
private Integer deadWarn;
/**
* 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
*/
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
private Integer source;
/**
* 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
private Integer inspect;
/**
* 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
private Integer danger;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.ioTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
+ public String getBeBatch$() {
+ if (null == this.beBatch) {
+ return null;
+ }
+ switch (this.beBatch) {
case 1:
return "鏄�";
case 0:
@@ -281,9 +283,11 @@
}
}
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
+ public String getSource$() {
+ if (null == this.source) {
+ return null;
+ }
+ switch (this.source) {
case 1:
return "鍒堕��";
case 2:
@@ -295,9 +299,11 @@
}
}
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
+ public String getInspect$() {
+ if (null == this.inspect) {
+ return null;
+ }
+ switch (this.inspect) {
case 1:
return "鏄�";
case 0:
@@ -307,9 +313,11 @@
}
}
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
+ public String getDanger$() {
+ if (null == this.danger) {
+ return null;
+ }
+ switch (this.danger) {
case 1:
return "鏄�";
case 0:
@@ -319,33 +327,33 @@
}
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index da098cd..ea41e59 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -22,209 +22,211 @@
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 宸ヤ綔鏃堕棿
*/
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
+ @ApiModelProperty(value = "宸ヤ綔鏃堕棿")
@TableField("io_time")
private Date ioTime;
/**
* 鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
private Double anfme;
/**
* 鎵樼洏鏉＄爜
*/
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+ @ApiModelProperty(value = "鎵樼洏鏉＄爜")
private String zpallet;
/**
* 鐗╂枡
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
private String matnr;
/**
* 鐗╂枡鎻忚堪
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
private String maktx;
/**
* 鎵瑰彿
*/
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value = "鎵瑰彿")
private String batch;
/**
* 鍗曟嵁缂栧彿
*/
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
/**
* 瑙勬牸
*/
- @ApiModelProperty(value= "瑙勬牸")
+ @ApiModelProperty(value = "瑙勬牸")
private String specs;
/**
* 鍨嬪彿
*/
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value = "鍨嬪彿")
private String model;
/**
* 棰滆壊
*/
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value = "棰滆壊")
private String color;
/**
* 鍝佺墝
*/
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value = "鍝佺墝")
private String brand;
/**
* 鍗曚綅
*/
- @ApiModelProperty(value= "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅")
private String unit;
/**
* 鍗曚环
*/
- @ApiModelProperty(value= "鍗曚环")
+ @ApiModelProperty(value = "鍗曚环")
private Double price;
/**
* sku
*/
- @ApiModelProperty(value= "sku")
+ @ApiModelProperty(value = "sku")
private String sku;
/**
* 鍗曚綅閲�
*/
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value = "鍗曚綅閲�")
private Double units;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
/**
* 浜у湴
*/
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value = "浜у湴")
private String origin;
/**
* 瀹夊叏搴撳瓨閲�
*/
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
@TableField("safe_qty")
private Double safeQty;
/**
* 閲嶉噺
*/
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value = "閲嶉噺")
private Double weight;
/**
* 闀垮害
*/
- @ApiModelProperty(value= "闀垮害")
+ @ApiModelProperty(value = "闀垮害")
private Double length;
/**
* 浣撶Н
*/
- @ApiModelProperty(value= "浣撶Н")
+ @ApiModelProperty(value = "浣撶Н")
private Double volume;
/**
* 涓夋柟缂栫爜
*/
- @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
@TableField("three_code")
private String threeCode;
/**
* 渚涘簲鍟�
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value = "渚涘簲鍟�")
private String supp;
/**
* 渚涘簲鍟嗙紪鐮�
*/
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
@TableField("supp_code")
private String suppCode;
/**
* 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
private Integer danger;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.ioTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
+ public String getDanger$() {
+ if (null == this.danger) {
+ return null;
+ }
+ switch (this.danger) {
case 1:
return "鏄�";
case 0:
@@ -234,33 +236,33 @@
}
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
diff --git a/src/main/java/com/zy/asrs/entity/WrkLastno.java b/src/main/java/com/zy/asrs/entity/WrkLastno.java
index 514079f..b398d5b 100644
--- a/src/main/java/com/zy/asrs/entity/WrkLastno.java
+++ b/src/main/java/com/zy/asrs/entity/WrkLastno.java
@@ -22,7 +22,7 @@
/**
* 绫诲瀷
*/
- @ApiModelProperty(value= "绫诲瀷")
+ @ApiModelProperty(value = "绫诲瀷")
@TableId(value = "wrk_mk", type = IdType.INPUT)
@TableField("wrk_mk")
private Integer wrkMk;
@@ -30,62 +30,63 @@
/**
* 褰撳墠ID
*/
- @ApiModelProperty(value= "褰撳墠ID")
+ @ApiModelProperty(value = "褰撳墠ID")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
/**
* 璧峰ID
*/
- @ApiModelProperty(value= "璧峰ID")
+ @ApiModelProperty(value = "璧峰ID")
@TableField("s_no")
private Integer sNo;
/**
* 缁堟ID
*/
- @ApiModelProperty(value= "缁堟ID")
+ @ApiModelProperty(value = "缁堟ID")
@TableField("e_no")
private Integer eNo;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
@TableField("memo_m")
private String memoM;
- public WrkLastno() {}
+ public WrkLastno() {
+ }
- public WrkLastno(Integer wrkNo,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Integer sNo,Integer eNo,String memoM) {
+ public WrkLastno(Integer wrkNo, Long modiUser, Date modiTime, Long appeUser, Date appeTime, Integer sNo, Integer eNo, String memoM) {
this.wrkNo = wrkNo;
this.modiUser = modiUser;
this.modiTime = modiTime;
@@ -127,64 +128,64 @@
return modiUser;
}
- public String getModiUser$(){
+ public void setModiUser(Long modiUser) {
+ this.modiUser = modiUser;
+ }
+
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
}
public Date getModiTime() {
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public void setModiTime(Date modiTime) {
+ this.modiTime = modiTime;
+ }
+
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
}
public Long getAppeUser() {
return appeUser;
}
- public String getAppeUser$(){
+ public void setAppeUser(Long appeUser) {
+ this.appeUser = appeUser;
+ }
+
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
}
public Date getAppeTime() {
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public void setAppeTime(Date appeTime) {
+ this.appeTime = appeTime;
+ }
+
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
}
public Integer getSNo() {
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index db2e4c4..ba93a27 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -8,7 +8,9 @@
import com.core.common.SpringUtils;
import com.zy.asrs.mapper.BasWrkIotypeMapper;
import com.zy.asrs.mapper.BasWrkStatusMapper;
-import com.zy.asrs.service.*;
+import com.zy.asrs.service.BasCrnpService;
+import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.LocMastService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -29,307 +31,307 @@
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableId(value = "wrk_no", type = IdType.INPUT)
@TableField("wrk_no")
private Integer wrkNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("inv_wh")
private String invWh;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private Date ymd;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String mk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("whs_type")
private Integer whsType;
/**
* 宸ヤ綔鐘舵��
*/
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
+ @ApiModelProperty(value = "宸ヤ綔鐘舵��")
@TableField("wrk_sts")
private Long wrkSts;
/**
* 鍏ュ嚭搴撶被鍨�
*/
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨�")
@TableField("io_type")
private Integer ioType;
/**
* 鍫嗗灈鏈�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈�")
+ @ApiModelProperty(value = "鍫嗗灈鏈�")
@TableField("crn_no")
private Integer crnNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("sheet_no")
private String sheetNo;
/**
* 浼樺厛绾�
*/
- @ApiModelProperty(value= "浼樺厛绾�")
+ @ApiModelProperty(value = "浼樺厛绾�")
@TableField("io_pri")
private Double ioPri;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("wrk_date")
private Date wrkDate;
/**
* 鐩爣搴撲綅
*/
- @ApiModelProperty(value= "鐩爣搴撲綅")
+ @ApiModelProperty(value = "鐩爣搴撲綅")
@TableField("loc_no")
private String locNo;
/**
* 鐩爣绔�
*/
- @ApiModelProperty(value= "鐩爣绔�")
+ @ApiModelProperty(value = "鐩爣绔�")
@TableField("sta_no")
private Integer staNo;
/**
* 婧愮珯
*/
- @ApiModelProperty(value= "婧愮珯")
+ @ApiModelProperty(value = "婧愮珯")
@TableField("source_sta_no")
private Integer sourceStaNo;
/**
* 婧愬簱浣�
*/
- @ApiModelProperty(value= "婧愬簱浣�")
+ @ApiModelProperty(value = "婧愬簱浣�")
@TableField("source_loc_no")
private String sourceLocNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("loc_sts")
private String locSts;
/**
* 鎷ｆ枡
*/
- @ApiModelProperty(value= "鎷ｆ枡")
+ @ApiModelProperty(value = "鎷ｆ枡")
private String picking;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("link_mis")
private String linkMis;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("online_yn")
private String onlineYn;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("upd_mk")
private String updMk;
/**
* 閫�鍑�
*/
- @ApiModelProperty(value= "閫�鍑�")
+ @ApiModelProperty(value = "閫�鍑�")
@TableField("exit_mk")
private String exitMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("plt_type")
private Integer pltType;
/**
* 绌烘澘
*/
- @ApiModelProperty(value= "绌烘澘")
+ @ApiModelProperty(value = "绌烘澘")
@TableField("empty_mk")
private String emptyMk;
/**
* 宸ヤ綔鏃堕棿
*/
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
+ @ApiModelProperty(value = "宸ヤ綔鏃堕棿")
@TableField("io_time")
private Date ioTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_type")
private Integer ctnType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String packed;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ove_mk")
private String oveMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("mtn_type")
private Double mtnType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("user_no")
private String userNo;
/**
* 鍫嗗灈鏈哄惎鍔ㄦ椂闂�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄惎鍔ㄦ椂闂�")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄惎鍔ㄦ椂闂�")
@TableField("crn_str_time")
private Date crnStrTime;
/**
* 鍫嗗灈鏈哄仠姝㈡椂闂�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄仠姝㈡椂闂�")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄仠姝㈡椂闂�")
@TableField("crn_end_time")
private Date crnEndTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("plc_str_time")
private Date plcStrTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("crn_pos_time")
private Date crnPosTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("load_time")
private Double loadTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("exp_time")
private Double expTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ref_wrkno")
private Double refWrkno;
/**
* 鎷ｆ枡鏃堕棿
*/
- @ApiModelProperty(value= "鎷ｆ枡鏃堕棿")
+ @ApiModelProperty(value = "鎷ｆ枡鏃堕棿")
@TableField("ref_iotime")
private Date refIotime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("pause_mk")
private String pauseMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("error_time")
private Date errorTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("error_memo")
private String errorMemo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_kind")
private Integer ctnKind;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("manu_type")
private String manuType;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("sc_weight")
private Double scWeight;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("log_mk")
private String logMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("log_err_time")
private Date logErrTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("log_err_memo")
private String logErrMemo;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("Pdc_type")
private String PdcType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_no")
private String ctnNo;
/**
* 婊℃澘
*/
- @ApiModelProperty(value= "婊℃澘")
+ @ApiModelProperty(value = "婊℃澘")
@TableField("full_plt")
private String fullPlt;
/**
* wms浠诲姟鍙�
*/
- @ApiModelProperty(value= "wms浠诲姟鍙�")
+ @ApiModelProperty(value = "wms浠诲姟鍙�")
@TableField("wms_wrk_no")
private String taskNo;
/**
* 缁撴潫鏃堕棿
*/
- @ApiModelProperty(value= "缁撴潫鏃堕棿")
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
@TableField("end_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
//鍛戒护list
@TableField(exist = false)
private List<CommandInfo> children;
- public String getWrkSts$(){
+ public String getWrkSts$() {
BasWrkStatusMapper mapper = SpringUtils.getBean(BasWrkStatusMapper.class);
BasWrkStatus entity = mapper.selectById(this.wrkSts);
if (entity != null) {
@@ -338,7 +340,7 @@
return null;
}
- public String getIoType$(){
+ public String getIoType$() {
BasWrkIotypeMapper mapper = SpringUtils.getBean(BasWrkIotypeMapper.class);
BasWrkIotype entity = mapper.selectById(this.ioType);
if (entity != null) {
@@ -347,127 +349,127 @@
return null;
}
- public String getYmd$(){
- if (Cools.isEmpty(this.ymd)){
+ public String getYmd$() {
+ if (Cools.isEmpty(this.ymd)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ymd);
}
- public String getCrnNo$(){
+ public String getCrnNo$() {
BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
BasCrnp basCrnp = service.selectById(this.crnNo);
- if (!Cools.isEmpty(basCrnp)){
+ if (!Cools.isEmpty(basCrnp)) {
return String.valueOf(basCrnp.getCrnNo());
}
return null;
}
- public String getWrkDate$(){
- if (Cools.isEmpty(this.wrkDate)){
+ public String getWrkDate$() {
+ if (Cools.isEmpty(this.wrkDate)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.wrkDate);
}
- public String getLocNo$(){
+ public String getLocNo$() {
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
- if (!Cools.isEmpty(locMast)){
+ if (!Cools.isEmpty(locMast)) {
return String.valueOf(locMast.getLocNo());
}
return null;
}
- public String getStaNo$(){
+ public String getStaNo$() {
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.staNo);
- if (!Cools.isEmpty(basDevp)){
+ if (!Cools.isEmpty(basDevp)) {
return String.valueOf(basDevp.getDevNo());
}
return null;
}
- public String getSourceStaNo$(){
+ public String getSourceStaNo$() {
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.sourceStaNo);
- if (!Cools.isEmpty(basDevp)){
+ if (!Cools.isEmpty(basDevp)) {
return String.valueOf(basDevp.getDevNo());
}
return null;
}
- public String getSourceLocNo$(){
+ public String getSourceLocNo$() {
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.sourceLocNo);
- if (!Cools.isEmpty(locMast)){
+ if (!Cools.isEmpty(locMast)) {
return String.valueOf(locMast.getLocNo());
}
return null;
}
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.ioTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public String getCrnStrTime$(){
- if (Cools.isEmpty(this.crnStrTime)){
+ public String getCrnStrTime$() {
+ if (Cools.isEmpty(this.crnStrTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnStrTime);
}
- public String getCrnEndTime$(){
- if (Cools.isEmpty(this.crnEndTime)){
+ public String getCrnEndTime$() {
+ if (Cools.isEmpty(this.crnEndTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnEndTime);
}
- public String getPlcStrTime$(){
- if (Cools.isEmpty(this.plcStrTime)){
+ public String getPlcStrTime$() {
+ if (Cools.isEmpty(this.plcStrTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.plcStrTime);
}
- public String getCrnPosTime$(){
- if (Cools.isEmpty(this.crnPosTime)){
+ public String getCrnPosTime$() {
+ if (Cools.isEmpty(this.crnPosTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnPosTime);
}
- public String getRefIotime$(){
- if (Cools.isEmpty(this.refIotime)){
+ public String getRefIotime$() {
+ if (Cools.isEmpty(this.refIotime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.refIotime);
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -477,15 +479,15 @@
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
- public String getErrorTime$(){
- if (Cools.isEmpty(this.errorTime)){
+ public String getErrorTime$() {
+ if (Cools.isEmpty(this.errorTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
@@ -498,15 +500,15 @@
this.errorMemo = errorMemo;
}
- public String getLogErrTime$(){
- if (Cools.isEmpty(this.logErrTime)){
+ public String getLogErrTime$() {
+ if (Cools.isEmpty(this.logErrTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
}
- public String getEndTime$(){
- if (Cools.isEmpty(this.endTime)){
+ public String getEndTime$() {
+ if (Cools.isEmpty(this.endTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index e542a25..2a83ec6 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -26,492 +26,493 @@
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("inv_wh")
private String invWh;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private Date ymd;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String mk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("whs_type")
private Integer whsType;
/**
* 宸ヤ綔鐘舵��
*/
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
+ @ApiModelProperty(value = "宸ヤ綔鐘舵��")
@TableField("wrk_sts")
private Long wrkSts;
/**
* 鍏ュ嚭搴撶被鍨�
*/
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨�")
@TableField("io_type")
private Integer ioType;
/**
* 鍫嗗灈鏈哄彿
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄彿")
@TableField("crn_no")
private Integer crnNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("sheet_no")
private String sheetNo;
/**
* 浼樺厛绾�
*/
- @ApiModelProperty(value= "浼樺厛绾�")
+ @ApiModelProperty(value = "浼樺厛绾�")
@TableField("io_pri")
private Double ioPri;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("wrk_date")
private Date wrkDate;
/**
* 鐩爣搴撲綅
*/
- @ApiModelProperty(value= "鐩爣搴撲綅")
+ @ApiModelProperty(value = "鐩爣搴撲綅")
@TableField("loc_no")
private String locNo;
/**
* 鐩爣绔�
*/
- @ApiModelProperty(value= "鐩爣绔�")
+ @ApiModelProperty(value = "鐩爣绔�")
@TableField("sta_no")
private Integer staNo;
/**
* 婧愮珯
*/
- @ApiModelProperty(value= "婧愮珯")
+ @ApiModelProperty(value = "婧愮珯")
@TableField("source_sta_no")
private Integer sourceStaNo;
/**
* 婧愬簱浣�
*/
- @ApiModelProperty(value= "婧愬簱浣�")
+ @ApiModelProperty(value = "婧愬簱浣�")
@TableField("source_loc_no")
private String sourceLocNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("loc_sts")
private String locSts;
/**
* 鎷ｆ枡
*/
- @ApiModelProperty(value= "鎷ｆ枡")
+ @ApiModelProperty(value = "鎷ｆ枡")
private String picking;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("link_mis")
private String linkMis;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("online_yn")
private String onlineYn;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("upd_mk")
private String updMk;
/**
* 閫�鍑�
*/
- @ApiModelProperty(value= "閫�鍑�")
+ @ApiModelProperty(value = "閫�鍑�")
@TableField("exit_mk")
private String exitMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("plt_type")
private Integer pltType;
/**
* 绌烘澘
*/
- @ApiModelProperty(value= "绌烘澘")
+ @ApiModelProperty(value = "绌烘澘")
@TableField("empty_mk")
private String emptyMk;
/**
* 宸ヤ綔鏃堕棿
*/
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
+ @ApiModelProperty(value = "宸ヤ綔鏃堕棿")
@TableField("io_time")
private Date ioTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_type")
private Integer ctnType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String packed;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ove_mk")
private String oveMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("mtn_type")
private Double mtnType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("user_no")
private String userNo;
/**
* 鍫嗗灈鏈哄惎鍔ㄦ椂闂�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄惎鍔ㄦ椂闂�")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄惎鍔ㄦ椂闂�")
@TableField("crn_str_time")
private Date crnStrTime;
/**
* 鍫嗗灈鏈哄仠姝㈡椂闂�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄仠姝㈡椂闂�")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄仠姝㈡椂闂�")
@TableField("crn_end_time")
private Date crnEndTime;
/**
* 鎷ｆ枡鏃堕棿
*/
- @ApiModelProperty(value= "鎷ｆ枡鏃堕棿")
+ @ApiModelProperty(value = "鎷ｆ枡鏃堕棿")
@TableField("plc_str_time")
private Date plcStrTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("crn_pos_time")
private Date crnPosTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("load_time")
private Double loadTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("exp_time")
private Double expTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ref_wrkno")
private Double refWrkno;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ref_iotime")
private Date refIotime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("pause_mk")
private String pauseMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("error_time")
private Date errorTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("error_memo")
private String errorMemo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_kind")
private Integer ctnKind;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("manu_type")
private String manuType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("memo")
private String memo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("sc_weight")
private Double scWeight;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("log_mk")
private String logMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("log_err_time")
private Date logErrTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("log_err_memo")
private String logErrMemo;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("Pdc_type")
private String PdcType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_no")
private String ctnNo;
/**
* 婊℃澘
*/
- @ApiModelProperty(value= "婊℃澘")
+ @ApiModelProperty(value = "婊℃澘")
@TableField("full_plt")
private String fullPlt;
/**
* 绌挎杞�
*/
- @ApiModelProperty(value= "涓ゅ悜绌挎杞�")
+ @ApiModelProperty(value = "涓ゅ悜绌挎杞�")
@TableField("ste_no")
private Integer steNo;
/**
* 绌挎杞�
*/
- @ApiModelProperty(value= "鍥涘悜绌挎杞�")
+ @ApiModelProperty(value = "鍥涘悜绌挎杞�")
@TableField("shuttle_no")
private Integer shuttleNo;
/**
* 缁撴潫鏃堕棿
*/
- @ApiModelProperty(value= "缁撴潫鏃堕棿")
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
@TableField("end_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
- public WrkMastLog() {}
+ public WrkMastLog() {
+ }
- public String getWrkNo$(){
+ public String getWrkNo$() {
WrkMastService service = SpringUtils.getBean(WrkMastService.class);
WrkMast wrkMast = service.selectById(this.wrkNo);
- if (!Cools.isEmpty(wrkMast)){
+ if (!Cools.isEmpty(wrkMast)) {
return String.valueOf(wrkMast.getWrkNo());
}
return null;
}
- public String getYmd$(){
- if (Cools.isEmpty(this.ymd)){
+ public String getYmd$() {
+ if (Cools.isEmpty(this.ymd)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ymd);
}
- public String getWrkSts$(){
+ public String getWrkSts$() {
BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
- if (!Cools.isEmpty(basWrkStatus)){
+ if (!Cools.isEmpty(basWrkStatus)) {
return String.valueOf(basWrkStatus.getWrkDesc());
}
return null;
}
- public String getIoType$(){
+ public String getIoType$() {
BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
BasWrkIotype basWrkIotype = service.selectById(this.ioType);
- if (!Cools.isEmpty(basWrkIotype)){
+ if (!Cools.isEmpty(basWrkIotype)) {
return String.valueOf(basWrkIotype.getIoDesc());
}
return null;
}
- public String getCrnNo$(){
+ public String getCrnNo$() {
BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
BasCrnp basCrnp = service.selectById(this.crnNo);
- if (!Cools.isEmpty(basCrnp)){
+ if (!Cools.isEmpty(basCrnp)) {
return String.valueOf(basCrnp.getCrnNo());
}
return null;
}
- public String getWrkDate$(){
- if (Cools.isEmpty(this.wrkDate)){
+ public String getWrkDate$() {
+ if (Cools.isEmpty(this.wrkDate)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.wrkDate);
}
- public String getLocNo$(){
+ public String getLocNo$() {
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
- if (!Cools.isEmpty(locMast)){
+ if (!Cools.isEmpty(locMast)) {
return String.valueOf(locMast.getLocNo());
}
return null;
}
- public String getStaNo$(){
+ public String getStaNo$() {
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.staNo);
- if (!Cools.isEmpty(basDevp)){
+ if (!Cools.isEmpty(basDevp)) {
return String.valueOf(basDevp.getDevNo());
}
return null;
}
- public String getSourceStaNo$(){
+ public String getSourceStaNo$() {
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.sourceStaNo);
- if (!Cools.isEmpty(basDevp)){
+ if (!Cools.isEmpty(basDevp)) {
return String.valueOf(basDevp.getDevNo());
}
return null;
}
- public String getSourceLocNo$(){
+ public String getSourceLocNo$() {
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.sourceLocNo);
- if (!Cools.isEmpty(locMast)){
+ if (!Cools.isEmpty(locMast)) {
return String.valueOf(locMast.getLocNo());
}
return null;
}
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.ioTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public String getCrnStrTime$(){
- if (Cools.isEmpty(this.crnStrTime)){
+ public String getCrnStrTime$() {
+ if (Cools.isEmpty(this.crnStrTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnStrTime);
}
- public String getCrnEndTime$(){
- if (Cools.isEmpty(this.crnEndTime)){
+ public String getCrnEndTime$() {
+ if (Cools.isEmpty(this.crnEndTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnEndTime);
}
- public String getPlcStrTime$(){
- if (Cools.isEmpty(this.plcStrTime)){
+ public String getPlcStrTime$() {
+ if (Cools.isEmpty(this.plcStrTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.plcStrTime);
}
- public String getCrnPosTime$(){
- if (Cools.isEmpty(this.crnPosTime)){
+ public String getCrnPosTime$() {
+ if (Cools.isEmpty(this.crnPosTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnPosTime);
}
- public String getRefIotime$(){
- if (Cools.isEmpty(this.refIotime)){
+ public String getRefIotime$() {
+ if (Cools.isEmpty(this.refIotime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.refIotime);
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
- public String getErrorTime$(){
- if (Cools.isEmpty(this.errorTime)){
+ public String getErrorTime$() {
+ if (Cools.isEmpty(this.errorTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
}
- public String getLogErrTime$(){
- if (Cools.isEmpty(this.logErrTime)){
+ public String getLogErrTime$() {
+ if (Cools.isEmpty(this.logErrTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
}
- public String getEndTime$(){
- if (Cools.isEmpty(this.endTime)){
+ public String getEndTime$() {
+ if (Cools.isEmpty(this.endTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
diff --git a/src/main/java/com/zy/asrs/entity/param/StorageEscalationParam.java b/src/main/java/com/zy/asrs/entity/param/StorageEscalationParam.java
index a0505a5..48e66f2 100644
--- a/src/main/java/com/zy/asrs/entity/param/StorageEscalationParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StorageEscalationParam.java
@@ -7,7 +7,7 @@
//鎵樼洏鐮�
private String BoxNo;
//鎵ц鐘舵�� 0锛氭垚鍔� 1锛氬け璐�
- private Integer WCSStatus=0;
+ private Integer WCSStatus = 0;
//閿欒淇℃伅 鍏蜂綋鐨勯敊璇俊鎭紙瓒呴珮锛岃秴閲嶇瓑锛�
- private String WCSErrorMessage="";
+ private String WCSErrorMessage = "";
}
diff --git a/src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java b/src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java
index 0d5534d..e782bd8 100644
--- a/src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java
@@ -1,6 +1,5 @@
package com.zy.asrs.entity.param;
-import io.swagger.models.auth.In;
import lombok.Data;
@Data
@@ -32,9 +31,12 @@
//鍫嗗灈鏈�
private Integer crn;
- public TaskCreateParam(){};
+ public TaskCreateParam() {
+ }
- public TaskCreateParam(WMSAndAGVInterfaceParam param){
+ ;
+
+ public TaskCreateParam(WMSAndAGVInterfaceParam param) {
this.taskNo = param.getTaskNo();
this.ioType = convertParamIoType(param.getTaskType());
this.barcode = param.getContainerCode();
@@ -43,9 +45,11 @@
this.targetPoint = param.getTargetLocationCode();
this.emptyContainer = param.getEmptyContainer();
this.crn = param.getTaskTunnel();
- };
+ }
- public TaskCreateParam(CarryParam param, Integer crn){
+ ;
+
+ public TaskCreateParam(CarryParam param, Integer crn) {
this.taskNo = param.getTaskNo();
this.ioType = param.getStereoscopicTaskType();
this.barcode = param.getBoxNo();
@@ -54,11 +58,13 @@
this.targetPoint = param.getTerminalNo();
this.emptyContainer = "N";
this.crn = crn;
- };
+ }
+
+ ;
- public static Integer convertParamIoType(String paramIoType){
- switch (paramIoType){
+ public static Integer convertParamIoType(String paramIoType) {
+ switch (paramIoType) {
case "RK":
return 1;
case "CK":
diff --git a/src/main/java/com/zy/asrs/entity/param/TaskStatusFeedbackParam.java b/src/main/java/com/zy/asrs/entity/param/TaskStatusFeedbackParam.java
index c99af14..d87a2af 100644
--- a/src/main/java/com/zy/asrs/entity/param/TaskStatusFeedbackParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/TaskStatusFeedbackParam.java
@@ -51,23 +51,23 @@
* */
-
//浠诲姟鍙栨秷鎺ュ彛
/*鎿嶄綔绫诲瀷:
- * 1.姝ｅ父鍙栨秷--鍙兘鍙栨秷鏈墽琛岀殑浠诲姟锛岃揣鐗╁鍦ㄦ湭鎵ц浠诲姟鐘舵��
- * 2.寮哄埗鍙栨秷--鍙彇娑堝凡鎵ц鏈畬鎴愮殑浠诲姟锛岃揣鐗╁鍦ㄦ湭鎵ц浠诲姟鐘舵��
- * 3.姝ｅ父瀹屾垚--鍙兘瀹屾垚鏈墽琛岀殑浠诲姟锛岃揣鐗╁浜庝换鍔℃墽琛屽畬鎴愮姸鎬�
- * 4.寮哄埗瀹屾垚--鍙畬鎴愬凡鎵ц鏈畬鎴愮殑浠诲姟锛岃揣鐗╁浜庝换鍔℃墽琛屽畬鎴愮姸鎬�
- * */
+ * 1.姝ｅ父鍙栨秷--鍙兘鍙栨秷鏈墽琛岀殑浠诲姟锛岃揣鐗╁鍦ㄦ湭鎵ц浠诲姟鐘舵��
+ * 2.寮哄埗鍙栨秷--鍙彇娑堝凡鎵ц鏈畬鎴愮殑浠诲姟锛岃揣鐗╁鍦ㄦ湭鎵ц浠诲姟鐘舵��
+ * 3.姝ｅ父瀹屾垚--鍙兘瀹屾垚鏈墽琛岀殑浠诲姟锛岃揣鐗╁浜庝换鍔℃墽琛屽畬鎴愮姸鎬�
+ * 4.寮哄埗瀹屾垚--鍙畬鎴愬凡鎵ц鏈畬鎴愮殑浠诲姟锛岃揣鐗╁浜庝换鍔℃墽琛屽畬鎴愮姸鎬�
+ * */
private String taskStatus; //鎿嶄綔绫诲瀷
private String wharfSource; //婧愮爜澶�
private List<String> freeWharfs;
private String requestType; //璇锋眰绫诲瀷: 1=鍙栬揣锛�2=鏀捐揣
private String wharfCode; //鐮佸ご缂栧彿
- public TaskStatusFeedbackParam(){}
+ public TaskStatusFeedbackParam() {
+ }
- public TaskStatusFeedbackParam(TaskWrk taskWrk){
+ public TaskStatusFeedbackParam(TaskWrk taskWrk) {
this.taskNo = taskWrk.getTaskNo();
this.feedbackFrom = "WCS";
this.warehouseId = "1688469798893297665";
@@ -89,8 +89,8 @@
this.targetLocationCode = taskWrk.getTargetPoint();
}
- public static String getTaskType(Integer paramIoType){
- switch (paramIoType){
+ public static String getTaskType(Integer paramIoType) {
+ switch (paramIoType) {
case 1:
return "RK";
case 2:
@@ -101,7 +101,6 @@
return "鏈煡";
}
}
-
}
diff --git a/src/main/java/com/zy/asrs/entity/param/WMSAndAGVInterfaceParam.java b/src/main/java/com/zy/asrs/entity/param/WMSAndAGVInterfaceParam.java
index 225eccd..51cd80e 100644
--- a/src/main/java/com/zy/asrs/entity/param/WMSAndAGVInterfaceParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/WMSAndAGVInterfaceParam.java
@@ -37,11 +37,11 @@
//浠诲姟鍙栨秷鎺ュ彛
/*鎿嶄綔绫诲瀷:
- * 1.姝ｅ父鍙栨秷--鍙兘鍙栨秷鏈墽琛岀殑浠诲姟锛岃揣鐗╁鍦ㄦ湭鎵ц浠诲姟鐘舵��
- * 2.寮哄埗鍙栨秷--鍙彇娑堝凡鎵ц鏈畬鎴愮殑浠诲姟锛岃揣鐗╁鍦ㄦ湭鎵ц浠诲姟鐘舵��
- * 3.姝ｅ父瀹屾垚--鍙兘瀹屾垚鏈墽琛岀殑浠诲姟锛岃揣鐗╁浜庝换鍔℃墽琛屽畬鎴愮姸鎬�
- * 4.寮哄埗瀹屾垚--鍙畬鎴愬凡鎵ц鏈畬鎴愮殑浠诲姟锛岃揣鐗╁浜庝换鍔℃墽琛屽畬鎴愮姸鎬�
- * */
+ * 1.姝ｅ父鍙栨秷--鍙兘鍙栨秷鏈墽琛岀殑浠诲姟锛岃揣鐗╁鍦ㄦ湭鎵ц浠诲姟鐘舵��
+ * 2.寮哄埗鍙栨秷--鍙彇娑堝凡鎵ц鏈畬鎴愮殑浠诲姟锛岃揣鐗╁鍦ㄦ湭鎵ц浠诲姟鐘舵��
+ * 3.姝ｅ父瀹屾垚--鍙兘瀹屾垚鏈墽琛岀殑浠诲姟锛岃揣鐗╁浜庝换鍔℃墽琛屽畬鎴愮姸鎬�
+ * 4.寮哄埗瀹屾垚--鍙畬鎴愬凡鎵ц鏈畬鎴愮殑浠诲姟锛岃揣鐗╁浜庝换鍔℃墽琛屽畬鎴愮姸鎬�
+ * */
private Integer taskStatus; //鎿嶄綔绫诲瀷
//AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛
diff --git a/src/main/java/com/zy/asrs/mapper/ApiConfigMapper.java b/src/main/java/com/zy/asrs/mapper/ApiConfigMapper.java
index 80beb1d..e2b0284 100644
--- a/src/main/java/com/zy/asrs/mapper/ApiConfigMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ApiConfigMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.ApiConfig;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.ApiConfig;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/ApiLogMapper.java b/src/main/java/com/zy/asrs/mapper/ApiLogMapper.java
index 7f9c418..8c39292 100644
--- a/src/main/java/com/zy/asrs/mapper/ApiLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ApiLogMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.ApiLog;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.ApiLog;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasCrnOptMapper.java b/src/main/java/com/zy/asrs/mapper/BasCrnOptMapper.java
index 744c664..759120c 100644
--- a/src/main/java/com/zy/asrs/mapper/BasCrnOptMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasCrnOptMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.BasCrnOpt;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.BasCrnOpt;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasErrLogMapper.java b/src/main/java/com/zy/asrs/mapper/BasErrLogMapper.java
index cd49855..ed77f10 100644
--- a/src/main/java/com/zy/asrs/mapper/BasErrLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasErrLogMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.BasErrLog;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.BasErrLog;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasPlcerrorLogMapper.java b/src/main/java/com/zy/asrs/mapper/BasPlcerrorLogMapper.java
index 131c896..9bd1a92 100644
--- a/src/main/java/com/zy/asrs/mapper/BasPlcerrorLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasPlcerrorLogMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.BasPlcerrorLog;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.BasPlcerrorLog;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/CommandInfoLogMapper.java b/src/main/java/com/zy/asrs/mapper/CommandInfoLogMapper.java
index 74a7704..0360978 100644
--- a/src/main/java/com/zy/asrs/mapper/CommandInfoLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/CommandInfoLogMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.CommandInfoLog;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.CommandInfoLog;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/CommandInfoMapper.java b/src/main/java/com/zy/asrs/mapper/CommandInfoMapper.java
index 3b0dad5..3169904 100644
--- a/src/main/java/com/zy/asrs/mapper/CommandInfoMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/CommandInfoMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.CommandInfo;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.CommandInfo;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/DataResourceMapper.java b/src/main/java/com/zy/asrs/mapper/DataResourceMapper.java
index c6acebb..ad80808 100644
--- a/src/main/java/com/zy/asrs/mapper/DataResourceMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/DataResourceMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.DataResource;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.DataResource;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/DeviceErrorMapper.java b/src/main/java/com/zy/asrs/mapper/DeviceErrorMapper.java
index 639e551..64b5c8a 100644
--- a/src/main/java/com/zy/asrs/mapper/DeviceErrorMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/DeviceErrorMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.DeviceError;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.DeviceError;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index d7f0f90..643b890 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -13,12 +13,12 @@
@Repository
public interface LocMastMapper extends BaseMapper<LocMast> {
-// @Select("select distinct row1 from asr_loc_mast where crn_no = #{crnNo}")
+ // @Select("select distinct row1 from asr_loc_mast where crn_no = #{crnNo}")
@Select("select row1 from ( select distinct row1 from asr_loc_mast where crn_no = #{crnNo} ) a " +
- "order by case row1 when 1 then 1 when 2 then 0 when 3 then 0 when 4 then 1 " +
- "when 5 then 1 when 6 then 0 when 7 then 0 when 8 then 1 when 9 then 1 when 10 then 0 " +
- "when 11 then 0 when 12 then 1 when 13 then 1 when 14 then 0 when 15 then 0 when 16 then 1 end desc,newid()")
- List<Integer> queryDistinctRow(@Param("crnNo")Integer crnNo);
+ "order by case row1 when 1 then 1 when 2 then 0 when 3 then 0 when 4 then 1 " +
+ "when 5 then 1 when 6 then 0 when 7 then 0 when 8 then 1 when 9 then 1 when 10 then 0 " +
+ "when 11 then 0 when 12 then 1 when 13 then 1 when 14 then 0 when 15 then 0 when 16 then 1 end desc,newid()")
+ List<Integer> queryDistinctRow(@Param("crnNo") Integer crnNo);
LocMast queryFreeLocMast(@Param("row") Integer row, @Param("locType1") Short locType1);
@@ -37,6 +37,6 @@
LocMast selectByLocNo(String locNo);
- List<LocMast> selectLocByLev(@Param("lev")Integer lev);
+ List<LocMast> selectLocByLev(@Param("lev") Integer lev);
}
diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index b234685..3778c18 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -24,7 +24,9 @@
//鍒嗛〉鏌ヨ搴撳瓨婊炵暀鏃堕棿
public List<ViewStayTimeBean> queryViewStayTimeList(ViewStayTimeBean viewStayTime);
+
public int getViewStayTimeCount(ViewStayTimeBean viewStayTime);
+
//涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
public List<ViewStayTimeBean> getViewStayTimeAll(ViewStayTimeBean viewStayTime);
@@ -52,11 +54,13 @@
//鍒嗛〉鏌ヨ鏃ュ叆搴撹褰�
public List<ViewWorkInBean> queryViewWorkInList(ViewWorkInBean viewWorkIn);
+
public int getViewWorkInCount(ViewWorkInBean viewWorkIn);
+
//涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
public List<ViewWorkInBean> getViewWorkInAll(ViewWorkInBean viewWorkIn);
- List<ViewWorkCountInView> selectWorkCountIn(@Param("curr") Integer curr, @Param("limit") Integer limit, @Param("matnr")String matnr, @Param("start") String startTime, @Param("end") String endTime);
+ List<ViewWorkCountInView> selectWorkCountIn(@Param("curr") Integer curr, @Param("limit") Integer limit, @Param("matnr") String matnr, @Param("start") String startTime, @Param("end") String endTime);
Integer selectWorkCountInTotal(String matnr, @Param("start") String startTime, @Param("end") String endTime);
@@ -70,7 +74,9 @@
//鍒嗛〉鏌ヨ鏃ュ嚭搴撹褰�
public List<ViewWorkInBean> queryViewWorkOutList(ViewWorkInBean viewWorkOut);
+
public int getViewWorkOutCount(ViewWorkInBean viewWorkOut);
+
//涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
public List<ViewWorkInBean> getViewWorkOutAll(ViewWorkInBean viewWorkOut);
diff --git a/src/main/java/com/zy/asrs/mapper/TaskWrkLogMapper.java b/src/main/java/com/zy/asrs/mapper/TaskWrkLogMapper.java
index 66c793e..9631f61 100644
--- a/src/main/java/com/zy/asrs/mapper/TaskWrkLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/TaskWrkLogMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.TaskWrkLog;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.TaskWrkLog;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
index 1a70e31..eda8b16 100644
--- a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
@@ -1,8 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.TaskWrk;
import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.TaskWrk;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -14,6 +13,7 @@
public interface TaskWrkMapper extends BaseMapper<TaskWrk> {
TaskWrk selectByTaskNo(String taskNo);
+
TaskWrk selectByStartPoint(@Param("startPoint") String startPoint);
TaskWrk selectByWrkNo(Integer wrkNo);
@@ -32,7 +32,7 @@
TaskWrk selectCrnStaWorking(@Param("crnNo") Integer crnNo, @Param("targetPoint") String targetPoint);
- TaskWrk selectCrnNoInWorking(@Param("crnNo") Integer crnNo,@Param("workNo") Integer workNo);
+ TaskWrk selectCrnNoInWorking(@Param("crnNo") Integer crnNo, @Param("workNo") Integer workNo);
List<TaskWrk> selectToBeHistoryData();
diff --git a/src/main/java/com/zy/asrs/mapper/TaskWrkReportLogMapper.java b/src/main/java/com/zy/asrs/mapper/TaskWrkReportLogMapper.java
new file mode 100644
index 0000000..212b93c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/TaskWrkReportLogMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.TaskWrkReportLog;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface TaskWrkReportLogMapper extends BaseMapper<TaskWrkReportLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/TaskWrkReportMapper.java b/src/main/java/com/zy/asrs/mapper/TaskWrkReportMapper.java
new file mode 100644
index 0000000..bed6ce4
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/TaskWrkReportMapper.java
@@ -0,0 +1,13 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.TaskWrkReport;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface TaskWrkReportMapper extends BaseMapper<TaskWrkReport> {
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 8c1d459..c8de1b7 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -2,7 +2,10 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WrkMast;
-import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -15,7 +18,7 @@
WrkMast selectByLocNo1(@Param("sourceLocNo") String sourceLocNo);
-// @Select("select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type <> 103 and io_type <> 104 and io_type <> 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no")
+ // @Select("select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type <> 103 and io_type <> 104 and io_type <> 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no")
List<WrkMast> selectToBeCompleteData();
List<WrkMast> selectToBeHistoryData();
@@ -23,37 +26,37 @@
// wcs ---------------------------------------------
// 鍏ュ簱绗竴姝ワ紝鎵爜浠幏鍙栨潯鐮佷俊鎭椂鏌ヨ
// @Select("select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and barcode=#{barcode} and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC")
- WrkMast selectPakInStep1(@Param("sourceStaNo")Integer sourceStaNo, @Param("barcode")String barcode);
+ WrkMast selectPakInStep1(@Param("sourceStaNo") Integer sourceStaNo, @Param("barcode") String barcode);
- WrkMast selectPakInStep11(@Param("sourceStaNo")Integer sourceStaNo);
+ WrkMast selectPakInStep11(@Param("sourceStaNo") Integer sourceStaNo);
// 鍏ュ簱绗簩姝ワ紝褰撴墭鐩樼墿鏂欏湪鍫嗗灈鏈哄叆搴撶珯鏃舵椂鏌ヨ
// @Select("select top 1 * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC")
- WrkMast selectPakInStep2(@Param("crnNo")Integer crnNo, @Param("workNo")Integer workNo, @Param("staNo")Integer staNo);
+ WrkMast selectPakInStep2(@Param("crnNo") Integer crnNo, @Param("workNo") Integer workNo, @Param("staNo") Integer staNo);
// 鍏ュ簱绗笁姝ワ紝褰撳爢鍨涙満鎶婅揣鏀惧叆搴撲綅鏃�
// @Select("select top 1 from dbo.asr_wrk_mast where wrk_no=#{workNo}")
- WrkMast selectPakInStep3(@Param("workNo")Integer workNo);
+ WrkMast selectPakInStep3(@Param("workNo") Integer workNo);
// 鎷ｆ枡鍐嶅叆搴撴椂锛岀珯鐐规湁鐗╀笖闇�姹傛椂鏌ヨ
// @Select("select top 1 * from asr_wrk_mast where wrk_no=#{workNo} and wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104)")
- WrkMast selectPickStep(@Param("barcode")String barcode);
+ WrkMast selectPickStep(@Param("barcode") String barcode);
// 鍑哄簱绗竴姝ワ紝浠庡簱浣嶅埌鍫嗗灈鏈哄嚭搴撶珯
// @Select("select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc")
- WrkMast selectPakOutStep1(@Param("crnNo")Integer crnNO, @Param("sourceStaNo")Integer sourceStaNo);
+ WrkMast selectPakOutStep1(@Param("crnNo") Integer crnNO, @Param("sourceStaNo") Integer sourceStaNo);
// 鍑哄簱绗簩姝ワ紝浠庡爢鍨涙満鍑哄簱绔欏埌鐩爣鍑哄簱绔欙紝鍫嗗灈鏈哄嚭搴撶珯鏈夌墿鏃舵墽琛�
// @Select("select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC")
- WrkMast selectPakOutStep2(@Param("sourceStaNo")Integer sourceStaNo);
+ WrkMast selectPakOutStep2(@Param("sourceStaNo") Integer sourceStaNo);
// 搴撲綅绉昏浆宸ヤ綔妗ｏ紝鍦ㄨ繘琛屼竴娆″叆鍑哄簱浣滀笟鍚庣揣璺熷簱浣嶇Щ杞�
// @Select("select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and (io_type=11 or io_type=110) and crn_no=#{crnNo} order by io_time,wrk_no")
- WrkMast selectLocMove(@Param("crnNo")Integer crnNo);
+ WrkMast selectLocMove(@Param("crnNo") Integer crnNo);
- WrkMast selectLocMoving(@Param("crnNo")Integer crnNo);
+ WrkMast selectLocMoving(@Param("crnNo") Integer crnNo);
- WrkMast selectWorking(@Param("crnNo")Integer crnNo);
+ WrkMast selectWorking(@Param("crnNo") Integer crnNo);
// work log -------------------------------------------------------
@Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
@@ -81,14 +84,14 @@
* @param crnNo
* @return
*/
- WrkMast selectCrnWorking(@Param("crnNo")Integer crnNo);
+ WrkMast selectCrnWorking(@Param("crnNo") Integer crnNo);
/**
* 杈撻�佺嚎鏄惁瀛樺湪鍏ュ簱浠诲姟
* @param crnNo
* @return
*/
- WrkMast selectDevWorking(@Param("crnNo")Integer crnNo);
+ WrkMast selectDevWorking(@Param("crnNo") Integer crnNo);
List<WrkMast> selectPick();
@@ -99,8 +102,9 @@
* @param sourceStaNo
* @return
*/
- List<WrkMast> selectPakOutStep11(@Param("crnNo")Integer crnNO, @Param("sourceStaNo")Integer sourceStaNo);
+ List<WrkMast> selectPakOutStep11(@Param("crnNo") Integer crnNO, @Param("sourceStaNo") Integer sourceStaNo);
- WrkMast selectWorkingPakin(@Param("sourceStaNo")Integer sourceStaNo);
- WrkMast selectWorkingPakout(@Param("sourceStaNo")Integer sourceStaNo);
+ WrkMast selectWorkingPakin(@Param("sourceStaNo") Integer sourceStaNo);
+
+ WrkMast selectWorkingPakout(@Param("sourceStaNo") Integer sourceStaNo);
}
diff --git a/src/main/java/com/zy/asrs/service/ApiLogService.java b/src/main/java/com/zy/asrs/service/ApiLogService.java
index aa01c8f..083c527 100644
--- a/src/main/java/com/zy/asrs/service/ApiLogService.java
+++ b/src/main/java/com/zy/asrs/service/ApiLogService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.ApiLog;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.ApiLog;
public interface ApiLogService extends IService<ApiLog> {
diff --git a/src/main/java/com/zy/asrs/service/BasPlcerrorLogService.java b/src/main/java/com/zy/asrs/service/BasPlcerrorLogService.java
index 844f745..d5e12cd 100644
--- a/src/main/java/com/zy/asrs/service/BasPlcerrorLogService.java
+++ b/src/main/java/com/zy/asrs/service/BasPlcerrorLogService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.BasPlcerrorLog;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.BasPlcerrorLog;
public interface BasPlcerrorLogService extends IService<BasPlcerrorLog> {
diff --git a/src/main/java/com/zy/asrs/service/BasPlcerrorService.java b/src/main/java/com/zy/asrs/service/BasPlcerrorService.java
index 1f7b153..45c6c91 100644
--- a/src/main/java/com/zy/asrs/service/BasPlcerrorService.java
+++ b/src/main/java/com/zy/asrs/service/BasPlcerrorService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.BasPlcerror;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.BasPlcerror;
public interface BasPlcerrorService extends IService<BasPlcerror> {
diff --git a/src/main/java/com/zy/asrs/service/CommandInfoLogService.java b/src/main/java/com/zy/asrs/service/CommandInfoLogService.java
index d7a85ad..962bcd9 100644
--- a/src/main/java/com/zy/asrs/service/CommandInfoLogService.java
+++ b/src/main/java/com/zy/asrs/service/CommandInfoLogService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.CommandInfoLog;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.CommandInfoLog;
public interface CommandInfoLogService extends IService<CommandInfoLog> {
diff --git a/src/main/java/com/zy/asrs/service/CommandInfoService.java b/src/main/java/com/zy/asrs/service/CommandInfoService.java
index eaed3cb..7a344b8 100644
--- a/src/main/java/com/zy/asrs/service/CommandInfoService.java
+++ b/src/main/java/com/zy/asrs/service/CommandInfoService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.CommandInfo;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.CommandInfo;
import java.util.List;
diff --git a/src/main/java/com/zy/asrs/service/DataResourceService.java b/src/main/java/com/zy/asrs/service/DataResourceService.java
index e630ecb..6d1d01d 100644
--- a/src/main/java/com/zy/asrs/service/DataResourceService.java
+++ b/src/main/java/com/zy/asrs/service/DataResourceService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.DataResource;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.DataResource;
import java.util.List;
diff --git a/src/main/java/com/zy/asrs/service/DeviceErrorService.java b/src/main/java/com/zy/asrs/service/DeviceErrorService.java
index dfba9bc..b12b888 100644
--- a/src/main/java/com/zy/asrs/service/DeviceErrorService.java
+++ b/src/main/java/com/zy/asrs/service/DeviceErrorService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.DeviceError;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.DeviceError;
public interface DeviceErrorService extends IService<DeviceError> {
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 7175c40..7071d38 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service;
import com.core.common.R;
+import com.zy.asrs.entity.param.TaskCreateParam;
import com.zy.asrs.entity.param.TaskOverParam;
import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
-import com.zy.asrs.entity.param.TaskCreateParam;
import java.io.IOException;
import java.util.HashMap;
@@ -11,12 +11,13 @@
public interface OpenService {
//鍒涘缓浠诲姟
- HashMap<String,Object> taskCreate(TaskCreateParam param);
+ HashMap<String, Object> taskCreate(TaskCreateParam param);
R AgvToWCSToWms(WMSAndAGVInterfaceParam param) throws IOException;
void getAgvTaskOver(TaskOverParam param);
R getAgvPickAndPlaceV1(TaskOverParam param);
+
R getAgvPickAndPlaceV2(TaskOverParam param);
}
diff --git a/src/main/java/com/zy/asrs/service/StaDescService.java b/src/main/java/com/zy/asrs/service/StaDescService.java
index 0c45ff2..376a6db 100644
--- a/src/main/java/com/zy/asrs/service/StaDescService.java
+++ b/src/main/java/com/zy/asrs/service/StaDescService.java
@@ -7,6 +7,6 @@
StaDesc queryCrnStn(Integer typeNo, Integer crnNo, Integer stnNo);
- StaDesc queryCrn(Integer typeNo, Integer stnNo,Integer crnNo);
+ StaDesc queryCrn(Integer typeNo, Integer stnNo, Integer crnNo);
}
diff --git a/src/main/java/com/zy/asrs/service/TaskWrkReportLogService.java b/src/main/java/com/zy/asrs/service/TaskWrkReportLogService.java
new file mode 100644
index 0000000..6eac8c3
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/TaskWrkReportLogService.java
@@ -0,0 +1,9 @@
+package com.zy.asrs.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.TaskWrkReportLog;
+
+public interface TaskWrkReportLogService extends IService<TaskWrkReportLog> {
+
+
+}
diff --git a/src/main/java/com/zy/asrs/service/TaskWrkReportService.java b/src/main/java/com/zy/asrs/service/TaskWrkReportService.java
new file mode 100644
index 0000000..111725d
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/TaskWrkReportService.java
@@ -0,0 +1,9 @@
+package com.zy.asrs.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.TaskWrkReport;
+
+public interface TaskWrkReportService extends IService<TaskWrkReport> {
+
+
+}
diff --git a/src/main/java/com/zy/asrs/service/TaskWrkService.java b/src/main/java/com/zy/asrs/service/TaskWrkService.java
index e62ee0b..4ca1d5c 100644
--- a/src/main/java/com/zy/asrs/service/TaskWrkService.java
+++ b/src/main/java/com/zy/asrs/service/TaskWrkService.java
@@ -8,6 +8,7 @@
public interface TaskWrkService extends IService<TaskWrk> {
TaskWrk selectByTaskNo(String taskNo);
+
TaskWrk selectByStartPoint(String taskNo);
TaskWrk selectByWrkNo(Integer wrkNo);
diff --git a/src/main/java/com/zy/asrs/service/impl/ApiConfigServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ApiConfigServiceImpl.java
index f96f797..90f66f5 100644
--- a/src/main/java/com/zy/asrs/service/impl/ApiConfigServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ApiConfigServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.ApiConfigMapper;
-import com.zy.asrs.entity.ApiConfig;
-import com.zy.asrs.service.ApiConfigService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.ApiConfig;
+import com.zy.asrs.mapper.ApiConfigMapper;
+import com.zy.asrs.service.ApiConfigService;
import org.springframework.stereotype.Service;
@Service("apiConfigService")
diff --git a/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java
index 1ca14f4..1af6aba 100644
--- a/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java
@@ -1,16 +1,17 @@
package com.zy.asrs.service.impl;
-import com.core.common.SnowflakeIdWorker;
-import com.zy.asrs.mapper.ApiLogMapper;
-import com.zy.asrs.entity.ApiLog;
-import com.zy.asrs.service.ApiLogService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.SnowflakeIdWorker;
+import com.zy.asrs.entity.ApiLog;
+import com.zy.asrs.mapper.ApiLogMapper;
+import com.zy.asrs.service.ApiLogService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import java.util.Date;
+
@Slf4j
@Service("apiLogService")
public class ApiLogServiceImpl extends ServiceImpl<ApiLogMapper, ApiLog> implements ApiLogService {
@@ -32,7 +33,7 @@
request, // 璇锋眰鍐呭
response,
null, // 寮傚父鍐呭
- success?1:0 , // 缁撴灉
+ success ? 1 : 0, // 缁撴灉
1, // 鐘舵��
now, // 娣诲姞鏃堕棿
now, // 淇敼鏃堕棿
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnOptServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnOptServiceImpl.java
index 299afa8..bff0979 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnOptServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnOptServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.BasCrnOptMapper;
-import com.zy.asrs.entity.BasCrnOpt;
-import com.zy.asrs.service.BasCrnOptService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.BasCrnOpt;
+import com.zy.asrs.mapper.BasCrnOptMapper;
+import com.zy.asrs.service.BasCrnOptService;
import org.springframework.stereotype.Service;
@Service("basCrnOptService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
index 1f87a7d..951b5bc 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -45,21 +45,21 @@
@Override
public BasDevp checkSiteStatus(Integer devpNo, boolean put) {
BasDevp station = selectById(devpNo);
- if (station == null){
- throw new CoolException(devpNo+"绔欑偣涓嶅瓨鍦�");
+ if (station == null) {
+ throw new CoolException(devpNo + "绔欑偣涓嶅瓨鍦�");
}
if (put) {
- if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
- throw new CoolException(devpNo+"绔欑偣涓嶆槸鑷姩鐘舵��");
+ if (station.getAutoing() == null || !station.getAutoing().equals("Y")) {
+ throw new CoolException(devpNo + "绔欑偣涓嶆槸鑷姩鐘舵��");
}
- if(station.getLoading()==null || !station.getLoading().equals("Y")) {
- throw new CoolException(devpNo+"绔欑偣鏃犵墿");
+ if (station.getLoading() == null || !station.getLoading().equals("Y")) {
+ throw new CoolException(devpNo + "绔欑偣鏃犵墿");
}
- if(station.getWrkNo()!=null && station.getWrkNo()>0) {
- throw new CoolException(devpNo+"绔欑偣宸叉湁宸ヤ綔鍙�");
+ if (station.getWrkNo() != null && station.getWrkNo() > 0) {
+ throw new CoolException(devpNo + "绔欑偣宸叉湁宸ヤ綔鍙�");
}
- if(wrkMastService.getWorkingMast(devpNo)>0){
- throw new CoolException(devpNo+"绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
+ if (wrkMastService.getWorkingMast(devpNo) > 0) {
+ throw new CoolException(devpNo + "绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
}
}
return station;
diff --git a/src/main/java/com/zy/asrs/service/impl/BasErrLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasErrLogServiceImpl.java
index 817212c..5f57d36 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasErrLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasErrLogServiceImpl.java
@@ -1,10 +1,10 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.asrs.mapper.BasErrLogMapper;
-import com.zy.asrs.entity.BasErrLog;
-import com.zy.asrs.service.BasErrLogService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.BasErrLog;
+import com.zy.asrs.mapper.BasErrLogMapper;
+import com.zy.asrs.service.BasErrLogService;
import org.springframework.stereotype.Service;
import java.util.List;
diff --git a/src/main/java/com/zy/asrs/service/impl/BasPlcerrorLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasPlcerrorLogServiceImpl.java
index 2d2f55e..88f7a69 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasPlcerrorLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasPlcerrorLogServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.BasPlcerrorLogMapper;
-import com.zy.asrs.entity.BasPlcerrorLog;
-import com.zy.asrs.service.BasPlcerrorLogService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.BasPlcerrorLog;
+import com.zy.asrs.mapper.BasPlcerrorLogMapper;
+import com.zy.asrs.service.BasPlcerrorLogService;
import org.springframework.stereotype.Service;
@Service("basPlcerrorLogService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasPlcerrorServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasPlcerrorServiceImpl.java
index 7b5b78c..0d48f6f 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasPlcerrorServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasPlcerrorServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.BasPlcerrorMapper;
-import com.zy.asrs.entity.BasPlcerror;
-import com.zy.asrs.service.BasPlcerrorService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.BasPlcerror;
+import com.zy.asrs.mapper.BasPlcerrorMapper;
+import com.zy.asrs.service.BasPlcerrorService;
import org.springframework.stereotype.Service;
@Service("basPlcerrorService")
diff --git a/src/main/java/com/zy/asrs/service/impl/CommandInfoLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/CommandInfoLogServiceImpl.java
index dd8b439..a0884b7 100644
--- a/src/main/java/com/zy/asrs/service/impl/CommandInfoLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CommandInfoLogServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.CommandInfoLogMapper;
-import com.zy.asrs.entity.CommandInfoLog;
-import com.zy.asrs.service.CommandInfoLogService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.CommandInfoLog;
+import com.zy.asrs.mapper.CommandInfoLogMapper;
+import com.zy.asrs.service.CommandInfoLogService;
import org.springframework.stereotype.Service;
@Service("commandInfoLogService")
diff --git a/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java
index 15f2a53..e57c059 100644
--- a/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java
@@ -1,12 +1,12 @@
package com.zy.asrs.service.impl;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.CommandInfo;
import com.zy.asrs.entity.CommandInfoLog;
import com.zy.asrs.mapper.CommandInfoMapper;
-import com.zy.asrs.entity.CommandInfo;
import com.zy.asrs.service.CommandInfoLogService;
import com.zy.asrs.service.CommandInfoService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/zy/asrs/service/impl/CommonServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/CommonServiceImpl.java
new file mode 100644
index 0000000..490cc22
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/CommonServiceImpl.java
@@ -0,0 +1,1545 @@
+package com.zy.asrs.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.core.exception.CoolException;
+import com.zy.asrs.controller.CrnController;
+import com.zy.asrs.controller.SiteController;
+import com.zy.asrs.domain.enums.TaskStatusType;
+import com.zy.asrs.domain.enums.WorkNoType;
+import com.zy.asrs.domain.param.CrnOperatorParam;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.Result;
+import com.zy.asrs.entity.param.StorageEscalationParam;
+import com.zy.asrs.entity.param.TaskOverToWms;
+import com.zy.asrs.mapper.BasCrnErrorMapper;
+import com.zy.asrs.mapper.StaDescMapper;
+import com.zy.asrs.mapper.TaskWrkMapper;
+import com.zy.asrs.mapper.WrkMastMapper;
+import com.zy.asrs.service.*;
+import com.zy.asrs.utils.CommandUtils;
+import com.zy.asrs.utils.Utils;
+import com.zy.common.service.CommonService;
+import com.zy.common.utils.HttpHandler;
+import com.zy.core.CrnThread;
+import com.zy.core.DevpThread;
+import com.zy.core.cache.MessageQueue;
+import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.*;
+import com.zy.core.model.CrnSlave;
+import com.zy.core.model.DevpSlave;
+import com.zy.core.model.Task;
+import com.zy.core.model.command.CrnCommand;
+import com.zy.core.model.protocol.CrnProtocol;
+import com.zy.core.model.protocol.StaProtocol;
+import com.zy.core.properties.SlaveProperties;
+import com.zy.core.thread.BarcodeThread;
+import com.zy.core.thread.SiemensDevpThread;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 绔嬩綋浠撳簱WCS绯荤粺涓绘祦绋嬩笟鍔�
+ * Created by vincent on 2020/8/6
+ */
+@Slf4j
+@Service("commonService")
+@Transactional
+public class CommonServiceImpl {
+
+ public static final long COMMAND_TIMEOUT = 5 * 1000;
+
+ @Autowired
+ private SlaveProperties slaveProperties;
+ @Autowired
+ private WrkMastMapper wrkMastMapper;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private BasCrnpService basCrnpService;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private BasErrLogService basErrLogService;
+ @Autowired
+ private BasCrnErrorMapper basCrnErrorMapper;
+ @Autowired
+ private TaskWrkMapper taskWrkMapper;
+ @Autowired
+ private TaskWrkService taskWrkService;
+ @Autowired
+ private ConfigService configService;
+ @Autowired
+ private StaDescMapper staDescMapper;
+ @Autowired
+ private CommandInfoService commandInfoService;
+
+ @Autowired
+ private OpenServiceImpl openServiceImpl;
+ @Autowired
+ private StaDescService staDescService;
+
+ @Autowired
+ private ApiLogService apiLogService;
+ @Autowired
+ private CommonService commonService;
+
+ @Value("${wms.url}")
+ private String wmsUrl;
+ @Value("${wms.inboundTaskApplyPath}")
+ private String inboundTaskApplyPath;
+ @Value("${wms.TaskExecCallback}")
+ private String TaskExecCallback;
+ @Value("${wms.taskStatusFeedbackPath}")
+ private String taskStatusFeedbackPath;
+ @Autowired
+ private CrnController crnController;
+ @Autowired
+ private SiteController siteController;
+
+ public StorageEscalationParam getErrorMsg(StaProtocol staProtocol) {
+ StorageEscalationParam storageEscalationParam = new StorageEscalationParam();
+ if (staProtocol.isFrontErr()) {
+ storageEscalationParam.setWCSErrorMessage("鍓嶈秴闄�");
+ storageEscalationParam.setWCSStatus(1);
+ }
+ if (staProtocol.isBackErr()) {
+ storageEscalationParam.setWCSErrorMessage(storageEscalationParam.getWCSErrorMessage() + "鍚庤秴闄�");
+ storageEscalationParam.setWCSStatus(1);
+ }
+ if (staProtocol.isHighErr()) {
+ storageEscalationParam.setWCSErrorMessage(storageEscalationParam.getWCSErrorMessage() + "楂樿秴闄�");
+ storageEscalationParam.setWCSStatus(1);
+ }
+ if (staProtocol.isLeftErr()) {
+ storageEscalationParam.setWCSErrorMessage(storageEscalationParam.getWCSErrorMessage() + "宸﹁秴闄�");
+ storageEscalationParam.setWCSStatus(1);
+ }
+ if (staProtocol.isRightErr()) {
+ storageEscalationParam.setWCSErrorMessage(storageEscalationParam.getWCSErrorMessage() + "鍙宠秴闄�");
+ storageEscalationParam.setWCSStatus(1);
+ }
+ if (staProtocol.isWeightErr()) {
+ storageEscalationParam.setWCSErrorMessage(storageEscalationParam.getWCSErrorMessage() + "瓒呴噸");
+ storageEscalationParam.setWCSStatus(1);
+ }
+ if (staProtocol.isBarcodeErr()) {
+ storageEscalationParam.setWCSErrorMessage(storageEscalationParam.getWCSErrorMessage() + "鎵爜澶辫触");
+ storageEscalationParam.setWCSStatus(1);
+ }
+ return storageEscalationParam;
+ }
+
+ public void generateStoreWrkFile1() throws IOException, InterruptedException {
+ try {
+ // 鏍规嵁杈撻�佺嚎plc閬嶅巻
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ // 閬嶅巻鍏ュ簱鍙�
+ for (DevpSlave.Sta inSta : devp.getInSta()) {
+ StorageEscalationParam storageEscalationParam = new StorageEscalationParam();
+ // 鑾峰彇鍏ュ簱绔欎俊鎭�
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ Short workNo = staProtocol.getWorkNo();
+ Short stano = staProtocol.getStaNo();
+
+ // 灏哄妫�娴嬪紓甯�
+ boolean back = false;
+ String errMsg = "";
+
+ // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
+ if (staProtocol.isAutoing() && staProtocol.isLoading()
+ && staProtocol.isInEnable()
+ && !staProtocol.isEmptyMk() && workNo >= 9790
+ && staProtocol.isPakMk()) {
+ // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
+ if (barcodeThread == null) {
+ continue;
+ }
+ String BoxNo = barcodeThread.getBarcode();
+ TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", BoxNo));
+ if (!Cools.isEmpty(taskWrk1)) {
+ log.info("鎵樼洏鐮侊細" + BoxNo + "浠诲姟妗ｅ瓨鍦�");
+ if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) {
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no", taskWrk1.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
+ if (Cools.isEmpty(staDesc)) {
+ return;
+ } else {
+ continue;
+ }
+ }
+ }
+ if (back) {
+ storageEscalationParam.setWCSStatus(1);
+ storageEscalationParam.setWCSErrorMessage(storageEscalationParam.getWCSErrorMessage() + errMsg);
+ }
+ log.info("缁勬墭鍏ュ簱={}", storageEscalationParam);
+ storageEscalationParam.setBoxNo(BoxNo);
+ String response = "";
+ Boolean success = false;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath(inboundTaskApplyPath)
+ .setJson(JSON.toJSONString(storageEscalationParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (back) {
+ staProtocol.setStaNo(inSta.getBackSta().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ } else {
+ if (!Cools.isEmpty(response) && !Cools.isEmpty(jsonObject.get("ReturnStatus")) && jsonObject.get("ReturnStatus").equals(0) && !Cools.isEmpty(jsonObject.get("Result").toString())) {
+ Result result = JSON.parseObject(jsonObject.get("Result").toString(), Result.class);
+ // 鍒涙柊涓�涓叆搴撳伐浣滄。
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(result.getTaskNo());
+ if (Cools.isEmpty(taskWrk)) {
+ taskWrk = createTask1(result, BoxNo);
+ if (Cools.isEmpty(taskWrk)) {
+ log.error("搴撲綅寮傚父锛屽簱浣嶅彿锛�={}", taskWrk.getOriginTargetPoint());
+ } else {
+ taskWrkService.insert(taskWrk);
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
+ staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
+ staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("TaskNo", taskWrk.getTaskNo());
+ try {
+ //寮�濮嬩笂鎶�,浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
+ response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath(taskStatusFeedbackPath)
+ .setJson(JSON.toJSONString(hashMap))
+ .build()
+ .doPost();
+ JSONObject jsonObject1 = JSON.parseObject(response);
+ Boolean bool = false;
+ if (jsonObject1.get("ReturnStatus").equals(0)) {
+ bool = true;
+ }
+ apiLogService.save("wcs寮�濮嬪叆搴撲换鍔′笂鎶ms"
+ , wmsUrl + TaskExecCallback
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(hashMap)
+ , response
+ , bool
+ );
+ } catch (Exception e) {
+
+ }
+ }
+ } else {
+ staProtocol.setStaNo(inSta.getBackSta().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ }
+
+ } else {
+ staProtocol.setStaNo(inSta.getBackSta().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ }
+ }
+ } catch (Exception e) {
+ log.error("璇锋眰鍏ュ簱璋冪敤鎺ュ彛澶辫触");
+ log.error("寮傚父淇℃伅鎵撳嵃锛�" + e);
+ try {
+ BasDevp basDevp = basDevpService.selectById(inSta.getStaNo());
+ if (Cools.isEmpty(basDevp)) {
+ log.error("绔欑偣鍙峰紓甯�" + inSta.getStaNo());
+ } else if (basDevp.getStaErr() != 0) {
+ basDevp.setStaErr(2);
+ basDevpService.updateById(basDevp);
+ }
+ } catch (Exception e1) {
+ // 閫�鍥�
+ log.error("鎵爜妫�娴嬬▼搴忓紓甯�" + inSta.getStaNo() + "寮傚父淇℃伅" + e1);
+ }
+ } finally {
+ apiLogService.save("wms璇锋眰鍏ュ簱璐т綅鎺ュ彛"
+ , wmsUrl + inboundTaskApplyPath
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(storageEscalationParam)
+ , response
+ , success
+ );
+ }
+ log.info("鍏ュ簱璇锋眰鍙傛暟=" + JSON.toJSONString(BoxNo));
+ log.info("鍏ュ簱璇锋眰杩斿洖鍙傛暟=" + JSON.toJSONString(response));
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.error("generateStoreWrkFile e", e);
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ }
+ }
+
+ public void generateStoreWrkFile() throws IOException, InterruptedException {
+ try {
+ // 鏍规嵁杈撻�佺嚎plc閬嶅巻
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ // 閬嶅巻鍏ュ簱鍙�
+ for (DevpSlave.Sta inSta : devp.getInSta()) {
+ // 鑾峰彇鍏ュ簱绔欎俊鎭�
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ Short workNo = staProtocol.getWorkNo();
+ Short stano = staProtocol.getStaNo();
+
+ // 灏哄妫�娴嬪紓甯�
+ boolean back = false;
+ String errMsg = "";
+ if (staProtocol.isFrontErr()) {
+ errMsg = "鍓嶈秴闄�";
+ back = true;
+ }
+ if (!back && staProtocol.isBackErr()) {
+ errMsg = "鍚庤秴闄�";
+ back = true;
+ }
+ if (!back && staProtocol.isHighErr()) {
+ errMsg = "楂樿秴闄�";
+ back = true;
+ }
+ if (!back && staProtocol.isLeftErr()) {
+ errMsg = "宸﹁秴闄�";
+ back = true;
+ }
+ if (!back && staProtocol.isRightErr()) {
+ errMsg = "鍙宠秴闄�";
+ back = true;
+ }
+ if (!back && staProtocol.isWeightErr()) {
+ errMsg = "瓒呴噸";
+ back = true;
+ }
+ if (!back && staProtocol.isBarcodeErr()) {
+ errMsg = "鎵爜澶辫触";
+ back = true;
+ }
+ // 閫�鍥�
+ if (back) {
+ if (stano == inSta.getBackSta().shortValue()) {
+ continue;
+ }
+ if (workNo == 0 && stano == 0) {
+ continue;
+ }
+ if (!staProtocol.isPakMk()) {
+ continue;
+ }
+// News.warn("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
+ staProtocol.setWorkNo(workNo);
+ staProtocol.setStaNo(inSta.getStaNo().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
+ if (taskWrk != null) {
+ taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
+ taskWrkMapper.updateById(taskWrk);
+ }
+ continue;
+ }
+ // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
+ if (staProtocol.isAutoing() && staProtocol.isLoading()
+ && staProtocol.isInEnable()
+ && !staProtocol.isEmptyMk() && (workNo >= 9899)
+ && staProtocol.isPakMk()) {
+ // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
+ if (barcodeThread == null) {
+ continue;
+ }
+ String barcode = barcodeThread.getBarcode();
+ if (!Cools.isEmpty(barcode) && !barcode.equals("99999999")) {
+ // 璇锋眰wms鎺ュ彛锛岃幏鍙栧伐浣滃彿鍜岀洰鏍囧簱浣�
+ ToWmsDTO toWmsDTO = new ToWmsDTO(barcode, staProtocol.getSiteId(), staProtocol.isHigh() ? 2 : 1);
+ TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", barcode));
+ if (!Cools.isEmpty(taskWrk1)) {
+ log.info("鎵樼洏鐮侊細" + barcode + "浠诲姟妗ｅ瓨鍦�");
+ if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) {
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no", taskWrk1.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
+ if (Cools.isEmpty(staDesc)) {
+ log.info("鎵樼洏鐮侊細" + barcode + "浠诲姟妗ｅ瓨鍦�");
+ return;
+ } else {
+ staProtocol.setWorkNo(taskWrk1.getWrkNo().shortValue());
+ staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ }
+ }
+ return;
+ }
+ HashMap<String, Object> headParam = new HashMap<>();
+ headParam.put("Content-Type", "application/json");
+ System.out.println(JSON.toJSONString(toWmsDTO));
+ String response;
+ try {
+ response = new HttpHandler.Builder()
+ // .setHeaders(headParam)
+ .setUri(wmsUrl)
+ .setPath(inboundTaskApplyPath)
+ .setJson(JSON.toJSONString(toWmsDTO))
+ .build()
+ .doPost();
+ } catch (Exception e) {
+ log.error("璇锋眰鍏ュ簱璋冪敤鎺ュ彛澶辫触");
+ log.error("寮傚父淇℃伅鎵撳嵃锛�" + e);
+ try {
+ BasDevp basDevp = basDevpService.selectById(inSta.getStaNo());
+ if (Cools.isEmpty(basDevp)) {
+ log.error("绔欑偣鍙峰紓甯�" + inSta.getStaNo());
+ } else if (basDevp.getStaErr() != 0) {
+ basDevp.setStaErr(2);
+ basDevpService.updateById(basDevp);
+ }
+ } catch (Exception e1) {
+ // 閫�鍥�
+ log.error("鎵爜妫�娴嬬▼搴忓紓甯�" + inSta.getStaNo() + "寮傚父淇℃伅" + e1);
+ }
+ staProtocol.setWorkNo((short) 9999);
+ staProtocol.setStaNo(inSta.getStaNo().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+// TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
+// if (taskWrk != null) {
+// taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
+// taskWrkMapper.updateById(taskWrk);
+// }
+ continue;
+ }
+
+ JSONObject jsonObject = JSON.parseObject(response);
+ log.info("鍏ュ簱璇锋眰鍙傛暟{}" + JSON.toJSONString(toWmsDTO));
+ log.info("鍏ュ簱璇锋眰杩斿洖鍙傛暟{}" + JSON.toJSONString(response));
+ if (jsonObject.getInteger("code").equals(200) && !Cools.isEmpty(jsonObject.get("data").toString())) {
+ GetWmsDto getWmsDto = JSON.parseObject(jsonObject.get("data").toString(), GetWmsDto.class);
+ try {
+ BasDevp basDevp = basDevpService.selectById(inSta.getStaNo());
+ if (Cools.isEmpty(basDevp)) {
+ log.error("绔欑偣鍙峰紓甯�1" + inSta.getStaNo());
+ throw new CoolException("绔欑偣鍙峰紓甯�1,鏈煡璇㈠埌绔欑偣淇℃伅" + inSta.getStaNo());
+ }
+ Integer staNoCrnNo = Utils.StaNoCrnNo(inSta.getStaNo());
+ if (staNoCrnNo == 0) {
+ basDevp.setStaErr(1);
+ basDevpService.updateById(basDevp);
+ log.error("绔欑偣鍙峰紓甯�2" + inSta.getStaNo());
+ throw new CoolException("绔欑偣鍙峰紓甯�2,绔欑偣鍙蜂笉瀛樺湪" + inSta.getStaNo());
+ } else {
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("crn_no", staNoCrnNo.longValue())
+ .eq("loc_no", getWmsDto.getLocNo()));
+ if (Cools.isEmpty(locMast)) {
+ basDevp.setStaErr(1);
+ basDevpService.updateById(basDevp);
+ log.error("绔欑偣鍙峰紓甯�3" + inSta.getStaNo());
+ throw new CoolException("绔欑偣鍙峰紓甯�3锛氭宸烽亾涓嶅瓨鍦ㄧ洰鏍囧簱浣�" + inSta.getStaNo());
+ }
+ }
+ } catch (Exception e) {
+// log.error("鎵爜妫�娴嬬▼搴忓紓甯�"+inSta.getStaNo()+"寮傚父淇℃伅"+e);
+ // 閫�鍥�
+ log.error("鎵爜妫�娴嬬▼搴忓紓甯�" + inSta.getStaNo() + errMsg);
+ log.error("鎵爜妫�娴嬬▼搴忓紓甯�,寮傚父淇℃伅" + e);
+
+ staProtocol.setWorkNo((short) 9999);
+ staProtocol.setStaNo(inSta.getStaNo().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+// TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
+// if (taskWrk != null) {
+// taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
+// taskWrkMapper.updateById(taskWrk);
+// }
+ continue;
+ }
+ //鏌ョ湅璇ュ簱浣嶆槸鍚︿负绌哄簱浣�
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "O")
+ .eq("loc_no", getWmsDto.getLocNo()));
+ if (Cools.isEmpty(locMast)) {
+ try {
+ HashMap<String, Object> headParam1 = new HashMap<>();
+ headParam1.put("taskNo", getWmsDto.getTaskNo());
+ headParam1.put("status", 6);
+ headParam1.put("ioType", 1);
+ headParam1.put("barcode", barcode);
+ String response2;
+ response2 = new HttpHandler.Builder()
+ // .setHeaders(headParam)
+ .setUri(wmsUrl)
+ .setPath(taskStatusFeedbackPath)
+ .setJson(JSON.toJSONString(headParam1))
+ .build()
+ .doPost();
+ JSONObject jsonObject1 = JSON.parseObject(response2);
+ apiLogService.save("wcs娲惧彂搴撲綅==銆嬩笉涓虹┖銆�==涓婃姤wms"
+ , wmsUrl + taskStatusFeedbackPath
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(headParam1)
+ , response
+ , true
+ );
+ } catch (Exception e) {
+ log.error("wcs娲惧彂搴撲綅==銆嬩笉涓虹┖銆�==涓婃姤wms", getWmsDto.getWrkNo());
+ throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触,娲惧彂搴撲綅==銆嬩笉涓虹┖銆�==锛屽紓甯镐俊鎭細" + e);
+ }
+ }
+
+ // 鍒涙柊涓�涓叆搴撳伐浣滄。
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(getWmsDto.getWrkNo());
+ if (Cools.isEmpty(taskWrk)) {
+ taskWrk = createTask(getWmsDto, barcode);
+ if (Cools.isEmpty(taskWrk)) {
+ log.error("搴撲綅寮傚父锛屽簱浣嶅彿锛歿}", getWmsDto.getTargetLocationCode());
+ } else {
+ taskWrkService.insert(taskWrk);
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
+ staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
+ staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ }
+ }
+
+ } else {
+ continue;
+ }
+ apiLogService.save("wms璇锋眰鍏ュ簱璐т綅鎺ュ彛"
+ , wmsUrl + inboundTaskApplyPath
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(toWmsDTO)
+ , response
+ , true
+ );
+
+ } else {
+ // 閫�鍥�
+ log.error("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
+
+ staProtocol.setWorkNo((short) 9999);
+ staProtocol.setStaNo(inSta.getStaNo().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
+ if (taskWrk != null) {
+ taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
+ taskWrkMapper.updateById(taskWrk);
+ }
+ }
+ }
+
+
+ }
+ }
+ } catch (Exception e) {
+ log.error("generateStoreWrkFile e", e);
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ }
+ }
+
+
+ /**
+ * 鍫嗗灈鏈虹珯鍑哄簱鍒板嚭搴撶珯
+ */
+ public void crnStnToOutStn() {
+ for (CrnSlave crnSlave : slaveProperties.getCrn()) {
+ // 閬嶅巻鍫嗗灈鏈哄嚭搴撶珯
+ for (CrnSlave.CrnStn crnStn : crnSlave.getCrnOutStn()) {
+ List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("crn_no", crnSlave.getId()).eq("crn_stn", crnStn.getStaNo()));
+ for (StaDesc staDesc : staDescs) {
+ try {
+ // 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
+ StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == 0)) {
+ // 鏌ヨ宸ヤ綔妗�
+ TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorking(crnSlave.getId(), staDesc.getStnNo().toString());
+ if (taskWrk == null) {
+ continue;
+ }
+ log.info("涓嬪彂杈撻�佺嚎浠诲姟锛歵askWrk:" + JSON.toJSONString(taskWrk));
+// R r = siteController.siteDetlUpdate(Integer.valueOf(taskWrk.getTargetPoint()), taskWrk.getWrkNo().shortValue(), (short) 0, "Y", false, false);
+ staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
+ staProtocol.setStaNo(staDesc.getStnNo().shortValue());
+ boolean offer = false;
+ try {
+ offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
+ } catch (Exception e) {
+ log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:" + e);
+ log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:offer:" + offer);
+ }
+// JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(r));
+ if (offer) {
+ log.info("涓嬪彂杈撻�佺嚎浠诲姟鎴愬姛锛歵askWrk:" + JSON.toJSONString(taskWrk));
+ taskWrk.setStatus(5);
+ taskWrk.setWrkSts(14);
+ taskWrkService.updateById(taskWrk);
+
+ } else {
+ log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛歵askWrk:" + JSON.toJSONString(taskWrk));
+// log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯镐俊鎭�:"+JSON.toJSONString(r));
+ }
+ }
+ } catch (Exception e) {
+ log.error("鍑哄簱鍒板嚭搴撶珯寮傚父:寮傚父淇℃伅锛�" + e);
+ }
+ }
+
+ }
+ }
+ }
+
+ /**
+ * 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
+ */
+ public synchronized void crnIoExecute() throws IOException {
+ for (CrnSlave crn : slaveProperties.getCrn()) {
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) {
+ continue;
+ }
+ BasCrnp basCrnp = basCrnpService.selectById(crn.getId());
+ if (basCrnp == null) {
+ log.error("{}鍙峰爢鍨涙満灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", crn.getId());
+ continue;
+ }
+
+
+ // 鍙湁褰撳爢鍨涙満绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛�
+ if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
+ && crnProtocol.getLoaded() == 0 && crnProtocol.getForkPos() == 0) {
+ // 濡傛灉鏈�杩戜竴娆℃槸鍏ュ簱妯″紡
+ if (crnProtocol.getLastIo().equals("I")) {
+ if (basCrnp.getInEnable().equals("Y")) {
+ this.crnStnToLoc(crn, crnProtocol); // 鍏ュ簱
+ crnProtocol.setLastIo("O");
+ } else if (basCrnp.getOutEnable().equals("Y")) {
+ this.locToCrnStn(crn, crnProtocol); // 鍑哄簱
+ crnProtocol.setLastIo("I");
+ }
+ }
+ // 濡傛灉鏈�杩戜竴娆℃槸鍑哄簱妯″紡
+ else if (crnProtocol.getLastIo().equals("O")) {
+ if (basCrnp.getOutEnable().equals("Y")) {
+ this.locToCrnStn(crn, crnProtocol); // 鍑哄簱
+ crnProtocol.setLastIo("I");
+ } else if (basCrnp.getInEnable().equals("Y")) {
+ this.crnStnToLoc(crn, crnProtocol); // 鍏ュ簱
+ crnProtocol.setLastIo("O");
+ }
+ }
+
+ // 搴撲綅绉昏浆
+ this.locToLoc(crn, crnProtocol);
+ }
+
+ }
+ }
+
+ /**
+ * 鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鍒板簱浣�
+ */
+ public void crnStnToLoc(CrnSlave slave, CrnProtocol crnProtocol) throws IOException {
+ for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) {
+ List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("crn_no", slave.getId()).eq("crn_stn", crnStn.getStaNo()));
+ for (StaDesc staDesc : staDescs) {
+ boolean flag = false;
+ // 鑾峰彇鍫嗗灈鏈哄叆搴撶珯淇℃伅
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
+ StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ // 鏌ヨ绔欑偣璇︾粏淇℃伅
+ BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
+ if (staDetl == null) {
+ log.error("鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo());
+ continue;
+ }
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
+ && staDetl.getCanining() != null && staDetl.getCanining().equals("Y")) {
+ flag = true;
+ }
+ if (!flag) {
+ continue;
+ }
+
+ // 鑾峰彇宸ヤ綔鐘舵�佷负2锛堣澶囦笂璧帮級鐨勫叆搴撳伐浣滄。
+ TaskWrk taskWrk = taskWrkMapper.selectPakIn(slave.getId(), staProtocol.getWorkNo().intValue(), staDesc.getStnNo().toString());
+ if (null == taskWrk) {
+ continue;
+ }
+
+ // 鍫嗗灈鏈烘帶鍒惰繃婊�
+ if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
+ continue;
+ }
+
+ // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
+ if (taskWrkMapper.selectCrnWorking(slave.getId()) != null) {
+ continue;
+ }
+
+// int workNo = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+// taskWrk.setWrkNo(workNo);//宸ヤ綔鍙�
+ taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//娲惧彂鐘舵��
+ taskWrk.setAssignTime(new Date());//娲惧彂鏃堕棿
+ taskWrk.setWrkSts(3);//宸ヤ綔鐘舵�� 3.鍚婅溅鍏ュ簱
+ taskWrk.setCrnNo(staDesc.getCrnNo());//鍫嗗灈鏈哄彿
+ taskWrk.setModiTime(new Date());
+ taskWrk.setModiUser(9988L);
+
+ // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setCrnNo(staDesc.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ crnCommand.setTaskNo(taskWrk.getWrkNo().shortValue()); // 宸ヤ綔鍙�
+ crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
+ crnCommand.setSourcePosX(crnStn.getRow().shortValue()); // 婧愬簱浣嶅垪
+ crnCommand.setSourcePosY(crnStn.getBay().shortValue()); // 婧愬簱浣嶅眰
+ crnCommand.setSourcePosZ(crnStn.getLev().shortValue()); // 婧愬簱浣嶆帓
+ crnCommand.setDestinationPosX(Utils.getRowShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鍒�
+ crnCommand.setDestinationPosY(Utils.getBayShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅灞�
+ crnCommand.setDestinationPosZ(Utils.getLevShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鎺�
+ crnCommand.setCommand((short) 1);
+ log.info("鍫嗗灈鏈哄叆搴撲换鍔′笅鍙�={}", crnCommand);
+ if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand), false)) {
+ log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
+ throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
+ } else {
+ try {
+ taskWrkService.updateById(taskWrk);
+ } catch (Exception e) {
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽紓甯革細" + e);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * 鍑哄簱 ===>> 搴撲綅鍒板爢鍨涙満绔�
+ * 2022-06-09 TQS淇敼锛屾煡璇㈠伐浣滄。LIST锛岄亶鍘嗕笅鍙戯紝闃叉绗竴涓换鍔″牭濉炲嚭搴�
+ */
+ public void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol) {
+ List<TaskWrk> taskWrksInitial = taskWrkMapper.selectPakOut(slave.getId(), null);
+ if (taskWrksInitial.size() == 0) {
+ return;
+ }
+ for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
+ List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("crn_no", slave.getId()).eq("crn_stn", crnStn.getStaNo()));
+ for (StaDesc staDesc : staDescs) {
+ // 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑鍑哄簱宸ヤ綔妗�
+ List<TaskWrk> taskWrks = taskWrkMapper.selectPakOut(slave.getId(), staDesc.getStnNo().toString());
+ for (TaskWrk taskWrk : taskWrks) {
+ if (taskWrk == null) {
+ continue;
+ }
+ // 宸ヤ綔妗ｇ姸鎬佸垽鏂�
+ if (taskWrk.getIoType() != 2 || taskWrk.getTargetPoint() == null || taskWrk.getStartPoint() == null) {
+ log.error("鏌ヨ宸ヤ綔妗ｆ暟鎹笉绗﹀悎鏉′欢--鍏ュ嚭绫诲瀷/绔欑偣, 宸ヤ綔鍙�={}锛屾簮搴撲綅={}锛屽叆鍑虹被鍨�={}", taskWrk.getWrkNo(), taskWrk.getStartPoint(), taskWrk.getIoType());
+ continue;
+ }
+
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ //鍒ゆ柇鍏跺簱浣嶆槸鍚︿负娣卞簱浣嶏紝濡傛灉涓烘繁搴撲綅鎵惧叾娴呭簱浣嶆槸閮芥湁璐�
+ if (locMast.getRow1() == 1 || locMast.getRow1() == 5) {
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", (locMast.getRow1() + 1))
+ .eq("bay1", locMast.getBay1())
+ .eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
+ if (!Cools.isEmpty(locMast1)) {
+ log.info(locMast.getLocNo() + "鍑烘繁搴撲綅锛屾祬搴撲綅鏈夎揣");
+ continue;
+ }
+ } else if (locMast.getRow1() == 4 || locMast.getRow1() == 8) {
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", (locMast.getRow1() - 1))
+ .eq("bay1", locMast.getBay1())
+ .eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
+ if (!Cools.isEmpty(locMast1)) {
+ log.info(locMast.getLocNo() + "鍑烘繁搴撲綅锛屾祬搴撲綅鏈夎揣");
+ continue;
+ }
+ }
+
+ // 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
+ StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
+ if (staProtocol == null) {
+ break;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+
+ // 鏌ヨ绔欑偣璇︾粏淇℃伅
+ BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
+ if (staDetl == null) {
+ log.error("鍑哄簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo());
+ break;
+ }
+
+ // 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
+ if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
+ && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
+ // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
+
+ // 鍫嗗灈鏈烘帶鍒惰繃婊�
+ if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
+ break;
+ }
+
+ // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
+ if (taskWrkMapper.selectCrnWorking(slave.getId()) != null) {
+ break;
+ }
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(taskWrk.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo(taskWrk.getWrkNo().shortValue()); // 宸ヤ綔鍙�
+ command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡
+ command.setSourcePosX(Utils.getRowShort(taskWrk.getStartPoint())); // 婧愬簱浣嶆帓
+ command.setSourcePosY(Utils.getBayShort(taskWrk.getStartPoint())); // 婧愬簱浣嶅垪
+ command.setSourcePosZ(Utils.getLevShort(taskWrk.getStartPoint())); // 婧愬簱浣嶅眰
+ command.setDestinationPosX(crnStn.getRow().shortValue()); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosY(crnStn.getBay().shortValue()); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosZ(crnStn.getLev().shortValue()); // 鐩爣搴撲綅灞�
+ command.setCommand((short) 1);
+
+ if (Cools.isEmpty(taskWrk.getMarkStart()) || taskWrk.getMarkStart() == 0) {
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("TaskNo", taskWrk.getTaskNo());
+ String response = "";
+ try {
+ //寮�濮嬩笂鎶�,鍑哄簱浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
+ response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath(taskStatusFeedbackPath)
+ .setJson(JSON.toJSONString(hashMap))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ Boolean bool = false;
+ if (jsonObject.get("ReturnStatus").equals(0)) {
+ bool = true;
+ taskWrk.setMarkStart(1);
+ }
+ apiLogService.save("wcs寮�濮嬩换鍔′笂鎶ms"
+ , wmsUrl + TaskExecCallback
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(hashMap)
+ , response
+ , bool
+ );
+ } catch (Exception e) {
+ }
+ }
+
+ if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, command), false)) {
+ log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(command));
+ throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
+ } else {
+ try {
+ // 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
+ Date now = new Date();
+ taskWrk.setWrkSts(12);
+ taskWrk.setStatus(2);
+ taskWrk.setModiTime(now);
+ if (taskWrkMapper.updateById(taskWrk) == 0) {
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
+ }
+ } catch (Exception e) {
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽紓甯革細" + e);
+ }
+// try {
+// HashMap<String, Object> headParam = new HashMap<>();
+// headParam.put("taskNo", taskWrk.getTaskNo());
+// headParam.put("status", taskWrk.getStatus());
+// headParam.put("ioType", taskWrk.getIoType());
+// headParam.put("barcode", taskWrk.getBarcode());
+// String response;
+// response = new HttpHandler.Builder()
+// // .setHeaders(headParam)
+// .setUri(wmsUrl)
+// .setPath(taskStatusFeedbackPath)
+// .setJson(JSON.toJSONString(headParam))
+// .build()
+// .doPost();
+// JSONObject jsonObject = JSON.parseObject(response);
+// apiLogService.save("wcs娲惧彂鍑哄簱浠诲姟涓婃姤wms"
+// , wmsUrl + taskStatusFeedbackPath
+// , null
+// , "127.0.0.1"
+// , JSON.toJSONString(headParam)
+// , response
+// , true
+// );
+// } catch (Exception e) {
+// log.error("wcs娲惧彂鍑哄簱浠诲姟涓婃姤wms澶辫触", JSON.toJSONString(taskWrk));
+//// throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
+// }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * 搴撲綅绉昏浆
+ */
+ public void locToLoc(CrnSlave slave, CrnProtocol crnProtocol) {
+ for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
+ // 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑绉诲簱宸ヤ綔妗�
+ List<TaskWrk> taskWrks = taskWrkMapper.selectList(new EntityWrapper<TaskWrk>()
+ .eq("crn_no", slave.getId())
+ .eq("wrk_sts", 11)
+ .eq("io_type", 3)
+ .orderBy("io_pri", false));
+ for (TaskWrk taskWrk : taskWrks) {
+
+ // 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
+// if (Utils.isDeepLoc(slaveProperties, taskWrk.getStartPoint())) {
+// String shallowLocNo = Utils.getShallowLoc(slaveProperties, taskWrk.getStartPoint());
+// TaskWrk hallowLocNoTask = taskWrkMapper.selectByStartPoint(shallowLocNo);
+// if (!Cools.isEmpty(hallowLocNoTask)){
+// continue;
+// }
+// }
+ // 鍫嗗灈鏈烘帶鍒惰繃婊�
+ if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
+ continue;
+ }
+
+ // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
+ if (taskWrkMapper.selectCrnWorking(slave.getId()) != null) {
+ continue;
+ }
+
+ if (taskWrk == null || Cools.isEmpty(taskWrk.getTargetPoint()) || taskWrk.getTargetPoint().equals("") || taskWrk.getWrkNo() == null) {
+ continue;
+ }
+ // 宸ヤ綔妗ｇ姸鎬佸垽鏂�
+ if (taskWrk.getIoType() != 3 || taskWrk.getTargetPoint() == null) {
+ log.error("鏌ヨ宸ヤ綔妗ｆ暟鎹笉绗﹀悎鏉′欢--鍏ュ嚭绫诲瀷/鐩爣搴撲綅鍙�, 宸ヤ綔鍙�={}锛屾簮搴撲綅={}锛屽叆鍑虹被鍨�={}", taskWrk.getWrkNo(), taskWrk.getTargetPoint(), taskWrk.getIoType());
+ continue;
+ }
+
+ // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
+
+
+ // 1.鍫嗗灈鏈哄紑濮嬬Щ鍔�
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
+ crnCommand.setTaskNo(taskWrk.getWrkNo().shortValue()); // 宸ヤ綔鍙�
+ crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
+ crnCommand.setSourcePosX(Utils.getRowShort(taskWrk.getStartPoint())); // 婧愬簱浣嶆帓
+ crnCommand.setSourcePosY(Utils.getBayShort(taskWrk.getStartPoint())); // 婧愬簱浣嶅垪
+ crnCommand.setSourcePosZ(Utils.getLevShort(taskWrk.getStartPoint())); // 婧愬簱浣嶅眰
+ crnCommand.setDestinationPosX(Utils.getRowShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鎺�
+ crnCommand.setDestinationPosY(Utils.getBayShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鍒�
+ crnCommand.setDestinationPosZ(Utils.getLevShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅灞�
+ crnCommand.setCommand((short) 1);
+ if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand), false)) {
+ log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
+ } else {
+ // 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
+ Date now = new Date();
+ taskWrk.setWrkSts(12);
+ taskWrk.setStatus(2);
+ taskWrk.setModiTime(now);
+ if (taskWrkMapper.updateById(taskWrk) == 0) {
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
+ }
+ try {
+ HashMap<String, Object> headParam = new HashMap<>();
+ headParam.put("TaskNo", taskWrk.getTaskNo());
+ String response;
+ response = new HttpHandler.Builder()
+ // .setHeaders(headParam)
+ .setUri(wmsUrl)
+ .setPath(taskStatusFeedbackPath)
+ .setJson(JSON.toJSONString(headParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ apiLogService.save("wcs娲惧彂绉诲簱浠诲姟涓婃姤wms"
+ , wmsUrl + taskStatusFeedbackPath
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(headParam)
+ , response
+ , true
+ );
+ } catch (Exception e) {
+ log.error("wcs娲惧彂绉诲簱搴撲换鍔′笂鎶ms澶辫触", taskWrk);
+// throw new CoolException("wcs娲惧彂绉诲簱搴撲换鍔′笂鎶ms澶辫触");
+ }
+
+ }
+ return;
+ }
+ }
+
+ }
+
+ /**
+ * 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
+ */
+// public void storeFinished() {
+// for (CrnSlave crn : slaveProperties.getCrn()) {
+// // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+// CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+// CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+// if (crnProtocol == null) { continue; }
+//
+// // 鐘舵�侊細绛夊緟纭 骞朵笖 浠诲姟瀹屾垚浣� = 1
+// if (crnProtocol.getTaskFinish() == 0 && crnProtocol.statusType == CrnStatusType.HANDLING_COMPLETED && crnProtocol.getTaskNo() != 0) {
+// //鑾峰彇鍏ュ簱寰呯‘璁ゅ伐浣滄。
+// TaskWrk taskWrk = taskWrkMapper.selectCrnNoInWorking(crn.getId(),crnProtocol.getTaskNo().intValue());
+// if (Cools.isEmpty(taskWrk)) {
+//// log.error("鍫嗗灈鏈哄浜庣瓑寰呯‘璁や笖浠诲姟瀹屾垚鐘舵�侊紝浣嗘湭鎵惧埌宸ヤ綔妗ｃ�傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", crn.getId(), crnProtocol.getTaskNo());
+// continue;
+// }
+//
+// //鑾峰彇鎸囦护ID
+// Integer commandId = crnProtocol.getCommandId();
+// CommandInfo commandInfo = new CommandInfo();
+// if (Cools.isEmpty(commandId)){
+// commandInfo = commandInfoService.selectOne(new EntityWrapper<CommandInfo>()
+// .eq("wrk_no",crnProtocol.getTaskNo())
+// .eq("device","Crn"));
+// }else {
+// commandInfo = commandInfoService.selectById(commandId);
+// }
+//
+//
+// if (commandInfo == null) {
+// //鎸囦护涓嶅瓨鍦�
+// continue;
+// }
+// if (commandInfo.getCommandStatus() == 3){
+// continue;
+// }
+// commandInfo.setCommandStatus(CommandStatusType.COMPLETE.id);//鎸囦护瀹屾垚
+// commandInfo.setCompleteTime(new Date());//鎸囦护瀹屾垚鏃堕棿
+// if (commandInfoService.updateById(commandInfo)) {//淇敼鎴愬姛鍚庡浣嶅爢鍨涙満
+// // 鍫嗗灈鏈哄浣�
+// crnThread.setResetFlag(true);
+// }
+// }
+// }
+// }
+
+ /**
+ * 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
+ */
+ public void storeFinished() throws InterruptedException {
+ for (CrnSlave crn : slaveProperties.getCrn()) {
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) {
+ continue;
+ }
+
+ // 鐘舵�侊細绛夊緟纭 骞朵笖 浠诲姟瀹屾垚浣� = 1
+ if (crnProtocol.getTaskFinish() == 0 && crnProtocol.statusType == CrnStatusType.HANDLING_COMPLETED && crnProtocol.getTaskNo() != 0) {
+ //鑾峰彇鍏ュ簱寰呯‘璁ゅ伐浣滄。
+ TaskWrk taskWrk = taskWrkMapper.selectCrnNoInWorking(crn.getId(), crnProtocol.getTaskNo().intValue());
+ if (Cools.isEmpty(taskWrk) && crnProtocol.getTaskNo() != 999) {
+ log.error("鍫嗗灈鏈哄浜庣瓑寰呯‘璁や笖浠诲姟瀹屾垚鐘舵�侊紝浣嗘湭鎵惧埌宸ヤ綔妗ｃ�傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", crn.getId(), crnProtocol.getTaskNo());
+ continue;
+ }
+ //纭瀹屾垚淇″彿
+ CrnOperatorParam crnOperatorParam = new CrnOperatorParam();
+ crnOperatorParam.setCrnNo(crn.getId());
+ R r = crnController.crnTaskComplete(crnOperatorParam);
+ Thread.sleep(1000);
+ if (!r.get("code").equals(200)) {
+ return;
+ }
+ if (!Cools.isEmpty(taskWrk)) {
+ if (taskWrk.getIoType() == 1 && taskWrk.getWrkSts() == 3) {
+ taskWrk.setWrkSts(4);//鍏ュ簱瀹屾垚
+ taskWrk.setStatus(5);//瀹岀粨
+ //鏇存柊搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ locMast.setLocSts("F");//F.鍦ㄥ簱
+ locMast.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
+ locMast.setModiTime(new Date());
+ locMast.setModiUser(9999L);
+ locMastService.updateById(locMast);
+ } else if (taskWrk.getIoType() == 2 && taskWrk.getWrkSts() == 12) {
+ taskWrk.setWrkSts(13);//鍑哄簱瀹屾垚
+ taskWrk.setStatus(5);//瀹岀粨
+ //鏇存柊搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ locMast.setLocSts("O");//O.绌哄簱浣�
+ locMast.setBarcode("");//鎵樼洏鐮�
+ locMast.setModiTime(new Date());
+ locMast.setModiUser(9999L);
+ locMastService.updateById(locMast);
+ } else if (taskWrk.getIoType() == 3 && taskWrk.getWrkSts() == 12) {
+ taskWrk.setWrkSts(4);//鍏ュ簱瀹屾垚
+ taskWrk.setStatus(5);//瀹岀粨
+ //鏇存柊搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ locMast.setLocSts("F");//F.鍦ㄥ簱
+ locMast.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
+ locMast.setModiTime(new Date());
+ locMast.setModiUser(9999L);
+ locMastService.updateById(locMast);
+
+ LocMast locMast1 = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ locMast1.setLocSts("O");//O.绌哄簱浣�
+ locMast1.setBarcode("");//鎵樼洏鐮�
+ locMast1.setModiTime(new Date());
+ locMast1.setModiUser(9999L);
+ locMastService.updateById(locMast1);
+ }
+ taskWrkService.updateById(taskWrk);
+ }
+
+ }
+ }
+ }
+
+ /**
+ * 鍫嗗灈鏈哄紓甯镐俊鎭褰�
+ */
+ public void recCrnErr() {
+ Date now = new Date();
+ for (CrnSlave crn : slaveProperties.getCrn()) {
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) {
+ continue;
+ }
+ if (false) {
+// if (crnProtocol.getModeType() != CrnModeType.STOP) {
+ // 鏈変换鍔�
+ if (crnProtocol.getTaskNo() != 0) {
+ BasErrLog latest = basErrLogService.findLatestByTaskNo(crn.getId(), crnProtocol.getTaskNo().intValue());
+ // 鏈夊紓甯�
+ if (latest == null) {
+ if (crnProtocol.getAlarm() != null && crnProtocol.getAlarm() > 0) {
+ WrkMast wrkMast = wrkMastMapper.selectById(crnProtocol.getTaskNo());
+ if (wrkMast == null) {
+ continue;
+ }
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
+ String errName = crnError == null ? String.valueOf(crnProtocol.getAlarm()) : crnError.getErrName();
+ BasErrLog basErrLog = new BasErrLog(
+ null, // 缂栧彿
+ wrkMast.getWrkNo(), // 宸ヤ綔鍙�
+ now, // 鍙戠敓鏃堕棿
+ null, // 缁撴潫鏃堕棿
+ wrkMast.getWrkSts(), // 宸ヤ綔鐘舵��
+ wrkMast.getIoType(), // 鍏ュ嚭搴撶被鍨�
+ crn.getId(), // 鍫嗗灈鏈�
+ null, // plc
+ wrkMast.getLocNo(), // 鐩爣搴撲綅
+ wrkMast.getStaNo(), // 鐩爣绔�
+ wrkMast.getSourceStaNo(), // 婧愮珯
+ wrkMast.getSourceLocNo(), // 婧愬簱浣�
+ wrkMast.getBarcode(), // 鏉＄爜
+ (int) crnProtocol.getAlarm1(), // 寮傚父鐮�
+ errName, // 寮傚父
+ 1, // 寮傚父鎯呭喌
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ "浠诲姟涓紓甯�" // 澶囨敞
+ );
+ if (!basErrLogService.insert(basErrLog)) {
+ log.error("鍫嗗灈鏈簆lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", crn.getId(), errName);
+ }
+ }
+ } else {
+ // 寮傚父淇
+ if (crnProtocol.getAlarm1() == null || crnProtocol.getAlarm1() == 0) {
+ latest.setEndTime(now);
+ latest.setUpdateTime(now);
+ latest.setStatus(2);
+ if (!basErrLogService.updateById(latest)) {
+ log.error("鍫嗗灈鏈簆lc寮傚父璁板綍淇澶辫触 ===>> [id:{}] [errLogId:{}]", crn.getId(), latest.getId());
+ }
+ }
+ }
+ // 鏃犱换鍔�
+ } else {
+ BasErrLog latest = basErrLogService.findLatest(crn.getId());
+ // 鏈夊紓甯�
+ if (crnProtocol.getAlarm1() != null && crnProtocol.getAlarm() > 0) {
+ // 璁板綍鏂板紓甯�
+ if (latest == null || (latest.getErrCode() != crnProtocol.getAlarm().intValue())) {
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
+ String errName = crnError == null ? String.valueOf(crnProtocol.getAlarm()) : crnError.getErrName();
+ BasErrLog basErrLog = new BasErrLog(
+ null, // 缂栧彿
+ null, // 宸ヤ綔鍙�
+ now, // 鍙戠敓鏃堕棿
+ null, // 缁撴潫鏃堕棿
+ null, // 宸ヤ綔鐘舵��
+ null, // 鍏ュ嚭搴撶被鍨�
+ crn.getId(), // 鍫嗗灈鏈�
+ null, // plc
+ null, // 鐩爣搴撲綅
+ null, // 鐩爣绔�
+ null, // 婧愮珯
+ null, // 婧愬簱浣�
+ null, // 鏉＄爜
+ (int) crnProtocol.getAlarm1(), // 寮傚父鐮�
+ errName, // 寮傚父
+ 1, // 寮傚父鎯呭喌
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ "鏃犱换鍔″紓甯�" // 澶囨敞
+ );
+ if (!basErrLogService.insert(basErrLog)) {
+ log.error("鍫嗗灈鏈簆lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", crn.getId(), errName);
+ }
+ }
+ // 鏃犲紓甯�
+ } else {
+ // 寮傚父淇
+ if (latest != null && latest.getStatus() == 1) {
+ latest.setEndTime(now);
+ latest.setUpdateTime(now);
+ latest.setStatus(2);
+ if (!basErrLogService.updateById(latest)) {
+ log.error("鍫嗗灈鏈簆lc寮傚父璁板綍淇澶辫触 ===>> [id:{}] [errLogId:{}]", crn.getId(), latest.getId());
+ }
+ }
+ }
+ }
+ }
+
+ }
+ }
+
+ //鑷姩娲惧彂浠诲姟
+ public void autoDistribute() {
+ Config config = configService.selectByCode("autoDistribute");
+ if (config == null) {
+ return;
+ }
+
+ if (config.getValue().equals("false")) {//鍒ゆ柇鏄惁寮�鍚嚜鍔ㄦ淳鍙戜换鍔�
+ return;
+ }
+
+ for (TaskWrk taskWrk : taskWrkService.selectReceive()) {
+
+ try {
+ taskWrkService.distribute(taskWrk.getTaskNo(), 9527L);
+ } catch (CoolException e) {
+ log.info(e.getMessage());
+ }
+ }
+ }
+
+ //agv鍙栨斁璐т换鍔″畬鎴�
+ public synchronized void autoCompleteAGV() {
+ List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ try {
+ Thread.sleep(500);
+ } catch (Exception e) {
+
+ }
+
+ for (BasDevp basDevp : basDevps) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ StaProtocol staProtocol = devpThread.getStation().get(basDevp.getDevNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ if (basDevp.getWrkNo() != 0) {
+ if (basDevp.getAgvTargetPick() != 0) {//鍙栬揣
+ staProtocol.setAgvTypeSign((short) 0);
+ staProtocol.setStaNo(basDevp.getDevNo().shortValue());
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
+ }
+ boolean sign = true;
+ if (basDevp.getAgvTargetPlace() != 0) {
+ sign = false;
+ basDevp.setAgvTargetPlace(0);
+ basDevpService.updateById(basDevp);
+ staProtocol.setAgvTypeSign((short) 3);//1
+ staProtocol.setStaNo(basDevp.getDevNo().shortValue());
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
+ }
+ } else {
+ if (basDevp.getAgvTargetPlace() != 0) {
+ if (basDevp.getLoading().equals("Y")) {
+ staProtocol.setAgvTypeSign((short) 1);
+ staProtocol.setStaNo(basDevp.getDevNo().shortValue());
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
+ } else {
+ log.error("AGV鏀捐揣瀹屾垚浣嗚緭閫佺嚎鏃犵墿锛屽浣嶄俊鍙� ===>> [staNo:{}] [basDevp:{}]", basDevp.getDevNo(), basDevp);
+ basDevp.setAgvTargetPlace(0);
+ basDevpService.updateById(basDevp);
+ staProtocol.setAgvTypeSign((short) 3);//1
+ staProtocol.setStaNo(basDevp.getDevNo().shortValue());
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
+ }
+
+ }
+ if (basDevp.getAgvTargetPick() != 0) {
+ basDevp.setAgvTargetPick(0);
+ basDevpService.updateById(basDevp);
+ staProtocol.setAgvTypeSign((short) 2);//0
+ staProtocol.setStaNo(basDevp.getDevNo().shortValue());
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
+ }
+ }
+ }
+ }
+
+ public synchronized void autoCompleteTask() {
+ List<TaskWrk> taskWrks = taskWrkMapper.selectWorkingTask();
+ for (TaskWrk taskWrk : taskWrks) {
+ //鑾峰彇鍛戒护闆嗗悎
+ List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskWrk.getTaskNo());
+ if (taskWrk.getCommandStep() < commandInfos.size()) {
+ continue;//褰撳墠姝ュ簭娌℃湁鍒拌揪鏈�鍚庝竴鏉″懡浠�
+ }
+
+ //鍒ゆ柇鏈鍛戒护鏄惁鎵ц瀹屾垚
+ CommandInfo commandInfo = commandInfos.get(commandInfos.size() - 1);
+ if (commandInfo.getCommandStatus() != CommandStatusType.COMPLETE.id) {
+ continue;//鎸囦护鏈畬鎴�
+ }
+
+ Date now = new Date();
+ //鎸囦护宸插畬鎴愶紝鏇存柊浠诲姟
+ if (taskWrk.getIoType() == 1) {
+ //鍏ュ簱浠诲姟
+ taskWrk.setWrkSts(4);//3.鍚婅溅鍏ュ簱涓� => 4.鍏ュ簱瀹屾垚
+ //taskWrk.setStatus(TaskStatusType.COMPLETE.id);
+ taskWrk.setModiTime(now);
+ taskWrkService.updateById(taskWrk);
+
+ //鏇存柊搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ locMast.setLocSts("F");//F.鍦ㄥ簱
+ locMast.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
+ locMast.setModiTime(now);
+ locMast.setModiUser(9999L);
+ locMastService.updateById(locMast);
+ } else if (taskWrk.getIoType() == 2) {
+ //鍑哄簱浠诲姟
+ taskWrk.setWrkSts(14);//12.鍚婅溅鍑哄簱涓� => 14.鍑哄簱瀹屾垚
+// taskWrk.setStatus(TaskStatusType.COMPLETE.id);
+ taskWrk.setModiTime(now);
+ taskWrkService.updateById(taskWrk);
+
+ //鏇存柊搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ locMast.setLocSts("O");//O.绌哄簱浣�
+ locMast.setBarcode("");//鎵樼洏鐮�
+ locMast.setModiTime(now);
+ locMast.setModiUser(9999L);
+ locMastService.updateById(locMast);
+ }
+ }
+ }
+
+
+ public synchronized String CrnStartRunning(TaskWrk taskWrk) {
+ String tasktype = null;
+ switch (taskWrk.getIoType()) {
+ case 1:
+ tasktype = "RK";
+ break;
+ case 2:
+ tasktype = "CK";
+ break;
+ case 3:
+ tasktype = "YK";
+ break;
+ default:
+ tasktype = "鏈煡";
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("x-api-key", "7a15b5db-29b6-552c-8cff-0cfec3756da2");
+ TaskOverToWms taskOverToWms = new TaskOverToWms();
+ taskOverToWms.setFeedbackFrom("WCS"); //鏉ユ簮
+ taskOverToWms.setWarehouseId("1688469798893297665"); //浠撳簱鏍囪瘑
+ taskOverToWms.setTaskNo(taskWrk.getTaskNo()); //浠诲姟鍙�
+ taskOverToWms.setTaskType(tasktype); // 浠诲姟绫诲瀷
+ taskOverToWms.setContainerCode(taskWrk.getBarcode()); // 瀹瑰櫒缂栫爜
+ if (taskWrk.getIoType() == 1 || taskWrk.getIoType() == 3) {
+ taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //璁惧缂栫爜
+ taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //鐩爣搴撲綅
+ } else if (taskWrk.getIoType() == 2) {
+ Map<Integer, String> map1 = new HashMap<>();
+ map1.put(102, "J-1101");
+ map1.put(106, "J-1103");
+ map1.put(110, "J-1105");
+ map1.put(114, "J-1107");
+ map1.put(118, "J-1109");
+ map1.put(122, "J-1111");
+ map1.put(305, "H-1101");
+ map1.put(405, "G-1101");
+ taskOverToWms.setEquipmentCode(map1.get(taskWrk.getTargetPoint())); //璁惧缂栫爜
+ taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint()); //婧愬簱浣�
+ }
+
+ taskOverToWms.setTaskStatus("executing"); //浠诲姟鐘舵��
+ String response = null;
+ try {
+ response = new HttpHandler.Builder()
+ .setHeaders(map)
+ .setUri(wmsUrl)
+ .setPath("wcsManager/wcsInterface/taskStatusFeedback")
+ .setJson(JSON.toJSONString(taskOverToWms))
+ .build()
+ .doPost();
+ } catch (Exception e) {
+ log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛澶辫触");
+ }
+ apiLogService.save("鍫嗗灈鏈哄紑濮嬭繍琛�"
+ , wmsUrl + "wcsManager/wcsInterface/taskStatusFeedback"
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(taskOverToWms)
+ , response
+ , true
+ );
+ return response;
+ }
+
+ private TaskWrk createTask1(Result result, String barcode) {
+ String locNo = Utils.Fusion(result.getRow(), result.getFloor(), result.getColumn());
+
+
+ Date now = new Date();
+ TaskWrk taskWrk = new TaskWrk();
+ int workNo1 = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+ taskWrk.setTaskNo(result.getTaskNo());//浠诲姟鍙�
+ taskWrk.setWrkNo(workNo1);
+ taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//浠诲姟鐘舵�侊細娲惧彂
+ taskWrk.setCreateTime(now);
+ taskWrk.setIoType(1);//浠诲姟绫诲瀷
+ taskWrk.setIoPri(13);//浼樺厛绾�
+ taskWrk.setBarcode(barcode);//鏉＄爜
+ LocMast locMast = locMastService.selectByLocNo(locNo);
+ taskWrk.setCrnNo(locMast.getCrnNo());
+ taskWrk.setTargetPoint(locNo);
+ taskWrk.setStartPoint("116");
+ if (result.getAlley().equals("1")) {
+ taskWrk.setCrnNo(1);
+ } else {
+ taskWrk.setCrnNo(2);
+ }
+ if (taskWrk.getIoType() == 1) {
+ taskWrk.setWrkSts(2);
+ if (!Cools.isEmpty(taskWrk.getTargetPoint())) {
+ taskWrk.setOriginTargetPoint(taskWrk.getTargetPoint());
+ }
+ }
+ return taskWrk;
+ }
+
+ private TaskWrk createTask(GetWmsDto dto, String barcode) {
+ String wcsLocNo = dto.getLocNo();
+ if (Cools.isEmpty(wcsLocNo)) {
+ return null;
+ }
+ Date now = new Date();
+ TaskWrk taskWrk = new TaskWrk();
+ int workNo1 = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+ taskWrk.setTaskNo(dto.getWrkNo());//浠诲姟鍙�
+ taskWrk.setWrkNo(workNo1);
+ taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
+ taskWrk.setCreateTime(now);
+ taskWrk.setIoType(1);//浠诲姟绫诲瀷
+ taskWrk.setIoPri(Cools.isEmpty(dto.getTaskPriority()) ? 300 : Integer.parseInt(dto.getTaskPriority()));//浼樺厛绾�
+ taskWrk.setBarcode(barcode);//鏉＄爜
+ LocMast locMast = locMastService.selectByLocNo(wcsLocNo);
+ taskWrk.setCrnNo(locMast.getCrnNo());
+ taskWrk.setTargetPoint(wcsLocNo);
+ taskWrk.setStartPoint(dto.getStaNo().toString());
+ if (taskWrk.getIoType() == 1) {
+ taskWrk.setWrkSts(2);
+ if (!Cools.isEmpty(taskWrk.getTargetPoint())) {
+ taskWrk.setOriginTargetPoint(taskWrk.getTargetPoint());
+ }
+
+// } else if (param.getIoType() == 2) {
+// taskWrk.setWrkSts(11);
+// if (!Cools.isEmpty(param.getStartPoint())) {
+// taskWrk.setStartPoint(Utils.getWcsLocNo(param.getStartPoint()));//璧风偣
+// taskWrk.setOriginStartPoint(param.getStartPoint());
+// }
+// taskWrk.setTargetPoint(param.getTargetPoint());
+// }else if (param.getIoType() == 3){
+// taskWrk.setWrkSts(11);
+// if (!Cools.isEmpty(param.getStartPoint())) {
+// taskWrk.setStartPoint(param.getStartPoint());//璧风偣
+// taskWrk.setOriginStartPoint(param.getStartPoint());
+// }
+ }
+ return taskWrk;
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/DataResourceServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/DataResourceServiceImpl.java
index 7488e74..20b80f1 100644
--- a/src/main/java/com/zy/asrs/service/impl/DataResourceServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/DataResourceServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.DataResourceMapper;
-import com.zy.asrs.entity.DataResource;
-import com.zy.asrs.service.DataResourceService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.DataResource;
+import com.zy.asrs.mapper.DataResourceMapper;
+import com.zy.asrs.service.DataResourceService;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -36,7 +36,7 @@
for (DataResource dataResource : dataResources) {//灏嗘櫘閫氭暟鎹拰鏈夊瀛愯妭鐐规暟鎹繘琛屽垎鍓�
if (this.hasChild(dataResource.getId())) {
listChild.add(dataResource);
- }else {
+ } else {
list.add(dataResource);
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/DeviceErrorServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/DeviceErrorServiceImpl.java
index 9d95094..2caff09 100644
--- a/src/main/java/com/zy/asrs/service/impl/DeviceErrorServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/DeviceErrorServiceImpl.java
@@ -1,13 +1,11 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.DeviceErrorMapper;
-import com.zy.asrs.entity.DeviceError;
-import com.zy.asrs.service.DeviceErrorService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.zy.core.enums.SlaveType;
+import com.zy.asrs.entity.DeviceError;
+import com.zy.asrs.mapper.DeviceErrorMapper;
+import com.zy.asrs.service.DeviceErrorService;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
import java.util.Date;
@Service("deviceErrorService")
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index ef957cb..c5831e6 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -8,8 +8,6 @@
import com.core.common.R;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WmsLocStatus;
-import com.zy.asrs.entity.param.TaskOverToWms;
-import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.LocMastService;
@@ -23,6 +21,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
@Slf4j
@Service("locMastService")
public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService {
@@ -73,7 +72,7 @@
@Override
public LocMast selectByLocNo(String locNo) {
- return this.selectOne(new EntityWrapper<LocMast>().eq("loc_no",locNo));
+ return this.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locNo));
//return this.baseMapper.selectByLocNo(locNo);
}
@@ -87,20 +86,20 @@
public R toWmsLocStatus(LocMast locMast) {
String response = null;
Map<String, Object> map = new HashMap<>();
- map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
+ map.put("x-api-key", "7a15b5db-29b6-552c-8cff-0cfec3756da2");
WmsLocStatus param = new WmsLocStatus();
param.setWarehouseId("1688469798893297665");
param.setLocationCode(Utils.getWmsLocNo(locMast.getLocNo()));
param.setEmptyContainer(locMast.getEmptyContainer$());
- if (locMast.getLocSts().equals("Z")){
+ if (locMast.getLocSts().equals("Z")) {
param.setStatus("JY");
- }else {
+ } else {
param.setStatus("QY");
}
- if (Cools.isEmpty(locMast.getBarcode()) || locMast.getLocSts().equals("O")){
+ if (Cools.isEmpty(locMast.getBarcode()) || locMast.getLocSts().equals("O")) {
param.setContainerCode("");
param.setContainerTypeCode("");
- }else {
+ } else {
param.setContainerCode(locMast.getBarcode());
param.setContainerTypeCode(locMast.getContainerTypeCode());
}
@@ -113,19 +112,19 @@
.setJson(JSON.toJSONString(param))
.build()
.doPost();
- }catch (Exception e){
+ } catch (Exception e) {
log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛澶辫触");
}
JSONObject jsonObject = JSON.parseObject(response);
apiLogService.save("Wms鍙樻洿璐т綅鐘舵��"
- ,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply"
- ,null
- ,"127.0.0.1"
- ,JSON.toJSONString(param)
- ,response
- ,true
+ , wmsUrl + "wcsManager/wcsInterface/inboundTaskApply"
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(param)
+ , response
+ , true
);
return null;
diff --git a/src/main/java/com/zy/asrs/service/impl/MainCpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainCpServiceImpl.java
new file mode 100644
index 0000000..b6874da
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/MainCpServiceImpl.java
@@ -0,0 +1,1558 @@
+package com.zy.asrs.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.core.exception.CoolException;
+import com.zy.asrs.controller.CrnController;
+import com.zy.asrs.controller.SiteController;
+import com.zy.asrs.domain.enums.TaskStatusType;
+import com.zy.asrs.domain.enums.WorkNoType;
+import com.zy.asrs.domain.param.CrnOperatorParam;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.Result;
+import com.zy.asrs.entity.param.StorageEscalationParam;
+import com.zy.asrs.entity.param.TaskOverToWms;
+import com.zy.asrs.mapper.BasCrnErrorMapper;
+import com.zy.asrs.mapper.StaDescMapper;
+import com.zy.asrs.mapper.TaskWrkMapper;
+import com.zy.asrs.mapper.WrkMastMapper;
+import com.zy.asrs.service.*;
+import com.zy.asrs.utils.CommandUtils;
+import com.zy.asrs.utils.Utils;
+import com.zy.common.service.CommonService;
+import com.zy.common.utils.HttpHandler;
+import com.zy.core.CrnThread;
+import com.zy.core.DevpThread;
+import com.zy.core.cache.MessageQueue;
+import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.*;
+import com.zy.core.model.CrnSlave;
+import com.zy.core.model.DevpSlave;
+import com.zy.core.model.Task;
+import com.zy.core.model.command.CrnCommand;
+import com.zy.core.model.protocol.CrnProtocol;
+import com.zy.core.model.protocol.StaProtocol;
+import com.zy.core.properties.SlaveProperties;
+import com.zy.core.thread.BarcodeThread;
+import com.zy.core.thread.SiemensDevpThread;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 绔嬩綋浠撳簱WCS绯荤粺涓绘祦绋嬩笟鍔�
+ * Created by vincent on 2020/8/6
+ */
+@Slf4j
+@Service("mainService")
+@Transactional
+public class MainCpServiceImpl {
+
+ public static final long COMMAND_TIMEOUT = 5 * 1000;
+
+ @Autowired
+ private SlaveProperties slaveProperties;
+ @Autowired
+ private WrkMastMapper wrkMastMapper;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private BasCrnpService basCrnpService;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private BasErrLogService basErrLogService;
+ @Autowired
+ private BasCrnErrorMapper basCrnErrorMapper;
+ @Autowired
+ private TaskWrkMapper taskWrkMapper;
+ @Autowired
+ private TaskWrkService taskWrkService;
+ @Autowired
+ private ConfigService configService;
+ @Autowired
+ private StaDescMapper staDescMapper;
+ @Autowired
+ private CommandInfoService commandInfoService;
+
+ @Autowired
+ private OpenServiceImpl openServiceImpl;
+ @Autowired
+ private StaDescService staDescService;
+
+ @Autowired
+ private ApiLogService apiLogService;
+ @Autowired
+ private CommonService commonService;
+
+ @Value("${wms.url}")
+ private String wmsUrl;
+ @Value("${wms.inboundTaskApplyPath}")
+ private String inboundTaskApplyPath;
+ @Value("${wms.TaskExecCallback}")
+ private String TaskExecCallback;
+ @Value("${wms.taskStatusFeedbackPath}")
+ private String taskStatusFeedbackPath;
+ @Autowired
+ private CrnController crnController;
+ @Autowired
+ private SiteController siteController;
+
+
+ public void generateStoreWrkFile1() throws IOException, InterruptedException {
+ try {
+ // 鏍规嵁杈撻�佺嚎plc閬嶅巻
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ // 閬嶅巻鍏ュ簱鍙�
+ for (DevpSlave.Sta inSta : devp.getInSta()) {
+ StorageEscalationParam storageEscalationParam = new StorageEscalationParam();
+ // 鑾峰彇鍏ュ簱绔欎俊鎭�
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ Short workNo = staProtocol.getWorkNo();
+ Short stano = staProtocol.getStaNo();
+
+ // 灏哄妫�娴嬪紓甯�
+ boolean back = false;
+ String errMsg = "";
+ if (staProtocol.isFrontErr()) {
+ errMsg = "鍓嶈秴闄�";
+ back = true;
+ }
+ if (!back && staProtocol.isBackErr()) {
+ errMsg = "鍚庤秴闄�";
+ back = true;
+ }
+ if (!back && staProtocol.isHighErr()) {
+ errMsg = "楂樿秴闄�";
+ back = true;
+ }
+ if (!back && staProtocol.isLeftErr()) {
+ errMsg = "宸﹁秴闄�";
+ back = true;
+ }
+ if (!back && staProtocol.isRightErr()) {
+ errMsg = "鍙宠秴闄�";
+ back = true;
+ }
+ if (!back && staProtocol.isWeightErr()) {
+ errMsg = "瓒呴噸";
+ back = true;
+ }
+ if (!back && staProtocol.isBarcodeErr()) {
+ errMsg = "鎵爜澶辫触";
+ back = true;
+ }
+ // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
+ if (staProtocol.isAutoing() && staProtocol.isLoading()
+ && staProtocol.isInEnable()
+ && !staProtocol.isEmptyMk() && workNo >= 9790
+ && staProtocol.isPakMk()) {
+ // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
+ if (barcodeThread == null) {
+ continue;
+ }
+ String BoxNo = barcodeThread.getBarcode();
+ TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", BoxNo));
+ if (!Cools.isEmpty(taskWrk1)) {
+ log.info("鎵樼洏鐮侊細" + BoxNo + "浠诲姟妗ｅ瓨鍦�");
+ if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) {
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no", taskWrk1.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
+ if (Cools.isEmpty(staDesc)) {
+ return;
+ } else {
+ continue;
+ }
+ }
+ }
+ if (back) {
+ storageEscalationParam.setWCSStatus(1);
+ storageEscalationParam.setWCSErrorMessage(storageEscalationParam.getWCSErrorMessage() + errMsg);
+ }
+ log.info("缁勬墭鍏ュ簱={}", storageEscalationParam);
+ storageEscalationParam.setBoxNo(BoxNo);
+ String response = "";
+ Boolean success = false;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath(inboundTaskApplyPath)
+ .setJson(JSON.toJSONString(storageEscalationParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (back) {
+ if (staProtocol.getWorkNo() >= 9801 && staProtocol.getWorkNo() <= 9825) {
+ staProtocol.setStaNo((short) 105);
+ } else if (staProtocol.getWorkNo() >= 9826 && staProtocol.getWorkNo() <= 9850) {
+ staProtocol.setStaNo((short) 107);
+ } else if (staProtocol.getWorkNo() >= 9851 && staProtocol.getWorkNo() <= 9875) {
+ staProtocol.setStaNo((short) 109);
+ } else {
+ staProtocol.setStaNo((short) 110);
+ }
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ } else {
+ if (!Cools.isEmpty(response) && !Cools.isEmpty(jsonObject.get("ReturnStatus")) && jsonObject.get("ReturnStatus").equals(0) && !Cools.isEmpty(jsonObject.get("Result").toString())) {
+ Result result = JSON.parseObject(jsonObject.get("Result").toString(), Result.class);
+ // 鍒涙柊涓�涓叆搴撳伐浣滄。
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(result.getTaskNo());
+ if (Cools.isEmpty(taskWrk)) {
+ taskWrk = createTask1(result, BoxNo);
+ if (Cools.isEmpty(taskWrk)) {
+ log.error("搴撲綅寮傚父锛屽簱浣嶅彿锛�={}", taskWrk.getOriginTargetPoint());
+ } else {
+ taskWrkService.insert(taskWrk);
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
+ staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
+ staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("TaskNo", taskWrk.getTaskNo());
+ try {
+ //寮�濮嬩笂鎶�,浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
+ response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath(taskStatusFeedbackPath)
+ .setJson(JSON.toJSONString(hashMap))
+ .build()
+ .doPost();
+ JSONObject jsonObject1 = JSON.parseObject(response);
+ Boolean bool = false;
+ if (jsonObject1.get("ReturnStatus").equals(0)) {
+ bool = true;
+ }
+ apiLogService.save("wcs寮�濮嬪叆搴撲换鍔′笂鎶ms"
+ , wmsUrl + TaskExecCallback
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(hashMap)
+ , response
+ , bool
+ );
+ } catch (Exception e) {
+
+ }
+ }
+ } else {
+// staProtocol.setWorkNo((short) 9991);
+ if (staProtocol.getWorkNo() >= 9801 && staProtocol.getWorkNo() <= 9825) {
+ staProtocol.setStaNo((short) 105);
+ } else if (staProtocol.getWorkNo() >= 9826 && staProtocol.getWorkNo() <= 9850) {
+ staProtocol.setStaNo((short) 107);
+ } else if (staProtocol.getWorkNo() >= 9851 && staProtocol.getWorkNo() <= 9875) {
+ staProtocol.setStaNo((short) 109);
+ } else {
+ staProtocol.setStaNo((short) 110);
+ }
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ }
+
+ } else {
+// staProtocol.setWorkNo((short) 9991);
+ staProtocol.setStaNo(inSta.getBackSta().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ }
+ }
+ } catch (Exception e) {
+ log.error("璇锋眰鍏ュ簱璋冪敤鎺ュ彛澶辫触");
+ log.error("寮傚父淇℃伅鎵撳嵃锛�" + e);
+ try {
+ BasDevp basDevp = basDevpService.selectById(inSta.getStaNo());
+ if (Cools.isEmpty(basDevp)) {
+ log.error("绔欑偣鍙峰紓甯�" + inSta.getStaNo());
+ } else if (basDevp.getStaErr() != 0) {
+ basDevp.setStaErr(2);
+ basDevpService.updateById(basDevp);
+ }
+ } catch (Exception e1) {
+ // 閫�鍥�
+ log.error("鎵爜妫�娴嬬▼搴忓紓甯�" + inSta.getStaNo() + "寮傚父淇℃伅" + e1);
+ }
+ } finally {
+ apiLogService.save("wms璇锋眰鍏ュ簱璐т綅鎺ュ彛"
+ , wmsUrl + inboundTaskApplyPath
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(storageEscalationParam)
+ , response
+ , success
+ );
+ }
+ log.info("鍏ュ簱璇锋眰鍙傛暟=" + JSON.toJSONString(BoxNo));
+ log.info("鍏ュ簱璇锋眰杩斿洖鍙傛暟=" + JSON.toJSONString(response));
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.error("generateStoreWrkFile e", e);
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ }
+ }
+
+ public void generateStoreWrkFile() throws IOException, InterruptedException {
+ try {
+ // 鏍规嵁杈撻�佺嚎plc閬嶅巻
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ // 閬嶅巻鍏ュ簱鍙�
+ for (DevpSlave.Sta inSta : devp.getInSta()) {
+ // 鑾峰彇鍏ュ簱绔欎俊鎭�
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ Short workNo = staProtocol.getWorkNo();
+ Short stano = staProtocol.getStaNo();
+
+ // 灏哄妫�娴嬪紓甯�
+ boolean back = false;
+ String errMsg = "";
+ if (staProtocol.isFrontErr()) {
+ errMsg = "鍓嶈秴闄�";
+ back = true;
+ }
+ if (!back && staProtocol.isBackErr()) {
+ errMsg = "鍚庤秴闄�";
+ back = true;
+ }
+ if (!back && staProtocol.isHighErr()) {
+ errMsg = "楂樿秴闄�";
+ back = true;
+ }
+ if (!back && staProtocol.isLeftErr()) {
+ errMsg = "宸﹁秴闄�";
+ back = true;
+ }
+ if (!back && staProtocol.isRightErr()) {
+ errMsg = "鍙宠秴闄�";
+ back = true;
+ }
+ if (!back && staProtocol.isWeightErr()) {
+ errMsg = "瓒呴噸";
+ back = true;
+ }
+ if (!back && staProtocol.isBarcodeErr()) {
+ errMsg = "鎵爜澶辫触";
+ back = true;
+ }
+ // 閫�鍥�
+ if (back) {
+ if (stano == inSta.getBackSta().shortValue()) {
+ continue;
+ }
+ if (workNo == 0 && stano == 0) {
+ continue;
+ }
+ if (!staProtocol.isPakMk()) {
+ continue;
+ }
+// News.warn("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
+ staProtocol.setWorkNo(workNo);
+ staProtocol.setStaNo(inSta.getStaNo().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
+ if (taskWrk != null) {
+ taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
+ taskWrkMapper.updateById(taskWrk);
+ }
+ continue;
+ }
+ // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
+ if (staProtocol.isAutoing() && staProtocol.isLoading()
+ && staProtocol.isInEnable()
+ && !staProtocol.isEmptyMk() && (workNo >= 9899)
+ && staProtocol.isPakMk()) {
+ // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
+ if (barcodeThread == null) {
+ continue;
+ }
+ String barcode = barcodeThread.getBarcode();
+ if (!Cools.isEmpty(barcode) && !barcode.equals("99999999")) {
+ // 璇锋眰wms鎺ュ彛锛岃幏鍙栧伐浣滃彿鍜岀洰鏍囧簱浣�
+ ToWmsDTO toWmsDTO = new ToWmsDTO(barcode, staProtocol.getSiteId(), staProtocol.isHigh() ? 2 : 1);
+ TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", barcode));
+ if (!Cools.isEmpty(taskWrk1)) {
+ log.info("鎵樼洏鐮侊細" + barcode + "浠诲姟妗ｅ瓨鍦�");
+ if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) {
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no", taskWrk1.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
+ if (Cools.isEmpty(staDesc)) {
+ log.info("鎵樼洏鐮侊細" + barcode + "浠诲姟妗ｅ瓨鍦�");
+ return;
+ } else {
+ staProtocol.setWorkNo(taskWrk1.getWrkNo().shortValue());
+ staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ }
+ }
+ return;
+ }
+ HashMap<String, Object> headParam = new HashMap<>();
+ headParam.put("Content-Type", "application/json");
+ System.out.println(JSON.toJSONString(toWmsDTO));
+ String response;
+ try {
+ response = new HttpHandler.Builder()
+ // .setHeaders(headParam)
+ .setUri(wmsUrl)
+ .setPath(inboundTaskApplyPath)
+ .setJson(JSON.toJSONString(toWmsDTO))
+ .build()
+ .doPost();
+ } catch (Exception e) {
+ log.error("璇锋眰鍏ュ簱璋冪敤鎺ュ彛澶辫触");
+ log.error("寮傚父淇℃伅鎵撳嵃锛�" + e);
+ try {
+ BasDevp basDevp = basDevpService.selectById(inSta.getStaNo());
+ if (Cools.isEmpty(basDevp)) {
+ log.error("绔欑偣鍙峰紓甯�" + inSta.getStaNo());
+ } else if (basDevp.getStaErr() != 0) {
+ basDevp.setStaErr(2);
+ basDevpService.updateById(basDevp);
+ }
+ } catch (Exception e1) {
+ // 閫�鍥�
+ log.error("鎵爜妫�娴嬬▼搴忓紓甯�" + inSta.getStaNo() + "寮傚父淇℃伅" + e1);
+ }
+ staProtocol.setWorkNo((short) 9999);
+ staProtocol.setStaNo(inSta.getStaNo().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+// TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
+// if (taskWrk != null) {
+// taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
+// taskWrkMapper.updateById(taskWrk);
+// }
+ continue;
+ }
+
+ JSONObject jsonObject = JSON.parseObject(response);
+ log.info("鍏ュ簱璇锋眰鍙傛暟{}" + JSON.toJSONString(toWmsDTO));
+ log.info("鍏ュ簱璇锋眰杩斿洖鍙傛暟{}" + JSON.toJSONString(response));
+ if (jsonObject.getInteger("code").equals(200) && !Cools.isEmpty(jsonObject.get("data").toString())) {
+ GetWmsDto getWmsDto = JSON.parseObject(jsonObject.get("data").toString(), GetWmsDto.class);
+ try {
+ BasDevp basDevp = basDevpService.selectById(inSta.getStaNo());
+ if (Cools.isEmpty(basDevp)) {
+ log.error("绔欑偣鍙峰紓甯�1" + inSta.getStaNo());
+ throw new CoolException("绔欑偣鍙峰紓甯�1,鏈煡璇㈠埌绔欑偣淇℃伅" + inSta.getStaNo());
+ }
+ Integer staNoCrnNo = Utils.StaNoCrnNo(inSta.getStaNo());
+ if (staNoCrnNo == 0) {
+ basDevp.setStaErr(1);
+ basDevpService.updateById(basDevp);
+ log.error("绔欑偣鍙峰紓甯�2" + inSta.getStaNo());
+ throw new CoolException("绔欑偣鍙峰紓甯�2,绔欑偣鍙蜂笉瀛樺湪" + inSta.getStaNo());
+ } else {
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("crn_no", staNoCrnNo.longValue())
+ .eq("loc_no", getWmsDto.getLocNo()));
+ if (Cools.isEmpty(locMast)) {
+ basDevp.setStaErr(1);
+ basDevpService.updateById(basDevp);
+ log.error("绔欑偣鍙峰紓甯�3" + inSta.getStaNo());
+ throw new CoolException("绔欑偣鍙峰紓甯�3锛氭宸烽亾涓嶅瓨鍦ㄧ洰鏍囧簱浣�" + inSta.getStaNo());
+ }
+ }
+ } catch (Exception e) {
+// log.error("鎵爜妫�娴嬬▼搴忓紓甯�"+inSta.getStaNo()+"寮傚父淇℃伅"+e);
+ // 閫�鍥�
+ log.error("鎵爜妫�娴嬬▼搴忓紓甯�" + inSta.getStaNo() + errMsg);
+ log.error("鎵爜妫�娴嬬▼搴忓紓甯�,寮傚父淇℃伅" + e);
+
+ staProtocol.setWorkNo((short) 9999);
+ staProtocol.setStaNo(inSta.getStaNo().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+// TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
+// if (taskWrk != null) {
+// taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
+// taskWrkMapper.updateById(taskWrk);
+// }
+ continue;
+ }
+ //鏌ョ湅璇ュ簱浣嶆槸鍚︿负绌哄簱浣�
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "O")
+ .eq("loc_no", getWmsDto.getLocNo()));
+ if (Cools.isEmpty(locMast)) {
+ try {
+ HashMap<String, Object> headParam1 = new HashMap<>();
+ headParam1.put("taskNo", getWmsDto.getTaskNo());
+ headParam1.put("status", 6);
+ headParam1.put("ioType", 1);
+ headParam1.put("barcode", barcode);
+ String response2;
+ response2 = new HttpHandler.Builder()
+ // .setHeaders(headParam)
+ .setUri(wmsUrl)
+ .setPath(taskStatusFeedbackPath)
+ .setJson(JSON.toJSONString(headParam1))
+ .build()
+ .doPost();
+ JSONObject jsonObject1 = JSON.parseObject(response2);
+ apiLogService.save("wcs娲惧彂搴撲綅==銆嬩笉涓虹┖銆�==涓婃姤wms"
+ , wmsUrl + taskStatusFeedbackPath
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(headParam1)
+ , response
+ , true
+ );
+ } catch (Exception e) {
+ log.error("wcs娲惧彂搴撲綅==銆嬩笉涓虹┖銆�==涓婃姤wms", getWmsDto.getWrkNo());
+ throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触,娲惧彂搴撲綅==銆嬩笉涓虹┖銆�==锛屽紓甯镐俊鎭細" + e);
+ }
+ }
+
+ // 鍒涙柊涓�涓叆搴撳伐浣滄。
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(getWmsDto.getWrkNo());
+ if (Cools.isEmpty(taskWrk)) {
+ taskWrk = createTask(getWmsDto, barcode);
+ if (Cools.isEmpty(taskWrk)) {
+ log.error("搴撲綅寮傚父锛屽簱浣嶅彿锛歿}", getWmsDto.getTargetLocationCode());
+ } else {
+ taskWrkService.insert(taskWrk);
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
+ staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
+ staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ }
+ }
+
+ } else {
+ continue;
+ }
+ apiLogService.save("wms璇锋眰鍏ュ簱璐т綅鎺ュ彛"
+ , wmsUrl + inboundTaskApplyPath
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(toWmsDTO)
+ , response
+ , true
+ );
+
+ } else {
+ // 閫�鍥�
+ log.error("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
+
+ staProtocol.setWorkNo((short) 9999);
+ staProtocol.setStaNo(inSta.getStaNo().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
+ if (taskWrk != null) {
+ taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
+ taskWrkMapper.updateById(taskWrk);
+ }
+ }
+ }
+
+
+ }
+ }
+ } catch (Exception e) {
+ log.error("generateStoreWrkFile e", e);
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ }
+ }
+
+
+ /**
+ * 鍫嗗灈鏈虹珯鍑哄簱鍒板嚭搴撶珯
+ */
+ public void crnStnToOutStn() {
+ for (CrnSlave crnSlave : slaveProperties.getCrn()) {
+ // 閬嶅巻鍫嗗灈鏈哄嚭搴撶珯
+ for (CrnSlave.CrnStn crnStn : crnSlave.getCrnOutStn()) {
+ List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("crn_no", crnSlave.getId()).eq("crn_stn", crnStn.getStaNo()));
+ for (StaDesc staDesc : staDescs) {
+ try {
+ // 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
+ StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == 0)) {
+ // 鏌ヨ宸ヤ綔妗�
+ TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorking(crnSlave.getId(), staDesc.getStnNo().toString());
+ if (taskWrk == null) {
+ continue;
+ }
+ log.info("涓嬪彂杈撻�佺嚎浠诲姟锛歵askWrk:" + JSON.toJSONString(taskWrk));
+// R r = siteController.siteDetlUpdate(Integer.valueOf(taskWrk.getTargetPoint()), taskWrk.getWrkNo().shortValue(), (short) 0, "Y", false, false);
+ staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
+ staProtocol.setStaNo(staDesc.getStnNo().shortValue());
+ boolean offer = false;
+ try {
+ offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
+ } catch (Exception e) {
+ log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:" + e);
+ log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:offer:" + offer);
+ }
+// JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(r));
+ if (offer) {
+ log.info("涓嬪彂杈撻�佺嚎浠诲姟鎴愬姛锛歵askWrk:" + JSON.toJSONString(taskWrk));
+ taskWrk.setStatus(5);
+ taskWrk.setWrkSts(14);
+ taskWrkService.updateById(taskWrk);
+
+ } else {
+ log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛歵askWrk:" + JSON.toJSONString(taskWrk));
+// log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯镐俊鎭�:"+JSON.toJSONString(r));
+ }
+ }
+ } catch (Exception e) {
+ log.error("鍑哄簱鍒板嚭搴撶珯寮傚父:寮傚父淇℃伅锛�" + e);
+ }
+ }
+
+ }
+ }
+ }
+
+ /**
+ * 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
+ */
+ public synchronized void crnIoExecute() throws IOException {
+ for (CrnSlave crn : slaveProperties.getCrn()) {
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) {
+ continue;
+ }
+ BasCrnp basCrnp = basCrnpService.selectById(crn.getId());
+ if (basCrnp == null) {
+ log.error("{}鍙峰爢鍨涙満灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", crn.getId());
+ continue;
+ }
+
+
+ // 鍙湁褰撳爢鍨涙満绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛�
+ if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
+ && crnProtocol.getLoaded() == 0 && crnProtocol.getForkPos() == 0) {
+ // 濡傛灉鏈�杩戜竴娆℃槸鍏ュ簱妯″紡
+ if (crnProtocol.getLastIo().equals("I")) {
+ if (basCrnp.getInEnable().equals("Y")) {
+ this.crnStnToLoc(crn, crnProtocol); // 鍏ュ簱
+ crnProtocol.setLastIo("O");
+ } else if (basCrnp.getOutEnable().equals("Y")) {
+ this.locToCrnStn(crn, crnProtocol); // 鍑哄簱
+ crnProtocol.setLastIo("I");
+ }
+ }
+ // 濡傛灉鏈�杩戜竴娆℃槸鍑哄簱妯″紡
+ else if (crnProtocol.getLastIo().equals("O")) {
+ if (basCrnp.getOutEnable().equals("Y")) {
+ this.locToCrnStn(crn, crnProtocol); // 鍑哄簱
+ crnProtocol.setLastIo("I");
+ } else if (basCrnp.getInEnable().equals("Y")) {
+ this.crnStnToLoc(crn, crnProtocol); // 鍏ュ簱
+ crnProtocol.setLastIo("O");
+ }
+ }
+
+ // 搴撲綅绉昏浆
+ this.locToLoc(crn, crnProtocol);
+ }
+
+ }
+ }
+
+ /**
+ * 鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鍒板簱浣�
+ */
+ public void crnStnToLoc(CrnSlave slave, CrnProtocol crnProtocol) throws IOException {
+ for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) {
+ List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("crn_no", slave.getId()).eq("crn_stn", crnStn.getStaNo()));
+ for (StaDesc staDesc : staDescs) {
+ boolean flag = false;
+ // 鑾峰彇鍫嗗灈鏈哄叆搴撶珯淇℃伅
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
+ StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ // 鏌ヨ绔欑偣璇︾粏淇℃伅
+ BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
+ if (staDetl == null) {
+ log.error("鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo());
+ continue;
+ }
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
+ && staDetl.getCanining() != null && staDetl.getCanining().equals("Y")) {
+ flag = true;
+ }
+ if (!flag) {
+ continue;
+ }
+
+ // 鑾峰彇宸ヤ綔鐘舵�佷负2锛堣澶囦笂璧帮級鐨勫叆搴撳伐浣滄。
+ TaskWrk taskWrk = taskWrkMapper.selectPakIn(slave.getId(), staProtocol.getWorkNo().intValue(), staDesc.getStnNo().toString());
+ if (null == taskWrk) {
+ continue;
+ }
+
+ // 鍫嗗灈鏈烘帶鍒惰繃婊�
+ if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
+ continue;
+ }
+
+ // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
+ if (taskWrkMapper.selectCrnWorking(slave.getId()) != null) {
+ continue;
+ }
+
+// int workNo = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+// taskWrk.setWrkNo(workNo);//宸ヤ綔鍙�
+ taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//娲惧彂鐘舵��
+ taskWrk.setAssignTime(new Date());//娲惧彂鏃堕棿
+ taskWrk.setWrkSts(3);//宸ヤ綔鐘舵�� 3.鍚婅溅鍏ュ簱
+ taskWrk.setCrnNo(staDesc.getCrnNo());//鍫嗗灈鏈哄彿
+ taskWrk.setModiTime(new Date());
+ taskWrk.setModiUser(9988L);
+
+ // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setCrnNo(staDesc.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ crnCommand.setTaskNo(taskWrk.getWrkNo().shortValue()); // 宸ヤ綔鍙�
+ crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
+ crnCommand.setSourcePosX(crnStn.getRow().shortValue()); // 婧愬簱浣嶅垪
+ crnCommand.setSourcePosY(crnStn.getBay().shortValue()); // 婧愬簱浣嶅眰
+ crnCommand.setSourcePosZ(crnStn.getLev().shortValue()); // 婧愬簱浣嶆帓
+ crnCommand.setDestinationPosX(Utils.getRowShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鍒�
+ crnCommand.setDestinationPosY(Utils.getBayShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅灞�
+ crnCommand.setDestinationPosZ(Utils.getLevShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鎺�
+ crnCommand.setCommand((short) 1);
+ log.info("鍫嗗灈鏈哄叆搴撲换鍔′笅鍙�={}", crnCommand);
+ if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand), false)) {
+ log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
+ throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
+ } else {
+ try {
+ taskWrkService.updateById(taskWrk);
+ } catch (Exception e) {
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽紓甯革細" + e);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * 鍑哄簱 ===>> 搴撲綅鍒板爢鍨涙満绔�
+ * 2022-06-09 TQS淇敼锛屾煡璇㈠伐浣滄。LIST锛岄亶鍘嗕笅鍙戯紝闃叉绗竴涓换鍔″牭濉炲嚭搴�
+ */
+ public void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol) {
+ List<TaskWrk> taskWrksInitial = taskWrkMapper.selectPakOut(slave.getId(), null);
+ if (taskWrksInitial.size() == 0) {
+ return;
+ }
+ for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
+ List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("crn_no", slave.getId()).eq("crn_stn", crnStn.getStaNo()));
+ for (StaDesc staDesc : staDescs) {
+ // 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑鍑哄簱宸ヤ綔妗�
+ List<TaskWrk> taskWrks = taskWrkMapper.selectPakOut(slave.getId(), staDesc.getStnNo().toString());
+ for (TaskWrk taskWrk : taskWrks) {
+ if (taskWrk == null) {
+ continue;
+ }
+ // 宸ヤ綔妗ｇ姸鎬佸垽鏂�
+ if (taskWrk.getIoType() != 2 || taskWrk.getTargetPoint() == null || taskWrk.getStartPoint() == null) {
+ log.error("鏌ヨ宸ヤ綔妗ｆ暟鎹笉绗﹀悎鏉′欢--鍏ュ嚭绫诲瀷/绔欑偣, 宸ヤ綔鍙�={}锛屾簮搴撲綅={}锛屽叆鍑虹被鍨�={}", taskWrk.getWrkNo(), taskWrk.getStartPoint(), taskWrk.getIoType());
+ continue;
+ }
+
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ //鍒ゆ柇鍏跺簱浣嶆槸鍚︿负娣卞簱浣嶏紝濡傛灉涓烘繁搴撲綅鎵惧叾娴呭簱浣嶆槸閮芥湁璐�
+ if (locMast.getRow1() == 1 || locMast.getRow1() == 5) {
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", (locMast.getRow1() + 1))
+ .eq("bay1", locMast.getBay1())
+ .eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
+ if (!Cools.isEmpty(locMast1)) {
+ log.info(locMast.getLocNo() + "鍑烘繁搴撲綅锛屾祬搴撲綅鏈夎揣");
+ continue;
+ }
+ } else if (locMast.getRow1() == 4 || locMast.getRow1() == 8) {
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", (locMast.getRow1() - 1))
+ .eq("bay1", locMast.getBay1())
+ .eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
+ if (!Cools.isEmpty(locMast1)) {
+ log.info(locMast.getLocNo() + "鍑烘繁搴撲綅锛屾祬搴撲綅鏈夎揣");
+ continue;
+ }
+ }
+
+ // 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
+ StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
+ if (staProtocol == null) {
+ break;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+
+ // 鏌ヨ绔欑偣璇︾粏淇℃伅
+ BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
+ if (staDetl == null) {
+ log.error("鍑哄簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo());
+ break;
+ }
+
+ // 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
+ if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
+ && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
+ // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
+
+ // 鍫嗗灈鏈烘帶鍒惰繃婊�
+ if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
+ break;
+ }
+
+ // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
+ if (taskWrkMapper.selectCrnWorking(slave.getId()) != null) {
+ break;
+ }
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(taskWrk.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo(taskWrk.getWrkNo().shortValue()); // 宸ヤ綔鍙�
+ command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡
+ command.setSourcePosX(Utils.getRowShort(taskWrk.getStartPoint())); // 婧愬簱浣嶆帓
+ command.setSourcePosY(Utils.getBayShort(taskWrk.getStartPoint())); // 婧愬簱浣嶅垪
+ command.setSourcePosZ(Utils.getLevShort(taskWrk.getStartPoint())); // 婧愬簱浣嶅眰
+ command.setDestinationPosX(crnStn.getRow().shortValue()); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosY(crnStn.getBay().shortValue()); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosZ(crnStn.getLev().shortValue()); // 鐩爣搴撲綅灞�
+ command.setCommand((short) 1);
+
+ if (Cools.isEmpty(taskWrk.getMarkStart()) || taskWrk.getMarkStart() == 0) {
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("TaskNo", taskWrk.getTaskNo());
+ String response = "";
+ try {
+ //寮�濮嬩笂鎶�,鍑哄簱浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
+ response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath(taskStatusFeedbackPath)
+ .setJson(JSON.toJSONString(hashMap))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ Boolean bool = false;
+ if (jsonObject.get("ReturnStatus").equals(0)) {
+ bool = true;
+ taskWrk.setMarkStart(1);
+ }
+ apiLogService.save("wcs寮�濮嬩换鍔′笂鎶ms"
+ , wmsUrl + TaskExecCallback
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(hashMap)
+ , response
+ , bool
+ );
+ } catch (Exception e) {
+ }
+ }
+
+ if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, command), false)) {
+ log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(command));
+ throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
+ } else {
+ try {
+ // 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
+ Date now = new Date();
+ taskWrk.setWrkSts(12);
+ taskWrk.setStatus(2);
+ taskWrk.setModiTime(now);
+ if (taskWrkMapper.updateById(taskWrk) == 0) {
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
+ }
+ } catch (Exception e) {
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽紓甯革細" + e);
+ }
+// try {
+// HashMap<String, Object> headParam = new HashMap<>();
+// headParam.put("taskNo", taskWrk.getTaskNo());
+// headParam.put("status", taskWrk.getStatus());
+// headParam.put("ioType", taskWrk.getIoType());
+// headParam.put("barcode", taskWrk.getBarcode());
+// String response;
+// response = new HttpHandler.Builder()
+// // .setHeaders(headParam)
+// .setUri(wmsUrl)
+// .setPath(taskStatusFeedbackPath)
+// .setJson(JSON.toJSONString(headParam))
+// .build()
+// .doPost();
+// JSONObject jsonObject = JSON.parseObject(response);
+// apiLogService.save("wcs娲惧彂鍑哄簱浠诲姟涓婃姤wms"
+// , wmsUrl + taskStatusFeedbackPath
+// , null
+// , "127.0.0.1"
+// , JSON.toJSONString(headParam)
+// , response
+// , true
+// );
+// } catch (Exception e) {
+// log.error("wcs娲惧彂鍑哄簱浠诲姟涓婃姤wms澶辫触", JSON.toJSONString(taskWrk));
+//// throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
+// }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * 搴撲綅绉昏浆
+ */
+ public void locToLoc(CrnSlave slave, CrnProtocol crnProtocol) {
+ for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
+ // 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑绉诲簱宸ヤ綔妗�
+ List<TaskWrk> taskWrks = taskWrkMapper.selectList(new EntityWrapper<TaskWrk>()
+ .eq("crn_no", slave.getId())
+ .eq("wrk_sts", 11)
+ .eq("io_type", 3)
+ .orderBy("io_pri", false));
+ for (TaskWrk taskWrk : taskWrks) {
+
+ // 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
+// if (Utils.isDeepLoc(slaveProperties, taskWrk.getStartPoint())) {
+// String shallowLocNo = Utils.getShallowLoc(slaveProperties, taskWrk.getStartPoint());
+// TaskWrk hallowLocNoTask = taskWrkMapper.selectByStartPoint(shallowLocNo);
+// if (!Cools.isEmpty(hallowLocNoTask)){
+// continue;
+// }
+// }
+ // 鍫嗗灈鏈烘帶鍒惰繃婊�
+ if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
+ continue;
+ }
+
+ // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
+ if (taskWrkMapper.selectCrnWorking(slave.getId()) != null) {
+ continue;
+ }
+
+ if (taskWrk == null || Cools.isEmpty(taskWrk.getTargetPoint()) || taskWrk.getTargetPoint().equals("") || taskWrk.getWrkNo() == null) {
+ continue;
+ }
+ // 宸ヤ綔妗ｇ姸鎬佸垽鏂�
+ if (taskWrk.getIoType() != 3 || taskWrk.getTargetPoint() == null) {
+ log.error("鏌ヨ宸ヤ綔妗ｆ暟鎹笉绗﹀悎鏉′欢--鍏ュ嚭绫诲瀷/鐩爣搴撲綅鍙�, 宸ヤ綔鍙�={}锛屾簮搴撲綅={}锛屽叆鍑虹被鍨�={}", taskWrk.getWrkNo(), taskWrk.getTargetPoint(), taskWrk.getIoType());
+ continue;
+ }
+
+ // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
+
+
+ // 1.鍫嗗灈鏈哄紑濮嬬Щ鍔�
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
+ crnCommand.setTaskNo(taskWrk.getWrkNo().shortValue()); // 宸ヤ綔鍙�
+ crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
+ crnCommand.setSourcePosX(Utils.getRowShort(taskWrk.getStartPoint())); // 婧愬簱浣嶆帓
+ crnCommand.setSourcePosY(Utils.getBayShort(taskWrk.getStartPoint())); // 婧愬簱浣嶅垪
+ crnCommand.setSourcePosZ(Utils.getLevShort(taskWrk.getStartPoint())); // 婧愬簱浣嶅眰
+ crnCommand.setDestinationPosX(Utils.getRowShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鎺�
+ crnCommand.setDestinationPosY(Utils.getBayShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鍒�
+ crnCommand.setDestinationPosZ(Utils.getLevShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅灞�
+ crnCommand.setCommand((short) 1);
+ if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand), false)) {
+ log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
+ } else {
+ // 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
+ Date now = new Date();
+ taskWrk.setWrkSts(12);
+ taskWrk.setStatus(2);
+ taskWrk.setModiTime(now);
+ if (taskWrkMapper.updateById(taskWrk) == 0) {
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
+ }
+ try {
+ HashMap<String, Object> headParam = new HashMap<>();
+ headParam.put("TaskNo", taskWrk.getTaskNo());
+ String response;
+ response = new HttpHandler.Builder()
+ // .setHeaders(headParam)
+ .setUri(wmsUrl)
+ .setPath(taskStatusFeedbackPath)
+ .setJson(JSON.toJSONString(headParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ apiLogService.save("wcs娲惧彂绉诲簱浠诲姟涓婃姤wms"
+ , wmsUrl + taskStatusFeedbackPath
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(headParam)
+ , response
+ , true
+ );
+ } catch (Exception e) {
+ log.error("wcs娲惧彂绉诲簱搴撲换鍔′笂鎶ms澶辫触", taskWrk);
+// throw new CoolException("wcs娲惧彂绉诲簱搴撲换鍔′笂鎶ms澶辫触");
+ }
+
+ }
+ return;
+ }
+ }
+
+ }
+
+ /**
+ * 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
+ */
+// public void storeFinished() {
+// for (CrnSlave crn : slaveProperties.getCrn()) {
+// // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+// CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+// CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+// if (crnProtocol == null) { continue; }
+//
+// // 鐘舵�侊細绛夊緟纭 骞朵笖 浠诲姟瀹屾垚浣� = 1
+// if (crnProtocol.getTaskFinish() == 0 && crnProtocol.statusType == CrnStatusType.HANDLING_COMPLETED && crnProtocol.getTaskNo() != 0) {
+// //鑾峰彇鍏ュ簱寰呯‘璁ゅ伐浣滄。
+// TaskWrk taskWrk = taskWrkMapper.selectCrnNoInWorking(crn.getId(),crnProtocol.getTaskNo().intValue());
+// if (Cools.isEmpty(taskWrk)) {
+//// log.error("鍫嗗灈鏈哄浜庣瓑寰呯‘璁や笖浠诲姟瀹屾垚鐘舵�侊紝浣嗘湭鎵惧埌宸ヤ綔妗ｃ�傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", crn.getId(), crnProtocol.getTaskNo());
+// continue;
+// }
+//
+// //鑾峰彇鎸囦护ID
+// Integer commandId = crnProtocol.getCommandId();
+// CommandInfo commandInfo = new CommandInfo();
+// if (Cools.isEmpty(commandId)){
+// commandInfo = commandInfoService.selectOne(new EntityWrapper<CommandInfo>()
+// .eq("wrk_no",crnProtocol.getTaskNo())
+// .eq("device","Crn"));
+// }else {
+// commandInfo = commandInfoService.selectById(commandId);
+// }
+//
+//
+// if (commandInfo == null) {
+// //鎸囦护涓嶅瓨鍦�
+// continue;
+// }
+// if (commandInfo.getCommandStatus() == 3){
+// continue;
+// }
+// commandInfo.setCommandStatus(CommandStatusType.COMPLETE.id);//鎸囦护瀹屾垚
+// commandInfo.setCompleteTime(new Date());//鎸囦护瀹屾垚鏃堕棿
+// if (commandInfoService.updateById(commandInfo)) {//淇敼鎴愬姛鍚庡浣嶅爢鍨涙満
+// // 鍫嗗灈鏈哄浣�
+// crnThread.setResetFlag(true);
+// }
+// }
+// }
+// }
+
+ /**
+ * 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
+ */
+ public void storeFinished() throws InterruptedException {
+ for (CrnSlave crn : slaveProperties.getCrn()) {
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) {
+ continue;
+ }
+
+ // 鐘舵�侊細绛夊緟纭 骞朵笖 浠诲姟瀹屾垚浣� = 1
+ if (crnProtocol.getTaskFinish() == 0 && crnProtocol.statusType == CrnStatusType.HANDLING_COMPLETED && crnProtocol.getTaskNo() != 0) {
+ //鑾峰彇鍏ュ簱寰呯‘璁ゅ伐浣滄。
+ TaskWrk taskWrk = taskWrkMapper.selectCrnNoInWorking(crn.getId(), crnProtocol.getTaskNo().intValue());
+ if (Cools.isEmpty(taskWrk) && crnProtocol.getTaskNo() != 999) {
+ log.error("鍫嗗灈鏈哄浜庣瓑寰呯‘璁や笖浠诲姟瀹屾垚鐘舵�侊紝浣嗘湭鎵惧埌宸ヤ綔妗ｃ�傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", crn.getId(), crnProtocol.getTaskNo());
+ continue;
+ }
+ //纭瀹屾垚淇″彿
+ CrnOperatorParam crnOperatorParam = new CrnOperatorParam();
+ crnOperatorParam.setCrnNo(crn.getId());
+ R r = crnController.crnTaskComplete(crnOperatorParam);
+ Thread.sleep(1000);
+ if (!r.get("code").equals(200)) {
+ return;
+ }
+ if (!Cools.isEmpty(taskWrk)) {
+ if (taskWrk.getIoType() == 1 && taskWrk.getWrkSts() == 3) {
+ taskWrk.setWrkSts(4);//鍏ュ簱瀹屾垚
+ taskWrk.setStatus(5);//瀹岀粨
+ //鏇存柊搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ locMast.setLocSts("F");//F.鍦ㄥ簱
+ locMast.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
+ locMast.setModiTime(new Date());
+ locMast.setModiUser(9999L);
+ locMastService.updateById(locMast);
+ } else if (taskWrk.getIoType() == 2 && taskWrk.getWrkSts() == 12) {
+ taskWrk.setWrkSts(13);//鍑哄簱瀹屾垚
+ taskWrk.setStatus(5);//瀹岀粨
+ //鏇存柊搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ locMast.setLocSts("O");//O.绌哄簱浣�
+ locMast.setBarcode("");//鎵樼洏鐮�
+ locMast.setModiTime(new Date());
+ locMast.setModiUser(9999L);
+ locMastService.updateById(locMast);
+ } else if (taskWrk.getIoType() == 3 && taskWrk.getWrkSts() == 12) {
+ taskWrk.setWrkSts(4);//鍏ュ簱瀹屾垚
+ taskWrk.setStatus(5);//瀹岀粨
+ //鏇存柊搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ locMast.setLocSts("F");//F.鍦ㄥ簱
+ locMast.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
+ locMast.setModiTime(new Date());
+ locMast.setModiUser(9999L);
+ locMastService.updateById(locMast);
+
+ LocMast locMast1 = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ locMast1.setLocSts("O");//O.绌哄簱浣�
+ locMast1.setBarcode("");//鎵樼洏鐮�
+ locMast1.setModiTime(new Date());
+ locMast1.setModiUser(9999L);
+ locMastService.updateById(locMast1);
+ }
+ taskWrkService.updateById(taskWrk);
+ }
+
+ }
+ }
+ }
+
+ /**
+ * 鍫嗗灈鏈哄紓甯镐俊鎭褰�
+ */
+ public void recCrnErr() {
+ Date now = new Date();
+ for (CrnSlave crn : slaveProperties.getCrn()) {
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) {
+ continue;
+ }
+ if (false) {
+// if (crnProtocol.getModeType() != CrnModeType.STOP) {
+ // 鏈変换鍔�
+ if (crnProtocol.getTaskNo() != 0) {
+ BasErrLog latest = basErrLogService.findLatestByTaskNo(crn.getId(), crnProtocol.getTaskNo().intValue());
+ // 鏈夊紓甯�
+ if (latest == null) {
+ if (crnProtocol.getAlarm() != null && crnProtocol.getAlarm() > 0) {
+ WrkMast wrkMast = wrkMastMapper.selectById(crnProtocol.getTaskNo());
+ if (wrkMast == null) {
+ continue;
+ }
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
+ String errName = crnError == null ? String.valueOf(crnProtocol.getAlarm()) : crnError.getErrName();
+ BasErrLog basErrLog = new BasErrLog(
+ null, // 缂栧彿
+ wrkMast.getWrkNo(), // 宸ヤ綔鍙�
+ now, // 鍙戠敓鏃堕棿
+ null, // 缁撴潫鏃堕棿
+ wrkMast.getWrkSts(), // 宸ヤ綔鐘舵��
+ wrkMast.getIoType(), // 鍏ュ嚭搴撶被鍨�
+ crn.getId(), // 鍫嗗灈鏈�
+ null, // plc
+ wrkMast.getLocNo(), // 鐩爣搴撲綅
+ wrkMast.getStaNo(), // 鐩爣绔�
+ wrkMast.getSourceStaNo(), // 婧愮珯
+ wrkMast.getSourceLocNo(), // 婧愬簱浣�
+ wrkMast.getBarcode(), // 鏉＄爜
+ (int) crnProtocol.getAlarm1(), // 寮傚父鐮�
+ errName, // 寮傚父
+ 1, // 寮傚父鎯呭喌
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ "浠诲姟涓紓甯�" // 澶囨敞
+ );
+ if (!basErrLogService.insert(basErrLog)) {
+ log.error("鍫嗗灈鏈簆lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", crn.getId(), errName);
+ }
+ }
+ } else {
+ // 寮傚父淇
+ if (crnProtocol.getAlarm1() == null || crnProtocol.getAlarm1() == 0) {
+ latest.setEndTime(now);
+ latest.setUpdateTime(now);
+ latest.setStatus(2);
+ if (!basErrLogService.updateById(latest)) {
+ log.error("鍫嗗灈鏈簆lc寮傚父璁板綍淇澶辫触 ===>> [id:{}] [errLogId:{}]", crn.getId(), latest.getId());
+ }
+ }
+ }
+ // 鏃犱换鍔�
+ } else {
+ BasErrLog latest = basErrLogService.findLatest(crn.getId());
+ // 鏈夊紓甯�
+ if (crnProtocol.getAlarm1() != null && crnProtocol.getAlarm() > 0) {
+ // 璁板綍鏂板紓甯�
+ if (latest == null || (latest.getErrCode() != crnProtocol.getAlarm().intValue())) {
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
+ String errName = crnError == null ? String.valueOf(crnProtocol.getAlarm()) : crnError.getErrName();
+ BasErrLog basErrLog = new BasErrLog(
+ null, // 缂栧彿
+ null, // 宸ヤ綔鍙�
+ now, // 鍙戠敓鏃堕棿
+ null, // 缁撴潫鏃堕棿
+ null, // 宸ヤ綔鐘舵��
+ null, // 鍏ュ嚭搴撶被鍨�
+ crn.getId(), // 鍫嗗灈鏈�
+ null, // plc
+ null, // 鐩爣搴撲綅
+ null, // 鐩爣绔�
+ null, // 婧愮珯
+ null, // 婧愬簱浣�
+ null, // 鏉＄爜
+ (int) crnProtocol.getAlarm1(), // 寮傚父鐮�
+ errName, // 寮傚父
+ 1, // 寮傚父鎯呭喌
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ "鏃犱换鍔″紓甯�" // 澶囨敞
+ );
+ if (!basErrLogService.insert(basErrLog)) {
+ log.error("鍫嗗灈鏈簆lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", crn.getId(), errName);
+ }
+ }
+ // 鏃犲紓甯�
+ } else {
+ // 寮傚父淇
+ if (latest != null && latest.getStatus() == 1) {
+ latest.setEndTime(now);
+ latest.setUpdateTime(now);
+ latest.setStatus(2);
+ if (!basErrLogService.updateById(latest)) {
+ log.error("鍫嗗灈鏈簆lc寮傚父璁板綍淇澶辫触 ===>> [id:{}] [errLogId:{}]", crn.getId(), latest.getId());
+ }
+ }
+ }
+ }
+ }
+
+ }
+ }
+
+ //鑷姩娲惧彂浠诲姟
+ public void autoDistribute() {
+ Config config = configService.selectByCode("autoDistribute");
+ if (config == null) {
+ return;
+ }
+
+ if (config.getValue().equals("false")) {//鍒ゆ柇鏄惁寮�鍚嚜鍔ㄦ淳鍙戜换鍔�
+ return;
+ }
+
+ for (TaskWrk taskWrk : taskWrkService.selectReceive()) {
+
+ try {
+ taskWrkService.distribute(taskWrk.getTaskNo(), 9527L);
+ } catch (CoolException e) {
+ log.info(e.getMessage());
+ }
+ }
+ }
+
+ //agv鍙栨斁璐т换鍔″畬鎴�
+ public synchronized void autoCompleteAGV() {
+ List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ try {
+ Thread.sleep(500);
+ } catch (Exception e) {
+
+ }
+
+ for (BasDevp basDevp : basDevps) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ StaProtocol staProtocol = devpThread.getStation().get(basDevp.getDevNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ if (basDevp.getWrkNo() != 0) {
+ if (basDevp.getAgvTargetPick() != 0) {//鍙栬揣
+ staProtocol.setAgvTypeSign((short) 0);
+ staProtocol.setStaNo(basDevp.getDevNo().shortValue());
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
+ }
+ boolean sign = true;
+ if (basDevp.getAgvTargetPlace() != 0) {
+ sign = false;
+ basDevp.setAgvTargetPlace(0);
+ basDevpService.updateById(basDevp);
+ staProtocol.setAgvTypeSign((short) 3);//1
+ staProtocol.setStaNo(basDevp.getDevNo().shortValue());
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
+ }
+ } else {
+ if (basDevp.getAgvTargetPlace() != 0) {
+ if (basDevp.getLoading().equals("Y")) {
+ staProtocol.setAgvTypeSign((short) 1);
+ staProtocol.setStaNo(basDevp.getDevNo().shortValue());
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
+ } else {
+ log.error("AGV鏀捐揣瀹屾垚浣嗚緭閫佺嚎鏃犵墿锛屽浣嶄俊鍙� ===>> [staNo:{}] [basDevp:{}]", basDevp.getDevNo(), basDevp);
+ basDevp.setAgvTargetPlace(0);
+ basDevpService.updateById(basDevp);
+ staProtocol.setAgvTypeSign((short) 3);//1
+ staProtocol.setStaNo(basDevp.getDevNo().shortValue());
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
+ }
+
+ }
+ if (basDevp.getAgvTargetPick() != 0) {
+ basDevp.setAgvTargetPick(0);
+ basDevpService.updateById(basDevp);
+ staProtocol.setAgvTypeSign((short) 2);//0
+ staProtocol.setStaNo(basDevp.getDevNo().shortValue());
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
+ }
+ }
+ }
+ }
+
+ public synchronized void autoCompleteTask() {
+ List<TaskWrk> taskWrks = taskWrkMapper.selectWorkingTask();
+ for (TaskWrk taskWrk : taskWrks) {
+ //鑾峰彇鍛戒护闆嗗悎
+ List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskWrk.getTaskNo());
+ if (taskWrk.getCommandStep() < commandInfos.size()) {
+ continue;//褰撳墠姝ュ簭娌℃湁鍒拌揪鏈�鍚庝竴鏉″懡浠�
+ }
+
+ //鍒ゆ柇鏈鍛戒护鏄惁鎵ц瀹屾垚
+ CommandInfo commandInfo = commandInfos.get(commandInfos.size() - 1);
+ if (commandInfo.getCommandStatus() != CommandStatusType.COMPLETE.id) {
+ continue;//鎸囦护鏈畬鎴�
+ }
+
+ Date now = new Date();
+ //鎸囦护宸插畬鎴愶紝鏇存柊浠诲姟
+ if (taskWrk.getIoType() == 1) {
+ //鍏ュ簱浠诲姟
+ taskWrk.setWrkSts(4);//3.鍚婅溅鍏ュ簱涓� => 4.鍏ュ簱瀹屾垚
+ //taskWrk.setStatus(TaskStatusType.COMPLETE.id);
+ taskWrk.setModiTime(now);
+ taskWrkService.updateById(taskWrk);
+
+ //鏇存柊搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ locMast.setLocSts("F");//F.鍦ㄥ簱
+ locMast.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
+ locMast.setModiTime(now);
+ locMast.setModiUser(9999L);
+ locMastService.updateById(locMast);
+ } else if (taskWrk.getIoType() == 2) {
+ //鍑哄簱浠诲姟
+ taskWrk.setWrkSts(14);//12.鍚婅溅鍑哄簱涓� => 14.鍑哄簱瀹屾垚
+// taskWrk.setStatus(TaskStatusType.COMPLETE.id);
+ taskWrk.setModiTime(now);
+ taskWrkService.updateById(taskWrk);
+
+ //鏇存柊搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ locMast.setLocSts("O");//O.绌哄簱浣�
+ locMast.setBarcode("");//鎵樼洏鐮�
+ locMast.setModiTime(now);
+ locMast.setModiUser(9999L);
+ locMastService.updateById(locMast);
+ }
+ }
+ }
+
+
+ public synchronized String CrnStartRunning(TaskWrk taskWrk) {
+ String tasktype = null;
+ switch (taskWrk.getIoType()) {
+ case 1:
+ tasktype = "RK";
+ break;
+ case 2:
+ tasktype = "CK";
+ break;
+ case 3:
+ tasktype = "YK";
+ break;
+ default:
+ tasktype = "鏈煡";
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("x-api-key", "7a15b5db-29b6-552c-8cff-0cfec3756da2");
+ TaskOverToWms taskOverToWms = new TaskOverToWms();
+ taskOverToWms.setFeedbackFrom("WCS"); //鏉ユ簮
+ taskOverToWms.setWarehouseId("1688469798893297665"); //浠撳簱鏍囪瘑
+ taskOverToWms.setTaskNo(taskWrk.getTaskNo()); //浠诲姟鍙�
+ taskOverToWms.setTaskType(tasktype); // 浠诲姟绫诲瀷
+ taskOverToWms.setContainerCode(taskWrk.getBarcode()); // 瀹瑰櫒缂栫爜
+ if (taskWrk.getIoType() == 1 || taskWrk.getIoType() == 3) {
+ taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //璁惧缂栫爜
+ taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //鐩爣搴撲綅
+ } else if (taskWrk.getIoType() == 2) {
+ Map<Integer, String> map1 = new HashMap<>();
+ map1.put(102, "J-1101");
+ map1.put(106, "J-1103");
+ map1.put(110, "J-1105");
+ map1.put(114, "J-1107");
+ map1.put(118, "J-1109");
+ map1.put(122, "J-1111");
+ map1.put(305, "H-1101");
+ map1.put(405, "G-1101");
+ taskOverToWms.setEquipmentCode(map1.get(taskWrk.getTargetPoint())); //璁惧缂栫爜
+ taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint()); //婧愬簱浣�
+ }
+
+ taskOverToWms.setTaskStatus("executing"); //浠诲姟鐘舵��
+ String response = null;
+ try {
+ response = new HttpHandler.Builder()
+ .setHeaders(map)
+ .setUri(wmsUrl)
+ .setPath("wcsManager/wcsInterface/taskStatusFeedback")
+ .setJson(JSON.toJSONString(taskOverToWms))
+ .build()
+ .doPost();
+ } catch (Exception e) {
+ log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛澶辫触");
+ }
+ apiLogService.save("鍫嗗灈鏈哄紑濮嬭繍琛�"
+ , wmsUrl + "wcsManager/wcsInterface/taskStatusFeedback"
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(taskOverToWms)
+ , response
+ , true
+ );
+ return response;
+ }
+
+ private TaskWrk createTask1(Result result, String barcode) {
+ String locNo = Utils.Fusion(result.getRow(), result.getFloor(), result.getColumn());
+
+
+ Date now = new Date();
+ TaskWrk taskWrk = new TaskWrk();
+ int workNo1 = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+ taskWrk.setTaskNo(result.getTaskNo());//浠诲姟鍙�
+ taskWrk.setWrkNo(workNo1);
+ taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//浠诲姟鐘舵�侊細娲惧彂
+ taskWrk.setCreateTime(now);
+ taskWrk.setIoType(1);//浠诲姟绫诲瀷
+ taskWrk.setIoPri(13);//浼樺厛绾�
+ taskWrk.setBarcode(barcode);//鏉＄爜
+ LocMast locMast = locMastService.selectByLocNo(locNo);
+ taskWrk.setCrnNo(locMast.getCrnNo());
+ taskWrk.setTargetPoint(locNo);
+ taskWrk.setStartPoint("116");
+ if (result.getAlley().equals("1")) {
+ taskWrk.setCrnNo(1);
+ } else {
+ taskWrk.setCrnNo(2);
+ }
+ if (taskWrk.getIoType() == 1) {
+ taskWrk.setWrkSts(2);
+ if (!Cools.isEmpty(taskWrk.getTargetPoint())) {
+ taskWrk.setOriginTargetPoint(taskWrk.getTargetPoint());
+ }
+ }
+ return taskWrk;
+ }
+
+ private TaskWrk createTask(GetWmsDto dto, String barcode) {
+ String wcsLocNo = dto.getLocNo();
+ if (Cools.isEmpty(wcsLocNo)) {
+ return null;
+ }
+ Date now = new Date();
+ TaskWrk taskWrk = new TaskWrk();
+ int workNo1 = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+ taskWrk.setTaskNo(dto.getWrkNo());//浠诲姟鍙�
+ taskWrk.setWrkNo(workNo1);
+ taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
+ taskWrk.setCreateTime(now);
+ taskWrk.setIoType(1);//浠诲姟绫诲瀷
+ taskWrk.setIoPri(Cools.isEmpty(dto.getTaskPriority()) ? 300 : Integer.parseInt(dto.getTaskPriority()));//浼樺厛绾�
+ taskWrk.setBarcode(barcode);//鏉＄爜
+ LocMast locMast = locMastService.selectByLocNo(wcsLocNo);
+ taskWrk.setCrnNo(locMast.getCrnNo());
+ taskWrk.setTargetPoint(wcsLocNo);
+ taskWrk.setStartPoint(dto.getStaNo().toString());
+ if (taskWrk.getIoType() == 1) {
+ taskWrk.setWrkSts(2);
+ if (!Cools.isEmpty(taskWrk.getTargetPoint())) {
+ taskWrk.setOriginTargetPoint(taskWrk.getTargetPoint());
+ }
+
+// } else if (param.getIoType() == 2) {
+// taskWrk.setWrkSts(11);
+// if (!Cools.isEmpty(param.getStartPoint())) {
+// taskWrk.setStartPoint(Utils.getWcsLocNo(param.getStartPoint()));//璧风偣
+// taskWrk.setOriginStartPoint(param.getStartPoint());
+// }
+// taskWrk.setTargetPoint(param.getTargetPoint());
+// }else if (param.getIoType() == 3){
+// taskWrk.setWrkSts(11);
+// if (!Cools.isEmpty(param.getStartPoint())) {
+// taskWrk.setStartPoint(param.getStartPoint());//璧风偣
+// taskWrk.setOriginStartPoint(param.getStartPoint());
+// }
+ }
+ return taskWrk;
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 1a45968..f3b0695 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -7,7 +7,6 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.controller.CrnController;
-import com.zy.asrs.controller.OpenController;
import com.zy.asrs.controller.SiteController;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.domain.enums.WorkNoType;
@@ -16,7 +15,10 @@
import com.zy.asrs.entity.param.Result;
import com.zy.asrs.entity.param.StorageEscalationParam;
import com.zy.asrs.entity.param.TaskOverToWms;
-import com.zy.asrs.mapper.*;
+import com.zy.asrs.mapper.BasCrnErrorMapper;
+import com.zy.asrs.mapper.StaDescMapper;
+import com.zy.asrs.mapper.TaskWrkMapper;
+import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.CommandUtils;
import com.zy.asrs.utils.Utils;
@@ -30,7 +32,6 @@
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.Task;
-import com.zy.core.model.command.CommandPackage;
import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.StaProtocol;
@@ -47,7 +48,10 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.io.IOException;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* 绔嬩綋浠撳簱WCS绯荤粺涓绘祦绋嬩笟鍔�
@@ -198,20 +202,12 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- if(back){
- if(staProtocol.getWorkNo()>=9801&&staProtocol.getWorkNo()<=9825){
- staProtocol.setStaNo((short)105);
- } else if (staProtocol.getWorkNo()>=9826&&staProtocol.getWorkNo()<=9850) {
- staProtocol.setStaNo((short)107);
- }else if (staProtocol.getWorkNo()>=9851&&staProtocol.getWorkNo()<=9875) {
- staProtocol.setStaNo((short)109);
- }else{
- staProtocol.setStaNo((short)110);
- }
+ if (back) {
+ staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- }else{
- if (!Cools.isEmpty(response)&&!Cools.isEmpty(jsonObject.get("ReturnStatus"))&&jsonObject.get("ReturnStatus").equals(0) && !Cools.isEmpty(jsonObject.get("Result").toString())) {
+ } else {
+ if (!Cools.isEmpty(response) && !Cools.isEmpty(jsonObject.get("ReturnStatus")) && jsonObject.get("ReturnStatus").equals(0) && !Cools.isEmpty(jsonObject.get("Result").toString())) {
Result result = JSON.parseObject(jsonObject.get("Result").toString(), Result.class);
// 鍒涙柊涓�涓叆搴撳伐浣滄。
TaskWrk taskWrk = taskWrkService.selectByTaskNo(result.getTaskNo());
@@ -227,7 +223,7 @@
staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
HashMap<String, Object> hashMap = new HashMap<>();
- hashMap.put("TaskNo",taskWrk.getTaskNo());
+ hashMap.put("TaskNo", taskWrk.getTaskNo());
try {
//寮�濮嬩笂鎶�,浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
response = new HttpHandler.Builder()
@@ -238,7 +234,7 @@
.doPost();
JSONObject jsonObject1 = JSON.parseObject(response);
Boolean bool = false;
- if(jsonObject1.get("ReturnStatus").equals(0)){
+ if (jsonObject1.get("ReturnStatus").equals(0)) {
bool = true;
}
apiLogService.save("wcs寮�濮嬪叆搴撲换鍔′笂鎶ms"
@@ -254,22 +250,12 @@
}
}
} else {
-// staProtocol.setWorkNo((short) 9991);
- if(staProtocol.getWorkNo()>=9801&&staProtocol.getWorkNo()<=9825){
- staProtocol.setStaNo((short)105);
- } else if (staProtocol.getWorkNo()>=9826&&staProtocol.getWorkNo()<=9850) {
- staProtocol.setStaNo((short)107);
- }else if (staProtocol.getWorkNo()>=9851&&staProtocol.getWorkNo()<=9875) {
- staProtocol.setStaNo((short)109);
- }else{
- staProtocol.setStaNo((short)110);
- }
+ staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
}
} else {
-// staProtocol.setWorkNo((short) 9991);
staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
@@ -758,7 +744,7 @@
crnCommand.setDestinationPosY(Utils.getBayShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅灞�
crnCommand.setDestinationPosZ(Utils.getLevShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鎺�
crnCommand.setCommand((short) 1);
- log.info("鍫嗗灈鏈哄叆搴撲换鍔′笅鍙�={}",crnCommand);
+ log.info("鍫嗗灈鏈哄叆搴撲换鍔′笅鍙�={}", crnCommand);
if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand), false)) {
log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
@@ -798,24 +784,24 @@
continue;
}
- LocMast locMast=locMastService.selectByLocNo(taskWrk.getStartPoint());
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
//鍒ゆ柇鍏跺簱浣嶆槸鍚︿负娣卞簱浣嶏紝濡傛灉涓烘繁搴撲綅鎵惧叾娴呭簱浣嶆槸閮芥湁璐�
- if(locMast.getRow1()==1||locMast.getRow1()==5){
- LocMast locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("row1", (locMast.getRow1()+1))
- .eq("bay1",locMast.getBay1())
- .eq("lev1",locMast.getLev1()).eq("loc_sts","F"));
- if (!Cools.isEmpty(locMast1)){
- log.info(locMast.getLocNo()+"鍑烘繁搴撲綅锛屾祬搴撲綅鏈夎揣");
+ if (locMast.getRow1() == 1 || locMast.getRow1() == 5) {
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", (locMast.getRow1() + 1))
+ .eq("bay1", locMast.getBay1())
+ .eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
+ if (!Cools.isEmpty(locMast1)) {
+ log.info(locMast.getLocNo() + "鍑烘繁搴撲綅锛屾祬搴撲綅鏈夎揣");
continue;
}
- }else if(locMast.getRow1()==4||locMast.getRow1()==8){
- LocMast locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("row1", (locMast.getRow1()-1))
- .eq("bay1",locMast.getBay1())
- .eq("lev1",locMast.getLev1()).eq("loc_sts","F"));
- if (!Cools.isEmpty(locMast1)){
- log.info(locMast.getLocNo()+"鍑烘繁搴撲綅锛屾祬搴撲綅鏈夎揣");
+ } else if (locMast.getRow1() == 4 || locMast.getRow1() == 8) {
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", (locMast.getRow1() - 1))
+ .eq("bay1", locMast.getBay1())
+ .eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
+ if (!Cools.isEmpty(locMast1)) {
+ log.info(locMast.getLocNo() + "鍑烘繁搴撲綅锛屾祬搴撲綅鏈夎揣");
continue;
}
}
@@ -863,9 +849,9 @@
command.setDestinationPosZ(crnStn.getLev().shortValue()); // 鐩爣搴撲綅灞�
command.setCommand((short) 1);
- if(Cools.isEmpty(taskWrk.getMarkStart())||taskWrk.getMarkStart()==0){
+ if (Cools.isEmpty(taskWrk.getMarkStart()) || taskWrk.getMarkStart() == 0) {
HashMap<String, Object> hashMap = new HashMap<>();
- hashMap.put("TaskNo",taskWrk.getTaskNo());
+ hashMap.put("TaskNo", taskWrk.getTaskNo());
String response = "";
try {
//寮�濮嬩笂鎶�,鍑哄簱浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
@@ -877,7 +863,7 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
Boolean bool = false;
- if(jsonObject.get("ReturnStatus").equals(0)){
+ if (jsonObject.get("ReturnStatus").equals(0)) {
bool = true;
taskWrk.setMarkStart(1);
}
@@ -1116,7 +1102,7 @@
crnOperatorParam.setCrnNo(crn.getId());
R r = crnController.crnTaskComplete(crnOperatorParam);
Thread.sleep(1000);
- if(!r.get("code").equals(200)){
+ if (!r.get("code").equals(200)) {
return;
}
if (!Cools.isEmpty(taskWrk)) {
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index f2d45cb..254ae97 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -5,13 +5,12 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.R;
-import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.domain.enums.WorkNoType;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.TaskCreateParam;
import com.zy.asrs.entity.param.TaskOverParam;
import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
-import com.zy.asrs.entity.param.TaskCreateParam;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.service.CommonService;
@@ -34,25 +33,6 @@
@Service
public class OpenServiceImpl implements OpenService {
- @Autowired
- private TaskWrkService taskWrkService;
- @Autowired
- private SlaveProperties slaveProperties;
- @Autowired
- private ApiLogService apiLogService;
-
- @Autowired
- private StaDescService staDescService;
- @Autowired
- private CommonService commonService;
- @Autowired
- private LocMastService locMastService;
- @Autowired
- private BasDevpService basDevpService;
-
-
- @Value("${wms.url}")
- private String wmsUrl;
public ArrayList<String> wharfCode1 = new ArrayList<String>() {{
add("J-1101");
add("J-1103");
@@ -63,15 +43,30 @@
add("H-1101");
add("G-1101");
}};
-
+ @Autowired
+ private TaskWrkService taskWrkService;
+ @Autowired
+ private SlaveProperties slaveProperties;
+ @Autowired
+ private ApiLogService apiLogService;
+ @Autowired
+ private StaDescService staDescService;
+ @Autowired
+ private CommonService commonService;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Value("${wms.url}")
+ private String wmsUrl;
@Override
public HashMap<String, Object> taskCreate(TaskCreateParam param) {
- HashMap<String,Object> map=new HashMap<>();
+ HashMap<String, Object> map = new HashMap<>();
TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
if (taskWrk != null) {
- map.put("Code","0");
- map.put("Msg",param.getTaskNo()+"浠诲姟宸茬粡鐢熸垚锛�");
+ map.put("Code", "0");
+ map.put("Msg", param.getTaskNo() + "浠诲姟宸茬粡鐢熸垚锛�");
return map;
}
@@ -123,12 +118,12 @@
}
if (!taskWrkService.insert(taskWrk)) {
- map.put("Code","0");
- map.put("Msg",param.getTaskNo()+"鍒涘缓浠诲姟澶辫触锛�");
+ map.put("Code", "0");
+ map.put("Msg", param.getTaskNo() + "鍒涘缓浠诲姟澶辫触锛�");
return map;
}
- map.put("Code","1");
- map.put("Msg","ok");
+ map.put("Code", "1");
+ map.put("Msg", "ok");
return map;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
index 2fe26fb..272e80b 100644
--- a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
@@ -26,11 +26,11 @@
}
@Override
- public StaDesc queryCrn(Integer typeNo, Integer stnNo,Integer crnNo) {
+ public StaDesc queryCrn(Integer typeNo, Integer stnNo, Integer crnNo) {
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", typeNo)
.eq("stn_no", stnNo)
- .eq("crn_no",crnNo);
+ .eq("crn_no", crnNo);
StaDesc staDesc = this.selectOne(wrapper);
if (staDesc == null) {
return null;
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkLogServiceImpl.java
index c705e81..bff6315 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskWrkLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkLogServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.TaskWrkLogMapper;
-import com.zy.asrs.entity.TaskWrkLog;
-import com.zy.asrs.service.TaskWrkLogService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.TaskWrkLog;
+import com.zy.asrs.mapper.TaskWrkLogMapper;
+import com.zy.asrs.service.TaskWrkLogService;
import org.springframework.stereotype.Service;
@Service("taskWrkLogService")
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
index c237c06..2fa1e6a 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
@@ -2,17 +2,17 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.domain.enums.WorkNoType;
import com.zy.asrs.entity.StaDesc;
-import com.zy.asrs.mapper.TaskWrkMapper;
import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.mapper.TaskWrkMapper;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.StaDescService;
import com.zy.asrs.service.TaskWrkService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.utils.CommandUtils;
import com.zy.asrs.utils.Utils;
import com.zy.common.service.CommonService;
@@ -90,7 +90,7 @@
throw new CoolException("鏈帴鏀跺埌璧风偣鍜岀粓鐐癸紝涓嶈繘琛屾淳鍙�");
}
startup(taskWrk, userId);
- }else if(taskWrk.getIoType() == 2){
+ } else if (taskWrk.getIoType() == 2) {
//2.鍑哄簱
stockOut(taskWrk, userId);
} else if (taskWrk.getIoType() == 3) {
@@ -133,17 +133,17 @@
crnCommand.setDestinationPosX(Utils.getRowShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosY(Utils.getBayShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅灞�
crnCommand.setDestinationPosZ(Utils.getLevShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鎺�
- crnCommand.setCommand((short)1);
- if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(5, crnCommand),false)) {
+ crnCommand.setCommand((short) 1);
+ if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(5, crnCommand), false)) {
log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
- }else{
- try{
+ } else {
+ try {
HashMap<String, Object> headParam = new HashMap<>();
- headParam.put("taskNo",taskWrk.getTaskNo());
- headParam.put("status",taskWrk.getStatus());
- headParam.put("ioType",taskWrk.getIoType());
- headParam.put("barcode",taskWrk.getBarcode());
+ headParam.put("taskNo", taskWrk.getTaskNo());
+ headParam.put("status", taskWrk.getStatus());
+ headParam.put("ioType", taskWrk.getIoType());
+ headParam.put("barcode", taskWrk.getBarcode());
// headParam.put("reportTime",new Date());
String response;
response = new HttpHandler.Builder()
@@ -156,14 +156,14 @@
JSONObject jsonObject = JSON.parseObject(response);
apiLogService.save("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms"
- ,wmsUrl+taskStatusFeedbackPath
- ,null
- ,"127.0.0.1"
- ,JSON.toJSONString(headParam)
- ,response
- ,true
+ , wmsUrl + taskStatusFeedbackPath
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(headParam)
+ , response
+ , true
);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触", taskWrk);
// throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
}
@@ -204,7 +204,7 @@
crnCommand.setDestinationPosX(crnStn.getBay().shortValue()); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(crnStn.getLev().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(crnStn.getRow().shortValue()); // 鐩爣搴撲綅灞�
- crnCommand.setCommand((short)1);
+ crnCommand.setCommand((short) 1);
if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(5, crnCommand))) {
log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
@@ -224,9 +224,9 @@
@Override
public void locMove(TaskWrk taskWrk, Long userId) {
//搴撴牸绉昏浇浠诲姟娲惧彂
- if (Cools.isEmpty(taskWrk.getTargetPoint())){
- return;
- }
+ if (Cools.isEmpty(taskWrk.getTargetPoint())) {
+ return;
+ }
int workNo = commonService.getWorkNo(WorkNoType.OTHER.type);//鑾峰彇宸ヤ綔鍙�
taskWrk.setWrkNo(workNo);//宸ヤ綔鍙�
taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//娲惧彂鐘舵��
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 4df73f7..250d305 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -17,6 +17,7 @@
import java.util.Date;
import java.util.HashMap;
import java.util.concurrent.TimeUnit;
+
@Slf4j
@Service
public class WorkServiceImpl implements WorkService {
@@ -72,9 +73,9 @@
throw new CoolException("淇敼宸ヤ綔妗ｅけ璐�");
}
- HashMap<String,Object> headParam = new HashMap<>();
- headParam.put("TaskNo",wrkMast.getTaskNo());
- headParam.put("Result",0);//瀹屾垚
+ HashMap<String, Object> headParam = new HashMap<>();
+ headParam.put("TaskNo", wrkMast.getTaskNo());
+ headParam.put("Result", 0);//瀹屾垚
try {
String response;
@@ -179,9 +180,9 @@
if (!wrkMastRes || !locMastRes) {
throw new CoolException("淇濆瓨鏁版嵁澶辫触");
}
- HashMap<String,Object> headParam = new HashMap<>();
- headParam.put("TaskNo",wrkMast.getTaskNo());
- headParam.put("Result",1);//鍙栨秷
+ HashMap<String, Object> headParam = new HashMap<>();
+ headParam.put("TaskNo", wrkMast.getTaskNo());
+ headParam.put("Result", 1);//鍙栨秷
try {
String response;
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
index 3e1d1eb..88549de 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
@@ -11,6 +11,6 @@
@Override
public boolean save(Integer workNo) {
- return this.baseMapper.save(workNo)>0;
+ return this.baseMapper.save(workNo) > 0;
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index 017911a..f03d665 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -26,12 +26,12 @@
@Override
@Transactional
public void createWorkDetail(Integer workNo, List<WaitPakin> waitPakins, String barcode) {
- if (waitPakins.isEmpty()){
+ if (waitPakins.isEmpty()) {
return;
}
for (WaitPakin waitPakin : waitPakins) {
MatCode matCode = matCodeService.selectById(waitPakin.getMatnr());
- if (Cools.isEmpty(matCode)){
+ if (Cools.isEmpty(matCode)) {
throw new CoolException("鐗╂枡鏉＄爜鏁版嵁涓虹┖");
}
// 淇濇寔宸ヤ綔妗ｆ槑缁�
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index 8c0b9e9..526c697 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -29,6 +29,6 @@
@Override
public int getOutToStn182(Integer devpNo) {
- return selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devpNo).in("wrk_sts",11,12));
+ return selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devpNo).in("wrk_sts", 11, 12));
}
}
diff --git a/src/main/java/com/zy/asrs/task/AbstractHandler.java b/src/main/java/com/zy/asrs/task/AbstractHandler.java
index b48df43..9ba819b 100644
--- a/src/main/java/com/zy/asrs/task/AbstractHandler.java
+++ b/src/main/java/com/zy/asrs/task/AbstractHandler.java
@@ -17,12 +17,12 @@
// protected abstract ReturnT<T> start();
- protected void exceptionHandle(String errorMsg){
+ protected void exceptionHandle(String errorMsg) {
log.error(errorMsg);
exceptionHandle(errorMsg, (Object) null);
}
- protected void exceptionHandle(String errorMsg, Object... args){
+ protected void exceptionHandle(String errorMsg, Object... args) {
log.error(errorMsg);
throw new CoolException(MessageFormat.format(errorMsg, args));
}
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 1e53034..8ea8636 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -1,17 +1,13 @@
package com.zy.asrs.task;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.exception.CoolException;
-import com.zy.asrs.domain.enums.TaskStatusType;
-import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.TaskOverToWms;
-import com.zy.asrs.entity.param.TaskStatusFeedbackParam;
-import com.zy.asrs.service.*;
+import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.entity.TaskWrkLog;
+import com.zy.asrs.entity.TaskWrkReport;
+import com.zy.asrs.service.TaskWrkReportService;
+import com.zy.asrs.service.TaskWrkService;
import com.zy.asrs.service.impl.TaskWrkLogServiceImpl;
-import com.zy.asrs.utils.PostMesDataUtils;
-import com.zy.common.utils.HttpHandler;
+import com.zy.common.utils.Synchro;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -19,10 +15,6 @@
import org.springframework.stereotype.Component;
import java.io.IOException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
/**
* 瀹氭椂灏嗕换鍔�(瀹屾垚銆佸彇娑�)杞垚鏃ュ織
@@ -33,73 +25,43 @@
@Autowired
private TaskWrkService taskWrkService;
- @Autowired
- private CommandInfoService commandInfoService;
- @Autowired
- private ApiLogService apiLogService;
- @Autowired
- private BasDevpService basDevpService;
- @Autowired
- private StaDescService staDescService;
- @Autowired
- private LocMastService locMastService;
@Autowired
private TaskWrkLogServiceImpl wrkLogService;
+
+ @Autowired
+ private TaskWrkReportService taskWrkReportService;
+
@Value("${wms.url}")
private String wmsUrl;
- @Value("${wms.movePath}")
- private String movePath;
- @Value("${wms.inboundTaskApplyPath}")
- private String inboundTaskApplyPath;
+
@Value("${wms.TaskExecCallback}")
private String TaskExecCallback;
- @Value("${wms.taskStatusFeedbackPath}")
- private String taskStatusFeedbackPath;
+
@Scheduled(cron = "0/3 * * * * ? ")
public void execute() throws IOException {
for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
- HashMap<String, Object> headParam = new HashMap<>();
- if (taskWrk.getStatus().equals(TaskStatusType.OVER.id) || taskWrk.getStatus() == 7) {//瀹屾垚
- headParam.put("Result", 1);
- } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
- headParam.put("Result", 2);
+ switch (taskWrk.getStatus()) {
+ case 4:
+ break;
+ case 5:
+ break;
}
- String response = "";
- Boolean bool = false;
- try {
- headParam.put("TaskNo", taskWrk.getTaskNo());
- log.info("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms={}", taskWrk);
- response = new HttpHandler.Builder()
- // .setHeaders(headParam)
- .setUri(wmsUrl)
- .setPath(TaskExecCallback)
- .setJson(JSON.toJSONString(headParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
- if (!wrkLogService.insert(taskWrkLog)) {
- throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
- }
- if (!taskWrkService.deleteById(taskWrk)) {
- throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
- }
- bool = true;
- } catch (Exception e) {
- log.error("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶辫触{},杩斿洖鍊�={}", taskWrk, response);
- } finally {
- apiLogService.save("wcs瀹屾垚鎴栬�呭彇娑堜换鍔′笂鎶ms"
- , wmsUrl + TaskExecCallback
- , null
- , "127.0.0.1"
- , JSON.toJSONString(headParam)
- , response
- , bool
- );
+ TaskWrkReport taskWrkReport = new TaskWrkReport();
+ TaskWrkLog taskWrkLog = new TaskWrkLog();
+ Synchro.Copy(taskWrk, taskWrkReport);
+ Synchro.Copy(taskWrk, taskWrkLog);
+ if (!taskWrkReportService.insert(taskWrkReport)) {
+ throw new CoolException("杞Щ鑷充笂鎶ヨ〃" + taskWrk);
+ }
+ if (!wrkLogService.insert(taskWrkLog)) {
+ throw new CoolException("杞巻鍙叉。澶辫触" + taskWrk);
+ }
+ if (!taskWrkService.deleteById(taskWrk)) {
+ throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrk);
}
}
}
diff --git a/src/main/java/com/zy/asrs/task/TaskReportScheduler.java b/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
new file mode 100644
index 0000000..60e64f4
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
@@ -0,0 +1,98 @@
+package com.zy.asrs.task;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.exception.CoolException;
+import com.zy.asrs.domain.enums.TaskStatusType;
+import com.zy.asrs.entity.TaskWrkReport;
+import com.zy.asrs.entity.TaskWrkReportLog;
+import com.zy.asrs.service.ApiLogService;
+import com.zy.asrs.service.TaskWrkReportLogService;
+import com.zy.asrs.service.TaskWrkReportService;
+import com.zy.common.utils.HttpHandler;
+import com.zy.common.utils.Synchro;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.HashMap;
+
+/**
+ * 瀹氭椂灏嗕换鍔�(瀹屾垚銆佸彇娑�)杞垚鏃ュ織
+ */
+@Slf4j
+@Component
+public class TaskReportScheduler {
+
+ @Autowired
+ private TaskWrkReportService taskWrkReportService;
+
+ @Autowired
+ private TaskWrkReportLogService taskWrkReportLogService;
+
+ @Autowired
+ private ApiLogService apiLogService;
+
+
+ @Value("${wms.url}")
+ private String wmsUrl;
+
+ @Value("${wms.TaskExecCallback}")
+ private String TaskExecCallback;
+
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public void execute() throws IOException {
+ Page<TaskWrkReport> taskWrkReportPage = taskWrkReportService.selectPage(new Page<>(0, 10));
+ if (taskWrkReportPage.getRecords() != null) {
+ for (TaskWrkReport taskWrk : taskWrkReportPage.getRecords()) {
+ HashMap<String, Object> headParam = new HashMap<>();
+ if (taskWrk.getStatus().equals(TaskStatusType.OVER.id) || taskWrk.getStatus() == 7) {//瀹屾垚
+ headParam.put("Result", 1);
+ } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
+ headParam.put("Result", 2);
+ }
+ String response = "";
+ Boolean bool = false;
+ try {
+ headParam.put("TaskNo", taskWrk.getTaskNo());
+ log.info("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms={}", taskWrk);
+ response = new HttpHandler.Builder()
+ // .setHeaders(headParam)
+ .setUri(wmsUrl)
+ .setPath(TaskExecCallback)
+ .setJson(JSON.toJSONString(headParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ TaskWrkReportLog taskWrkLog = new TaskWrkReportLog();
+ Synchro.Copy(taskWrk, taskWrkLog);
+ if (!taskWrkReportLogService.insert(taskWrkLog)) {
+ throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
+ }
+ if (!taskWrkReportService.deleteById(taskWrk)) {
+ throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
+ }
+ bool = true;
+ } catch (Exception e) {
+ log.error("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶辫触{},杩斿洖鍊�={}", taskWrk, response);
+ } finally {
+ apiLogService.save("wcs瀹屾垚鎴栬�呭彇娑堜换鍔′笂鎶ms"
+ , wmsUrl + TaskExecCallback
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(headParam)
+ , response
+ , bool
+ );
+ }
+ }
+ }
+
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/task/core/ReturnT.java b/src/main/java/com/zy/asrs/task/core/ReturnT.java
index 26b8c12..f4fcede 100644
--- a/src/main/java/com/zy/asrs/task/core/ReturnT.java
+++ b/src/main/java/com/zy/asrs/task/core/ReturnT.java
@@ -27,7 +27,7 @@
this.content = content;
}
- public boolean isSuccess(){
+ public boolean isSuccess() {
return this.code == 200;
}
diff --git a/src/main/java/com/zy/asrs/task/core/WcsDispatcher.java b/src/main/java/com/zy/asrs/task/core/WcsDispatcher.java
index ea2c49f..81ba154 100644
--- a/src/main/java/com/zy/asrs/task/core/WcsDispatcher.java
+++ b/src/main/java/com/zy/asrs/task/core/WcsDispatcher.java
@@ -23,7 +23,7 @@
private ConfigService configService;
@PostConstruct
- private void start(){
+ private void start() {
thread = new Thread(() -> {
while (!Thread.currentThread().isInterrupted()) {
try {
@@ -43,7 +43,7 @@
}
@PreDestroy
- public void shutDown(){
+ public void shutDown() {
if (thread != null)
thread.interrupt();
log.info("浠诲姟涓績璋冨害鍣ㄥ凡鍋滄......");
diff --git a/src/main/java/com/zy/asrs/utils/CommandUtils.java b/src/main/java/com/zy/asrs/utils/CommandUtils.java
index a18ce22..fbe4ec3 100644
--- a/src/main/java/com/zy/asrs/utils/CommandUtils.java
+++ b/src/main/java/com/zy/asrs/utils/CommandUtils.java
@@ -11,8 +11,8 @@
import com.zy.core.enums.CommandType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.Task;
-import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.command.CommandPackage;
+import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.protocol.StaProtocol;
import java.util.Date;
@@ -53,7 +53,7 @@
commandInfo.setCommandStatus(CommandStatusType.CREATE.id);
commandInfo.setStartTime(new Date());
commandInfo.setDevice(SlaveType.Crn.toString());
- commandInfo.setCommandType(auto? CommandType.AUTO.id : CommandType.MANUAL.id);
+ commandInfo.setCommandType(auto ? CommandType.AUTO.id : CommandType.MANUAL.id);
commandInfoService.insert(commandInfo);//鎻掑叆鎸囦护
@@ -86,7 +86,7 @@
commandInfo.setCommandStatus(CommandStatusType.CREATE.id);
commandInfo.setStartTime(new Date());
commandInfo.setDevice(SlaveType.Devp.toString());
- commandInfo.setCommandType(auto? CommandType.AUTO.id : CommandType.MANUAL.id);
+ commandInfo.setCommandType(auto ? CommandType.AUTO.id : CommandType.MANUAL.id);
commandInfoService.insert(commandInfo);//鎻掑叆鎸囦护
diff --git a/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java b/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
index 04cc0db..baa3658 100644
--- a/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
+++ b/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -15,16 +14,16 @@
/*
- * url: eg: 192.168.4.15:1433
- * path: eg: api/InterFace/get_InterFace_TestStorage
- * combParam:鍙傛暟
- * */
- public ReturnT<String> postMesData(String name,String URL,String mesPath, Object combParam){
+ * url: eg: 192.168.4.15:1433
+ * path: eg: api/InterFace/get_InterFace_TestStorage
+ * combParam:鍙傛暟
+ * */
+ public ReturnT<String> postMesData(String name, String URL, String mesPath, Object combParam) {
// if (true){
// System.out.println("name:"+name+",URL:"+URL+",mesPath:"+mesPath+",combParam:"+combParam);
// return SUCCESS;
// }
- if(combParam != null){
+ if (combParam != null) {
String response = "";
boolean success = false;
try {
@@ -37,24 +36,25 @@
.setJson(JSON.toJSONString(combParam))
.build()
.doPost();
- System.out.println("response:"+response);
+ System.out.println("response:" + response);
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
success = true;
} else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
- throw new CoolException("涓婃姤"+name);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(combParam), response);
+ throw new CoolException("涓婃姤" + name);
}
} catch (Exception e) {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(combParam), response);
// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
} finally {
try {
} catch (Exception e) {
- log.error("", e); }
+ log.error("", e);
+ }
}
}
return SUCCESS;
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 91ae550..7c99b7e 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -3,7 +3,6 @@
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.zy.asrs.entity.LocMast;
import com.zy.core.model.CrnSlave;
import com.zy.core.properties.SlaveProperties;
@@ -20,14 +19,14 @@
public static String getWmsLocNo(String locNo) {
String loc = null;
int row = Integer.parseInt(locNo.substring(0, 2));
- int bay = Integer.parseInt(locNo.substring(2, 5))-1;
+ int bay = Integer.parseInt(locNo.substring(2, 5)) - 1;
int lev = Integer.parseInt(locNo.substring(5, 7));
Integer sssc = getRowZ(row);
Integer fz = getFZ(row, sssc);
Integer fz1 = getFZ1(row, sssc);
//System.out.println(sssc + "-" + bay + "-" + lev + "-" + fz + "-" + fz1);
- loc = String.format("%02d",sssc) + "-" + String.format("%02d",bay) + "-" + String.format("%02d",lev) + "-" + String.format("%02d",fz) + "-" + String.format("%02d",fz1);
+ loc = String.format("%02d", sssc) + "-" + String.format("%02d", bay) + "-" + String.format("%02d", lev) + "-" + String.format("%02d", fz) + "-" + String.format("%02d", fz1);
return loc;
}
@@ -60,40 +59,38 @@
}
-
-
//杞崲wms浼犺緭鐨勫簱浣嶅彿
- public static String getWcsLocNo(String locNo){
+ public static String getWcsLocNo(String locNo) {
String[] split = locNo.split("-");
int[] wcsRow = getWcsRow(split[0]);
int[] ints = null;
- if (split[3].equals("01")){
- ints = Arrays.copyOfRange(wcsRow, 0, (wcsRow.length+2-1) / 2);
- if (split[4].equals("01")){
- if (ints.length<2){
+ if (split[3].equals("01")) {
+ ints = Arrays.copyOfRange(wcsRow, 0, (wcsRow.length + 2 - 1) / 2);
+ if (split[4].equals("01")) {
+ if (ints.length < 2) {
- }else {
+ } else {
ints = Arrays.copyOfRange(ints, ints.length / 2, ints.length);
}
- }else {
- if (ints.length<2){
+ } else {
+ if (ints.length < 2) {
- }else {
- ints = Arrays.copyOfRange(ints, ints.length / 2-1,ints.length-1);
+ } else {
+ ints = Arrays.copyOfRange(ints, ints.length / 2 - 1, ints.length - 1);
}
}
- }else {
- ints = Arrays.copyOfRange(wcsRow, (wcsRow.length+2-1) / 2,wcsRow.length );
- if (split[4].equals("01")){
- if (ints.length<2){
+ } else {
+ ints = Arrays.copyOfRange(wcsRow, (wcsRow.length + 2 - 1) / 2, wcsRow.length);
+ if (split[4].equals("01")) {
+ if (ints.length < 2) {
- }else {
- ints = Arrays.copyOfRange(ints, ints.length / 2-1,ints.length-1);
+ } else {
+ ints = Arrays.copyOfRange(ints, ints.length / 2 - 1, ints.length - 1);
}
- }else {
- if (ints.length<2){
+ } else {
+ if (ints.length < 2) {
- }else {
+ } else {
ints = Arrays.copyOfRange(ints, ints.length / 2, ints.length);
}
@@ -102,43 +99,43 @@
}
int i = ints[0];
String wcsLocNo = "";
- Integer bay = Integer.parseInt(split[1])+1;
+ Integer bay = Integer.parseInt(split[1]) + 1;
String bay2 = "";
- if (bay>9){
+ if (bay > 9) {
bay2 = bay.toString();
- }else {
- bay2 = "0"+bay;
+ } else {
+ bay2 = "0" + bay;
}
- if (i>9){
- wcsLocNo = i+"0"+bay2+split[2];
- }else {
- wcsLocNo = "0"+i+"0"+bay2+split[2];
+ if (i > 9) {
+ wcsLocNo = i + "0" + bay2 + split[2];
+ } else {
+ wcsLocNo = "0" + i + "0" + bay2 + split[2];
}
-
return wcsLocNo;
}
- public static int[] getWcsRow(String row){
+
+ public static int[] getWcsRow(String row) {
int[] array = null;
- switch (row){
+ switch (row) {
case "01":
- array= new int[]{1, 2, 3, 4};
+ array = new int[]{1, 2, 3, 4};
break;
case "02":
- array= new int[]{5,6};
+ array = new int[]{5, 6};
break;
case "03":
- array= new int[]{7,8,9,10};
+ array = new int[]{7, 8, 9, 10};
break;
case "04":
- array= new int[]{11,12,13,14};
+ array = new int[]{11, 12, 13, 14};
break;
case "05":
- array= new int[]{15,16,17,18};
+ array = new int[]{15, 16, 17, 18};
break;
case "06":
- array= new int[]{19,20,21};
+ array = new int[]{19, 20, 21};
break;
default:
@@ -146,7 +143,7 @@
return array;
}
- public static float scale(Float f){
+ public static float scale(Float f) {
if (f == null || f == 0f || Float.isNaN(f)) {
return 0f;
}
@@ -154,19 +151,19 @@
}
//绔欑偣鍙疯浆鎹�
- public static String getEquipmentCode(String targetPoint){
- return "J-1"+targetPoint;
+ public static String getEquipmentCode(String targetPoint) {
+ return "J-1" + targetPoint;
}
- public static String zerofill(String msg, Integer count){
- if (msg.length() == count){
+ public static String zerofill(String msg, Integer count) {
+ if (msg.length() == count) {
return msg;
- } else if (msg.length() > count){
+ } else if (msg.length() > count) {
return msg.substring(0, 16);
} else {
StringBuilder msgBuilder = new StringBuilder(msg);
- for (int i = 0; i<count-msg.length(); i++){
- msgBuilder.insert(0,"0");
+ for (int i = 0; i < count - msg.length(); i++) {
+ msgBuilder.insert(0, "0");
}
return msgBuilder.toString();
}
@@ -175,7 +172,7 @@
/**
* 鍒ゆ柇鏄惁涓烘繁搴撲綅
*/
- public static boolean isDeepLoc(SlaveProperties slaveProperties, String locNo){
+ public static boolean isDeepLoc(SlaveProperties slaveProperties, String locNo) {
if (slaveProperties.isDoubleDeep()) {
int row = getRow(locNo);
return slaveProperties.getDoubleLocs().contains(row);
@@ -187,7 +184,7 @@
/**
* 鍒ゆ柇鏄惁涓烘繁搴撲綅
*/
- public static boolean isDeepLoc(SlaveProperties slaveProperties, Integer row){
+ public static boolean isDeepLoc(SlaveProperties slaveProperties, Integer row) {
if (slaveProperties.isDoubleDeep()) {
return slaveProperties.getDoubleLocs().contains(row);
} else {
@@ -198,7 +195,7 @@
/**
* 鍒ゆ柇鏄惁涓烘祬搴撲綅
*/
- public static boolean isShallowLoc(SlaveProperties slaveProperties, String locNo){
+ public static boolean isShallowLoc(SlaveProperties slaveProperties, String locNo) {
if (slaveProperties.isDoubleDeep()) {
int row = getRow(locNo);
return !slaveProperties.getDoubleLocs().contains(row);
@@ -210,7 +207,7 @@
/**
* 鍒ゆ柇鏄惁涓烘祬搴撲綅
*/
- public static boolean isShallowLoc(SlaveProperties slaveProperties, Integer row){
+ public static boolean isShallowLoc(SlaveProperties slaveProperties, Integer row) {
if (slaveProperties.isDoubleDeep()) {
return !slaveProperties.getDoubleLocs().contains(row);
} else {
@@ -224,16 +221,21 @@
public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) {
int row = getRow(deepLoc);
// int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
- int shallowRow = getShallowRow(row);
+ int shallowRow = getShallowRow(row);
return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
}
- public static int getShallowRow(Integer row){
+
+ public static int getShallowRow(Integer row) {
Map<Integer, Integer> map = new HashMap<>();
- map.put(1,2);map.put(4,3);
- map.put(7,8);map.put(10,9);
- map.put(11,12);map.put(14,13);
- map.put(15,16);map.put(18,17);
- map.put(19,20);
+ map.put(1, 2);
+ map.put(4, 3);
+ map.put(7, 8);
+ map.put(10, 9);
+ map.put(11, 12);
+ map.put(14, 13);
+ map.put(15, 16);
+ map.put(18, 17);
+ map.put(19, 20);
return map.get(row);
}
@@ -359,7 +361,7 @@
List<CrnSlave.CrnStn> crnInStn = null;
if (pakIn) {
crnInStn = crn.getCrnInStn();
- }else {
+ } else {
crnInStn = crn.getCrnOutStn();
}
@@ -387,7 +389,7 @@
}
public static Integer StaNoCrnNo(Integer staNo) {
- switch (staNo){
+ switch (staNo) {
case 100:
case 101:
return 1;
@@ -406,7 +408,7 @@
}
public static boolean locNoRowBoolean(Integer row) {
- switch (row){
+ switch (row) {
case 1:
case 2:
case 4:
@@ -426,17 +428,17 @@
}
}
- public static String Fusion(int x, int y, int z){
- String locNo="0"+x;
- if(z>=10){
- locNo=locNo+"0"+z;
- }else{
- locNo=locNo+"00"+z;
+ public static String Fusion(int x, int y, int z) {
+ String locNo = "0" + x;
+ if (z >= 10) {
+ locNo = locNo + "0" + z;
+ } else {
+ locNo = locNo + "00" + z;
}
- if(y>=10){
- locNo=locNo+y;
- }else {
- locNo=locNo+"0"+y;
+ if (y >= 10) {
+ locNo = locNo + y;
+ } else {
+ locNo = locNo + "0" + y;
}
return locNo;
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 0e8be1f..e875588 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -1,6 +1,5 @@
package com.zy.asrs.utils;
-import com.core.exception.CoolException;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.MatCode;
@@ -65,7 +64,7 @@
/**
* 搴撲綅绉昏浆鏃剁被鍨嬫娴�
**/
- public static void locMoveCheckLocType(LocMast sourceLoc, LocMast loc){
+ public static void locMoveCheckLocType(LocMast sourceLoc, LocMast loc) {
// 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
// if (sourceLoc.getLocType1() == 2 && loc.getLocType1() == 1) {
// throw new CoolException("楂樺簱浣嶄笉鑳界Щ杞嚦浣庡簱浣�");
@@ -75,7 +74,7 @@
/**
* 搴撲綅绉昏浆鏃剁被鍨嬫娴�
**/
- public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto){
+ public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto) {
return true;
}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 79cbcbc..19fd4c1 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -17,11 +17,11 @@
// generator.table="sys_host";
// sqlserver
generator.sqlOsType = SqlOsType.SQL_SERVER;
- generator.url="127.0.0.1:1433;databasename=ghtzasrs";
- generator.username="sa";
- generator.password="sa@123";
- generator.table="man_api_log";
- generator.packagePath="com.zy.asrs";
+ generator.url = "127.0.0.1:1433;databasename=ghtzasrs";
+ generator.username = "sa";
+ generator.password = "sa@123";
+ generator.table = "man_api_log";
+ generator.packagePath = "com.zy.asrs";
generator.js = false;
generator.html = false;
generator.sql = false;
diff --git a/src/main/java/com/zy/common/Main.java b/src/main/java/com/zy/common/Main.java
index c158631..f05db30 100644
--- a/src/main/java/com/zy/common/Main.java
+++ b/src/main/java/com/zy/common/Main.java
@@ -56,19 +56,18 @@
public static void main(String[] args) {
- SiemensS7Net siemens_net = new SiemensS7Net(SiemensPLCS.S300,"192.168.6.1");
+ SiemensS7Net siemens_net = new SiemensS7Net(SiemensPLCS.S300, "192.168.6.1");
siemens_net.setSlot((byte) 2);
siemens_net.setRack((byte) 0);
OperateResult connect = siemens_net.ConnectServer();
- if(connect.IsSuccess){
+ if (connect.IsSuccess) {
System.out.println("connect success!");
- }
- else {
- System.out.println("failed:"+connect.Message);
+ } else {
+ System.out.println("failed:" + connect.Message);
}
siemens_net.ConnectClose();
- short[] array = new short[] {9999,20,31,40,50};
+ short[] array = new short[]{9999, 20, 31, 40, 50};
OperateResult db100 = siemens_net.Write("DB8.18", array);
if (db100.IsSuccess) {
System.out.println("鍐欏叆鎴愬姛");
@@ -327,15 +326,13 @@
/**
* 涓夎彵 Q ASCII閫氳鏍煎紡
*/
- private static void MelsecAsciiTest(){
+ private static void MelsecAsciiTest() {
- MelsecMcAsciiNet melsec = new MelsecMcAsciiNet("192.168.1.192",6001);
- OperateResultExOne<short[]> read = melsec.ReadInt16("D100",(short) 2);
- if(read.IsSuccess)
- {
+ MelsecMcAsciiNet melsec = new MelsecMcAsciiNet("192.168.1.192", 6001);
+ OperateResultExOne<short[]> read = melsec.ReadInt16("D100", (short) 2);
+ if (read.IsSuccess) {
System.out.println(Arrays.toString(read.Content));
- }
- else {
+ } else {
System.out.println(read.ToMessageShowString());
}
}
@@ -344,14 +341,13 @@
/**
* 瑗块棬瀛�
*/
- private static void SiemesTest(){
- SiemensS7Net siemens_net = new SiemensS7Net(SiemensPLCS.S1200,"192.168.1.195");
+ private static void SiemesTest() {
+ SiemensS7Net siemens_net = new SiemensS7Net(SiemensPLCS.S1200, "192.168.1.195");
OperateResult connect = siemens_net.ConnectServer();
- if(connect.IsSuccess){
+ if (connect.IsSuccess) {
System.out.println("connect success!");
- }
- else {
- System.out.println("failed:"+connect.Message);
+ } else {
+ System.out.println("failed:" + connect.Message);
}
siemens_net.ConnectClose();
@@ -364,20 +360,19 @@
long m100_long = siemens_net.ReadInt64("M100").Content;
float m100_float = siemens_net.ReadFloat("M100").Content;
double m100_double = siemens_net.ReadDouble("M100").Content;
- String m100_string = siemens_net.ReadString("M100",(short) 10).Content;
+ String m100_string = siemens_net.ReadString("M100", (short) 10).Content;
- siemens_net.Write("M100",(byte) 123);
- siemens_net.Write("M100",(short) 123);
- siemens_net.Write("M100",(int) 123);
- siemens_net.Write("M100",(long) 123);
+ siemens_net.Write("M100", (byte) 123);
+ siemens_net.Write("M100", (short) 123);
+ siemens_net.Write("M100", (int) 123);
+ siemens_net.Write("M100", (long) 123);
siemens_net.Write("M100", 123.456f);
siemens_net.Write("M100", 123.456d);
- siemens_net.Write("M100","1234567890");
+ siemens_net.Write("M100", "1234567890");
- OperateResultExOne<byte[]> read = siemens_net.Read( "M100", (short) 10 );
+ OperateResultExOne<byte[]> read = siemens_net.Read("M100", (short) 10);
{
- if(read.IsSuccess)
- {
+ if (read.IsSuccess) {
byte m100 = read.Content[0];
byte m101 = read.Content[1];
byte m102 = read.Content[2];
@@ -388,9 +383,7 @@
byte m107 = read.Content[7];
byte m108 = read.Content[8];
byte m109 = read.Content[9];
- }
- else
- {
+ } else {
// 鍙戠敓浜嗗紓甯�
}
}
@@ -399,7 +392,7 @@
private static void PushNetTest() {
NetPushClient client = new NetPushClient("127.0.0.1", 23467, "A");
- OperateResult connect = client.CreatePush(new ActionOperateExTwo<NetPushClient,String>(){
+ OperateResult connect = client.CreatePush(new ActionOperateExTwo<NetPushClient, String>() {
@Override
public void Action(NetPushClient content1, String content2) {
System.out.println(content2);
@@ -408,35 +401,34 @@
if (connect.IsSuccess) {
System.out.println("杩炴帴鎴愬姛!");
} else {
- System.out.println("杩炴帴澶辫触!"+connect.Message);
+ System.out.println("杩炴帴澶辫触!" + connect.Message);
}
}
- private static void ModbusTcpTets(){
- ModbusTcpNet modbusTcpNet = new ModbusTcpNet("127.0.0.1",502,(byte) 0x01);
+ private static void ModbusTcpTets() {
+ ModbusTcpNet modbusTcpNet = new ModbusTcpNet("127.0.0.1", 502, (byte) 0x01);
// 褰撲綘闇�瑕佹寚瀹氭牸寮忕殑鏁版嵁瑙ｆ瀽鏃讹紝灏遍渶瑕佽缃笅闈㈢殑杩欎釜淇℃伅
modbusTcpNet.setDataFormat(DataFormat.BADC);
OperateResultExOne<Double> read = modbusTcpNet.ReadDouble("s=2;x=4;200");
- if(read.IsSuccess){
+ if (read.IsSuccess) {
System.out.println(read.Content);
- }
- else {
+ } else {
System.out.println(read.Message);
}
- modbusTcpNet.Write("100",new int[]{12345,-12345});
+ modbusTcpNet.Write("100", new int[]{12345, -12345});
}
- private static void NetComplexClientTest(){
+ private static void NetComplexClientTest() {
System.out.println("Hello World!绛夊緟10s鍏抽棴");
NetComplexClient client = new NetComplexClient();
client.setIpAddress("127.0.0.1");
client.setPort(12346);
client.setClientAlias("娴嬭瘯1");
- client.AcceptString= new ActionOperateExThree<NetComplexClient,NetHandle,String>(){
+ client.AcceptString = new ActionOperateExThree<NetComplexClient, NetHandle, String>() {
@Override
public void Action(NetComplexClient content1, NetHandle content2, String content3) {
- System.out.println("Handle:"+content2.get_CodeValue()+" Value:"+content3);
+ System.out.println("Handle:" + content2.get_CodeValue() + " Value:" + content3);
}
};
diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index 2db00f8..2e28046 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -34,6 +34,7 @@
@Component
public class AdminInterceptor extends HandlerInterceptorAdapter {
+ private final RateLimiter rateLimiter = RateLimiter.create(10);// 榛樿姣忕鏈�澶氬鐞� 10 涓姹�
@Value("${super.pwd}")
private String superPwd;
@Autowired
@@ -49,8 +50,6 @@
@Autowired
private ApiConfigService apiConfigService;
- private final RateLimiter rateLimiter = RateLimiter.create(10);// 榛樿姣忕鏈�澶氬鐞� 10 涓姹�
-
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
cors(response);
@@ -59,7 +58,7 @@
}
HandlerMethod handlerMethod = (HandlerMethod) handler;
Method method = handlerMethod.getMethod();
- if (method.isAnnotationPresent(RateLimit.class)){
+ if (method.isAnnotationPresent(RateLimit.class)) {
RateLimit annotation = method.getAnnotation(RateLimit.class);
rateLimiter.setRate(annotation.value());
if (!rateLimiter.tryAcquire(annotation.value(), TimeUnit.SECONDS)) {
@@ -70,12 +69,12 @@
// super璐﹀彿
String token = request.getHeader("token");
- if (token!=null) {
+ if (token != null) {
String deToken = Cools.deTokn(token, superPwd);
- if (deToken!=null){
+ if (deToken != null) {
long timestamp = Long.parseLong(deToken.substring(0, 13));
// 1澶╁悗杩囨湡
- if (System.currentTimeMillis() - timestamp > 86400000){
+ if (System.currentTimeMillis() - timestamp > 86400000) {
Http.response(response, BaseRes.DENIED);
return false;
}
@@ -87,9 +86,9 @@
}
// 璺ㄥ煙璁剧疆
// response.setHeader("Access-Control-Allow-Origin", "*");
- if (method.isAnnotationPresent(ManagerAuth.class)){
+ if (method.isAnnotationPresent(ManagerAuth.class)) {
ManagerAuth annotation = method.getAnnotation(ManagerAuth.class);
- if (annotation.value().equals(ManagerAuth.Auth.CHECK)){
+ if (annotation.value().equals(ManagerAuth.Auth.CHECK)) {
return check(request, response, annotation.memo());
}
}
@@ -98,7 +97,7 @@
String servletPath = request.getServletPath();
ApiConfig apiConfig = apiConfigService.selectByUrl(servletPath);
if (apiConfig != null) {
- if(apiConfig.getStatus() == 1){
+ if (apiConfig.getStatus() == 1) {
//api琚鐢�
Http.response(response, BaseRes.LIMIT);
return false;
@@ -122,7 +121,7 @@
try {
String token = request.getHeader("token");
UserLogin userLogin = userLoginService.selectOne(new EntityWrapper<UserLogin>().eq("token", token));
- if (null == userLogin){
+ if (null == userLogin) {
Http.response(response, BaseRes.DENIED);
return false;
}
@@ -130,7 +129,7 @@
String deToken = Cools.deTokn(token, user.getPassword());
long timestamp = Long.parseLong(deToken.substring(0, 13));
// 1澶╁悗杩囨湡
- if (System.currentTimeMillis() - timestamp > 86400000){
+ if (System.currentTimeMillis() - timestamp > 86400000) {
Http.response(response, BaseRes.DENIED);
return false;
}
@@ -149,7 +148,7 @@
request.setAttribute("userId", user.getId());
// request.setAttribute("operateLog", operateLog);
return true;
- } catch (Exception e){
+ } catch (Exception e) {
Http.response(response, BaseRes.DENIED);
return false;
}
@@ -175,7 +174,7 @@
/**
* 璺ㄥ煙
*/
- private void cors(HttpServletResponse response){
+ private void cors(HttpServletResponse response) {
// 璺ㄥ煙璁剧疆
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Credentials", "true");
diff --git a/src/main/java/com/zy/common/config/WebConfig.java b/src/main/java/com/zy/common/config/WebConfig.java
index 11bb6b2..4506b51 100644
--- a/src/main/java/com/zy/common/config/WebConfig.java
+++ b/src/main/java/com/zy/common/config/WebConfig.java
@@ -18,7 +18,7 @@
public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(adminInterceptor)
.addPathPatterns("/**")
- ;
+ ;
}
}
diff --git a/src/main/java/com/zy/common/entity/Parameter.java b/src/main/java/com/zy/common/entity/Parameter.java
index c41a78c..1013cfc 100644
--- a/src/main/java/com/zy/common/entity/Parameter.java
+++ b/src/main/java/com/zy/common/entity/Parameter.java
@@ -19,13 +19,18 @@
public class Parameter {
private volatile static Parameter instance = null;
+ // 楠岃瘉鐮佸紑鍏�
+ private String codeSwitch;
+ private String ledDefaultMsg;
+ // 搴撲綅鍒濆鍖栧彛浠�
+ private String locMastInitPwd;
- private Parameter(){
+ private Parameter() {
}
- public static Parameter get(){
- if (instance == null){
- synchronized (Parameter.class){
+ public static Parameter get() {
+ if (instance == null) {
+ synchronized (Parameter.class) {
instance = reset();
return instance;
}
@@ -33,10 +38,10 @@
return instance;
}
- /**
- * 閲嶇疆
- */
- public static Parameter reset() {
+ /**
+ * 閲嶇疆
+ */
+ public static Parameter reset() {
ConfigService configService = SpringUtils.getBean(ConfigService.class);
List<Config> configs = configService.selectList(new EntityWrapper<Config>().eq("status", "1"));
Map<String, Object> data = new HashMap<>();
@@ -50,14 +55,6 @@
instance = Cools.conver(data, Parameter.class);
return instance;
}
-
- // 楠岃瘉鐮佸紑鍏�
- private String codeSwitch;
-
- private String ledDefaultMsg;
-
- // 搴撲綅鍒濆鍖栧彛浠�
- private String locMastInitPwd;
}
diff --git a/src/main/java/com/zy/common/model/PageParam.java b/src/main/java/com/zy/common/model/PageParam.java
index a2f24e6..ef1007c 100644
--- a/src/main/java/com/zy/common/model/PageParam.java
+++ b/src/main/java/com/zy/common/model/PageParam.java
@@ -8,10 +8,10 @@
*/
public class PageParam {
- @ApiModelProperty(value="鍒嗛〉绱㈠紩",required=true)
+ @ApiModelProperty(value = "鍒嗛〉绱㈠紩", required = true)
private int page = 1;
- @ApiModelProperty(value="鍗曢〉鏁伴噺",required=true)
+ @ApiModelProperty(value = "鍗曢〉鏁伴噺", required = true)
private int size = 10;
public Integer getPage() {
diff --git a/src/main/java/com/zy/common/model/Shelves.java b/src/main/java/com/zy/common/model/Shelves.java
index de2aa46..26b21ab 100644
--- a/src/main/java/com/zy/common/model/Shelves.java
+++ b/src/main/java/com/zy/common/model/Shelves.java
@@ -41,18 +41,29 @@
init();
}
+ public static void main(String[] args) throws InterruptedException {
+ Shelves shelves = new Shelves(8, 2);
+ System.out.println(shelves.nodes.toString());
+ int start = 1;
+ while (true) {
+ System.out.println(start);
+ start = shelves.start(start);
+ Thread.sleep(500L);
+ }
+ }
+
/**
* 鍒濆鍖栨柟娉曘�愮鏈夈��
*/
- private void init(){
- if (group == 0 || size%group != 0) {
+ private void init() {
+ if (group == 0 || size % group != 0) {
throw new RuntimeException("shelves init fail!");
}
nodes = new ArrayList<>();
- for (int g = 1; g <= this.group; g++){
- int unit = size/group;
+ for (int g = 1; g <= this.group; g++) {
+ int unit = size / group;
List<Integer> node = new ArrayList<>();
- for (int i = (g-1)*unit+1+offset ; i <= g*unit+offset; i++){
+ for (int i = (g - 1) * unit + 1 + offset; i <= g * unit + offset; i++) {
node.add(i);
}
nodes.add(node);
@@ -72,9 +83,9 @@
* @param curSeq 褰撳墠璐ф灦鍙�
* @return 瑙勫垯鍛戒腑璐ф灦鍙�
*/
- public int start(int curSeq){
+ public int start(int curSeq) {
Iterator<List<Integer>> iterator = nodes.iterator();
- while (iterator.hasNext()){
+ while (iterator.hasNext()) {
List<Integer> node = iterator.next();
if (node.contains(curSeq)) {
int idx = node.indexOf(curSeq);
@@ -101,23 +112,12 @@
}
public Integer get(Integer curRow) {
- for (List<Integer> node : nodes){
+ for (List<Integer> node : nodes) {
if (node.contains(curRow)) {
return nodes.indexOf(node) + 1;
}
}
throw new CoolException("璐ф帓妫�绱㈢郴缁熸姤閿欙紝 node:" + JSON.toJSONString(nodes) + ", curRow:" + curRow);
- }
-
- public static void main(String[] args) throws InterruptedException {
- Shelves shelves = new Shelves(8,2);
- System.out.println(shelves.nodes.toString());
- int start = 1;
- while (true) {
- System.out.println(start);
- start = shelves.start(start);
- Thread.sleep(500L);
- }
}
}
diff --git a/src/main/java/com/zy/common/model/annotations/bit.java b/src/main/java/com/zy/common/model/annotations/bit.java
index b8452db..da299ed 100644
--- a/src/main/java/com/zy/common/model/annotations/bit.java
+++ b/src/main/java/com/zy/common/model/annotations/bit.java
@@ -9,8 +9,8 @@
* 鏍囪瘑娉ㄨВ绫�
* @author vincent
*/
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD,ElementType.TYPE,ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.TYPE, ElementType.METHOD})
public @interface bit {
- int value();
+ int value();
}
diff --git a/src/main/java/com/zy/common/model/annotations/expr.java b/src/main/java/com/zy/common/model/annotations/expr.java
index 06e4da7..e74eaa4 100644
--- a/src/main/java/com/zy/common/model/annotations/expr.java
+++ b/src/main/java/com/zy/common/model/annotations/expr.java
@@ -9,8 +9,8 @@
* 鏍囪瘑娉ㄨВ绫�
* @author vincent
*/
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD,ElementType.TYPE,ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.TYPE, ElementType.METHOD})
public @interface expr {
- String value();
+ String value();
}
diff --git a/src/main/java/com/zy/common/model/annotations/flag.java b/src/main/java/com/zy/common/model/annotations/flag.java
index 03fc98a..6c9f45d 100644
--- a/src/main/java/com/zy/common/model/annotations/flag.java
+++ b/src/main/java/com/zy/common/model/annotations/flag.java
@@ -9,8 +9,8 @@
* 鏍囪瘑娉ㄨВ绫�
* @author vincent
*/
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD,ElementType.TYPE,ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.TYPE, ElementType.METHOD})
public @interface flag {
- String value();
+ String value();
}
diff --git a/src/main/java/com/zy/common/model/annotations/little.java b/src/main/java/com/zy/common/model/annotations/little.java
index 9bbc47f..c95aaa4 100644
--- a/src/main/java/com/zy/common/model/annotations/little.java
+++ b/src/main/java/com/zy/common/model/annotations/little.java
@@ -9,6 +9,7 @@
* 灏忕妯″紡娉ㄨВ绫�
* @author vincent
*/
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD,ElementType.TYPE,ElementType.METHOD})
-public @interface little {}
\ No newline at end of file
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.TYPE, ElementType.METHOD})
+public @interface little {
+}
\ No newline at end of file
diff --git a/src/main/java/com/zy/common/model/annotations/size.java b/src/main/java/com/zy/common/model/annotations/size.java
index 1b84242..ca73cab 100644
--- a/src/main/java/com/zy/common/model/annotations/size.java
+++ b/src/main/java/com/zy/common/model/annotations/size.java
@@ -9,8 +9,8 @@
* 鏍囪瘑娉ㄨВ绫�
* @author vincent
*/
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD,ElementType.TYPE,ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.TYPE, ElementType.METHOD})
public @interface size {
- int value();
+ int value();
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index ea237b8..c730912 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -48,6 +48,40 @@
@Autowired
private LocDetlService locDetlService;
+ public static void main(String[] args) {
+ System.out.println(Arith.remainder(1, 4));
+ System.out.println("0200201".substring(0, 2));
+ String locNo = "0800201";
+ int row = Integer.parseInt(locNo.substring(0, 2));
+ double remainder = Arith.remainder(row, 4);
+ int targetRow;
+ if (remainder == 1) {
+ // 寰楀埌褰撳墠搴撲綅鐨勫鍥村簱浣�
+ targetRow = row + 1;
+ } else if (remainder == 0) {
+ // 寰楀埌褰撳墠搴撲綅鐨勫唴鍥村簱浣�
+ targetRow = row - 1;
+ } else {
+ return;
+ }
+ String zerofill = zerofill(String.valueOf(targetRow), 2) + locNo.substring(2);
+ System.out.println(zerofill);
+ }
+
+ public static String zerofill(String msg, Integer count) {
+ if (msg.length() == count) {
+ return msg;
+ } else if (msg.length() > count) {
+ return msg.substring(0, 16);
+ } else {
+ StringBuilder msgBuilder = new StringBuilder(msg);
+ for (int i = 0; i < count - msg.length(); ++i) {
+ msgBuilder.insert(0, "0");
+ }
+ return msgBuilder.toString();
+ }
+ }
+
/**
* 鐢熸垚宸ヤ綔鍙� wrkMk 0:鍏ュ簱 1 - 3000 ; 1:鎷ｆ枡/骞舵澘/鐩樼偣 3001 - 6000 ; 2: 鍑哄簱 6001 -9000 ; 3:鍏朵粬 9001 -9999
* @return workNo(宸ヤ綔鍙�)
@@ -61,17 +95,17 @@
int workNo = wrkLastno.getWrkNo();
int sNo = wrkLastno.getSNo();
int eNo = wrkLastno.getENo();
- workNo = workNo>=eNo ? sNo : workNo+1;
+ workNo = workNo >= eNo ? sNo : workNo + 1;
while (true) {
TaskWrk taskWrk = taskWrkService.selectByWrkNo(workNo);
if (null != taskWrk) {
- workNo = workNo>=eNo ? sNo : workNo+1;
+ workNo = workNo >= eNo ? sNo : workNo + 1;
} else {
break;
}
}
// 淇敼搴忓彿璁板綍
- if (workNo > 0){
+ if (workNo > 0) {
wrkLastno.setWrkNo(workNo);
wrkLastnoService.updateById(wrkLastno);
}
@@ -79,13 +113,12 @@
if (workNo == 0) {
throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
} else {
- if (taskWrkService.selectByWrkNo(workNo)!=null) {
+ if (taskWrkService.selectByWrkNo(workNo) != null) {
throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
}
}
return workNo;
}
-
/**
* 妫�绱㈠簱浣嶅彿
@@ -166,7 +199,7 @@
if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
continue;
}
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
+ String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
// 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
LocMast shallowLoc = locMastService.selectById(shallowLocNo);
if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
@@ -186,7 +219,7 @@
Shelves shelves = new Shelves(rowCount, crn_qty);
// 1-4鎺�
if (whsType == 1) {
- for (int i = 0; i < shelves.group; i ++) {
+ for (int i = 0; i < shelves.group; i++) {
curRow = shelves.start(curRow);
if (curRow < 0) {
throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
@@ -197,10 +230,10 @@
break;
}
}
- // 5-8鎺�
+ // 5-8鎺�
} else if (whsType == 2) {
curRow = curRow - 4;
- for (int i = 0; i < shelves.group; i ++) {
+ for (int i = 0; i < shelves.group; i++) {
curRow = shelves.start(curRow);
if (curRow < 0) {
throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
@@ -214,9 +247,9 @@
}
}
- // 126绌烘澘鍏� 1-8鎺�
+ // 126绌烘澘鍏� 1-8鎺�
} else {
- for (int i = 0; i < shelves.group; i ++) {
+ for (int i = 0; i < shelves.group; i++) {
curRow = shelves.start(curRow);
if (curRow < 0) {
throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
@@ -245,7 +278,7 @@
}
BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
if (!staNo.getAutoing().equals("Y")) {
- throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ throw new CoolException("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
}
// 鏇存柊搴撲綅鎺掑彿
rowLastno.setCurrentRow(curRow);
@@ -313,40 +346,6 @@
startupDto.setStaNo(staNo.getDevNo());
startupDto.setLocNo(locNo);
return startupDto;
- }
-
- public static void main(String[] args) {
- System.out.println(Arith.remainder(1, 4));
- System.out.println("0200201".substring(0, 2));
- String locNo = "0800201";
- int row = Integer.parseInt(locNo.substring(0, 2));
- double remainder = Arith.remainder(row, 4);
- int targetRow;
- if (remainder == 1) {
- // 寰楀埌褰撳墠搴撲綅鐨勫鍥村簱浣�
- targetRow = row + 1;
- } else if (remainder == 0) {
- // 寰楀埌褰撳墠搴撲綅鐨勫唴鍥村簱浣�
- targetRow = row - 1;
- } else {
- return;
- }
- String zerofill = zerofill(String.valueOf(targetRow), 2)+locNo.substring(2);
- System.out.println(zerofill);
- }
-
- public static String zerofill(String msg, Integer count) {
- if (msg.length() == count) {
- return msg;
- } else if (msg.length() > count) {
- return msg.substring(0, 16);
- } else {
- StringBuilder msgBuilder = new StringBuilder(msg);
- for(int i = 0; i < count - msg.length(); ++i) {
- msgBuilder.insert(0, "0");
- }
- return msgBuilder.toString();
- }
}
}
diff --git a/src/main/java/com/zy/common/utils/CollectionUtils.java b/src/main/java/com/zy/common/utils/CollectionUtils.java
index 4f0fe4c..4dc5761 100644
--- a/src/main/java/com/zy/common/utils/CollectionUtils.java
+++ b/src/main/java/com/zy/common/utils/CollectionUtils.java
@@ -8,10 +8,10 @@
public class CollectionUtils {
public static boolean equals(Set<?> set1, Set<?> set2) {
- if(set1 == null || set2 ==null){
+ if (set1 == null || set2 == null) {
return false;
}
- if(set1.size()!=set2.size()){
+ if (set1.size() != set2.size()) {
return false;
}
return set1.containsAll(set2);
diff --git a/src/main/java/com/zy/common/utils/CommonUtils.java b/src/main/java/com/zy/common/utils/CommonUtils.java
index 8a2e8b6..24ae48e 100644
--- a/src/main/java/com/zy/common/utils/CommonUtils.java
+++ b/src/main/java/com/zy/common/utils/CommonUtils.java
@@ -7,23 +7,23 @@
*/
public class CommonUtils {
- public static Integer parseInt(Object value){
- if(null == value){
+ public static Integer parseInt(Object value) {
+ if (null == value) {
return null;
}
String name = value.getClass().getSimpleName().toLowerCase();
- if(name.equals("float")){
- return ((Float)value).intValue();
- } else if(name.equals("double")){
- return ((Double)value).intValue();
- } else if(name.equals("bigdecimal")) {
- return ((BigDecimal)value).intValue();
- } else if(name.equals("long")) {
- return ((Long)value).intValue();
- } else if(name.contains("int")) {
- return (Integer)value;
+ if (name.equals("float")) {
+ return ((Float) value).intValue();
+ } else if (name.equals("double")) {
+ return ((Double) value).intValue();
+ } else if (name.equals("bigdecimal")) {
+ return ((BigDecimal) value).intValue();
+ } else if (name.equals("long")) {
+ return ((Long) value).intValue();
+ } else if (name.contains("int")) {
+ return (Integer) value;
} else {
- return Double.valueOf(""+value).intValue();
+ return Double.valueOf("" + value).intValue();
}
}
diff --git a/src/main/java/com/zy/common/utils/Http.java b/src/main/java/com/zy/common/utils/Http.java
index aa73414..83dec5e 100644
--- a/src/main/java/com/zy/common/utils/Http.java
+++ b/src/main/java/com/zy/common/utils/Http.java
@@ -13,7 +13,7 @@
*/
public class Http {
- public static void response(HttpServletResponse response, String baseRes){
+ public static void response(HttpServletResponse response, String baseRes) {
response.setCharacterEncoding("utf-8");
response.setContentType("application/json");
try (PrintWriter out = response.getWriter()) {
diff --git a/src/main/java/com/zy/common/utils/HttpHandler.java b/src/main/java/com/zy/common/utils/HttpHandler.java
index b305399..8648284 100644
--- a/src/main/java/com/zy/common/utils/HttpHandler.java
+++ b/src/main/java/com/zy/common/utils/HttpHandler.java
@@ -27,7 +27,7 @@
private Integer timeout;
private TimeUnit timeUnit;
- public HttpHandler(Builder builder){
+ public HttpHandler(Builder builder) {
this.uri = builder.uri;
this.path = builder.path;
this.json = builder.json;
@@ -45,8 +45,8 @@
public String doGet() throws IOException {
String url = paramsToUrl(uri, path, params, https);
Request.Builder headerBuilder = new Request.Builder();
- if (headers != null && headers.size()>0){
- for (Map.Entry<String, Object> entry : headers.entrySet()){
+ if (headers != null && headers.size() > 0) {
+ for (Map.Entry<String, Object> entry : headers.entrySet()) {
headerBuilder.addHeader(entry.getKey(), String.valueOf(entry.getValue()));
}
}
@@ -62,24 +62,24 @@
public String doPost() throws IOException {
Request request;
Request.Builder headerBuilder = new Request.Builder();
- if (headers != null && headers.size()>0){
- for (Map.Entry<String, Object> entry : headers.entrySet()){
+ if (headers != null && headers.size() > 0) {
+ for (Map.Entry<String, Object> entry : headers.entrySet()) {
headerBuilder.addHeader(entry.getKey(), String.valueOf(entry.getValue()));
}
}
- if (json == null || "".equals(json)){
+ if (json == null || "".equals(json)) {
FormBody.Builder builder = new FormBody.Builder();
- for (Map.Entry<String, Object> entry : params.entrySet()){
+ for (Map.Entry<String, Object> entry : params.entrySet()) {
builder.add(entry.getKey(), String.valueOf(entry.getValue()));
}
FormBody body = builder.build();
request = headerBuilder
- .url((https?"https://":"http://")+uri+path)
+ .url((https ? "https://" : "http://") + uri + path)
.post(body)
.build();
} else {
RequestBody body = RequestBody.create(MEDIA_TYPE, json);
- Request.Builder builder = headerBuilder.url((https?"https://":"http://")+uri+path);
+ Request.Builder builder = headerBuilder.url((https ? "https://" : "http://") + uri + path);
builder.header("Content-Type", "application/json");
request = builder.post(body).build();
@@ -98,7 +98,7 @@
StringBuilder res = new StringBuilder();
res.append(isHttps ? "https://" : "http://");
res.append(uri);
- if (path.length() > 0 && !(path.charAt(0) == '/')){
+ if (path.length() > 0 && !(path.charAt(0) == '/')) {
res.append("/");
}
res.append(path);
@@ -114,8 +114,8 @@
}
);
String url = res.toString();
- if ("&".equals(url.substring(url.length()-1, url.length()))){
- url = url.substring(0, url.length()-1);
+ if ("&".equals(url.substring(url.length() - 1, url.length()))) {
+ url = url.substring(0, url.length() - 1);
}
return url;
}
@@ -124,7 +124,7 @@
* 鑾峰彇 okHttpClient
* @return the HttpHandler instance
*/
- private OkHttpClient getClient(Integer timeout, TimeUnit timeUnit){
+ private OkHttpClient getClient(Integer timeout, TimeUnit timeUnit) {
return new OkHttpClient
.Builder()
.connectTimeout(timeout, timeUnit)
@@ -157,14 +157,14 @@
* 寤洪�犲櫒
* @return the HttpHandler instance
*/
- public HttpHandler build(){
- if (null == this.uri || "".equals(this.uri)){
+ public HttpHandler build() {
+ if (null == this.uri || "".equals(this.uri)) {
throw new RuntimeException("uri is null");
}
- if (this.uri.startsWith("http://")){
- this.uri = this.uri.substring(6,uri.length());
- } else if (this.uri.startsWith("https://")){
- this.uri = this.uri.substring(7,uri.length());
+ if (this.uri.startsWith("http://")) {
+ this.uri = this.uri.substring(6, uri.length());
+ } else if (this.uri.startsWith("https://")) {
+ this.uri = this.uri.substring(7, uri.length());
}
return new HttpHandler(this);
}
@@ -175,7 +175,7 @@
}
public Builder setPath(String path) {
- if (!path.startsWith("/")){
+ if (!path.startsWith("/")) {
path = "/" + path;
}
this.path = path;
diff --git a/src/main/java/com/zy/common/utils/QrCode.java b/src/main/java/com/zy/common/utils/QrCode.java
index 174d713..1b9174e 100644
--- a/src/main/java/com/zy/common/utils/QrCode.java
+++ b/src/main/java/com/zy/common/utils/QrCode.java
@@ -45,7 +45,7 @@
return image;
}
- private static InputStream convert(BufferedImage image){
+ private static InputStream convert(BufferedImage image) {
ByteArrayOutputStream os = new ByteArrayOutputStream();
try {
ImageIO.write(image, FORMAT_NAME, os);
@@ -85,7 +85,6 @@
// response.getOutputStream().flush();
// response.getOutputStream().close();
}
-
}
diff --git a/src/main/java/com/zy/common/utils/RandomValidateCodeUtil.java b/src/main/java/com/zy/common/utils/RandomValidateCodeUtil.java
index fd04503..ab4269c 100644
--- a/src/main/java/com/zy/common/utils/RandomValidateCodeUtil.java
+++ b/src/main/java/com/zy/common/utils/RandomValidateCodeUtil.java
@@ -11,7 +11,7 @@
public class RandomValidateCodeUtil {
public static final Map<String, String> code = new ConcurrentHashMap<>();
-
+
private static String randString = "0123456789ABCDEFGHJKLMNPRSTUVWXYZ";//闅忔満浜х敓鏁板瓧涓庡瓧姣嶇粍鍚堢殑瀛楃涓�
private static int width = 60;// 鍥剧墖瀹�
private static int height = 27;// 鍥剧墖楂�
@@ -97,7 +97,7 @@
.length())));
randomString += rand;
g.translate(random.nextInt(3), random.nextInt(3));
- g.drawString(rand, 13 * (i-1)+2, 16);
+ g.drawString(rand, 13 * (i - 1) + 2, 16);
return randomString;
}
diff --git a/src/main/java/com/zy/common/utils/RedisUtil.java b/src/main/java/com/zy/common/utils/RedisUtil.java
index 95da6dc..dd3e607 100644
--- a/src/main/java/com/zy/common/utils/RedisUtil.java
+++ b/src/main/java/com/zy/common/utils/RedisUtil.java
@@ -2,7 +2,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
diff --git a/src/main/java/com/zy/common/utils/ReflectUtils.java b/src/main/java/com/zy/common/utils/ReflectUtils.java
index 470e6e0..38c287b 100644
--- a/src/main/java/com/zy/common/utils/ReflectUtils.java
+++ b/src/main/java/com/zy/common/utils/ReflectUtils.java
@@ -17,17 +17,17 @@
/**
* 鑾峰彇鎸囧畾Class锛堝強鍏禨uperClass锛夌殑鎴愬憳鍙橀噺
*/
- public static Field[] getAllFields(Class<?> cls){
+ public static Field[] getAllFields(Class<?> cls) {
return getAllFields(cls, null);
}
/**
* 閫掑綊鍚堝苟鍩虹被Field
*/
- private static Field[] getAllFields(Class<?> cls, Field[] params){
+ private static Field[] getAllFields(Class<?> cls, Field[] params) {
Field[] fields = (params == null) ? cls.getDeclaredFields() : params;
Class<?> superCls = cls.getSuperclass();
- if (superCls == null || superCls == Object.class){
+ if (superCls == null || superCls == Object.class) {
return fields;
}
Field[] superClsFields = superCls.getDeclaredFields();
@@ -38,13 +38,13 @@
/**
* 鍒犻櫎Field鏁扮粍鐨勯潤鎬佹垚鍛樺彉閲�
*/
- public static Field[] removeStaticField(Field[] params){
+ public static Field[] removeStaticField(Field[] params) {
List<Field> fields = new ArrayList<>(Arrays.asList(params));
- if (fields.size() == 0){
+ if (fields.size() == 0) {
return null;
}
for (int i = fields.size() - 1; i >= 0; i--) {
- if(fields.get(i) == null){
+ if (fields.get(i) == null) {
fields.remove(i);
} else if (Modifier.isStatic(fields.get(i).getModifiers())) {
fields.remove(i);
@@ -57,13 +57,13 @@
/**
* 閫掑綊鑾峰彇鎴愬憳鍙橀噺瀵硅薄锛堝寘鍚叾鍩虹被锛�
*/
- public static Field getField(Class<?> cls, String fieldName){
+ public static Field getField(Class<?> cls, String fieldName) {
Field field;
try {
field = cls.getDeclaredField(fieldName);
} catch (NoSuchFieldException e) {
Class<?> superCls = cls.getSuperclass();
- if (superCls == null || superCls == Object.class){
+ if (superCls == null || superCls == Object.class) {
return null;
}
return getField(superCls, fieldName);
diff --git a/src/main/java/com/zy/common/utils/Struct.java b/src/main/java/com/zy/common/utils/Struct.java
index 0ee0939..b505108 100644
--- a/src/main/java/com/zy/common/utils/Struct.java
+++ b/src/main/java/com/zy/common/utils/Struct.java
@@ -21,487 +21,487 @@
* @author vincent
*/
public class Struct implements java.io.Serializable {
-
- private transient Map<String,byte[]> decodeByteMapping = new HashMap<>();
- private transient Map<String,byte[]> encodeByteMapping = new HashMap<>();
- // 瑙ｇ爜鍓嶇殑鍘熺敓瀛楄妭鏁扮粍
- private transient byte[] dataBytes = null;
- private transient byte[] decodeBytes = null;
- private transient byte[] encodeBytes = null;
- private transient byte[] unusedBytes = null;
- public Class getClassType(String name){
- return null;
- }
+ private transient Map<String, byte[]> decodeByteMapping = new HashMap<>();
+ private transient Map<String, byte[]> encodeByteMapping = new HashMap<>();
+ // 瑙ｇ爜鍓嶇殑鍘熺敓瀛楄妭鏁扮粍
+ private transient byte[] dataBytes = null;
+ private transient byte[] decodeBytes = null;
+ private transient byte[] encodeBytes = null;
+ private transient byte[] unusedBytes = null;
- /**
- * 鍒ゆ柇澶у皬绔�
- * @return true: 灏忕 / false: 澶х
- */
- public boolean isReverse() {
- return this.getClass().getAnnotation(little.class)!=null;
- }
+ @SuppressWarnings({"unchecked", "rawtypes"})
+ public static <T extends Struct> T decode(Class<? extends Struct> cls, byte[] bytes) throws Exception {
+ Struct instance = cls.newInstance();
+ return instance.decode(bytes);
+ }
- /**
- * 鑾峰彇瀛楄妭鏁扮粍
- */
- public byte[] toBytes() throws Exception {
- return encode(this);
- }
-
- public Map<String,String> toDecodeHexMapping() throws Exception{
- if(this.decodeByteMapping==null)this.decodeByteMapping=new HashMap<>();
- Map<String, String> mapping = getHex(this.decodeByteMapping);
- if(this.decodeBytes!=null){
- mapping.put("byte[]", Struct.toHex(this.decodeBytes));
- }
- return mapping;
- }
- public Map<String,String> toEncodeHexMapping() throws Exception{
- if(this.encodeBytes==null)this.encode(this);
- if(this.encodeByteMapping==null)this.encodeByteMapping=new HashMap<>();
- Map<String, String> mapping = getHex(this.encodeByteMapping);
- mapping.put("byte[]", Struct.toHex(this.encodeBytes));
- return mapping;
- }
- public Map<String,String> getHex(Map<String,byte[]> bytemapping) throws Exception {
- Map<String,String> map = new LinkedHashMap<>();
- Field[] fields = this.getClass().getFields();
- for (Field field : fields) {
- byte[] bytes = bytemapping.get(field.getName());
- if(bytes!=null){
- map.put(field.getName(), Struct.toHex(bytes));
- }
- }
- return map;
- }
-
- // 杞琷ava瀵硅薄鍒版暟缁�
- public byte[] encode(Struct entity) throws Exception {
- ByteArrayOutputStream baOs = new ByteArrayOutputStream();
- write(new DataOutputStream(baOs), entity);
- entity.encodeBytes = baOs.toByteArray();
- return entity.encodeBytes;
- }
-
- /**
- * 鍐欐暟鎹埌杈撳嚭娴�
- *
- * @param dos
- * @param entity
- */
- public void write(DataOutputStream dos, Struct entity) throws Exception {
- if(entity==null)return;
- if(entity.encodeByteMapping==null)entity.encodeByteMapping=new HashMap<>();
- Field[] fields = entity.getClass().getFields();
- EvaluationContext context = new StandardEvaluationContext();
- for (Field field : Objects.requireNonNull(ReflectUtils.removeStaticField(fields))) {
- field.setAccessible(true);
-
- String name = field.getName();
- Class<?> type = field.getType();
- String typeName = type.getSimpleName();
- if(typeName.equals("Struct")){
- if(entity.getClassType(name)!=null){
- type = entity.getClassType(name);
- typeName = type.getSimpleName();
- }else if(field.get(entity)!=null){
- type = field.get(entity).getClass();
- typeName = type.getSimpleName();
- }
- }
-
- size size = field.getAnnotation(size.class);
- bit bit = field.getAnnotation(bit.class);
- expr expr = field.getAnnotation(expr.class);
- flag flag = field.getAnnotation(flag.class);
- if(size==null && bit==null && expr==null){
- continue;
- }
-
- int bited = 0;//宸插啓浣嶆暟
- int length = 0;//瀹氫箟鐨勯暱搴�
- if(size!=null){
- length = size.value();
- bited+=size.value()*8;
- }else if(bit!=null){
- //鎸変綅鍐欐柟寮忔湭瀹炵幇澶勭悊
- throw new RuntimeException("鎸変綅鍐欐柟寮忔湭瀹炵幇澶勭悊");
- }else if(expr!=null){
- ExpressionParser parser = new SpelExpressionParser();
- Expression exp = parser.parseExpression(expr.value());
- Integer len = null;
- try{
- len = CommonUtils.parseInt(exp.getValue(context, entity));
- }catch (Exception e){
- len = 0;
- }
- if(len!=null){
- if(len==-1)continue;
- length = len;
- bited+=len*8;
- }
- }
- context.setVariable(name, field.get(entity));
-
- byte[] bytes = new byte[length];
-
- if (typeName.equals("int") || typeName.equals("Integer")){
- dos.write(bytes=convert(length,field.getInt(entity)));
- }else if (typeName.equals("long") || typeName.equals("Long")){
- dos.write(bytes=convert(length,field.getLong(entity)));
- }else if (typeName.equals("short") || typeName.equals("Short")){
- dos.write(bytes=convert(length,field.getShort(entity)));
- }else if (typeName.equals("byte") || typeName.equals("Byte")){
- dos.write(bytes=convert(length,field.getByte(entity)));
- }else if (typeName.equals("String")) {
- String str = (String) field.get(entity);
- if (str == null)
- str = "";
- str = str.replaceAll("銆�", " ");
-
- byte[] bts = null;
- if(flag!=null && flag.value().equals("ASCII")){
- bts = Struct.StrToAsc(str);
- }else if(flag!=null && flag.value().equals("BCD")){
- bts = Struct.str2Bcd(str);
- }else{
- bts = str.getBytes();
- }
-
- if(length==0){//濡傛灉闀垮害鏈缃紝浠ュ綋鍓嶅疄闄呯殑瀛楄妭涓哄噯
- bytes = new byte[bts.length];
- }
- System.arraycopy(bts, 0, bytes, 0, bts.length);
- dos.write(bytes);
- } else if (typeName.equals("byte[]")) {
- byte[] bts = (byte[]) field.get(entity);
- if(bts!=null){
- if(length==0){//濡傛灉闀垮害鏈缃紝浠ュ綋鍓嶅疄闄呯殑瀛楄妭涓哄噯
- bytes = new byte[bts.length];
- }
- System.arraycopy(bts, 0, bytes, 0, bts.length);
- dos.write(bytes);
- }
- }else if (type.isArray()) {
- ByteArrayOutputStream baOs1 = new ByteArrayOutputStream();
- DataOutputStream dos1 = new DataOutputStream(baOs1);
- for (Object object : (Object[]) field.get(entity)){
- write(dos1, (Struct) object);
- }
- byte[] bts = baOs1.toByteArray();
- if(length==0){//濡傛灉闀垮害鏈缃紝浠ュ綋鍓嶅疄闄呯殑瀛楄妭涓哄噯
- bytes = new byte[bts.length];
- }
- System.arraycopy(bts, 0, bytes, 0, bts.length);
- dos.write(bytes);
- } else {
- byte[] bts = encode((Struct) field.get(entity));
- if(length==0){//濡傛灉闀垮害鏈缃紝浠ュ綋鍓嶅疄闄呯殑瀛楄妭涓哄噯
- bytes = new byte[bts.length];
- }
- System.arraycopy(bts, 0, bytes, 0, bts.length);
- dos.write(bytes);
- }
- entity.encodeByteMapping.put(name, bytes);
- }
- }
-
-
- public byte[] convert(int size, long value) throws Exception{
- ByteArrayOutputStream baOs = new ByteArrayOutputStream();
- DataOutputStream dos = new DataOutputStream(baOs);
- switch(size){
- case 1://byte
- dos.write((byte) value);
- break;
- case 2://short
- dos.writeShort(this.isReverse() ? Short.reverseBytes((short)value) : (short)value);
- break;
- case 4://int
- dos.writeInt(this.isReverse() ? Integer.reverseBytes((int)value) : (int)value);
- break;
- case 8://long
- dos.writeLong(this.isReverse() ? Long.reverseBytes((long)value) : (long)value);
- break;
- }
- return baOs.toByteArray();
- }
-
- public long convertEx(long value,int size) throws Exception{
- switch(size){
- case 1://byte
- return value;
- case 2://short
- return (this.isReverse() ? Short.reverseBytes((short)value) : (short)value);
- case 4://int
- return (this.isReverse() ? Integer.reverseBytes((int)value) : (int)value);
- case 8://long
- return (this.isReverse() ? Long.reverseBytes((long)value) : (long)value);
- }
- return 0;
- }
-
- @SuppressWarnings({ "unchecked", "rawtypes" })
- public static <T extends Struct> T decode(Class<? extends Struct> cls,byte[] bytes) throws Exception{
- Struct instance = cls.newInstance();
- return instance.decode(bytes);
- }
-
- /**
- * 瑙ｇ爜锛� 瀛楄妭鏁扮粍 ====>> java瀵硅薄
- */
- @SuppressWarnings({ "unchecked", "rawtypes" })
- public <T extends Struct> T decode(byte[] bytes) throws Exception{
- this.dataBytes = bytes;
- Struct instance = this;
- Class<? extends Struct> cls = this.getClass();
- Field[] fields = cls.getFields();
- if(this.decodeByteMapping==null)instance.decodeByteMapping=new HashMap();
- // spring el琛ㄨ揪寮�
- EvaluationContext context = new StandardEvaluationContext();
- context.setVariable("_", bytes.length);
- int bited = 0;//宸茶浣嶆暟
- for(Field field: Objects.requireNonNull(ReflectUtils.removeStaticField(fields))){
- size size = field.getAnnotation(size.class);
- bit bit = field.getAnnotation(bit.class);
- expr expr = field.getAnnotation(expr.class);
- flag flag = field.getAnnotation(flag.class);
- // 娌℃湁size銆乥it銆乪xpr娉ㄨВ鐨勫彉閲忎笉杩涜瑙ｆ瀽
- if(size==null && bit==null && expr==null){
- continue;
- }
- String name = field.getName();
- Class<?> type = field.getType();
- String typeName = type.getSimpleName();
- if(typeName.equals("Struct")){
- if(instance.getClassType(name)!=null){
- type = instance.getClassType(name);
- typeName = type.getSimpleName();
- }
- }
- context.setVariable("__", bytes.length-bited/8);
- byte[] bts = null;
- if(size!=null){
- bts = new byte[size.value()];
- System.arraycopy(bytes, bited/8, bts, 0, size.value());
- bited+=size.value()*8;
- }else if(bit!=null){
- int val = 0;
- String strBin = "";
- for(int i=bited;i<bited+bit.value();i++){//閫愪綅鎵弿
- if((bytes[i/8] & (1 << (i%8))) != 0){//濡傛灉浣嶄负1
- strBin+="1";
- }else{
- strBin+="0";
- }
- val = Integer.parseInt(strBin, 2);
- }
- byte[] result = new byte[4];
- result[3] = (byte)(val);
- result[2] = (byte)(val >> 8);
- result[1] = (byte)(val >> 16);
- result[0] = (byte)(val >> 24);
- bts = new byte[(int)Math.ceil((double)bit.value()/8.0)];
- System.arraycopy(result, result.length-bts.length, bts, 0, bts.length);
- bited+=bit.value();
- }else if(expr!=null){
- ExpressionParser parser = new SpelExpressionParser();
- Expression exp = parser.parseExpression(expr.value());
- Integer len = CommonUtils.parseInt(exp.getValue(context,instance));
- if(len!=null){
- if(len==-1)continue;
- bts = new byte[len];
- System.arraycopy(bytes, bited/8, bts, 0, len);
- bited+=len*8;
- }
- }
- if(bts.length==0)continue;
- DataInputStream dis = new DataInputStream(new ByteArrayInputStream(bts));
- if (typeName.equals("int") || typeName.equals("Integer")){
- field.setInt(instance,(int) convertEx(dis.readInt(),4));
- }else if (typeName.equals("long") || typeName.equals("Long")){
- field.setLong(instance, convertEx(dis.readLong(),8));
- }else if (typeName.equals("short") || typeName.equals("Short")){
- field.setShort(instance, (short) convertEx(dis.readShort(),2));
- }else if (typeName.equals("byte") || typeName.equals("Byte")){
- field.setByte(instance, (byte) convertEx(dis.readByte(),1));
- }else if (typeName.equals("byte[]")){
- field.set(instance, bts);
- }else if (typeName.equals("String")) {
- String strStr = new String(bts, StandardCharsets.UTF_8);
- if(flag!=null && flag.value().equals("BCD")){
- strStr = bcd2Str(bts);
- }else if(flag!=null && flag.value().equals("ASCII")){
- strStr = Struct.AscToStr(bts);
- }
- strStr = strStr.replaceAll("[\u0000]", "");
- field.set(instance, strStr);
- }else if (type.isArray()) {
- byte[] arrayBytes = bts;
- List list = new ArrayList();
- while(arrayBytes.length>0 && list.size()<256){
- Struct item = decode((Class<? extends Struct>) type.getComponentType(),arrayBytes);
- list.add(item);
- arrayBytes = item.unusedBytes;
- }
- Object array = Array.newInstance(type.getComponentType(), list.size());
- for(int i=0;i<list.size();i++){
- Array.set(array, i, list.get(i));
- }
- field.set(instance, array);
- }else if(type==Struct.class || Struct.class.isAssignableFrom(type)){
- byte[] arrayBytes = bts;
- Struct item = decode((Class<? extends Struct>) type,arrayBytes);
- field.set(instance, item);
- }else{
- throw new RuntimeException(cls.getSimpleName()+"瀛楁"+field.getName()+"绫诲瀷鏈煡");
- }
- instance.decodeByteMapping.put(name, bts);
- context.setVariable(name, field.get(instance));
- }
- byte[] useBytes = new byte[bited/8];
- System.arraycopy(bytes, 0 , useBytes, 0, bited/8);
- instance.decodeBytes = useBytes;
- byte[] unusedBytes = new byte[bytes.length-(bited/8)];
- if(unusedBytes.length>0){
- System.arraycopy(bytes, useBytes.length , unusedBytes, 0, unusedBytes.length);
- }
- instance.unusedBytes = unusedBytes;
- return (T) instance;
- }
-
- // 瀛楄妭鏁扮粍 ===>> 杞负鍗佸叚杩涘埗瀛楃涓�
- public static String toHex(byte[] bytes) {
+ // 瀛楄妭鏁扮粍 ===>> 杞负鍗佸叚杩涘埗瀛楃涓�
+ public static String toHex(byte[] bytes) {
StringBuilder buf = new StringBuilder(bytes.length * 2);
- for(byte b : bytes) { // 浣跨敤String鐨刦ormat鏂规硶杩涜杞崲
+ for (byte b : bytes) { // 浣跨敤String鐨刦ormat鏂规硶杩涜杞崲
buf.append(String.format("%02x", b & 0xff));
}
return buf.toString().toUpperCase();
}
+
public static byte[] toBytes(String str) {
- if(str == null || str.trim().equals("")) return new byte[0];
+ if (str == null || str.trim().equals("")) return new byte[0];
byte[] bytes = new byte[str.length() / 2];
- for(int i = 0; i < str.length() / 2; i++) {
+ for (int i = 0; i < str.length() / 2; i++) {
String subStr = str.substring(i * 2, i * 2 + 2);
bytes[i] = (byte) Integer.parseInt(subStr, 16);
}
return bytes;
}
-
-
-
- /**
- * @鍔熻兘: BCD鐮佽浆涓�10杩涘埗涓�(闃挎媺浼暟鎹�)
- * @鍙傛暟: BCD鐮�
- * @缁撴灉: 10杩涘埗涓�
- */
- public static String bcd2Str(byte[] bytes) {
- StringBuffer temp = new StringBuffer(bytes.length * 2);
- for (int i = 0; i < bytes.length; i++) {
- temp.append((byte) ((bytes[i] & 0xf0) >>> 4));
- temp.append((byte) (bytes[i] & 0x0f));
- }
- return temp.toString().substring(0, 1).equalsIgnoreCase("0") ? temp
- .toString().substring(1) : temp.toString();
- }
- /**
- * @鍔熻兘: 10杩涘埗涓茶浆涓築CD鐮�
- * @鍙傛暟: 10杩涘埗涓�
- * @缁撴灉: BCD鐮�
- */
- public static byte[] str2Bcd(String asc) {
- int len = asc.length();
- int mod = len % 2;
- if (mod != 0) {
- asc = "0" + asc;
- len = asc.length();
- }
- byte abt[] = new byte[len];
- if (len >= 2) {
- len = len / 2;
- }
- byte bbt[] = new byte[len];
- abt = asc.getBytes();
- int j, k;
- for (int p = 0; p < asc.length() / 2; p++) {
- if ((abt[2 * p] >= '0') && (abt[2 * p] <= '9')) {
- j = abt[2 * p] - '0';
- } else if ((abt[2 * p] >= 'a') && (abt[2 * p] <= 'z')) {
- j = abt[2 * p] - 'a' + 0x0a;
- } else {
- j = abt[2 * p] - 'A' + 0x0a;
- }
- if ((abt[2 * p + 1] >= '0') && (abt[2 * p + 1] <= '9')) {
- k = abt[2 * p + 1] - '0';
- } else if ((abt[2 * p + 1] >= 'a') && (abt[2 * p + 1] <= 'z')) {
- k = abt[2 * p + 1] - 'a' + 0x0a;
- } else {
- k = abt[2 * p + 1] - 'A' + 0x0a;
- }
- int a = (j << 4) + k;
- byte b = (byte) a;
- bbt[p] = b;
- }
- return bbt;
- }
-
- public static class TestMessage {
- public @size(1) byte begin = 0x7e;//璧峰绗�
- public @size(2) short type = 0;//娑堟伅ID
- public @bit(2) byte retain;//娑堟伅浣撳睘鎬�>淇濈暀
- public @bit(1) byte subpkg;//娑堟伅浣撳睘鎬�>鏄惁鍒嗗寘,0琛ㄧず涓嶅垎鍖�
- public @bit(3) byte encrypt;//娑堟伅浣撳睘鎬�>鍔犲瘑鏂瑰紡,0琛ㄧず涓嶅姞瀵�
- public @bit(10) short length;//娑堟伅浣撻暱搴�
- public @size(6) @flag("BCD") String number;//鎵嬫満鍙风爜
- public @size(2) short serial;//娑堟伅娴佹按鍙�
- public @expr("#subpkg==1?2:0") short pkgs;//鍒嗗寘鏁�
- public @expr("#subpkg==1?2:0") short index;//鍖呭簭鍙�
- public @expr("#length") byte[] data;//鏁版嵁閮ㄥ垎
- public @size(1) byte verify;//鏍￠獙鐮�
- public @size(1) byte end = 0x7e;//缁撴潫绗�
- }
-
- public static byte getXor(byte[] datas,int start, int end){
- byte temp=datas[start];
- for (int i = start+1; i <end; i++) {
- temp ^=datas[i];
- }
- return temp;
+ /**
+ * @鍔熻兘: BCD鐮佽浆涓�10杩涘埗涓�(闃挎媺浼暟鎹�)
+ * @鍙傛暟: BCD鐮�
+ * @缁撴灉: 10杩涘埗涓�
+ */
+ public static String bcd2Str(byte[] bytes) {
+ StringBuffer temp = new StringBuffer(bytes.length * 2);
+ for (int i = 0; i < bytes.length; i++) {
+ temp.append((byte) ((bytes[i] & 0xf0) >>> 4));
+ temp.append((byte) (bytes[i] & 0x0f));
+ }
+ return temp.toString().substring(0, 1).equalsIgnoreCase("0") ? temp
+ .toString().substring(1) : temp.toString();
}
-
+ /**
+ * @鍔熻兘: 10杩涘埗涓茶浆涓築CD鐮�
+ * @鍙傛暟: 10杩涘埗涓�
+ * @缁撴灉: BCD鐮�
+ */
+ public static byte[] str2Bcd(String asc) {
+ int len = asc.length();
+ int mod = len % 2;
+ if (mod != 0) {
+ asc = "0" + asc;
+ len = asc.length();
+ }
+ byte abt[] = new byte[len];
+ if (len >= 2) {
+ len = len / 2;
+ }
+ byte bbt[] = new byte[len];
+ abt = asc.getBytes();
+ int j, k;
+ for (int p = 0; p < asc.length() / 2; p++) {
+ if ((abt[2 * p] >= '0') && (abt[2 * p] <= '9')) {
+ j = abt[2 * p] - '0';
+ } else if ((abt[2 * p] >= 'a') && (abt[2 * p] <= 'z')) {
+ j = abt[2 * p] - 'a' + 0x0a;
+ } else {
+ j = abt[2 * p] - 'A' + 0x0a;
+ }
+ if ((abt[2 * p + 1] >= '0') && (abt[2 * p + 1] <= '9')) {
+ k = abt[2 * p + 1] - '0';
+ } else if ((abt[2 * p + 1] >= 'a') && (abt[2 * p + 1] <= 'z')) {
+ k = abt[2 * p + 1] - 'a' + 0x0a;
+ } else {
+ k = abt[2 * p + 1] - 'A' + 0x0a;
+ }
+ int a = (j << 4) + k;
+ byte b = (byte) a;
+ bbt[p] = b;
+ }
+ return bbt;
+ }
+
+ public static byte getXor(byte[] datas, int start, int end) {
+ byte temp = datas[start];
+ for (int i = start + 1; i < end; i++) {
+ temp ^= datas[i];
+ }
+ return temp;
+ }
+
/**
* 姹傛牎楠屽拰鐨勭畻娉�
* @param b 闇�瑕佹眰鏍￠獙鍜岀殑瀛楄妭鏁扮粍
* @return 鏍￠獙鍜�
*/
- public static byte sumCheck(byte[] b,int start, int end){
+ public static byte sumCheck(byte[] b, int start, int end) {
int sum = 0;
- for(int i = start; i < end; i++){
+ for (int i = start; i < end; i++) {
sum = sum + b[i];
}
return (byte) (sum & 0xff);
}
-
- //瀛楃涓茶浆鎹负ascii
- public static byte[] StrToAsc(String content){
- try {
- return content.getBytes(StandardCharsets.US_ASCII);
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
+
+ //瀛楃涓茶浆鎹负ascii
+ public static byte[] StrToAsc(String content) {
+ try {
+ return content.getBytes(StandardCharsets.US_ASCII);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
}
-
+
//ascii杞崲涓簊tring
- public static String AscToStr(byte[] bytes){
- StringBuffer sbu = new StringBuffer();
- for (byte aByte : bytes) {
- sbu.append(Character.toString((char) aByte));
- }
- return sbu.toString();
+ public static String AscToStr(byte[] bytes) {
+ StringBuffer sbu = new StringBuffer();
+ for (byte aByte : bytes) {
+ sbu.append(Character.toString((char) aByte));
+ }
+ return sbu.toString();
+ }
+
+ public Class getClassType(String name) {
+ return null;
+ }
+
+ /**
+ * 鍒ゆ柇澶у皬绔�
+ * @return true: 灏忕 / false: 澶х
+ */
+ public boolean isReverse() {
+ return this.getClass().getAnnotation(little.class) != null;
+ }
+
+ /**
+ * 鑾峰彇瀛楄妭鏁扮粍
+ */
+ public byte[] toBytes() throws Exception {
+ return encode(this);
+ }
+
+ public Map<String, String> toDecodeHexMapping() throws Exception {
+ if (this.decodeByteMapping == null) this.decodeByteMapping = new HashMap<>();
+ Map<String, String> mapping = getHex(this.decodeByteMapping);
+ if (this.decodeBytes != null) {
+ mapping.put("byte[]", Struct.toHex(this.decodeBytes));
+ }
+ return mapping;
+ }
+
+ public Map<String, String> toEncodeHexMapping() throws Exception {
+ if (this.encodeBytes == null) this.encode(this);
+ if (this.encodeByteMapping == null) this.encodeByteMapping = new HashMap<>();
+ Map<String, String> mapping = getHex(this.encodeByteMapping);
+ mapping.put("byte[]", Struct.toHex(this.encodeBytes));
+ return mapping;
+ }
+
+ public Map<String, String> getHex(Map<String, byte[]> bytemapping) throws Exception {
+ Map<String, String> map = new LinkedHashMap<>();
+ Field[] fields = this.getClass().getFields();
+ for (Field field : fields) {
+ byte[] bytes = bytemapping.get(field.getName());
+ if (bytes != null) {
+ map.put(field.getName(), Struct.toHex(bytes));
+ }
+ }
+ return map;
+ }
+
+ // 杞琷ava瀵硅薄鍒版暟缁�
+ public byte[] encode(Struct entity) throws Exception {
+ ByteArrayOutputStream baOs = new ByteArrayOutputStream();
+ write(new DataOutputStream(baOs), entity);
+ entity.encodeBytes = baOs.toByteArray();
+ return entity.encodeBytes;
+ }
+
+ /**
+ * 鍐欐暟鎹埌杈撳嚭娴�
+ *
+ * @param dos
+ * @param entity
+ */
+ public void write(DataOutputStream dos, Struct entity) throws Exception {
+ if (entity == null) return;
+ if (entity.encodeByteMapping == null) entity.encodeByteMapping = new HashMap<>();
+ Field[] fields = entity.getClass().getFields();
+ EvaluationContext context = new StandardEvaluationContext();
+ for (Field field : Objects.requireNonNull(ReflectUtils.removeStaticField(fields))) {
+ field.setAccessible(true);
+
+ String name = field.getName();
+ Class<?> type = field.getType();
+ String typeName = type.getSimpleName();
+ if (typeName.equals("Struct")) {
+ if (entity.getClassType(name) != null) {
+ type = entity.getClassType(name);
+ typeName = type.getSimpleName();
+ } else if (field.get(entity) != null) {
+ type = field.get(entity).getClass();
+ typeName = type.getSimpleName();
+ }
+ }
+
+ size size = field.getAnnotation(size.class);
+ bit bit = field.getAnnotation(bit.class);
+ expr expr = field.getAnnotation(expr.class);
+ flag flag = field.getAnnotation(flag.class);
+ if (size == null && bit == null && expr == null) {
+ continue;
+ }
+
+ int bited = 0;//宸插啓浣嶆暟
+ int length = 0;//瀹氫箟鐨勯暱搴�
+ if (size != null) {
+ length = size.value();
+ bited += size.value() * 8;
+ } else if (bit != null) {
+ //鎸変綅鍐欐柟寮忔湭瀹炵幇澶勭悊
+ throw new RuntimeException("鎸変綅鍐欐柟寮忔湭瀹炵幇澶勭悊");
+ } else if (expr != null) {
+ ExpressionParser parser = new SpelExpressionParser();
+ Expression exp = parser.parseExpression(expr.value());
+ Integer len = null;
+ try {
+ len = CommonUtils.parseInt(exp.getValue(context, entity));
+ } catch (Exception e) {
+ len = 0;
+ }
+ if (len != null) {
+ if (len == -1) continue;
+ length = len;
+ bited += len * 8;
+ }
+ }
+ context.setVariable(name, field.get(entity));
+
+ byte[] bytes = new byte[length];
+
+ if (typeName.equals("int") || typeName.equals("Integer")) {
+ dos.write(bytes = convert(length, field.getInt(entity)));
+ } else if (typeName.equals("long") || typeName.equals("Long")) {
+ dos.write(bytes = convert(length, field.getLong(entity)));
+ } else if (typeName.equals("short") || typeName.equals("Short")) {
+ dos.write(bytes = convert(length, field.getShort(entity)));
+ } else if (typeName.equals("byte") || typeName.equals("Byte")) {
+ dos.write(bytes = convert(length, field.getByte(entity)));
+ } else if (typeName.equals("String")) {
+ String str = (String) field.get(entity);
+ if (str == null)
+ str = "";
+ str = str.replaceAll("銆�", " ");
+
+ byte[] bts = null;
+ if (flag != null && flag.value().equals("ASCII")) {
+ bts = Struct.StrToAsc(str);
+ } else if (flag != null && flag.value().equals("BCD")) {
+ bts = Struct.str2Bcd(str);
+ } else {
+ bts = str.getBytes();
+ }
+
+ if (length == 0) {//濡傛灉闀垮害鏈缃紝浠ュ綋鍓嶅疄闄呯殑瀛楄妭涓哄噯
+ bytes = new byte[bts.length];
+ }
+ System.arraycopy(bts, 0, bytes, 0, bts.length);
+ dos.write(bytes);
+ } else if (typeName.equals("byte[]")) {
+ byte[] bts = (byte[]) field.get(entity);
+ if (bts != null) {
+ if (length == 0) {//濡傛灉闀垮害鏈缃紝浠ュ綋鍓嶅疄闄呯殑瀛楄妭涓哄噯
+ bytes = new byte[bts.length];
+ }
+ System.arraycopy(bts, 0, bytes, 0, bts.length);
+ dos.write(bytes);
+ }
+ } else if (type.isArray()) {
+ ByteArrayOutputStream baOs1 = new ByteArrayOutputStream();
+ DataOutputStream dos1 = new DataOutputStream(baOs1);
+ for (Object object : (Object[]) field.get(entity)) {
+ write(dos1, (Struct) object);
+ }
+ byte[] bts = baOs1.toByteArray();
+ if (length == 0) {//濡傛灉闀垮害鏈缃紝浠ュ綋鍓嶅疄闄呯殑瀛楄妭涓哄噯
+ bytes = new byte[bts.length];
+ }
+ System.arraycopy(bts, 0, bytes, 0, bts.length);
+ dos.write(bytes);
+ } else {
+ byte[] bts = encode((Struct) field.get(entity));
+ if (length == 0) {//濡傛灉闀垮害鏈缃紝浠ュ綋鍓嶅疄闄呯殑瀛楄妭涓哄噯
+ bytes = new byte[bts.length];
+ }
+ System.arraycopy(bts, 0, bytes, 0, bts.length);
+ dos.write(bytes);
+ }
+ entity.encodeByteMapping.put(name, bytes);
+ }
+ }
+
+ public byte[] convert(int size, long value) throws Exception {
+ ByteArrayOutputStream baOs = new ByteArrayOutputStream();
+ DataOutputStream dos = new DataOutputStream(baOs);
+ switch (size) {
+ case 1://byte
+ dos.write((byte) value);
+ break;
+ case 2://short
+ dos.writeShort(this.isReverse() ? Short.reverseBytes((short) value) : (short) value);
+ break;
+ case 4://int
+ dos.writeInt(this.isReverse() ? Integer.reverseBytes((int) value) : (int) value);
+ break;
+ case 8://long
+ dos.writeLong(this.isReverse() ? Long.reverseBytes((long) value) : (long) value);
+ break;
+ }
+ return baOs.toByteArray();
+ }
+
+ public long convertEx(long value, int size) throws Exception {
+ switch (size) {
+ case 1://byte
+ return value;
+ case 2://short
+ return (this.isReverse() ? Short.reverseBytes((short) value) : (short) value);
+ case 4://int
+ return (this.isReverse() ? Integer.reverseBytes((int) value) : (int) value);
+ case 8://long
+ return (this.isReverse() ? Long.reverseBytes((long) value) : (long) value);
+ }
+ return 0;
+ }
+
+ /**
+ * 瑙ｇ爜锛� 瀛楄妭鏁扮粍 ====>> java瀵硅薄
+ */
+ @SuppressWarnings({"unchecked", "rawtypes"})
+ public <T extends Struct> T decode(byte[] bytes) throws Exception {
+ this.dataBytes = bytes;
+ Struct instance = this;
+ Class<? extends Struct> cls = this.getClass();
+ Field[] fields = cls.getFields();
+ if (this.decodeByteMapping == null) instance.decodeByteMapping = new HashMap();
+ // spring el琛ㄨ揪寮�
+ EvaluationContext context = new StandardEvaluationContext();
+ context.setVariable("_", bytes.length);
+ int bited = 0;//宸茶浣嶆暟
+ for (Field field : Objects.requireNonNull(ReflectUtils.removeStaticField(fields))) {
+ size size = field.getAnnotation(size.class);
+ bit bit = field.getAnnotation(bit.class);
+ expr expr = field.getAnnotation(expr.class);
+ flag flag = field.getAnnotation(flag.class);
+ // 娌℃湁size銆乥it銆乪xpr娉ㄨВ鐨勫彉閲忎笉杩涜瑙ｆ瀽
+ if (size == null && bit == null && expr == null) {
+ continue;
+ }
+ String name = field.getName();
+ Class<?> type = field.getType();
+ String typeName = type.getSimpleName();
+ if (typeName.equals("Struct")) {
+ if (instance.getClassType(name) != null) {
+ type = instance.getClassType(name);
+ typeName = type.getSimpleName();
+ }
+ }
+ context.setVariable("__", bytes.length - bited / 8);
+ byte[] bts = null;
+ if (size != null) {
+ bts = new byte[size.value()];
+ System.arraycopy(bytes, bited / 8, bts, 0, size.value());
+ bited += size.value() * 8;
+ } else if (bit != null) {
+ int val = 0;
+ String strBin = "";
+ for (int i = bited; i < bited + bit.value(); i++) {//閫愪綅鎵弿
+ if ((bytes[i / 8] & (1 << (i % 8))) != 0) {//濡傛灉浣嶄负1
+ strBin += "1";
+ } else {
+ strBin += "0";
+ }
+ val = Integer.parseInt(strBin, 2);
+ }
+ byte[] result = new byte[4];
+ result[3] = (byte) (val);
+ result[2] = (byte) (val >> 8);
+ result[1] = (byte) (val >> 16);
+ result[0] = (byte) (val >> 24);
+ bts = new byte[(int) Math.ceil((double) bit.value() / 8.0)];
+ System.arraycopy(result, result.length - bts.length, bts, 0, bts.length);
+ bited += bit.value();
+ } else if (expr != null) {
+ ExpressionParser parser = new SpelExpressionParser();
+ Expression exp = parser.parseExpression(expr.value());
+ Integer len = CommonUtils.parseInt(exp.getValue(context, instance));
+ if (len != null) {
+ if (len == -1) continue;
+ bts = new byte[len];
+ System.arraycopy(bytes, bited / 8, bts, 0, len);
+ bited += len * 8;
+ }
+ }
+ if (bts.length == 0) continue;
+ DataInputStream dis = new DataInputStream(new ByteArrayInputStream(bts));
+ if (typeName.equals("int") || typeName.equals("Integer")) {
+ field.setInt(instance, (int) convertEx(dis.readInt(), 4));
+ } else if (typeName.equals("long") || typeName.equals("Long")) {
+ field.setLong(instance, convertEx(dis.readLong(), 8));
+ } else if (typeName.equals("short") || typeName.equals("Short")) {
+ field.setShort(instance, (short) convertEx(dis.readShort(), 2));
+ } else if (typeName.equals("byte") || typeName.equals("Byte")) {
+ field.setByte(instance, (byte) convertEx(dis.readByte(), 1));
+ } else if (typeName.equals("byte[]")) {
+ field.set(instance, bts);
+ } else if (typeName.equals("String")) {
+ String strStr = new String(bts, StandardCharsets.UTF_8);
+ if (flag != null && flag.value().equals("BCD")) {
+ strStr = bcd2Str(bts);
+ } else if (flag != null && flag.value().equals("ASCII")) {
+ strStr = Struct.AscToStr(bts);
+ }
+ strStr = strStr.replaceAll("[\u0000]", "");
+ field.set(instance, strStr);
+ } else if (type.isArray()) {
+ byte[] arrayBytes = bts;
+ List list = new ArrayList();
+ while (arrayBytes.length > 0 && list.size() < 256) {
+ Struct item = decode((Class<? extends Struct>) type.getComponentType(), arrayBytes);
+ list.add(item);
+ arrayBytes = item.unusedBytes;
+ }
+ Object array = Array.newInstance(type.getComponentType(), list.size());
+ for (int i = 0; i < list.size(); i++) {
+ Array.set(array, i, list.get(i));
+ }
+ field.set(instance, array);
+ } else if (type == Struct.class || Struct.class.isAssignableFrom(type)) {
+ byte[] arrayBytes = bts;
+ Struct item = decode((Class<? extends Struct>) type, arrayBytes);
+ field.set(instance, item);
+ } else {
+ throw new RuntimeException(cls.getSimpleName() + "瀛楁" + field.getName() + "绫诲瀷鏈煡");
+ }
+ instance.decodeByteMapping.put(name, bts);
+ context.setVariable(name, field.get(instance));
+ }
+ byte[] useBytes = new byte[bited / 8];
+ System.arraycopy(bytes, 0, useBytes, 0, bited / 8);
+ instance.decodeBytes = useBytes;
+ byte[] unusedBytes = new byte[bytes.length - (bited / 8)];
+ if (unusedBytes.length > 0) {
+ System.arraycopy(bytes, useBytes.length, unusedBytes, 0, unusedBytes.length);
+ }
+ instance.unusedBytes = unusedBytes;
+ return (T) instance;
+ }
+
+ public static class TestMessage {
+ public @size(1) byte begin = 0x7e;//璧峰绗�
+ public @size(2) short type = 0;//娑堟伅ID
+ public @bit(2) byte retain;//娑堟伅浣撳睘鎬�>淇濈暀
+ public @bit(1) byte subpkg;//娑堟伅浣撳睘鎬�>鏄惁鍒嗗寘,0琛ㄧず涓嶅垎鍖�
+ public @bit(3) byte encrypt;//娑堟伅浣撳睘鎬�>鍔犲瘑鏂瑰紡,0琛ㄧず涓嶅姞瀵�
+ public @bit(10) short length;//娑堟伅浣撻暱搴�
+ public @size(6)
+ @flag("BCD") String number;//鎵嬫満鍙风爜
+ public @size(2) short serial;//娑堟伅娴佹按鍙�
+ public @expr("#subpkg==1?2:0") short pkgs;//鍒嗗寘鏁�
+ public @expr("#subpkg==1?2:0") short index;//鍖呭簭鍙�
+ public @expr("#length") byte[] data;//鏁版嵁閮ㄥ垎
+ public @size(1) byte verify;//鏍￠獙鐮�
+ public @size(1) byte end = 0x7e;//缁撴潫绗�
}
}
\ No newline at end of file
diff --git a/src/main/java/com/zy/common/utils/Synchro.java b/src/main/java/com/zy/common/utils/Synchro.java
index c23fbf1..ab90bdc 100644
--- a/src/main/java/com/zy/common/utils/Synchro.java
+++ b/src/main/java/com/zy/common/utils/Synchro.java
@@ -14,9 +14,9 @@
public static void Copy(Object source, Object dest) {
try {
- BeanInfo sourceBean = Introspector.getBeanInfo(source.getClass(),Object.class);
+ BeanInfo sourceBean = Introspector.getBeanInfo(source.getClass(), Object.class);
PropertyDescriptor[] sourceProperty = sourceBean.getPropertyDescriptors();
- BeanInfo destBean = Introspector.getBeanInfo(dest.getClass(),Object.class);
+ BeanInfo destBean = Introspector.getBeanInfo(dest.getClass(), Object.class);
PropertyDescriptor[] destProperty = destBean.getPropertyDescriptors();
for (PropertyDescriptor propertyDescriptor : sourceProperty) {
for (PropertyDescriptor descriptor : destProperty) {
diff --git a/src/main/java/com/zy/common/utils/YamlUtils.java b/src/main/java/com/zy/common/utils/YamlUtils.java
index 9e2a425..4944201 100644
--- a/src/main/java/com/zy/common/utils/YamlUtils.java
+++ b/src/main/java/com/zy/common/utils/YamlUtils.java
@@ -18,16 +18,38 @@
@Component
public class YamlUtils {
+ private static final String src = "src/main/resources/application-prod.yml";
+ private final static String C = "#";
+ private final static String CHARSET = "UTF-8";
+ //璇诲彇鍚庣殑姣忚鏁版嵁
+ private static List<String> LINES = null;
@Autowired
private DataResourceService dataResourceService;
- private static final String src = "src/main/resources/application-prod.yml";
+ public static void main(String[] args) {
+ Map<String, Integer> keyCountMap = new HashMap<>();
+ try {
+ List<String> lines = FileUtils.readLines(new File(src), CHARSET);
+ for (int i = 0; i < lines.size(); i++) {
+ String line = lines.get(i);
+ if (line.contains(C)) {
+ String[] split = line.split(C);
+ String tmp = split[0];
+ String memo = split[1];//鑾峰彇娉ㄩ噴
- private final static String C = "#";
- private final static String CHARSET = "UTF-8";
+ String[] split1 = tmp.split(":");
+ String name = split1[0];
+ String data = split1[1];
+ System.out.println(memo);
+ System.out.println(name);
+ System.out.println(data);
+ }
+ }
- //璇诲彇鍚庣殑姣忚鏁版嵁
- private static List<String> LINES = null;
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
public Map<String, Object> read() {
Yaml yaml = new Yaml();
@@ -54,7 +76,7 @@
dataResource.setData(null);
} else if (value instanceof Map) {
dataResource.setData(JSON.toJSONString(value));
- }else {
+ } else {
dataResource.setData(value.toString());
}
dataResource.setCreateTime(new Date());
@@ -178,31 +200,6 @@
data = "";
}
map.put(dataResource.getName(), data);
- }
- }
-
- public static void main(String[] args) {
- Map<String, Integer> keyCountMap = new HashMap<>();
- try {
- List<String> lines = FileUtils.readLines(new File(src), CHARSET);
- for (int i = 0; i < lines.size(); i++) {
- String line = lines.get(i);
- if (line.contains(C)) {
- String[] split = line.split(C);
- String tmp = split[0];
- String memo = split[1];//鑾峰彇娉ㄩ噴
-
- String[] split1 = tmp.split(":");
- String name = split1[0];
- String data = split1[1];
- System.out.println(memo);
- System.out.println(name);
- System.out.println(data);
- }
- }
-
- } catch (IOException e) {
- e.printStackTrace();
}
}
diff --git a/src/main/java/com/zy/common/utils/excel/ExcelUtils.java b/src/main/java/com/zy/common/utils/excel/ExcelUtils.java
index 0532402..6824c82 100644
--- a/src/main/java/com/zy/common/utils/excel/ExcelUtils.java
+++ b/src/main/java/com/zy/common/utils/excel/ExcelUtils.java
@@ -16,19 +16,9 @@
new ExcelUtils().simpleWrite();
}
- public void simpleRead(){
- ExcelReaderBuilder read = EasyExcel.read("/Users/vincent/Desktop/3869.xls", EnInitData.class, new EnInitDataListener());
- // 璇诲彇绗竴涓猻heet(琛�),鏂囦欢娴佷細鑷姩鍏抽棴
- read.sheet().doRead();
- }
-
- public void simpleWrite(){
- EasyExcel.write("/Users/vincent/Desktop/writeDemo.xls", EnInitData.class).sheet("lxt").doWrite(data());
- }
-
- public static List<EnInitData> data(){
+ public static List<EnInitData> data() {
List<EnInitData> list = new ArrayList<>();
- for (int i = 0; i<1000; i++) {
+ for (int i = 0; i < 1000; i++) {
EnInitData data = new EnInitData();
data.setEnName("娴嬭瘯");
data.setCode("test");
@@ -38,4 +28,14 @@
}
return list;
}
+
+ public void simpleRead() {
+ ExcelReaderBuilder read = EasyExcel.read("/Users/vincent/Desktop/3869.xls", EnInitData.class, new EnInitDataListener());
+ // 璇诲彇绗竴涓猻heet(琛�),鏂囦欢娴佷細鑷姩鍏抽棴
+ read.sheet().doRead();
+ }
+
+ public void simpleWrite() {
+ EasyExcel.write("/Users/vincent/Desktop/writeDemo.xls", EnInitData.class).sheet("lxt").doWrite(data());
+ }
}
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index fff96c3..cb70262 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -52,7 +52,7 @@
@RequestMapping("/login.action")
@ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐧诲綍")
- public R loginAction(String mobile, String password){
+ public R loginAction(String mobile, String password) {
//楠岃瘉璁稿彲璇佹槸鍚︽湁鏁�
LicenseVerify licenseVerify = new LicenseVerify();
boolean verify = licenseVerify.verify();
@@ -68,13 +68,13 @@
EntityWrapper<User> userWrapper = new EntityWrapper<>();
userWrapper.eq("mobile", mobile);
User user = userService.selectOne(userWrapper);
- if (Cools.isEmpty(user)){
+ if (Cools.isEmpty(user)) {
return R.parse(CodeRes.USER_10001);
}
- if (user.getStatus()!=1){
+ if (user.getStatus() != 1) {
return R.parse(CodeRes.USER_10002);
}
- if (!user.getPassword().equals(password)){
+ if (!user.getPassword().equals(password)) {
return R.parse(CodeRes.USER_10003);
}
String token = Cools.enToken(System.currentTimeMillis() + mobile, user.getPassword());
@@ -119,7 +119,7 @@
int time = 0;
while (time < 3000) {
code = RandomValidateCodeUtil.code.get(sd);
- if (!Cools.isEmpty(code)){
+ if (!Cools.isEmpty(code)) {
break;
} else {
Thread.sleep(10);
@@ -132,13 +132,13 @@
@RequestMapping("/user/detail/auth")
@ManagerAuth
- public R userDetail(){
+ public R userDetail() {
return R.ok(userService.selectById(getUserId()));
}
@RequestMapping("/menu/auth")
@ManagerAuth(memo = "棣栭〉鑿滃崟")
- public R menu(){
+ public R menu() {
// 鑾峰彇鎵�鏈変竴绾ц彍鍗�
List<Resource> oneLevel = resourceService.selectList(new EntityWrapper<Resource>().eq("level", 1).eq("status", 1).orderBy("sort"));
User user = null;
@@ -151,7 +151,7 @@
List<RoleResource> roleResources = roleResourceService.selectList(new EntityWrapper<RoleResource>().eq("role_id", user.getRoleId()));
List<Long> resourceIds = new ArrayList<>();
roleResources.forEach(roleResource -> resourceIds.add(roleResource.getResourceId()));
- if (resourceIds.isEmpty()){
+ if (resourceIds.isEmpty()) {
return R.ok();
}
resourceWrapper = new EntityWrapper<Resource>().in("id", resourceIds).eq("level", 2).eq("status", 1).orderBy("sort");
@@ -169,11 +169,11 @@
// 鏄惁鎷ユ湁鏌ョ湅鏉冮檺
if (getUserId() != 9527) {
Resource view = resourceService.selectOne(new EntityWrapper<Resource>().eq("resource_id", resource.getId()).like("code", "view"));
- if (!Cools.isEmpty(view)){
+ if (!Cools.isEmpty(view)) {
RoleResource param = new RoleResource();
param.setResourceId(view.getId());
param.setRoleId(user.getRoleId());
- if (null == roleResourceService.selectOne(new EntityWrapper<>(param))){
+ if (null == roleResourceService.selectOne(new EntityWrapper<>(param))) {
continue;
}
}
@@ -197,11 +197,11 @@
@RequestMapping("/power/list/auth")
@ManagerAuth
- public R powerList(){
+ public R powerList() {
List<Resource> oneLevels = resourceService.selectList(new EntityWrapper<Resource>().eq("level", 1).eq("status", 1).orderBy("sort"));
List<Map> result = new ArrayList<>();
// 涓�绾�
- for (Resource oneLevel : oneLevels){
+ for (Resource oneLevel : oneLevels) {
List<Map> twoLevelsList = new ArrayList<>();
Map<String, Object> oneLevelMap = new HashMap<>();
oneLevelMap.put("title", oneLevel.getName());
@@ -210,7 +210,7 @@
oneLevelMap.put("children", twoLevelsList);
List<Resource> twoLevels = resourceService.selectList(new EntityWrapper<Resource>().eq("resource_id", oneLevel.getId()).eq("level", 2).eq("status", 1).orderBy("sort"));
// 浜岀骇
- for (Resource twoLevel : twoLevels){
+ for (Resource twoLevel : twoLevels) {
Map<String, Object> twoLevelMap = new HashMap<>();
twoLevelMap.put("title", twoLevel.getName());
twoLevelMap.put("id", twoLevel.getId());
@@ -220,7 +220,7 @@
twoLevelMap.put("children", threeLevelsList);
// 涓夌骇
List<Resource> threeLevels = resourceService.selectList(new EntityWrapper<Resource>().eq("resource_id", twoLevel.getId()).eq("level", 3).eq("status", 1).orderBy("sort"));
- for (Resource threeLevel : threeLevels){
+ for (Resource threeLevel : threeLevels) {
Map<String, Object> threeLevelMap = new HashMap<>();
threeLevelMap.put("title", threeLevel.getName());
threeLevelMap.put("id", threeLevel.getId());
@@ -259,19 +259,19 @@
List<Object> result = new ArrayList<>();
// 鑿滃崟
List<RoleResource> roleResources = roleResourceService.selectList(new EntityWrapper<RoleResource>().eq("role_id", roleId));
- for (RoleResource roleResource : roleResources){
+ for (RoleResource roleResource : roleResources) {
Resource resource = resourceService.selectById(roleResource.getResourceId());
- if (!Cools.isEmpty(resource)){
- if (resource.getLevel() == 3){
+ if (!Cools.isEmpty(resource)) {
+ if (resource.getLevel() == 3) {
result.add(resource.getId());
}
}
}
// 鍔熻兘
List<RolePermission> rolePermissions = rolePermissionService.selectList(new EntityWrapper<RolePermission>().eq("role_id", roleId));
- for (RolePermission rolePermission : rolePermissions){
+ for (RolePermission rolePermission : rolePermissions) {
Permission permission = permissionService.selectById(rolePermission.getPermissionId());
- if (!Cools.isEmpty(permission)){
+ if (!Cools.isEmpty(permission)) {
result.add(permission.getAction());
}
}
@@ -281,12 +281,12 @@
@RequestMapping("/power/auth")
@ManagerAuth(memo = "鎺堟潈")
@Transactional
- public R power(Long roleId, String powers){
+ public R power(Long roleId, String powers) {
Role role = roleService.selectById(roleId);
Long leaderId = role.getLeader();
roleResourceService.delete(new EntityWrapper<RoleResource>().eq("role_id", roleId));
rolePermissionService.delete(new EntityWrapper<RolePermission>().eq("role_id", roleId));
- if (!Cools.isEmpty(powers)){
+ if (!Cools.isEmpty(powers)) {
List<PowerDto> dtos = JSON.parseArray(powers, PowerDto.class);
for (PowerDto dto : dtos) {
Resource resource = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", dto.getTwo()).eq("level", 2));
@@ -304,14 +304,14 @@
roleResourceService.insert(roleResource);
} else {
Permission permission = permissionService.selectOne(new EntityWrapper<Permission>().eq("action", dto.getTwo()));
- if (!Cools.isEmpty(permission)){
+ if (!Cools.isEmpty(permission)) {
RolePermission rolePermission = new RolePermission();
rolePermission.setRoleId(roleId);
rolePermission.setPermissionId(permission.getId());
rolePermissionService.insert(rolePermission);
}
}
- for (String three : dto.getThree()){
+ for (String three : dto.getThree()) {
Resource resource1 = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", three).eq("level", 3));
if (!Cools.isEmpty(resource1)) {
// 鏍￠獙涓婄骇鏉冮檺
diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java
index 1d40c1d..b814e1b 100644
--- a/src/main/java/com/zy/common/web/BaseController.java
+++ b/src/main/java/com/zy/common/web/BaseController.java
@@ -30,11 +30,11 @@
@Autowired
private UserService userService;
- protected Long getUserId(){
+ protected Long getUserId() {
return Long.parseLong(String.valueOf(request.getAttribute("userId")));
}
- protected User getUser(){
+ protected User getUser() {
User user = userService.selectById(getUserId());
if (null == user) {
throw new CoolException(BaseRes.DENIED);
@@ -42,10 +42,10 @@
return user;
}
- protected String getComment(Class<?> cls, String fieldName){
+ protected String getComment(Class<?> cls, String fieldName) {
Field[] fields = Cools.getAllFields(cls);
- for (Field field : fields){
- if (fieldName.equals(field.getName())){
+ for (Field field : fields) {
+ if (fieldName.equals(field.getName())) {
return field.getAnnotation(ApiModelProperty.class).value();
}
}
@@ -58,15 +58,15 @@
* @param set 鎺掗櫎瀛楁闆嗗悎
* @param condition 鎼滅储鍐呭
*/
- protected <T> void allLike(Class<T> cls, Set<String> set, EntityWrapper<T> wrapper, String condition){
+ protected <T> void allLike(Class<T> cls, Set<String> set, EntityWrapper<T> wrapper, String condition) {
if (Cools.isEmpty(condition)) {
return;
}
List<String> columns = new ArrayList<>();
- for (Field field :Cools.getAllFields(cls)){
+ for (Field field : Cools.getAllFields(cls)) {
if (Modifier.isFinal(field.getModifiers())
|| Modifier.isStatic(field.getModifiers())
- || Modifier.isTransient(field.getModifiers())){
+ || Modifier.isTransient(field.getModifiers())) {
continue;
}
String column = null;
@@ -83,8 +83,8 @@
if (columns.isEmpty()) {
return;
}
- for (int i=0;i<columns.size();i++){
- if (i==0){
+ for (int i = 0; i < columns.size(); i++) {
+ if (i == 0) {
wrapper.andNew();
} else {
wrapper.or();
diff --git a/src/main/java/com/zy/common/web/RouterController.java b/src/main/java/com/zy/common/web/RouterController.java
index 0b83bb3..5760c9d 100644
--- a/src/main/java/com/zy/common/web/RouterController.java
+++ b/src/main/java/com/zy/common/web/RouterController.java
@@ -18,27 +18,27 @@
@RequestMapping("/")
public void index(HttpServletResponse response) {
- try{
- response.sendRedirect(contextPath+"/views/index.html");
- } catch (Exception ex){
+ try {
+ response.sendRedirect(contextPath + "/views/index.html");
+ } catch (Exception ex) {
ex.printStackTrace();
}
}
@RequestMapping("/login")
public void login(HttpServletResponse response) {
- try{
- response.sendRedirect(contextPath+"/views/login.html");
- } catch (Exception ex){
+ try {
+ response.sendRedirect(contextPath + "/views/login.html");
+ } catch (Exception ex) {
ex.printStackTrace();
}
}
@RequestMapping("/control")
public void control(HttpServletResponse response) {
- try{
- response.sendRedirect(contextPath+"/views/control.html");
- } catch (Exception ex){
+ try {
+ response.sendRedirect(contextPath + "/views/control.html");
+ } catch (Exception ex) {
ex.printStackTrace();
}
}
@@ -47,9 +47,9 @@
public void monitor(@PathVariable("cnrId") Integer cnrId,
@PathVariable("ledId") Integer ledId,
HttpServletResponse response) {
- try{
- response.sendRedirect(contextPath+"/views/monitor/monitor.html"+ "?" + "crnId=" + cnrId + "&" + "ledId=" + ledId);
- } catch (Exception ex){
+ try {
+ response.sendRedirect(contextPath + "/views/monitor/monitor.html" + "?" + "crnId=" + cnrId + "&" + "ledId=" + ledId);
+ } catch (Exception ex) {
ex.printStackTrace();
}
}
@@ -57,9 +57,9 @@
@RequestMapping("/monitor0/{ledId}")
public void monitor(@PathVariable("ledId") Integer ledId,
HttpServletResponse response) {
- try{
- response.sendRedirect(contextPath+"/views/monitor/monitor0.html"+ "?" + "crnId=" + 2 + "&" + "ledId=" + ledId);
- } catch (Exception ex){
+ try {
+ response.sendRedirect(contextPath + "/views/monitor/monitor0.html" + "?" + "crnId=" + 2 + "&" + "ledId=" + ledId);
+ } catch (Exception ex) {
ex.printStackTrace();
}
}
diff --git a/src/main/java/com/zy/core/DevpThread.java b/src/main/java/com/zy/core/DevpThread.java
index 715c3a5..2ee0a3a 100644
--- a/src/main/java/com/zy/core/DevpThread.java
+++ b/src/main/java/com/zy/core/DevpThread.java
@@ -4,7 +4,7 @@
import java.util.Map;
-public interface DevpThread extends ThreadHandler {
+public interface DevpThread extends ThreadHandler {
Map<Integer, StaProtocol> getStation();
diff --git a/src/main/java/com/zy/core/CPMainProcess.java b/src/main/java/com/zy/core/MainCpProcess.java
similarity index 94%
rename from src/main/java/com/zy/core/CPMainProcess.java
rename to src/main/java/com/zy/core/MainCpProcess.java
index 14b4e62..4603e64 100644
--- a/src/main/java/com/zy/core/CPMainProcess.java
+++ b/src/main/java/com/zy/core/MainCpProcess.java
@@ -16,7 +16,7 @@
@Data
@Slf4j
@Component
-public class CPMainProcess {
+public class MainCpProcess {
@Autowired
private MainServiceImpl mainService;
@@ -28,7 +28,7 @@
/**
* =====>> 寮�濮嬪伐浣�
*/
- public void start(){
+ public void start() {
thread = new Thread(() -> {
while (!Thread.currentThread().isInterrupted()) {
try {
@@ -67,7 +67,7 @@
}
//鑷姩娲惧彂浠诲姟
- // mainService.autoDistribute();
+ // mainService.autoDistribute();
//鑷姩瀹屾垚浠诲姟
// mainService.autoCompleteTask();
//agv鍙栨斁璐у畬鎴�
@@ -82,7 +82,7 @@
}
@PreDestroy
- public void shutDown(){
+ public void shutDown() {
if (thread != null) thread.interrupt();
}
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 864647e..1858d01 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -5,9 +5,10 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
-import com.zy.core.model.LedSlave;
import com.zy.core.properties.SlaveProperties;
-import com.zy.core.thread.*;
+import com.zy.core.thread.BarcodeThread;
+import com.zy.core.thread.SiemensCrnThread;
+import com.zy.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
@@ -28,7 +29,7 @@
@Autowired
private MainProcess mainProcess;
@Autowired
- private CPMainProcess cpMainProcess;
+ private MainCpProcess cpMainProcess;
/**
* PostConstruct浼氬湪鍔犺浇servlet鐨勬椂鍊欒繍琛屼竴娆�
@@ -49,7 +50,7 @@
log.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
}
- private void initMq(){
+ private void initMq() {
// 鍒濆鍖栧爢鍨涙満mq
for (Slave crn : slaveProperties.getCrn()) {
MessageQueue.init(SlaveType.Crn, crn);
@@ -76,7 +77,7 @@
// }
}
- private void initThread(){
+ private void initThread() {
// 鍒濆鍖栧爢鍨涙満绾跨▼
log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
for (CrnSlave crn : slaveProperties.getCrn()) {
diff --git a/src/main/java/com/zy/core/cache/MessageQueue.java b/src/main/java/com/zy/core/cache/MessageQueue.java
index b98b430..f5385e7 100644
--- a/src/main/java/com/zy/core/cache/MessageQueue.java
+++ b/src/main/java/com/zy/core/cache/MessageQueue.java
@@ -1,6 +1,5 @@
package com.zy.core.cache;
-import com.zy.asrs.utils.CommandUtils;
import com.zy.core.Slave;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.Task;
@@ -125,10 +124,10 @@
}
}
- public static void clear(SlaveType type, Integer id){
+ public static void clear(SlaveType type, Integer id) {
switch (type) {
case Crn:
-
+
CRN_EXCHANGE.get(id).clear();
break;
case Devp:
diff --git a/src/main/java/com/zy/core/cache/SlaveConnection.java b/src/main/java/com/zy/core/cache/SlaveConnection.java
index 0b57169..4233714 100644
--- a/src/main/java/com/zy/core/cache/SlaveConnection.java
+++ b/src/main/java/com/zy/core/cache/SlaveConnection.java
@@ -40,7 +40,7 @@
return null;
}
String key = null;
- for (Map.Entry<String, ThreadHandler> entry : conContain.entrySet()){
+ for (Map.Entry<String, ThreadHandler> entry : conContain.entrySet()) {
if (entry.getValue() == threadHandler) {
key = entry.getKey();
break;
@@ -56,8 +56,8 @@
}
}
- private static String toKey(SlaveType type, Integer id){
- return type.toString()+_LINK+id;
+ private static String toKey(SlaveType type, Integer id) {
+ return type.toString() + _LINK + id;
}
}
diff --git a/src/main/java/com/zy/core/enums/CrnFingerPosType.java b/src/main/java/com/zy/core/enums/CrnFingerPosType.java
index 76d8c60..a7d4474 100644
--- a/src/main/java/com/zy/core/enums/CrnFingerPosType.java
+++ b/src/main/java/com/zy/core/enums/CrnFingerPosType.java
@@ -9,6 +9,7 @@
public Integer id;
public String desc;
+
CrnFingerPosType(Integer id, String desc) {
this.id = id;
this.desc = desc;
diff --git a/src/main/java/com/zy/core/enums/CrnForkPosType.java b/src/main/java/com/zy/core/enums/CrnForkPosType.java
index a915d6a..cfea858 100644
--- a/src/main/java/com/zy/core/enums/CrnForkPosType.java
+++ b/src/main/java/com/zy/core/enums/CrnForkPosType.java
@@ -12,6 +12,7 @@
public Integer id;
public String desc;
+
CrnForkPosType(Integer id, String desc) {
this.id = id;
this.desc = desc;
diff --git a/src/main/java/com/zy/core/enums/CrnLiftPosType.java b/src/main/java/com/zy/core/enums/CrnLiftPosType.java
index 62bbf5e..add94f0 100644
--- a/src/main/java/com/zy/core/enums/CrnLiftPosType.java
+++ b/src/main/java/com/zy/core/enums/CrnLiftPosType.java
@@ -12,6 +12,7 @@
public Integer id;
public String desc;
+
CrnLiftPosType(Integer id, String desc) {
this.id = id;
this.desc = desc;
diff --git a/src/main/java/com/zy/core/enums/CrnModeType.java b/src/main/java/com/zy/core/enums/CrnModeType.java
index d7b6111..b18917a 100644
--- a/src/main/java/com/zy/core/enums/CrnModeType.java
+++ b/src/main/java/com/zy/core/enums/CrnModeType.java
@@ -11,6 +11,7 @@
public Integer id;
public String desc;
+
CrnModeType(Integer id, String desc) {
this.id = id;
this.desc = desc;
diff --git a/src/main/java/com/zy/core/enums/CrnStatusType.java b/src/main/java/com/zy/core/enums/CrnStatusType.java
index 87c6e53..8ef6852 100644
--- a/src/main/java/com/zy/core/enums/CrnStatusType.java
+++ b/src/main/java/com/zy/core/enums/CrnStatusType.java
@@ -26,7 +26,7 @@
HOMING(5, "鏀捐揣绛夊緟"),
ANTI_ORIGIN(6, "鏀捐揣涓�"),
PUT_COMPLETE(7, "鍥炲師鐐�"),
-// MOVE_THE_SHIPPING_LOCATION(8, "绉诲姩鍒版斁璐т綅缃�"),
+ // MOVE_THE_SHIPPING_LOCATION(8, "绉诲姩鍒版斁璐т綅缃�"),
// PUTTING(9, "鏀捐揣涓�"),
HANDLING_COMPLETED(10, "鎼繍瀹屾垚绛夊緟WCS纭"),
EMPTY_AVOIDANCE(11, "绌鸿浇閬胯"),
@@ -36,6 +36,7 @@
public Integer id;
public String desc;
+
CrnStatusType(Integer id, String desc) {
this.id = id;
this.desc = desc;
diff --git a/src/main/java/com/zy/core/enums/CrnTaskModeType.java b/src/main/java/com/zy/core/enums/CrnTaskModeType.java
index 968c075..1777c18 100644
--- a/src/main/java/com/zy/core/enums/CrnTaskModeType.java
+++ b/src/main/java/com/zy/core/enums/CrnTaskModeType.java
@@ -12,6 +12,7 @@
;
public Integer id;
+
CrnTaskModeType(Integer id) {
this.id = id;
}
diff --git a/src/main/java/com/zy/core/enums/SlaveType.java b/src/main/java/com/zy/core/enums/SlaveType.java
index 56330fe..9d32604 100644
--- a/src/main/java/com/zy/core/enums/SlaveType.java
+++ b/src/main/java/com/zy/core/enums/SlaveType.java
@@ -10,7 +10,7 @@
Car,
;
- public static SlaveType findInstance(String s){
+ public static SlaveType findInstance(String s) {
for (SlaveType type : SlaveType.values()) {
if (type.toString().equals(s)) {
return type;
diff --git a/src/main/java/com/zy/core/model/command/CommandPackage.java b/src/main/java/com/zy/core/model/command/CommandPackage.java
index e447e9a..05e02a5 100644
--- a/src/main/java/com/zy/core/model/command/CommandPackage.java
+++ b/src/main/java/com/zy/core/model/command/CommandPackage.java
@@ -2,9 +2,6 @@
import lombok.Data;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* 鎸囦护鏁版嵁鍖�
*/
diff --git a/src/main/java/com/zy/core/model/command/CrnCommand.java b/src/main/java/com/zy/core/model/command/CrnCommand.java
index cea2f4d..2b5b9e1 100644
--- a/src/main/java/com/zy/core/model/command/CrnCommand.java
+++ b/src/main/java/com/zy/core/model/command/CrnCommand.java
@@ -82,23 +82,13 @@
private Short onlineWrk3 = 0;
//鎭㈠鑱旀満浠诲姟
private Short onlineWrk4 = 0;
- private Short reset = 0;
+ private Short reset = 0;
// 浠诲姟纭 0锛氭湭纭 1锛氬凡纭
private Short command = 0;
//鎸囦护ID
private Integer commandId;
-
- public void setTaskMode(Short taskMode){
- this.taskMode = taskMode;
- this.taskModeType = CrnTaskModeType.get(taskModeType);
- }
-
- public void setTaskMode(CrnTaskModeType type) {
- this.taskModeType = type;
- this.taskMode = CrnTaskModeType.get(type).id.shortValue();
- }
public static void main(String[] args) {
Date date = new Date();
@@ -107,7 +97,7 @@
System.out.println(cal.get(Calendar.YEAR));
//榛樿浠�0-11
- System.out.println(cal.get(Calendar.MONTH)+1);
+ System.out.println(cal.get(Calendar.MONTH) + 1);
System.out.println(cal.get(Calendar.DATE));
int hour = cal.get(Calendar.HOUR_OF_DAY);
System.out.println("鏃�");
@@ -122,4 +112,14 @@
System.out.println("绀兼嫓");
System.out.println(mm);
}
+
+ public void setTaskMode(Short taskMode) {
+ this.taskMode = taskMode;
+ this.taskModeType = CrnTaskModeType.get(taskModeType);
+ }
+
+ public void setTaskMode(CrnTaskModeType type) {
+ this.taskModeType = type;
+ this.taskMode = CrnTaskModeType.get(type).id.shortValue();
+ }
}
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index baa789a..6e22c96 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -221,92 +221,81 @@
* 杞借揣鍙版湁鐗�
*/
public Short loaded;
-
- /**
- * 鍫嗗灈鏈哄瀭鐩存晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
- */
- private Integer alarm1 = 0;
-
- /**
- * 鍫嗗灈鏈烘按骞虫晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
- */
- private Integer alarm2 = 0;;
-
- /**
- * 鍫嗗灈鏈鸿揣鍙夋晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
- */
- private Integer alarm3 = 0;;
-
- /**
- * 鍫嗗灈鏈虹姸鎬佹晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
- */
- private Integer alarm4 = 0;;
-
- /**
- * 寮傚父1
- */
- private boolean[] error1;
-
- private CrnError1 crnError1;
-
- /**
- * 寮傚父2
- */
- private boolean[] error2;
-
- private CrnError2 crnError2;
-
- /**
- * 寮傚父3
- */
- private boolean[] error3;
-
- private CrnError3 crnError3;
-
- /**
- * 寮傚父4
- */
- private boolean[] error4;
-
- private CrnError4 crnError4;
-
- /**
- * X琛岃蛋绾块�熷害m/min
- */
- private Float xSpeed = 0F;
-
- /**
- * Y琛岃蛋绾块�熷害m/min
- */
- private Float ySpeed = 0F;
-
- /**
- * Z琛岃蛋绾块�熷害m/min
- */
- private Float zSpeed = 0F;
-
/**
* 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m
*/
public Float xDistance = 0F;
-
/**
* 鍫嗗灈鏈虹疮璁″崌闄嶈窛绂籯m
*/
public Float yDistance = 0F;
-
+ ;
/**
* 鍫嗗灈鏈虹疮璁¤蛋琛屾椂闀縣
*/
public Float xDuration = 0F;
-
+ ;
/**w
* 鍫嗗灈鏈虹疮璁″崌闄嶆椂闀縣
*/
public Float yDuration = 0F;
-
+ ;
+ /**
+ * 鍫嗗灈鏈哄瀭鐩存晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
+ */
+ private Integer alarm1 = 0;
+ /**
+ * 鍫嗗灈鏈烘按骞虫晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
+ */
+ private Integer alarm2 = 0;
+ /**
+ * 鍫嗗灈鏈鸿揣鍙夋晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
+ */
+ private Integer alarm3 = 0;
+ /**
+ * 鍫嗗灈鏈虹姸鎬佹晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
+ */
+ private Integer alarm4 = 0;
+ /**
+ * 寮傚父1
+ */
+ private boolean[] error1;
+ private CrnError1 crnError1;
+ /**
+ * 寮傚父2
+ */
+ private boolean[] error2;
+ private CrnError2 crnError2;
+ /**
+ * 寮傚父3
+ */
+ private boolean[] error3;
+ private CrnError3 crnError3;
+ /**
+ * 寮傚父4
+ */
+ private boolean[] error4;
+ private CrnError4 crnError4;
+ /**
+ * X琛岃蛋绾块�熷害m/min
+ */
+ private Float xSpeed = 0F;
+ /**
+ * Y琛岃蛋绾块�熷害m/min
+ */
+ private Float ySpeed = 0F;
+ /**
+ * Z琛岃蛋绾块�熷害m/min
+ */
+ private Float zSpeed = 0F;
//鎸囦护ID
private Integer commandId;
+ /**
+ * 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
+ * I:鍏ュ簱
+ * O:鍑哄簱
+ */
+ private String lastIo = "I";
public void setMode(Short mode) {
this.mode = mode;
@@ -338,12 +327,12 @@
this.liftPos = CrnLiftPosType.get(type).id.shortValue();
}
- public void setStatus(Short status){
+ public void setStatus(Short status) {
this.status = status;
this.statusType = CrnStatusType.get(status);
}
- public void setStatus(CrnStatusType type){
+ public void setStatus(CrnStatusType type) {
this.statusType = type;
this.status = CrnStatusType.get(type).id.shortValue();
}
@@ -353,7 +342,7 @@
this.fingerPosType = CrnFingerPosType.get(type);
}
- public void setError1(boolean[] error1){
+ public void setError1(boolean[] error1) {
this.error1 = error1;
this.crnError1 = new CrnError1();
this.crnError1.remoteStop = error1[0];
@@ -374,7 +363,7 @@
this.crnError1.leftOverWidthErr2 = error1[15];
}
- public void setError2(boolean[] error2){
+ public void setError2(boolean[] error2) {
this.error2 = error2;
this.crnError2 = new CrnError2();
this.crnError2.leftOverLenErr1 = error2[0];
@@ -425,15 +414,7 @@
this.crnError4.zLooseBrakeTimeout = error4[3];
}
- /**
- * 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
- * I:鍏ュ簱
- * O:鍑哄簱
- */
- private String lastIo = "I";
-
-
- public BasCrnp toSqlModel(BasCrnp basCrnp){
+ public BasCrnp toSqlModel(BasCrnp basCrnp) {
basCrnp.setCrnErr(alarm.longValue());
basCrnp.setWrkNo(taskNo.intValue());
return basCrnp;
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 4182f70..9c0ace0 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -1,7 +1,6 @@
package com.zy.core.model.protocol;
import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.CommandInfo;
import lombok.Data;
import java.util.ArrayList;
@@ -106,7 +105,6 @@
private Boolean upcontactErr = false; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
-
private Short agvStartPick; //鍏佽鍙栬揣
private Short agvStartPlace; //鍏佽鏀捐揣
private Short agvTypeSign; //鍏佽鏀捐揣
@@ -118,85 +116,84 @@
private List<Integer> alarm;
- public List<Integer> getAlarm(){
+ public List<Integer> getAlarm() {
List<Integer> alarm = new ArrayList<>();
- if (breakerErr){
+ if (breakerErr) {
alarm.add(1);
}
- if (infraredErr){
+ if (infraredErr) {
alarm.add(2);
}
- if (outTimeErr){
+ if (outTimeErr) {
alarm.add(3);
}
- if (seizeSeatErr){
+ if (seizeSeatErr) {
alarm.add(4);
}
- if (wrkYgoodsN){
+ if (wrkYgoodsN) {
alarm.add(5);
}
- if (inverterErr){
+ if (inverterErr) {
alarm.add(6);
}
- if (contactErr){
+ if (contactErr) {
alarm.add(7);
}
- if (upcontactErr){
+ if (upcontactErr) {
alarm.add(8);
}
return alarm;
}
-
- public BasDevp toSqlModel(){
+ public BasDevp toSqlModel() {
BasDevp basDevp = new BasDevp();
basDevp.setDevNo(siteId);
basDevp.setWrkNo(workNo.intValue());
- basDevp.setAutoing(autoing?"Y":"N");
- basDevp.setLoading(loading?"Y":"N");
- if (frontErr){
+ basDevp.setAutoing(autoing ? "Y" : "N");
+ basDevp.setLoading(loading ? "Y" : "N");
+ if (frontErr) {
basDevp.setStaErr(11);
- }else if (backErr){
+ } else if (backErr) {
basDevp.setStaErr(12);
- }else if (highErr){
+ } else if (highErr) {
basDevp.setStaErr(13);
- }else if (leftErr){
+ } else if (leftErr) {
basDevp.setStaErr(14);
- }else if (rightErr){
+ } else if (rightErr) {
basDevp.setStaErr(15);
- }else if (weightErr){
+ } else if (weightErr) {
basDevp.setStaErr(16);
- }else if (barcodeErr){
+ } else if (barcodeErr) {
basDevp.setStaErr(17);
- }else if (breakerErr){
+ } else if (breakerErr) {
basDevp.setStaErr(18);
- }else if (infraredErr){
+ } else if (infraredErr) {
basDevp.setStaErr(19);
- }else if (outTimeErr){
+ } else if (outTimeErr) {
basDevp.setStaErr(110);
- }else if (seizeSeatErr){
+ } else if (seizeSeatErr) {
basDevp.setStaErr(111);
- }else if (wrkYgoodsN){
+ } else if (wrkYgoodsN) {
basDevp.setStaErr(112);
- }else if (inverterErr){
+ } else if (inverterErr) {
basDevp.setStaErr(113);
- }else if (contactErr){
+ } else if (contactErr) {
basDevp.setStaErr(114);
- }else if (upcontactErr){
+ } else if (upcontactErr) {
basDevp.setStaErr(115);
- }else {
- if (!loading){
+ } else {
+ if (!loading) {
basDevp.setStaErr(0);
}
}
- basDevp.setInEnable(inEnable?"Y":"N");
- basDevp.setOutEnable(outEnable?"Y":"N");
+ basDevp.setInEnable(inEnable ? "Y" : "N");
+ basDevp.setOutEnable(outEnable ? "Y" : "N");
basDevp.setLocType1((short) 0); // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
basDevp.setLocType2((short) 0); // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
basDevp.setLocType3((short) 0); // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
- basDevp.setInQty(inQty !=null ?(int)inQty : 0);
+ basDevp.setInQty(inQty != null ? (int) inQty : 0);
// basDevp.setAgvStartPick(agvStartPick.intValue());
// basDevp.setAgvStartPlace(agvStartPlace.intValue());
return basDevp;
diff --git a/src/main/java/com/zy/core/netty/AbstractInboundHandler.java b/src/main/java/com/zy/core/netty/AbstractInboundHandler.java
index cd377c9..f225528 100644
--- a/src/main/java/com/zy/core/netty/AbstractInboundHandler.java
+++ b/src/main/java/com/zy/core/netty/AbstractInboundHandler.java
@@ -18,7 +18,7 @@
T t = (T) obj;
if (channelRead0(ctx, t)) {
ctx.fireChannelRead(t);
- } else {
+ } else {
// 绠￠亾涓柇锛宖ireChannelRead鏈墽琛岋紝闇�瑕佹墜鍔ㄩ噴鏀惧爢澶栧唴瀛�
if (obj instanceof ByteBuf) {
ReferenceCountUtil.release(obj);
diff --git a/src/main/java/com/zy/core/netty/HandlerInitializer.java b/src/main/java/com/zy/core/netty/HandlerInitializer.java
index 0ccfed1..d512229 100644
--- a/src/main/java/com/zy/core/netty/HandlerInitializer.java
+++ b/src/main/java/com/zy/core/netty/HandlerInitializer.java
@@ -68,7 +68,7 @@
/**
* Init channel attr track
*/
- private void initAttrTrack(Channel channel){
+ private void initAttrTrack(Channel channel) {
Attribute<Map<String, Object>> coolTrackAttr = channel.attr(ChannelAttrKey.DATA_MAP_ATTR);
Map<String, Object> trackMap = new HashMap<>();
coolTrackAttr.setIfAbsent(trackMap);
diff --git a/src/main/java/com/zy/core/netty/OnlineServer.java b/src/main/java/com/zy/core/netty/OnlineServer.java
index f6e68ec..5450a1f 100644
--- a/src/main/java/com/zy/core/netty/OnlineServer.java
+++ b/src/main/java/com/zy/core/netty/OnlineServer.java
@@ -33,18 +33,18 @@
private EventLoopGroup bossGroup;
private EventLoopGroup workerGroup;
- @Autowired
- public OnlineServer(TcpProperties tcpProperties, HandlerInitializer handlerInitializer) { ;
- this.tcpProperties = tcpProperties;
- this.handlerInitializer = handlerInitializer;
- }
-
{
bootstrap = new ServerBootstrap();
bossGroup = new NioEventLoopGroup(1);
workerGroup = new NioEventLoopGroup();
}
+ @Autowired
+ public OnlineServer(TcpProperties tcpProperties, HandlerInitializer handlerInitializer) {
+ ;
+ this.tcpProperties = tcpProperties;
+ this.handlerInitializer = handlerInitializer;
+ }
/**
* tcp server init
diff --git a/src/main/java/com/zy/core/netty/cache/ChannelCache.java b/src/main/java/com/zy/core/netty/cache/ChannelCache.java
index f122ba6..25a5381 100644
--- a/src/main/java/com/zy/core/netty/cache/ChannelCache.java
+++ b/src/main/java/com/zy/core/netty/cache/ChannelCache.java
@@ -20,44 +20,43 @@
private static Map<String, Channel> channelGroup = new ConcurrentHashMap<>();
- public static void setChannel(String uuid, Channel channel){
+ public static void setChannel(String uuid, Channel channel) {
// todo 缂撳瓨鏍囪 ===>> 鍒嗗竷寮忕郴缁�
// String hostName = SystemProperties.HOST_NAME;
- if (getChannel(uuid) == channel){
+ if (getChannel(uuid) == channel) {
return;
}
removeChannel(uuid);
channelGroup.put(uuid, channel);
}
- public static Channel getChannel(String uuid){
+ public static Channel getChannel(String uuid) {
return channelGroup.get(uuid);
}
public static void removeChannel(String uuid) {
Channel channel = getChannel(uuid);
- if (null == channel){
+ if (null == channel) {
return;
}
channelGroup.remove(uuid);
channel.close();
}
- public static String removeChannel(Channel channel){
+ public static String removeChannel(Channel channel) {
String key = null;
- for (Map.Entry<String, Channel> entry : channelGroup.entrySet()){
- if (entry.getValue() == channel){
+ for (Map.Entry<String, Channel> entry : channelGroup.entrySet()) {
+ if (entry.getValue() == channel) {
key = entry.getKey();
break;
}
}
- if (null != key){
+ if (null != key) {
channelGroup.remove(key);
return key;
}
return null;
}
-
}
diff --git a/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java b/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
index fc7f7a5..a134908 100644
--- a/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
+++ b/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
@@ -1,15 +1,10 @@
package com.zy.core.netty.handle;
-import com.core.common.Cools;
-import com.zy.core.Slave;
-import com.zy.core.cache.SlaveConnection;
-import com.zy.core.enums.SlaveType;
import com.zy.core.netty.AbstractInboundHandler;
import com.zy.core.netty.cache.ChannelCache;
import com.zy.core.netty.domain.ChPackage;
import com.zy.core.netty.properties.TcpProperties;
import com.zy.core.properties.SlaveProperties;
-import com.zy.core.thread.BarcodeThread;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
@@ -31,6 +26,19 @@
@Autowired
private TcpProperties tcpProperties;
+ /**
+ * 鏁版嵁涓嬭
+ */
+ public static void write(ChPackage chPackage) {
+ String uuid = chPackage.getUuid();
+ Channel channel = ChannelCache.getChannel(uuid);
+ if (null == channel) {
+ log.warn("閫氶亾uuid={} 涓嶅湪绾�", uuid);
+ return;
+ }
+ channel.writeAndFlush(chPackage);
+ }
+
@Override
protected boolean channelRead0(ChannelHandlerContext ctx, ChPackage pac) {
// log.info("璇荤爜鍣ㄣ�怚P:{}銆� 涓婅鏁版嵁 ===>> {}", pac.getIp(), pac.getAscii());
@@ -50,18 +58,5 @@
// }
return true;
- }
-
- /**
- * 鏁版嵁涓嬭
- */
- public static void write(ChPackage chPackage){
- String uuid = chPackage.getUuid();
- Channel channel = ChannelCache.getChannel(uuid);
- if (null == channel){
- log.warn("閫氶亾uuid={} 涓嶅湪绾�", uuid);
- return;
- }
- channel.writeAndFlush(chPackage);
}
}
diff --git a/src/main/java/com/zy/core/netty/handle/ProtectorHandler.java b/src/main/java/com/zy/core/netty/handle/ProtectorHandler.java
index ec0b43c..7dd862a 100644
--- a/src/main/java/com/zy/core/netty/handle/ProtectorHandler.java
+++ b/src/main/java/com/zy/core/netty/handle/ProtectorHandler.java
@@ -37,7 +37,7 @@
if (IdleState.READER_IDLE == e.state()) {
String uuid = ChannelCache.removeChannel(ctx.channel());
ctx.close();
- if (!Cools.isEmpty(uuid)){
+ if (!Cools.isEmpty(uuid)) {
log.info("uuid={} 绌洪棽鍓旈櫎", uuid);
}
}
@@ -51,7 +51,7 @@
public void channelInactive(ChannelHandlerContext ctx) {
String uuid = ChannelCache.removeChannel(ctx.channel());
ctx.close();
- if (!Cools.isEmpty(uuid)){
+ if (!Cools.isEmpty(uuid)) {
log.info("閫氶亾 uuid={} 澶卞幓杩炴帴", uuid);
}
}
diff --git a/src/main/java/com/zy/core/netty/handle/ProtocolDecoder.java b/src/main/java/com/zy/core/netty/handle/ProtocolDecoder.java
index 7cb12d7..fc37c72 100644
--- a/src/main/java/com/zy/core/netty/handle/ProtocolDecoder.java
+++ b/src/main/java/com/zy/core/netty/handle/ProtocolDecoder.java
@@ -19,7 +19,7 @@
private final SnowflakeIdWorker snowflakeIdWorker;
- public ProtocolDecoder(SnowflakeIdWorker snowflakeIdWorker){
+ public ProtocolDecoder(SnowflakeIdWorker snowflakeIdWorker) {
this.snowflakeIdWorker = snowflakeIdWorker;
}
@@ -27,11 +27,11 @@
@Override
protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> list) throws Exception {
int startMark = indexOfStartMark(in);
- if (startMark == -1){
+ if (startMark == -1) {
return;
}
// 鍘婚櫎鏃犵敤鍓嶇紑鎶ユ枃
- if (startMark != 0){
+ if (startMark != 0) {
in.readerIndex(startMark);
in.discardReadBytes();
}
@@ -46,7 +46,7 @@
list.add(analyzeProtocol(pac));
}
- public ChPackage analyzeProtocol(ChPackage pac){
+ public ChPackage analyzeProtocol(ChPackage pac) {
ByteBuf byteBuf = pac.getSourceBuff();
@@ -84,14 +84,14 @@
}
// 鑾峰彇鏍囪瘑浣嶄笅鏍�
- private int indexOfStartMark(ByteBuf inputBuffer){
+ private int indexOfStartMark(ByteBuf inputBuffer) {
int length = inputBuffer.writerIndex();
// 鎶ユ枃闀垮害鑷冲皯澶т簬2
if (length < 2) {
return -1;
}
int readerIndex = inputBuffer.readerIndex();
- for(int i = readerIndex; i < length - 1; i ++) {
+ for (int i = readerIndex; i < length - 1; i++) {
byte b1 = inputBuffer.getByte(i);
// "#" = b1
if (0x23 == b1) {
diff --git a/src/main/java/com/zy/core/netty/handle/ProtocolEncoder.java b/src/main/java/com/zy/core/netty/handle/ProtocolEncoder.java
index 4da18a9..68bb0fb 100644
--- a/src/main/java/com/zy/core/netty/handle/ProtocolEncoder.java
+++ b/src/main/java/com/zy/core/netty/handle/ProtocolEncoder.java
@@ -27,7 +27,7 @@
@Override
protected void encode(ChannelHandlerContext ctx, Object obj, ByteBuf out) {
boolean upgradeLog = true;
- if (obj instanceof ByteBuf){
+ if (obj instanceof ByteBuf) {
out.writeBytes((ByteBuf) obj);
} else if (obj instanceof byte[]) {
out.writeBytes((byte[]) obj);
diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index 00ffb2a..628053a 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -33,7 +33,7 @@
public void setBarcode(String barcode) {
this.barcode.delete(0, this.barcode.length());
this.barcode.append(barcode);
- if(!Cools.isEmpty(barcode)) {
+ if (!Cools.isEmpty(barcode)) {
log.info("{}鍙锋潯鐮佸櫒锛屾绱㈡暟鎹細{}", slave.getId(), this.barcode);
JSONObject jsonObject = new JSONObject();
jsonObject.put("time", DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 056c0e8..fcc9970 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -1,12 +1,9 @@
package com.zy.core.thread;
-import com.alibaba.fastjson.JSON;
-import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.CommandInfo;
import com.zy.asrs.service.CommandInfoService;
import com.zy.asrs.service.DeviceErrorService;
-import com.zy.common.entity.Parameter;
import com.zy.common.model.MatDto;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
@@ -28,7 +25,6 @@
import onbon.bx05.utils.DisplayStyleFactory;
import java.awt.*;
-import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -40,11 +36,11 @@
@Slf4j
public class LedThread implements Runnable, ThreadHandler {
- private Slave slave;
- private Bx5GScreenClient screen;
ProgramBxFile pf;
TextCaptionBxArea area;
DisplayStyleFactory.DisplayStyle[] styles = DisplayStyleFactory.getStyles().toArray(new DisplayStyleFactory.DisplayStyle[0]);
+ private Slave slave;
+ private Bx5GScreenClient screen;
private Set<Integer> workNos = new HashSet<>();
private boolean ledMk = false;
private boolean resetStatus = false; // 澶嶄綅鐘舵��
@@ -60,178 +56,18 @@
}
}
- @Override
- @SuppressWarnings({"InfiniteLoopStatement", "unchecked"})
- public void run() {
- connect();
- close();
- while (true) {
- try {
- Task task = MessageQueue.poll(SlaveType.Led, slave.getId());
- if (task != null) {
- switch (task.getStep()) {
- // 鍐欐暟鎹�
- case 1:
- write((List<LedCommand>)task.getData());
- break;
- // 澶嶄綅
- case 2:
- reset();
- break;
- default:
- break;
- }
- }
-
- Thread.sleep(400);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- private void write(List<LedCommand> list) throws Bx5GException {
- if (!connect()) {
- return;
- }
- pf = new ProgramBxFile( 0, screen.getProfile());
- pf.setFrameShow(false);
- // 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eight
- area = new TextCaptionBxArea( 0,0,96,48, screen.getProfile());
- // 鍒涘缓涓�涓暟鎹〉
- TextBxPage page = new TextBxPage();
- for (LedCommand command : list) {
- page.newLine(command.getTitle() +"锛�"+command.getWorkNo()+")");
- page.newLine("搴撲綅锛�"+ (command.getIoType() < 100 ? command.getLocNo() : command.getSourceLocNo()));
- page.newLine("鐩爣绔欙細"+command.getStaNo());
- if (!command.isEmptyMk()) {
- for (MatDto matDto : command.getMatDtos()) {
- //鍘绘帀灏忔暟鐐�
- String strQty = matDto.getCount().toString();
- int idx = strQty.lastIndexOf(".");
- if(idx >= 0){
- strQty.substring(0,idx);
- }
- page.newLine(matDto.getMaknx() + "[鏁伴噺" + strQty +"]");
-// page.newLine(matDto.getMaknx() + "銆愭暟閲�" + matDto.getCount() +"銆�");
- }
- }
- page.newLine("\n");
-
- //鏇存柊鎸囦护鐘舵��
- CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
- CommandInfo commandInfo = command.getCommandInfo();
- commandInfo.setCommandStatus(CommandStatusType.COMPLETE.id);
- commandInfoService.updateById(commandInfo);
- }
-
- // 璁剧疆瀛椾綋
- page.setFont(new Font("瀹嬩綋",Font.PLAIN,12));
- // 璁剧疆鏂囨湰棰滆壊
- page.setForeground(Color.red);
- // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
- page.setDisplayStyle(styles[6]);
- area.clearPages();
- area.addPage(page);
- pf.addArea(area);
- if (pf.validate() != null) {
- log.info("pf out of range");
- } else {
- // 鏇存柊鑺傜洰
- screen.writeProgram(pf);
-// resetStatus = false;
- }
- close();
- }
-
- private void reset() throws Bx5GException {
- if (!connect()) {
- return;
- }
-// if (resetStatus) {
-// return;
-// }
- pf = new ProgramBxFile( 0, screen.getProfile());
- pf.setFrameShow(false);
- // 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eight
- area = new TextCaptionBxArea( 0,0,96,48, screen.getProfile());
- // 鍒涘缓涓�涓暟鎹〉
- TextBxPage page = new TextBxPage();
-
-// List<String> list = null;
-// try {
-// String ledDefaultMsg = Parameter.get().getLedDefaultMsg();
-// list = JSON.parseArray(ledDefaultMsg, String.class);
-// } catch (Exception ignore) {
-// }
-// if (!Cools.isEmpty(list)) {
-// for (String str : list) {
-// page.newLine(str);
-// }
-// } else {
-// page.newLine("鑷姩鍖栫珛浣撲粨搴�");
-// page.newLine("瑗挎牸杩堣偂浠芥湁闄愬叕鍙�");
-// }
- page.newLine("鍔涙簮鏅鸿兘浠撳偍");
-
- // 璁剧疆瀛椾綋
- page.setFont(new Font("瀹嬩綋",Font.PLAIN,13));
- // 璁剧疆鏂囨湰棰滆壊
- page.setForeground(Color.red);
- // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
- page.setDisplayStyle(styles[6]);
- area.clearPages();
- area.addPage(page);
- pf.addArea(area);
- // 鏇存柊鑺傜洰
- if (pf.validate() != null) {
- log.info("pf out of range");
- } else {
- // 鏇存柊鑺傜洰
- screen.writeProgram(pf);
-// resetStatus = true;
- }
- close();
- }
-
- @Override
- public boolean connect() {
- boolean connRes = false;
- try {
- connRes = screen.connect(slave.getIp(),slave.getPort());
- screen.turnOn();
- } catch (Exception ignore) {
- }
- DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- if (connRes) {
- log.info("led杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- deviceErrorService.deleteDeviceError("led", slave.getId());
- } else {
- log.error("led杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- deviceErrorService.addDeviceError("led", slave.getId(), "led杩炴帴澶辫触");
- }
- return connRes;
- }
-
- @Override
- public void close() {
- screen.disconnect();
- }
-
-
-
public static void main(String[] args) throws Exception {
String strQty = "1234";
int index = strQty.lastIndexOf(".");
- if(index>=0) {
- strQty=strQty.substring(0, index);
+ if (index >= 0) {
+ strQty = strQty.substring(0, index);
}
- System.out.println("2==>>"+strQty);
+ System.out.println("2==>>" + strQty);
Bx5GEnv.initial(3000);
Bx5GScreenClient screen = new Bx5GScreenClient("my");
DisplayStyleFactory.DisplayStyle[] styles = DisplayStyleFactory.getStyles().toArray(new DisplayStyleFactory.DisplayStyle[0]);
- if (!screen.connect("192.168.10.101",5005)) {
+ if (!screen.connect("192.168.10.101", 5005)) {
System.err.println("杩炴帴澶辫触锛侊紒锛侊紒");
return;
}
@@ -241,10 +77,10 @@
while (true) {
Thread.sleep(5000L);
- ProgramBxFile pf = new ProgramBxFile( 0, screen.getProfile());
+ ProgramBxFile pf = new ProgramBxFile(0, screen.getProfile());
pf.setFrameShow(false);
// 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eigth
- TextCaptionBxArea area = new TextCaptionBxArea( 0,0,192,96,screen.getProfile());
+ TextCaptionBxArea area = new TextCaptionBxArea(0, 0, 192, 96, screen.getProfile());
// 鍒涘缓涓�涓暟鎹〉
// 绗竴琛屾暟鎹�
@@ -252,14 +88,14 @@
page.newLine("婧愬簱浣嶏細0100204");
page.newLine("鐩爣绔欙細1000");
// 璁剧疆瀛椾綋
- page.setFont( new Font("瀹嬩綋",Font.PLAIN,15));
+ page.setFont(new Font("瀹嬩綋", Font.PLAIN, 15));
// 璁剧疆鏂囨湰棰滆壊
page.setForeground(Color.red);
// 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
page.setDisplayStyle(styles[6]);
area.clearPages();
area.addPage(page);
- pf.addArea( area );
+ pf.addArea(area);
// 鏇存柊鑺傜洰
// 鏇存柊鑺傜洰
@@ -276,37 +112,6 @@
// screen.disconnect();
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
public static void main1(String[] args) throws Exception {
Bx5GEnv.initial(3000);
// 鍒涘缓screen瀵硅薄锛岀敤浜庡鎺у埗鍣ㄨ繘琛岃闂紝瀹㈡埛绔ā寮�
@@ -315,7 +120,7 @@
// Bx5GScreenRS screen = new Bx5GScreenRS("MyScreen");
// 鍦ㄥ鎺у埗鍣ㄤ氦浜掍箣鍓嶏紝闇�瑕佸厛涓庢帶鍒跺櫒寤虹珛杩炴帴
- boolean conn = screen.connect("192.168.10.61",5005);
+ boolean conn = screen.connect("192.168.10.61", 5005);
System.out.println(conn);
// 涓庢帶鍒跺櫒浜や簰瀹屾垚鍚庯紝闇�鏂紑涓庢帶鍒跺櫒涔嬮棿鐨勮繛鎺�
// screen.disconnect();
@@ -337,10 +142,9 @@
// // 瑙ｉ櫎閿佸畾灞忓箷褰撳墠鐢婚潰
// screen.unlock();
- Bx5GScreen.Result <ReturnControllerStatus> result1 =
+ Bx5GScreen.Result<ReturnControllerStatus> result1 =
screen.checkControllerStatus();
- if (result1.isOK())
- {
+ if (result1.isOK()) {
ReturnControllerStatus status = result1.reply;
System.out.println(status.getBrightness());
System.out.println(status.getRtcDay());
@@ -353,7 +157,7 @@
// 浠ヤ笅鏄潤鎬佸尯閮ㄥ垎 Demo
// 鍒涘缓鑺傜洰鏂囦欢
- ProgramBxFile pf = new ProgramBxFile( 0,screen.getProfile() );
+ ProgramBxFile pf = new ProgramBxFile(0, screen.getProfile());
// 鏄惁鏄剧ず鑺傜洰杈规
pf.setFrameShow(true);
// 鑺傜洰杈规鐨勭Щ鍔ㄩ�熷害
@@ -365,21 +169,21 @@
// 鍒涘缓涓�涓枃鏈尯
// 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eigth
// 娉ㄦ剰鍖哄煙鍧愭爣鍜屽搴﹂珮搴︼紝涓嶈瓒婄晫
- TextCaptionBxArea area = new TextCaptionBxArea( 0,0,160,64,screen.getProfile() );
+ TextCaptionBxArea area = new TextCaptionBxArea(0, 0, 160, 64, screen.getProfile());
// 鍒涘缓涓�涓暟鎹〉
// 绗竴琛屾暟鎹�
TextBxPage page = new TextBxPage("鍏ュ簱");
// 绗簩琛屾暟鎹�
- page.newLine( "鐗╂枡锛�" );
+ page.newLine("鐗╂枡锛�");
page.newLine("鎺ユ敹鍣� RX18 XH 6V 锛堟暟閲忥細2锛�");
page.newLine("涓帶 BM钃濈墮 鑻辨枃 6V 锛堟暟閲忥細1锛�");
page.newLine("绾挎潫 S2588-1-XX 鏃犲疄鐗╋紙鏁伴噺锛�5锛�");
page.newLine("鐩爣搴撲綅锛�0100204");
// 璁剧疆瀛椾綋
- page.setFont( new Font("瀹嬩綋",Font.PLAIN,12) );
+ page.setFont(new Font("瀹嬩綋", Font.PLAIN, 12));
// 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
- page.setDisplayStyle( styles[2] );
+ page.setDisplayStyle(styles[2]);
// 鏁版嵁椤靛彲浠ユ槸鍥剧墖
// ImageFileBxPage iPage = new ImageFileBxPage( "E;a/001.bmp" );
@@ -388,22 +192,14 @@
// TextFileBxPage tPage = new TextFileBxPage("E:a/001.txt");
// 灏嗗墠闈㈢殑page娣诲姞鍒癮rea涓� area涓彲浠ユ坊鍔犲涓猵age 鍏朵腑page鍙互鏄瓧绗︿覆锛屽彲浠ユ槸txt鏂囦欢锛屽彲浠ユ槸鍥剧墖锛屼笉鍙互鏄〃鏍硷紝濡傛灉闇�瑕丩ed灞忎笂鏄剧ず琛ㄦ牸锛岃鍏堝皢琛ㄦ牸缁樺埗鎴愬浘鐗�
- area.addPage( page );
+ area.addPage(page);
// area.addPage( iPage );
// area.addPage( tPage );
// 灏哸rea娣诲姞鍒拌妭鐩腑 鑺傜洰涓彲浠ユ坊鍔犲涓猘rea
- pf.addArea( area );
+ pf.addArea(area);
// 鏇存柊鑺傜洰
- screen.writeProgram( pf );
-
-
-
-
-
-
-
-
+ screen.writeProgram(pf);
//
@@ -463,4 +259,162 @@
}
+ @Override
+ @SuppressWarnings({"InfiniteLoopStatement", "unchecked"})
+ public void run() {
+ connect();
+ close();
+ while (true) {
+ try {
+ Task task = MessageQueue.poll(SlaveType.Led, slave.getId());
+ if (task != null) {
+ switch (task.getStep()) {
+ // 鍐欐暟鎹�
+ case 1:
+ write((List<LedCommand>) task.getData());
+ break;
+ // 澶嶄綅
+ case 2:
+ reset();
+ break;
+ default:
+ break;
+ }
+ }
+
+ Thread.sleep(400);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ private void write(List<LedCommand> list) throws Bx5GException {
+ if (!connect()) {
+ return;
+ }
+ pf = new ProgramBxFile(0, screen.getProfile());
+ pf.setFrameShow(false);
+ // 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eight
+ area = new TextCaptionBxArea(0, 0, 96, 48, screen.getProfile());
+ // 鍒涘缓涓�涓暟鎹〉
+ TextBxPage page = new TextBxPage();
+ for (LedCommand command : list) {
+ page.newLine(command.getTitle() + "锛�" + command.getWorkNo() + ")");
+ page.newLine("搴撲綅锛�" + (command.getIoType() < 100 ? command.getLocNo() : command.getSourceLocNo()));
+ page.newLine("鐩爣绔欙細" + command.getStaNo());
+ if (!command.isEmptyMk()) {
+ for (MatDto matDto : command.getMatDtos()) {
+ //鍘绘帀灏忔暟鐐�
+ String strQty = matDto.getCount().toString();
+ int idx = strQty.lastIndexOf(".");
+ if (idx >= 0) {
+ strQty.substring(0, idx);
+ }
+ page.newLine(matDto.getMaknx() + "[鏁伴噺" + strQty + "]");
+// page.newLine(matDto.getMaknx() + "銆愭暟閲�" + matDto.getCount() +"銆�");
+ }
+ }
+ page.newLine("\n");
+
+ //鏇存柊鎸囦护鐘舵��
+ CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
+ CommandInfo commandInfo = command.getCommandInfo();
+ commandInfo.setCommandStatus(CommandStatusType.COMPLETE.id);
+ commandInfoService.updateById(commandInfo);
+ }
+
+ // 璁剧疆瀛椾綋
+ page.setFont(new Font("瀹嬩綋", Font.PLAIN, 12));
+ // 璁剧疆鏂囨湰棰滆壊
+ page.setForeground(Color.red);
+ // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
+ page.setDisplayStyle(styles[6]);
+ area.clearPages();
+ area.addPage(page);
+ pf.addArea(area);
+ if (pf.validate() != null) {
+ log.info("pf out of range");
+ } else {
+ // 鏇存柊鑺傜洰
+ screen.writeProgram(pf);
+// resetStatus = false;
+ }
+ close();
+ }
+
+ private void reset() throws Bx5GException {
+ if (!connect()) {
+ return;
+ }
+// if (resetStatus) {
+// return;
+// }
+ pf = new ProgramBxFile(0, screen.getProfile());
+ pf.setFrameShow(false);
+ // 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eight
+ area = new TextCaptionBxArea(0, 0, 96, 48, screen.getProfile());
+ // 鍒涘缓涓�涓暟鎹〉
+ TextBxPage page = new TextBxPage();
+
+// List<String> list = null;
+// try {
+// String ledDefaultMsg = Parameter.get().getLedDefaultMsg();
+// list = JSON.parseArray(ledDefaultMsg, String.class);
+// } catch (Exception ignore) {
+// }
+// if (!Cools.isEmpty(list)) {
+// for (String str : list) {
+// page.newLine(str);
+// }
+// } else {
+// page.newLine("鑷姩鍖栫珛浣撲粨搴�");
+// page.newLine("瑗挎牸杩堣偂浠芥湁闄愬叕鍙�");
+// }
+ page.newLine("鍔涙簮鏅鸿兘浠撳偍");
+
+ // 璁剧疆瀛椾綋
+ page.setFont(new Font("瀹嬩綋", Font.PLAIN, 13));
+ // 璁剧疆鏂囨湰棰滆壊
+ page.setForeground(Color.red);
+ // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
+ page.setDisplayStyle(styles[6]);
+ area.clearPages();
+ area.addPage(page);
+ pf.addArea(area);
+ // 鏇存柊鑺傜洰
+ if (pf.validate() != null) {
+ log.info("pf out of range");
+ } else {
+ // 鏇存柊鑺傜洰
+ screen.writeProgram(pf);
+// resetStatus = true;
+ }
+ close();
+ }
+
+ @Override
+ public boolean connect() {
+ boolean connRes = false;
+ try {
+ connRes = screen.connect(slave.getIp(), slave.getPort());
+ screen.turnOn();
+ } catch (Exception ignore) {
+ }
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ if (connRes) {
+ log.info("led杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ deviceErrorService.deleteDeviceError("led", slave.getId());
+ } else {
+ log.error("led杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ deviceErrorService.addDeviceError("led", slave.getId(), "led杩炴帴澶辫触");
+ }
+ return connRes;
+ }
+
+ @Override
+ public void close() {
+ screen.disconnect();
+ }
+
}
diff --git a/src/main/java/com/zy/core/thread/ScaleThread.java b/src/main/java/com/zy/core/thread/ScaleThread.java
index 0dcae31..463ea9b 100644
--- a/src/main/java/com/zy/core/thread/ScaleThread.java
+++ b/src/main/java/com/zy/core/thread/ScaleThread.java
@@ -53,11 +53,11 @@
scale = Double.parseDouble(s.substring(1));
//灏嗙О閲嶉噸閲忓啓鍏ヨ澶囧熀纭�鏁版嵁涓殑gross_wt瀛楁
- if(scale > 20) {
+ if (scale > 20) {
BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
Integer staNo = slave.getId() == 1 ? 101 : 201;
BasDevp basDevp = basDevpService.selectById(staNo);
- if(!Cools.isEmpty(basDevp)) {
+ if (!Cools.isEmpty(basDevp)) {
basDevp.setGrossWt(scale);
if (null != basDevpService && !basDevpService.updateById(basDevp)) {
throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
@@ -110,26 +110,25 @@
public void close() {
try {
if (null != dataOutputStream) {
- dataOutputStream.close();
- }
- if (null != dataInputStream) {
- dataInputStream.close();
- }
+ dataOutputStream.close();
+ }
+ if (null != dataInputStream) {
+ dataInputStream.close();
+ }
// if (null != socket && !socket.isClosed()) {
// socket.close();
// }
- if (null != socket){
- socket.close();
- }
- socket = null;
+ if (null != socket) {
+ socket.close();
+ }
+ socket = null;
} catch (IOException e) {
log.error("SocketClient close Exception:" + e.getMessage());
}
}
public void write(byte[] msg, int len) throws IOException {
- if (null != dataInputStream)
- {
+ if (null != dataInputStream) {
dataOutputStream.write(msg, 0, len);
dataOutputStream.flush();
}
@@ -145,8 +144,8 @@
int len = dataInputStream.read(bytes);
byte[] tempBytes = null;
if (len > 0) {
- tempBytes = new byte[len];
- System.arraycopy(bytes, 0, tempBytes, 0, len);
+ tempBytes = new byte[len];
+ System.arraycopy(bytes, 0, tempBytes, 0, len);
}
return tempBytes;
}
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index b0cd878..300699e 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -17,15 +17,15 @@
import com.zy.core.CrnThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
-import com.zy.core.enums.*;
+import com.zy.core.enums.CommandStatusType;
+import com.zy.core.enums.CrnTaskModeType;
+import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.Task;
-import com.zy.core.model.command.CommandPackage;
import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.protocol.CrnProtocol;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import java.text.MessageFormat;
@@ -39,589 +39,47 @@
@Slf4j
public class SiemensCrnThread implements Runnable, CrnThread {
+ public static final List<Short> rowOne = new ArrayList<Short>() {{
+ add((short) 1);
+ add((short) 5);
+ add((short) 7);
+ add((short) 11);
+ add((short) 15);
+ add((short) 19);
+ }};
+ public static final List<Short> rowTwo = new ArrayList<Short>() {{
+ add((short) 2);
+ add((short) 6);
+ add((short) 8);
+ add((short) 12);
+ add((short) 16);
+ add((short) 20);
+ }};
+ public static final List<Short> rowThree = new ArrayList<Short>() {{
+ add((short) 3);
+ add((short) 9);
+ add((short) 13);
+ add((short) 17);
+ add((short) 21);
+ }};
+ public static final List<Short> rowFour = new ArrayList<Short>() {{
+ add((short) 4);
+ add((short) 10);
+ add((short) 14);
+ add((short) 18);
+ }};
private SiemensS7Net siemensNet;
private CrnSlave slave;
private CrnProtocol crnProtocol;
private boolean resetFlag = false;
-
@Value("${wms.url}")
private String wmsUrl;
- public static final List<Short> rowOne = new ArrayList<Short>() {{
- add((short) 1);add((short) 5);add((short) 7);add((short) 11);add((short) 15);add((short) 19);
- }};
- public static final List<Short> rowTwo = new ArrayList<Short>() {{
- add((short) 2);add((short) 6);add((short) 8);add((short) 12);add((short) 16);add((short) 20);
- }};
- public static final List<Short> rowThree = new ArrayList<Short>() {{
- add((short) 3);add((short) 9);add((short) 13);add((short) 17);add((short) 21);
- }};
- public static final List<Short> rowFour = new ArrayList<Short>() {{
- add((short) 4);add((short) 10);add((short) 14);add((short) 18);
- }};
public SiemensCrnThread(CrnSlave slave) {
this.slave = slave;
}
- @Override
- @SuppressWarnings("InfiniteLoopStatement")
- public void run() {
- initCrnProtocol();
- this.connect();
- while (true) {
- try {
- int step = 1;
- Task task = MessageQueue.poll(SlaveType.Crn, slave.getId());
- if (task != null) {
- step = task.getStep();
- }
- switch (step) {
- // 璇绘暟鎹�
- case 1:
- readStatus();
- break;
- // 鍐欏叆鏁版嵁
- case 2:
- write5((CrnCommand) task.getData());
- break;
- // 澶嶄綅
- case 3:
- CrnCommand command = (CrnCommand) task.getData();
- if (null == command) {
- command = new CrnCommand();
- }
- command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
- command.setTaskNo((short) 0); // 宸ヤ綔鍙�
- command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
- command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
- command.setSourcePosX((short)0); // 婧愬簱浣嶆帓
- command.setSourcePosY((short)0); // 婧愬簱浣嶅垪
- command.setSourcePosZ((short)0); // 婧愬簱浣嶅眰
- command.setDestinationPosX((short)0); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
- write(command);
- break;
- case 4:
- writeAuto((CrnCommand) task.getData());
- break;
- case 5:
- write((CrnCommand) task.getData());
- break;
- default:
- break;
- }
- Thread.sleep(500);
- } catch (Exception e) {
-// e.printStackTrace();
- }
-
- }
- }
-
- /**
- * 鍒濆鍖栧爢鍨涙満
- */
- private void initCrnProtocol(){
- crnProtocol = new CrnProtocol();
- crnProtocol.setMode((short) 0);
- crnProtocol.setStatus((short) 0);
- crnProtocol.setTaskNo((short) 0);
- crnProtocol.setTaskFinish((short) 0);
- crnProtocol.setValid((short) 0);
- crnProtocol.setBay((short) 0);
- crnProtocol.setLevel((short) 0);
- crnProtocol.setRow((short) 0);
- crnProtocol.setLane((short) 0);
- }
-
- @Override
- public boolean connect() {
- boolean result = false;
- siemensNet = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
- siemensNet.setRack(slave.getRack().byteValue());
- siemensNet.setSlot(slave.getSlot().byteValue());
- OperateResult connect = siemensNet.ConnectServer();
- if(connect.IsSuccess){
- result = true;
- OutputQueue.CRN.offer(MessageFormat.format( "銆恵0}銆戝爢鍨涙満plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- log.info("鍫嗗灈鏈簆lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
- } else {
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝爢鍨涙満plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- log.error("鍫嗗灈鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
-// DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
-// deviceErrorService.addDeviceError("crn", slave.getId(), "鍫嗗灈鏈簆lc杩炴帴澶辫触");
- initCrnProtocol();
- }
-// siemensNet.ConnectClose();
- return result;
- }
-
- /**
- * 璇诲彇鐘舵��
- */
- private void readStatus(){
-
- OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
- if (result.IsSuccess) {
- if (null == crnProtocol) {
- crnProtocol = new CrnProtocol();
- }
- crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
- crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2));
- crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4));
- crnProtocol.setBay(siemensNet.getByteTransform().TransInt16(result.Content, 6));
- crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 8));
- crnProtocol.setForkPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
- crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
- crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 14));
- crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 16));
- crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 18));
-// crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
-// crnProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 22));
-// crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
-// crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));
- crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 28));
- crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 32));
- crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 36));
- crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 40));
- crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 44));
- crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48));
- crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
-
-
-
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
-
- // 澶嶄綅淇″彿
- if (crnProtocol.getTaskFinish() == 0) {
- if (resetFlag) {
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setAckFinish((short)1);
- if (write(crnCommand)) {
- resetFlag = false;
-
- //鍫嗗灈鏈轰换鍔″畬鎴愬悗璁块棶wms璇锋眰浠诲姟瀹屾垚 locationDone 璐т綅澶勭悊瀹屾垚
- TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
- TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("wrk_no",crnProtocol.getTaskNo()));
- String tasktype = null;
- switch (taskWrk.getIoType()){
- case 1:
- tasktype= "RK";
- break;
- case 2:
- tasktype= "CK";
- break;
- case 3:
- tasktype= "YK";
- break;
- default:
- tasktype= "鏈煡";
- }
- Map<String, Object> map = new HashMap<>();
- map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
- TaskOverToWms taskOverToWms = new TaskOverToWms();
- taskOverToWms.setFeedbackFrom("WCS"); //鏉ユ簮
- taskOverToWms.setWarehouseId("1688469798893297665"); //浠撳簱鏍囪瘑
- taskOverToWms.setTaskNo(taskWrk.getTaskNo()); //浠诲姟鍙�
- taskOverToWms.setTaskType(tasktype); // 浠诲姟绫诲瀷
- taskOverToWms.setContainerCode(taskWrk.getBarcode()); // 瀹瑰櫒缂栫爜
- if (taskWrk.getIoType() ==1){
- taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //璁惧缂栫爜
- taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //鐩爣搴撲綅
- }else if (taskWrk.getIoType() ==2){
- Map<Integer,String> map1 = new HashMap<>();
- map1.put(102,"J-1101");
- map1.put(106,"J-1103");
- map1.put(110,"J-1105");
- map1.put(114,"J-1107");
- map1.put(118,"J-1109");
- map1.put(122,"J-1111");
- map1.put(305,"H-1101");
- map1.put(405,"G-1101");
- taskOverToWms.setEquipmentCode(map1.get(taskWrk.getTargetPoint())); //璁惧缂栫爜
- taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint()); //婧愬簱浣�
- } else if (taskWrk.getIoType() == 3) {
- taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //璁惧缂栫爜
- taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint());
- taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //鐩爣搴撲綅
- }
- taskOverToWms.setTaskStatus("location_done"); //浠诲姟鐘舵��
- String response = null;
- try {
- response = new HttpHandler.Builder()
- .setHeaders(map)
- .setUri("10.32.53.195:8080")
- .setPath("wcsManager/wcsInterface/taskStatusFeedback")
- .setJson(JSON.toJSONString(taskOverToWms))
- .build()
- .doPost();
- }catch (Exception e){
- log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛澶辫触");
- }
- ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
- apiLogService.save("Wms浠诲姟瀹屾垚鎺ュ彛"
- ,"10.32.53.195:8080"+"/wcsManager/wcsInterface/taskStatusFeedback"
- ,null
- ,"127.0.0.1"
- ,JSON.toJSONString(taskOverToWms)
- ,response
- ,true
- );
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)){
- if (taskWrk.getIoType() == 3){
- taskWrk.setWrkSts(4);
- }
- taskWrk.setStatus(5);
- if (!taskWrkService.update(taskWrk,new EntityWrapper<TaskWrk>().eq("wrk_no",crnProtocol.getTaskNo()))){
- log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝鏀瑰彉浠诲姟鐘舵�佸け璐�");
- }
-
- log.info("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛鎴愬姛");
- }else {
- log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛瀹屾垚锛屼絾杩斿洖澶辫触");
- }
-
- }
-
-
-
- }
- }
-
- try {
- // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
- BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
- BasCrnp basCrnp = new BasCrnp();
- basCrnp.setCrnNo(slave.getId());
- basCrnp.setCrnSts((int)crnProtocol.getMode());
- if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
- log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
- }
- } catch (Exception ignore){}
-
- DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.deleteDeviceError("crn", slave.getId());
- } else {
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
- DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("crn", slave.getId(), "璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐�");
- }
- }
-
- /**
- * 鍐欏叆鏁版嵁
- */
- private boolean write(CrnCommand command){
- if (null == command) {
- log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
- return false;
- }
- //杞崲鍓嶅厠闅嗕竴浠�
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setCrnNo(command.getCrnNo());
- crnCommand.setAckFinish(command.getAckFinish());
- crnCommand.setTaskNo(command.getTaskNo());
- crnCommand.setTaskMode(command.getTaskMode());
- crnCommand.setSourcePosX(command.getSourcePosX());
- crnCommand.setSourcePosY(command.getSourcePosY());
- crnCommand.setSourcePosZ(command.getSourcePosZ());
- crnCommand.setDestinationPosX(command.getDestinationPosX());
- crnCommand.setDestinationPosY(command.getDestinationPosY());
- crnCommand.setDestinationPosZ(command.getDestinationPosZ());
-// crnCommand.setSourceStaNo(command.getSourceStaNo());
-// crnCommand.setDestinationStaNo(command.getDestinationStaNo());
- crnCommand.setCommand(command.getCommand());
- if (command.getTaskNo() == 0 && command.getAckFinish() == 0 && command.getAuto() != 1) {
- command.setTaskNo((short) 999);
- }
-
- command.setCrnNo(slave.getId());
- short[] array = new short[10];
- array[0] = command.getAckFinish();
- array[1] = command.getTaskNo();
- array[2] = command.getTaskMode();
- array[3] = command.getSourcePosX();
- array[4] = command.getSourcePosY();
- array[5] = command.getSourcePosZ();
- array[6] = command.getDestinationPosX();
- array[7] = command.getDestinationPosY();
- array[8] = command.getDestinationPosZ();
- array[9] = command.getCommand();
-
- // 浣滀笟淇℃伅
- OperateResult result = siemensNet.Write("DB100.0", array);
-
-
- if (result.IsSuccess) {
- log.warn("鍫嗗灈鏈哄懡浠や笅鍙慬id:{},鏃堕棿锛歿}] >>>>> {}", slave.getId(), DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F), JSON.toJSON(command));
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
- return true;
- } else {
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
- return false;
- }
- }
-
- /**
- * 鍐欏叆鏁版嵁
- */
- private boolean write5(CrnCommand command) throws InterruptedException {
- String methodName = Thread.currentThread().getStackTrace()[1].getMethodName();
-
- if (null == command) {
- log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
- return false;
- }
-// convertRow(command);
- command.setCrnNo(slave.getId());
- short[] array = new short[10];
- array[0] = command.getAckFinish();
- array[1] = command.getTaskNo();
- array[2] = command.getTaskMode();
- array[3] = command.getSourcePosX();
- array[4] = command.getSourcePosY();
- array[5] = command.getSourcePosZ();
- array[6] = command.getDestinationPosX();
- array[7] = command.getDestinationPosY();
- array[8] = command.getDestinationPosZ();
-// array[9] = command.getSourceStaNo();
-// array[10] = command.getDestinationStaNo();
- array[9] = command.getCommand();
-
- OperateResult result = siemensNet.Write("DB100.0", array);
-
- int i=0;
- do{
- //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
- Thread.sleep(200);
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
- if (resultRead.IsSuccess) {
- CrnCommand one = new CrnCommand();
- one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
- one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
- one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
- one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
- one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
- one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
- one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
- one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
- if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode())
- || !command.getSourcePosX().equals(one.getSourcePosX()) || !command.getSourcePosY().equals(one.getSourcePosY())
- || !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
- || !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
- ){
- i++;
- log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}]>>>>閲嶅啓[{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), i,JSON.toJSON(command),JSON.toJSON(one));
- result = siemensNet.Write("DB100.0", array);
- }else{
- i=5;
- }
- }
- }while(i<5);
-
-
- try {
- // 鏃ュ織璁板綍
- BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
- BasCrnOpt basCrnOpt = new BasCrnOpt(
- command.getTaskNo().intValue(), // 浠诲姟鍙�
- command.getCrnNo(), // 鍫嗗灈鏈篬闈炵┖]
- new Date(), // 涓嬪彂鏃堕棿
- command.getTaskModeType().toString(), // 妯″紡
- command.getSourcePosX().intValue(), // 婧愭帓
- command.getSourcePosY().intValue(), // 婧愬垪
- command.getSourcePosZ().intValue(), // 婧愬眰
- null, // 婧愮珯
- command.getDestinationPosX().intValue(), // 鐩爣鎺�
- command.getDestinationPosY().intValue(), // 鐩爣鍒�
- command.getDestinationPosZ().intValue(), // 鐩爣灞�
- null, // 鐩爣绔�
- null, // 鍝嶅簲缁撴灉
- null, // 淇敼鏃堕棿
- null // 淇敼浜哄憳
- );
- bean.insert(basCrnOpt);
- } catch (Exception ignore) {}
-
- if (result != null && result.IsSuccess) {
- Thread.sleep(200);
- this.readStatus();
- log.info(methodName + ":鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
- return true;
- } else {
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- log.error(methodName + ":鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- return false;
- }
- }
-
- /**
- * 鍐欏叆鏁版嵁
- */
- private boolean write2(CrnCommand command){
- if (null == command) {
- log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
- return false;
- }
- //杞崲鍓嶅厠闅嗕竴浠�
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setCrnNo(command.getCrnNo());
- crnCommand.setAckFinish(command.getAckFinish());
- crnCommand.setTaskNo(command.getTaskNo());
- crnCommand.setTaskMode(command.getTaskMode());
- crnCommand.setSourcePosX(command.getSourcePosX());
- crnCommand.setSourcePosY(command.getSourcePosY());
- crnCommand.setSourcePosZ(command.getSourcePosZ());
- crnCommand.setDestinationPosX(command.getDestinationPosX());
- crnCommand.setDestinationPosY(command.getDestinationPosY());
- crnCommand.setDestinationPosZ(command.getDestinationPosZ());
-// crnCommand.setSourceStaNo(command.getSourceStaNo());
-// crnCommand.setDestinationStaNo(command.getDestinationStaNo());
- crnCommand.setCommand(command.getCommand());
- if (command.getTaskNo() == 0 && command.getAckFinish() == 0 && command.getAuto() != 1) {
- command.setTaskNo((short) 999);
- }
-
- command.setCrnNo(slave.getId());
- short[] array = new short[10];
- if (Cools.isEmpty(command.getAckFinish())) {
- array[0] = 5;
- } else {
- array[0] = command.getAckFinish();
- }
- array[1] = command.getTaskNo();
- array[2] = command.getTaskMode();
- array[3] = command.getSourcePosX();
- array[4] = command.getSourcePosY();
- array[5] = command.getSourcePosZ();
- array[6] = command.getDestinationPosX();
- array[7] = command.getDestinationPosY();
- array[8] = command.getDestinationPosZ();
- array[9] = command.getCommand();
- // 浣滀笟淇℃伅
- OperateResult result = siemensNet.Write("DB100.0", array);
- // 鏃ュ織璁板綍
- if (command.getAckFinish() != 1) {
- BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
- BasCrnOpt basCrnOpt = new BasCrnOpt(
- command.getTaskNo().intValue(), // 浠诲姟鍙�
- command.getCrnNo(), // 鍫嗗灈鏈篬闈炵┖]
- new Date(), // 涓嬪彂鏃堕棿
- command.getTaskModeType() == null ? null : command.getTaskModeType().toString(), // 妯″紡
- command.getSourcePosX().intValue(), // 婧愭帓
- command.getSourcePosY().intValue(), // 婧愬垪
- command.getSourcePosZ().intValue(), // 婧愬眰
- null, // 婧愮珯
- command.getDestinationPosX().intValue(), // 鐩爣鎺�
- command.getDestinationPosY().intValue(), // 鐩爣鍒�
- command.getDestinationPosZ().intValue(), // 鐩爣灞�
- null, // 鐩爣绔�
- null, // 鍝嶅簲缁撴灉
- null, // 淇敼鏃堕棿
- null // 淇敼浜哄憳
- );
- bean.insert(basCrnOpt);
- }
-// } catch (Exception ignore) {}
-
- //鏇存柊鍛戒护鏃ュ織
- CommandInfoLogService commandInfoLogService = SpringUtils.getBean(CommandInfoLogService.class);
- CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
- CommandInfo commandInfo = commandInfoService.selectById(command.getCommandId());
- if (Cools.isEmpty(commandInfo)){
- commandInfo = commandInfoService.selectOne(new EntityWrapper<CommandInfo>()
- .eq("wrk_no",crnProtocol.getTaskNo())
- .eq("device","Crn"));
- }
- CommandInfoLog commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
- commandInfoLog.setId(null);
- if (result.IsSuccess) {
- Date now = new Date();
- //鏇存柊鎸囦护鏃ュ織
- commandInfoLog.setDeviceLog("鎸囦护涓嬪彂鎴愬姛");
- commandInfoLogService.insert(commandInfoLog);
-
- //绾跨▼鏆傚瓨鎸囦护ID
- crnProtocol.setCommandId(command.getCommandId());
-
- //鏇存柊鎸囦护鐘舵��
- commandInfo.setCommandStatus(CommandStatusType.EXECUTE.id);//鎵ц涓�
- commandInfo.setExecuteTime(now);
- commandInfoService.updateById(commandInfo);
-
- //鏇存柊浠诲姟姝ュ簭
- TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
- TaskWrk taskWrk = taskWrkService.selectByWrkNo(command.getTaskNo().intValue());
- if (taskWrk != null) {
- taskWrk.setCommandStep(taskWrk.getCommandStep() + 1);//鏇存柊鎸囦护姝ュ簭
- taskWrkService.updateById(taskWrk);
- }
-
-
- } else {
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
- }
- return true;
- }
-
- private boolean writeAuto(CrnCommand command){
- if (null == command) {
- log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
- return false;
- }
- OperateResult result = new OperateResult();
- short[] array = new short[1];
- array[0] = command.getAuto();
- if(command.getAuto() !=0){
- array[0] = command.getAuto();
- result = siemensNet.Write("DB103.0", array);
- }else if (command.getOnlineWrk1() != 0){
- array[0] = command.getOnlineWrk1();
- result = siemensNet.Write("DB103.2", array);
- }else if (command.getOnlineWrk2() !=0){
- array[0] = command.getOnlineWrk2();
- result = siemensNet.Write("DB103.4", array);
- }else if (command.getOnlineWrk3() != 0){
- array[0] = command.getOnlineWrk3();
- result = siemensNet.Write("DB103.6", array);
- }else if (command.getOnlineWrk4() != 0){
- array[0] = command.getOnlineWrk4();
- result = siemensNet.Write("DB103.8", array);
- } else if (command.getReset() != 0) {
- array[0] = command.getReset();
- result = siemensNet.Write("DB103.10", array);
- }
-
-
- if (result.IsSuccess) {
- log.warn("鍫嗗灈鏈哄懡浠や笅鍙慬id:{},鏃堕棿锛歿}] >>>>> {}", slave.getId(), DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F), JSON.toJSON(command));
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
-
-
-
- return true;
- } else {
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
-
- return false;
- }
- }
-
- @Override
- public void close() {
- siemensNet.ConnectClose();
- }
-
- /******************************************************************************************/
- /**************************************** 娴嬭瘯涓撶敤 *****************************************/
/*****************************************************************************************/
public static void main(String[] args) throws InterruptedException {
CrnSlave slave = new CrnSlave();
@@ -735,4 +193,562 @@
}
+ @Override
+ @SuppressWarnings("InfiniteLoopStatement")
+ public void run() {
+ initCrnProtocol();
+ this.connect();
+ while (true) {
+ try {
+ int step = 1;
+ Task task = MessageQueue.poll(SlaveType.Crn, slave.getId());
+ if (task != null) {
+ step = task.getStep();
+ }
+ switch (step) {
+ // 璇绘暟鎹�
+ case 1:
+ readStatus();
+ break;
+ // 鍐欏叆鏁版嵁
+ case 2:
+ write5((CrnCommand) task.getData());
+ break;
+ // 澶嶄綅
+ case 3:
+ CrnCommand command = (CrnCommand) task.getData();
+ if (null == command) {
+ command = new CrnCommand();
+ }
+ command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
+ command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
+ command.setSourcePosX((short) 0); // 婧愬簱浣嶆帓
+ command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
+ command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
+ command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞�
+ write(command);
+ break;
+ case 4:
+ writeAuto((CrnCommand) task.getData());
+ break;
+ case 5:
+ write((CrnCommand) task.getData());
+ break;
+ default:
+ break;
+ }
+ Thread.sleep(500);
+ } catch (Exception e) {
+// e.printStackTrace();
+ }
+
+ }
+ }
+
+ /**
+ * 鍒濆鍖栧爢鍨涙満
+ */
+ private void initCrnProtocol() {
+ crnProtocol = new CrnProtocol();
+ crnProtocol.setMode((short) 0);
+ crnProtocol.setStatus((short) 0);
+ crnProtocol.setTaskNo((short) 0);
+ crnProtocol.setTaskFinish((short) 0);
+ crnProtocol.setValid((short) 0);
+ crnProtocol.setBay((short) 0);
+ crnProtocol.setLevel((short) 0);
+ crnProtocol.setRow((short) 0);
+ crnProtocol.setLane((short) 0);
+ }
+
+ @Override
+ public boolean connect() {
+ boolean result = false;
+ siemensNet = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
+ siemensNet.setRack(slave.getRack().byteValue());
+ siemensNet.setSlot(slave.getSlot().byteValue());
+ OperateResult connect = siemensNet.ConnectServer();
+ if (connect.IsSuccess) {
+ result = true;
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝爢鍨涙満plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+ log.info("鍫嗗灈鏈簆lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ } else {
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝爢鍨涙満plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+ log.error("鍫嗗灈鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+// DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+// deviceErrorService.addDeviceError("crn", slave.getId(), "鍫嗗灈鏈簆lc杩炴帴澶辫触");
+ initCrnProtocol();
+ }
+// siemensNet.ConnectClose();
+ return result;
+ }
+
+ /**
+ * 璇诲彇鐘舵��
+ */
+ private void readStatus() {
+
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
+ if (result.IsSuccess) {
+ if (null == crnProtocol) {
+ crnProtocol = new CrnProtocol();
+ }
+ crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
+ crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2));
+ crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4));
+ crnProtocol.setBay(siemensNet.getByteTransform().TransInt16(result.Content, 6));
+ crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 8));
+ crnProtocol.setForkPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
+ crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
+ crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 14));
+ crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 16));
+ crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 18));
+// crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
+// crnProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 22));
+// crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
+// crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));
+ crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 28));
+ crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 32));
+ crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 36));
+ crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 40));
+ crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 44));
+ crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48));
+ crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
+
+
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
+
+ // 澶嶄綅淇″彿
+ if (crnProtocol.getTaskFinish() == 0) {
+ if (resetFlag) {
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setAckFinish((short) 1);
+ if (write(crnCommand)) {
+ resetFlag = false;
+
+ //鍫嗗灈鏈轰换鍔″畬鎴愬悗璁块棶wms璇锋眰浠诲姟瀹屾垚 locationDone 璐т綅澶勭悊瀹屾垚
+ TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
+ TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("wrk_no", crnProtocol.getTaskNo()));
+ String tasktype = null;
+ switch (taskWrk.getIoType()) {
+ case 1:
+ tasktype = "RK";
+ break;
+ case 2:
+ tasktype = "CK";
+ break;
+ case 3:
+ tasktype = "YK";
+ break;
+ default:
+ tasktype = "鏈煡";
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("x-api-key", "7a15b5db-29b6-552c-8cff-0cfec3756da2");
+ TaskOverToWms taskOverToWms = new TaskOverToWms();
+ taskOverToWms.setFeedbackFrom("WCS"); //鏉ユ簮
+ taskOverToWms.setWarehouseId("1688469798893297665"); //浠撳簱鏍囪瘑
+ taskOverToWms.setTaskNo(taskWrk.getTaskNo()); //浠诲姟鍙�
+ taskOverToWms.setTaskType(tasktype); // 浠诲姟绫诲瀷
+ taskOverToWms.setContainerCode(taskWrk.getBarcode()); // 瀹瑰櫒缂栫爜
+ if (taskWrk.getIoType() == 1) {
+ taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //璁惧缂栫爜
+ taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //鐩爣搴撲綅
+ } else if (taskWrk.getIoType() == 2) {
+ Map<Integer, String> map1 = new HashMap<>();
+ map1.put(102, "J-1101");
+ map1.put(106, "J-1103");
+ map1.put(110, "J-1105");
+ map1.put(114, "J-1107");
+ map1.put(118, "J-1109");
+ map1.put(122, "J-1111");
+ map1.put(305, "H-1101");
+ map1.put(405, "G-1101");
+ taskOverToWms.setEquipmentCode(map1.get(taskWrk.getTargetPoint())); //璁惧缂栫爜
+ taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint()); //婧愬簱浣�
+ } else if (taskWrk.getIoType() == 3) {
+ taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //璁惧缂栫爜
+ taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint());
+ taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //鐩爣搴撲綅
+ }
+ taskOverToWms.setTaskStatus("location_done"); //浠诲姟鐘舵��
+ String response = null;
+ try {
+ response = new HttpHandler.Builder()
+ .setHeaders(map)
+ .setUri("10.32.53.195:8080")
+ .setPath("wcsManager/wcsInterface/taskStatusFeedback")
+ .setJson(JSON.toJSONString(taskOverToWms))
+ .build()
+ .doPost();
+ } catch (Exception e) {
+ log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛澶辫触");
+ }
+ ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
+ apiLogService.save("Wms浠诲姟瀹屾垚鎺ュ彛"
+ , "10.32.53.195:8080" + "/wcsManager/wcsInterface/taskStatusFeedback"
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(taskOverToWms)
+ , response
+ , true
+ );
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
+ if (taskWrk.getIoType() == 3) {
+ taskWrk.setWrkSts(4);
+ }
+ taskWrk.setStatus(5);
+ if (!taskWrkService.update(taskWrk, new EntityWrapper<TaskWrk>().eq("wrk_no", crnProtocol.getTaskNo()))) {
+ log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝鏀瑰彉浠诲姟鐘舵�佸け璐�");
+ }
+
+ log.info("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛鎴愬姛");
+ } else {
+ log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛瀹屾垚锛屼絾杩斿洖澶辫触");
+ }
+
+ }
+
+
+ }
+ }
+
+ try {
+ // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
+ BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
+ BasCrnp basCrnp = new BasCrnp();
+ basCrnp.setCrnNo(slave.getId());
+ basCrnp.setCrnSts((int) crnProtocol.getMode());
+ if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))) {
+ log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ }
+ } catch (Exception ignore) {
+ }
+
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.deleteDeviceError("crn", slave.getId());
+ } else {
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+ log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("crn", slave.getId(), "璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐�");
+ }
+ }
+
+ /**
+ * 鍐欏叆鏁版嵁
+ */
+ private boolean write(CrnCommand command) {
+ if (null == command) {
+ log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+ return false;
+ }
+ //杞崲鍓嶅厠闅嗕竴浠�
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setCrnNo(command.getCrnNo());
+ crnCommand.setAckFinish(command.getAckFinish());
+ crnCommand.setTaskNo(command.getTaskNo());
+ crnCommand.setTaskMode(command.getTaskMode());
+ crnCommand.setSourcePosX(command.getSourcePosX());
+ crnCommand.setSourcePosY(command.getSourcePosY());
+ crnCommand.setSourcePosZ(command.getSourcePosZ());
+ crnCommand.setDestinationPosX(command.getDestinationPosX());
+ crnCommand.setDestinationPosY(command.getDestinationPosY());
+ crnCommand.setDestinationPosZ(command.getDestinationPosZ());
+// crnCommand.setSourceStaNo(command.getSourceStaNo());
+// crnCommand.setDestinationStaNo(command.getDestinationStaNo());
+ crnCommand.setCommand(command.getCommand());
+ if (command.getTaskNo() == 0 && command.getAckFinish() == 0 && command.getAuto() != 1) {
+ command.setTaskNo((short) 999);
+ }
+
+ command.setCrnNo(slave.getId());
+ short[] array = new short[10];
+ array[0] = command.getAckFinish();
+ array[1] = command.getTaskNo();
+ array[2] = command.getTaskMode();
+ array[3] = command.getSourcePosX();
+ array[4] = command.getSourcePosY();
+ array[5] = command.getSourcePosZ();
+ array[6] = command.getDestinationPosX();
+ array[7] = command.getDestinationPosY();
+ array[8] = command.getDestinationPosZ();
+ array[9] = command.getCommand();
+
+ // 浣滀笟淇℃伅
+ OperateResult result = siemensNet.Write("DB100.0", array);
+
+
+ if (result.IsSuccess) {
+ log.warn("鍫嗗灈鏈哄懡浠や笅鍙慬id:{},鏃堕棿锛歿}] >>>>> {}", slave.getId(), DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F), JSON.toJSON(command));
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
+ return true;
+ } else {
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+ log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ return false;
+ }
+ }
+
+ /**
+ * 鍐欏叆鏁版嵁
+ */
+ private boolean write5(CrnCommand command) throws InterruptedException {
+ String methodName = Thread.currentThread().getStackTrace()[1].getMethodName();
+
+ if (null == command) {
+ log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+ return false;
+ }
+// convertRow(command);
+ command.setCrnNo(slave.getId());
+ short[] array = new short[10];
+ array[0] = command.getAckFinish();
+ array[1] = command.getTaskNo();
+ array[2] = command.getTaskMode();
+ array[3] = command.getSourcePosX();
+ array[4] = command.getSourcePosY();
+ array[5] = command.getSourcePosZ();
+ array[6] = command.getDestinationPosX();
+ array[7] = command.getDestinationPosY();
+ array[8] = command.getDestinationPosZ();
+// array[9] = command.getSourceStaNo();
+// array[10] = command.getDestinationStaNo();
+ array[9] = command.getCommand();
+
+ OperateResult result = siemensNet.Write("DB100.0", array);
+
+ int i = 0;
+ do {
+ //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
+ if (resultRead.IsSuccess) {
+ CrnCommand one = new CrnCommand();
+ one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
+ one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
+ one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
+ one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
+ one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
+ one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
+ one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
+ one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
+ if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode())
+ || !command.getSourcePosX().equals(one.getSourcePosX()) || !command.getSourcePosY().equals(one.getSourcePosY())
+ || !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
+ || !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
+ ) {
+ i++;
+ log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}]>>>>閲嶅啓[{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), i, JSON.toJSON(command), JSON.toJSON(one));
+ result = siemensNet.Write("DB100.0", array);
+ } else {
+ i = 5;
+ }
+ }
+ } while (i < 5);
+
+
+ try {
+ // 鏃ュ織璁板綍
+ BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
+ BasCrnOpt basCrnOpt = new BasCrnOpt(
+ command.getTaskNo().intValue(), // 浠诲姟鍙�
+ command.getCrnNo(), // 鍫嗗灈鏈篬闈炵┖]
+ new Date(), // 涓嬪彂鏃堕棿
+ command.getTaskModeType().toString(), // 妯″紡
+ command.getSourcePosX().intValue(), // 婧愭帓
+ command.getSourcePosY().intValue(), // 婧愬垪
+ command.getSourcePosZ().intValue(), // 婧愬眰
+ null, // 婧愮珯
+ command.getDestinationPosX().intValue(), // 鐩爣鎺�
+ command.getDestinationPosY().intValue(), // 鐩爣鍒�
+ command.getDestinationPosZ().intValue(), // 鐩爣灞�
+ null, // 鐩爣绔�
+ null, // 鍝嶅簲缁撴灉
+ null, // 淇敼鏃堕棿
+ null // 淇敼浜哄憳
+ );
+ bean.insert(basCrnOpt);
+ } catch (Exception ignore) {
+ }
+
+ if (result != null && result.IsSuccess) {
+ Thread.sleep(200);
+ this.readStatus();
+ log.info(methodName + ":鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
+ return true;
+ } else {
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
+ log.error(methodName + ":鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ return false;
+ }
+ }
+
+ /**
+ * 鍐欏叆鏁版嵁
+ */
+ private boolean write2(CrnCommand command) {
+ if (null == command) {
+ log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+ return false;
+ }
+ //杞崲鍓嶅厠闅嗕竴浠�
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setCrnNo(command.getCrnNo());
+ crnCommand.setAckFinish(command.getAckFinish());
+ crnCommand.setTaskNo(command.getTaskNo());
+ crnCommand.setTaskMode(command.getTaskMode());
+ crnCommand.setSourcePosX(command.getSourcePosX());
+ crnCommand.setSourcePosY(command.getSourcePosY());
+ crnCommand.setSourcePosZ(command.getSourcePosZ());
+ crnCommand.setDestinationPosX(command.getDestinationPosX());
+ crnCommand.setDestinationPosY(command.getDestinationPosY());
+ crnCommand.setDestinationPosZ(command.getDestinationPosZ());
+// crnCommand.setSourceStaNo(command.getSourceStaNo());
+// crnCommand.setDestinationStaNo(command.getDestinationStaNo());
+ crnCommand.setCommand(command.getCommand());
+ if (command.getTaskNo() == 0 && command.getAckFinish() == 0 && command.getAuto() != 1) {
+ command.setTaskNo((short) 999);
+ }
+
+ command.setCrnNo(slave.getId());
+ short[] array = new short[10];
+ if (Cools.isEmpty(command.getAckFinish())) {
+ array[0] = 5;
+ } else {
+ array[0] = command.getAckFinish();
+ }
+ array[1] = command.getTaskNo();
+ array[2] = command.getTaskMode();
+ array[3] = command.getSourcePosX();
+ array[4] = command.getSourcePosY();
+ array[5] = command.getSourcePosZ();
+ array[6] = command.getDestinationPosX();
+ array[7] = command.getDestinationPosY();
+ array[8] = command.getDestinationPosZ();
+ array[9] = command.getCommand();
+ // 浣滀笟淇℃伅
+ OperateResult result = siemensNet.Write("DB100.0", array);
+ // 鏃ュ織璁板綍
+ if (command.getAckFinish() != 1) {
+ BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
+ BasCrnOpt basCrnOpt = new BasCrnOpt(
+ command.getTaskNo().intValue(), // 浠诲姟鍙�
+ command.getCrnNo(), // 鍫嗗灈鏈篬闈炵┖]
+ new Date(), // 涓嬪彂鏃堕棿
+ command.getTaskModeType() == null ? null : command.getTaskModeType().toString(), // 妯″紡
+ command.getSourcePosX().intValue(), // 婧愭帓
+ command.getSourcePosY().intValue(), // 婧愬垪
+ command.getSourcePosZ().intValue(), // 婧愬眰
+ null, // 婧愮珯
+ command.getDestinationPosX().intValue(), // 鐩爣鎺�
+ command.getDestinationPosY().intValue(), // 鐩爣鍒�
+ command.getDestinationPosZ().intValue(), // 鐩爣灞�
+ null, // 鐩爣绔�
+ null, // 鍝嶅簲缁撴灉
+ null, // 淇敼鏃堕棿
+ null // 淇敼浜哄憳
+ );
+ bean.insert(basCrnOpt);
+ }
+// } catch (Exception ignore) {}
+
+ //鏇存柊鍛戒护鏃ュ織
+ CommandInfoLogService commandInfoLogService = SpringUtils.getBean(CommandInfoLogService.class);
+ CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
+ CommandInfo commandInfo = commandInfoService.selectById(command.getCommandId());
+ if (Cools.isEmpty(commandInfo)) {
+ commandInfo = commandInfoService.selectOne(new EntityWrapper<CommandInfo>()
+ .eq("wrk_no", crnProtocol.getTaskNo())
+ .eq("device", "Crn"));
+ }
+ CommandInfoLog commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
+ commandInfoLog.setId(null);
+ if (result.IsSuccess) {
+ Date now = new Date();
+ //鏇存柊鎸囦护鏃ュ織
+ commandInfoLog.setDeviceLog("鎸囦护涓嬪彂鎴愬姛");
+ commandInfoLogService.insert(commandInfoLog);
+
+ //绾跨▼鏆傚瓨鎸囦护ID
+ crnProtocol.setCommandId(command.getCommandId());
+
+ //鏇存柊鎸囦护鐘舵��
+ commandInfo.setCommandStatus(CommandStatusType.EXECUTE.id);//鎵ц涓�
+ commandInfo.setExecuteTime(now);
+ commandInfoService.updateById(commandInfo);
+
+ //鏇存柊浠诲姟姝ュ簭
+ TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
+ TaskWrk taskWrk = taskWrkService.selectByWrkNo(command.getTaskNo().intValue());
+ if (taskWrk != null) {
+ taskWrk.setCommandStep(taskWrk.getCommandStep() + 1);//鏇存柊鎸囦护姝ュ簭
+ taskWrkService.updateById(taskWrk);
+ }
+
+
+ } else {
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+ log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ }
+ return true;
+ }
+
+ private boolean writeAuto(CrnCommand command) {
+ if (null == command) {
+ log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+ return false;
+ }
+ OperateResult result = new OperateResult();
+ short[] array = new short[1];
+ array[0] = command.getAuto();
+ if (command.getAuto() != 0) {
+ array[0] = command.getAuto();
+ result = siemensNet.Write("DB103.0", array);
+ } else if (command.getOnlineWrk1() != 0) {
+ array[0] = command.getOnlineWrk1();
+ result = siemensNet.Write("DB103.2", array);
+ } else if (command.getOnlineWrk2() != 0) {
+ array[0] = command.getOnlineWrk2();
+ result = siemensNet.Write("DB103.4", array);
+ } else if (command.getOnlineWrk3() != 0) {
+ array[0] = command.getOnlineWrk3();
+ result = siemensNet.Write("DB103.6", array);
+ } else if (command.getOnlineWrk4() != 0) {
+ array[0] = command.getOnlineWrk4();
+ result = siemensNet.Write("DB103.8", array);
+ } else if (command.getReset() != 0) {
+ array[0] = command.getReset();
+ result = siemensNet.Write("DB103.10", array);
+ }
+
+
+ if (result.IsSuccess) {
+ log.warn("鍫嗗灈鏈哄懡浠や笅鍙慬id:{},鏃堕棿锛歿}] >>>>> {}", slave.getId(), DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F), JSON.toJSON(command));
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
+
+
+ return true;
+ } else {
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+ log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+
+ return false;
+ }
+ }
+
+ /******************************************************************************************/
+ /**************************************** 娴嬭瘯涓撶敤 *****************************************/
+
+ @Override
+ public void close() {
+ siemensNet.ConnectClose();
+ }
+
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index a8f5b06..c1e4336 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -9,17 +9,13 @@
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
-import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.CommandInfo;
-import com.zy.asrs.entity.CommandInfoLog;
-import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.service.*;
+import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.DeviceErrorService;
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
-import com.zy.core.enums.CommandStatusType;
import com.zy.core.enums.IoModeType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.DevpSlave;
@@ -43,18 +39,50 @@
@Slf4j
public class SiemensDevpThread implements Runnable, DevpThread {
+ public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
+ add(100);
+ add(101);
+ add(102);
+ add(103);
+ add(104);
+ add(105);
+ add(106);
+ add(107);
+ add(108);
+ add(109);
+ add(110);
+ add(111);
+ add(112);
+ add(113);
+ add(114);
+ add(115);
+ add(116);
+ add(117);
+ add(118);
+ add(119);
+ add(120);
+ add(121);
+ add(122);
+ add(123);
+ add(124);
+ add(125);
+ add(1001);
+ add(1002);
+ add(1003);
+ add(1004);
+ }};
+ /**
+ * 鍏ュ嚭搴撴ā寮�
+ * 0锛氭湭鐭�
+ * 1锛氬叆搴撳惎鍔ㄤ腑
+ * 2.鍏ュ簱妯″紡
+ * 3.鍑哄簱鍚姩涓� 锛堜笉鑳界敓鎴愬叆搴撳伐浣滄。锛�
+ * 4.鍑哄簱妯″紡
+ */
+ public IoModeType ioModeOf2F = IoModeType.NONE;
private DevpSlave slave;
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
- private short heartBeatVal = 1;
- public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
- add(100);add(101);add(102);add(103);add(104);
- add(105);add(106);add(107);add(108);add(109);
- add(110);add(111);add(112);add(113);add(114);
- add(115);add(116);add(117);add(118);add(119);
- add(120);add(121);add(122);add(123);add(124);
- add(125);add(1001);add(1002);add(1003);add(1004);
- }};
/*public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
add(200);add(201);add(202);add(203);
add(204);add(205);add(206);add(207);
@@ -74,22 +102,31 @@
add(400);add(401);add(402);add(403);
add(404);add(405);add(406);add(407);
}};*/
-
+ private short heartBeatVal = 1;
/**
* 鏉＄爜鏁伴噺
*/
private int barcodeSize = 1;
- /**
- * 鍏ュ嚭搴撴ā寮�
- * 0锛氭湭鐭�
- * 1锛氬叆搴撳惎鍔ㄤ腑
- * 2.鍏ュ簱妯″紡
- * 3.鍑哄簱鍚姩涓� 锛堜笉鑳界敓鎴愬叆搴撳伐浣滄。锛�
- * 4.鍑哄簱妯″紡
- */
- public IoModeType ioModeOf2F = IoModeType.NONE;
-// public IoModeType ioMode = IoModeType.NONE;
+ public SiemensDevpThread(DevpSlave slave) {
+ this.slave = slave;
+ }
+
+ public static void main(String[] args) {
+ ArrayList<Integer> staNos = staNos1;
+ System.out.println(staNos.indexOf(129));
+ System.out.println(staNos.size());
+ for (int i = 0; i < staNos.size(); i++) {
+// System.out.println(i*2);
+// System.out.println(i*2 + 200);
+// System.out.println(i);
+ }
+ int index = staNos.indexOf(128);
+ System.out.println(index * 2);
+ System.out.println(index * 2 + 200);
+ }
+
+ // public IoModeType ioMode = IoModeType.NONE;
private ArrayList<Integer> getStaNo() {
switch (slave.getId()) {
case 1:
@@ -103,10 +140,6 @@
default:
throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
}
- }
-
- public SiemensDevpThread(DevpSlave slave) {
- this.slave = slave;
}
@Override
@@ -127,12 +160,12 @@
break;
// 鍐欐暟鎹� ID+鐩爣绔�
case 2:
- write((StaProtocol)task.getData());
+ write((StaProtocol) task.getData());
read();
break;
// 鍐欐暟鎹� ID+鐩爣绔�
case 4:
- writeAgvOk((StaProtocol)task.getData());
+ writeAgvOk((StaProtocol) task.getData());
read();
break;
/* case 3:
@@ -186,12 +219,12 @@
siemensS7Net.setRack(slave.getRack().byteValue());
siemensS7Net.setSlot(slave.getSlot().byteValue());
OperateResult connect = siemensS7Net.ConnectServer();
- if(connect.IsSuccess){
+ if (connect.IsSuccess) {
result = true;
- OutputQueue.DEVP.offer(MessageFormat.format( "銆恵0}銆戣緭閫佺嚎plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣緭閫佺嚎plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
log.info("杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
} else {
- OutputQueue.DEVP.offer(MessageFormat.format( "銆恵0}銆戣緭閫佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣緭閫佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
log.error("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
// DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
// deviceErrorService.addDeviceError("devp", slave.getId(), "杈撻�佺嚎plc杩炴帴澶辫触");
@@ -209,7 +242,7 @@
// updateIoMode();
ArrayList<Integer> staNos = getStaNo();
int staNoSize = staNos.size();
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize*8));
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize * 8));
if (result.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -219,11 +252,11 @@
staProtocol.setSiteId(siteId);
station.put(siteId, staProtocol);
}
- staProtocol.setWorkNo((short)siemensS7Net.getByteTransform().TransInt32(result.Content, i*8)); // 宸ヤ綔鍙�
+ staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, i * 8)); // 宸ヤ綔鍙�
- staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*8 + 4)); // 鐩爣绔�
+ staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 8 + 4)); // 鐩爣绔�
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*8 + 6, 2);
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i * 8 + 6, 2);
staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setLoading(status[1]); // 鏈夌墿
staProtocol.setInEnable(status[2]); // 鍙叆
@@ -321,7 +354,7 @@
}
//澶栧舰妫�娴�
- OperateResultExOne<byte[]> resultErr1 = siemensS7Net.Read("DB101.810.0", (short) (barcodeSize*1));
+ OperateResultExOne<byte[]> resultErr1 = siemensS7Net.Read("DB101.810.0", (short) (barcodeSize * 1));
StaProtocol staProtocol1 = station.get(116);
boolean[] status1 = siemensS7Net.getByteTransform().TransBool(resultErr1.Content, 0, 1);
staProtocol1.setFrontErr(status1[0]);
@@ -376,9 +409,9 @@
// this.ioMode = IoModeType.get(result2.Content);
// }
- if (result.IsSuccess ) {
+ if (result.IsSuccess) {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
try {
@@ -417,48 +450,48 @@
}
ArrayList<Integer> staNos = getStaNo();
int index = staNos.indexOf(staProtocol.getSiteId());
- if (staProtocol.getAgvTypeSign()==0 || staProtocol.getAgvTypeSign()==2 ){ //0鍙栬揣
- switch (staProtocol.getSiteId()){
+ if (staProtocol.getAgvTypeSign() == 0 || staProtocol.getAgvTypeSign() == 2) { //0鍙栬揣
+ switch (staProtocol.getSiteId()) {
case 100:
- index=32;
+ index = 32;
break;
case 101:
- index=34;
+ index = 34;
break;
case 102:
- index=38;
+ index = 38;
break;
case 103:
- index=40;
+ index = 40;
break;
case 104:
- index=44;
+ index = 44;
break;
case 105:
- index=46;
+ index = 46;
break;
case 106:
- index=50;
+ index = 50;
break;
case 107:
- index=52;
+ index = 52;
break;
default:
return;
}
- }else {
- switch (staProtocol.getSiteId()){
+ } else {
+ switch (staProtocol.getSiteId()) {
case 100:
- index=30;
+ index = 30;
break;
case 102:
- index=36;
+ index = 36;
break;
case 104:
- index=42;
+ index = 42;
break;
case 106:
- index=48;
+ index = 48;
break;
default:
return;
@@ -470,28 +503,29 @@
int writeCount = 0;
do {
short textWrite = 1;// 浠诲姟瀹屾垚
- if (staProtocol.getAgvTypeSign()>1){
+ if (staProtocol.getAgvTypeSign() > 1) {
textWrite = 0;// 浠诲姟澶嶄綅
}
write = siemensS7Net.Write("DB102." + index, textWrite);
- if(write.IsSuccess){
- writeCount=6;
- }else {
+ if (write.IsSuccess) {
+ writeCount = 6;
+ } else {
writeCount++;
log.error("鍐欏叆杈撻�佺嚎鍙栨斁璐у畬鎴愬懡浠ゅ悗璇诲彇澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
}
- }while (writeCount<5);
+ } while (writeCount < 5);
if (!write.IsSuccess) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
log.error("鍐欏叆杈撻�佺嚎鍙栨斁璐у畬鎴愮珯鐐规暟鎹け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
} else {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
- log.info("杈撻�佺嚎鍙栨斁璐у畬鎴愬懡浠や笅鍙戠爜鍨涘畬鎴� 缁欒緭閫佺嚎鍐欎换鍔″畬鎴� [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
+ log.info("杈撻�佺嚎鍙栨斁璐у畬鎴愬懡浠や笅鍙戠爜鍨涘畬鎴� 缁欒緭閫佺嚎鍐欎换鍔″畬鎴� [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
}
}
+
private void write(StaProtocol staProtocol) throws InterruptedException {
if (null == staProtocol) {
return;
@@ -505,16 +539,16 @@
int writeCount = 0;
//浠诲姟涓嬪彂鎴愬姛鏍囪瘑
boolean writeFlag = false;
- while(writeCount < 5){
- OperateResult writeResult1 = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo().intValue()); // 宸ヤ綔鍙�
- OperateResult writeResult2 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo()); // 鐩爣绔�
- if(writeResult1.IsSuccess && writeResult2.IsSuccess){
+ while (writeCount < 5) {
+ OperateResult writeResult1 = siemensS7Net.Write("DB100." + index * 6, staProtocol.getWorkNo().intValue()); // 宸ヤ綔鍙�
+ OperateResult writeResult2 = siemensS7Net.Write("DB100." + (index * 6 + 4), staProtocol.getStaNo()); // 鐩爣绔�
+ if (writeResult1.IsSuccess && writeResult2.IsSuccess) {
Thread.sleep(200);
- OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index*6, (short)6);
- if(readResult.IsSuccess){
+ OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index * 6, (short) 6);
+ if (readResult.IsSuccess) {
Integer workNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
short staNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 4);
- if(workNo.equals(staProtocol.getWorkNo().intValue()) && staProtocol.getStaNo().equals(staNo)){
+ if (workNo.equals(staProtocol.getWorkNo().intValue()) && staProtocol.getStaNo().equals(staNo)) {
//浠诲姟鍛戒护鍐欏叆鎴愬姛
writeFlag = true;
log.info("鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝骞朵笖鍥炶鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
@@ -522,7 +556,7 @@
} else {//杩斿洖缁撴灉鏄垚鍔熶簡锛屼絾鏄湡瀹炲�间笉鐩稿悓
writeCount++;
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝浣嗘槸璇诲彇浠诲姟鍊间笉涓�鑷淬�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2},鍐欏叆娆℃暟={3}",
- slave.getId(), JSON.toJSON(staProtocol),writeCount));
+ slave.getId(), JSON.toJSON(staProtocol), writeCount));
log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝浣嗘槸璇诲彇浠诲姟鍊间笉涓�鑷淬�傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
}
} else {
@@ -534,16 +568,16 @@
} else {
writeCount++;
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2},鍐欏叆娆℃暟={3}",
- slave.getId(), JSON.toJSON(staProtocol),writeCount));
+ slave.getId(), JSON.toJSON(staProtocol), writeCount));
log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
}
Thread.sleep(200);
}
//鍐欏懡浠ゅ皾璇曚簡5娆¤繕鏄け璐ヤ簡
- if(!writeFlag){
+ if (!writeFlag) {
staProtocol = station.get(staProtocol.getSiteId());
- if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) {
+ if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() == 0) {
staProtocol.setPakMk(true);
}
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
@@ -554,7 +588,7 @@
// read();//璇诲彇1娆¤澶囩姸鎬�
} else {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂鎴愬姛 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
- log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂鎴愬姛锛� {}", slave.getId(), JSON.toJSON(staProtocol));
+ log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂鎴愬姛锛� {}", slave.getId(), JSON.toJSON(staProtocol));
// Integer siteId = staProtocol.getSiteId();
// staProtocol = station.get(siteId);
@@ -563,88 +597,6 @@
// }
}
-
- }
- private void write2(StaProtocol staProtocol) throws InterruptedException {
- if (null == staProtocol) {
- return;
- }
- ArrayList<Integer> staNos = getStaNo();
-
- int index = staNos.indexOf(staProtocol.getSiteId());
- short[] array = new short[2];
- array[0] = staProtocol.getWorkNo();
- array[1] = staProtocol.getStaNo();
-
- OperateResult writeResult;
- //浠诲姟涓嬪彂娆℃暟
- int writeCount = 0;
- //浠诲姟涓嬪彂鎴愬姛鏍囪瘑
- boolean writeFlag = false;
- while(writeCount < 5){
- writeResult = siemensS7Net.Write("DB100." + index*4, array); // 宸ヤ綔鍙枫�佺洰鏍囩珯
-
- if(writeResult.IsSuccess){
- Thread.sleep(200);
- OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index*4, (short)4);
- if(readResult.IsSuccess){
- short workNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 0);
- short staNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 2);
- if(staProtocol.getWorkNo().equals(workNo) && staProtocol.getStaNo().equals(staNo)){
- //浠诲姟鍛戒护鍐欏叆鎴愬姛
- writeFlag = true;
- log.info("鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝骞朵笖鍥炶鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-
- Date now = new Date();
- break;
- } else {//杩斿洖缁撴灉鏄垚鍔熶簡锛屼絾鏄湡瀹炲�间笉鐩稿悓
- writeCount++;
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝浣嗘槸璇诲彇浠诲姟鍊间笉涓�鑷淬�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2},鍐欏叆娆℃暟={3}",
- slave.getId(), JSON.toJSON(staProtocol),writeCount));
- log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝浣嗘槸璇诲彇浠诲姟鍊间笉涓�鑷淬�傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-
- }
- } else {
- writeCount++;
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2},鍐欏叆娆℃暟={3}",
- slave.getId(), JSON.toJSON(staProtocol), writeCount));
- log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-
- }
- } else {
- writeCount++;
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2},鍐欏叆娆℃暟={3}",
- slave.getId(), JSON.toJSON(staProtocol),writeCount));
- log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-
- }
- Thread.sleep(200);
- }
-
- //鍐欏懡浠ゅ皾璇曚簡5娆¤繕鏄け璐ヤ簡
- if(!writeFlag){
- staProtocol = station.get(staProtocol.getSiteId());
- if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) {
- staProtocol.setPakMk(true);
- }
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
- log.error("鍐欏叆杈撻�佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
-
- //閲嶆柊娣诲姞鏁版嵁鍒颁换鍔￠槦鍒�
- boolean result = MessageQueue.offer(SlaveType.Devp, slave.getId(), new Task(3, staProtocol));
- read();//璇诲彇1娆¤澶囩姸鎬�
- return;
- } else {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂鎴愬姛 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
- //log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂鎴愬姛锛� {}", slave.getId(), JSON.toJSON(staProtocol));
-
- Integer siteId = staProtocol.getSiteId();
- staProtocol = station.get(siteId);
- if ((siteId == 101 || siteId == 201)&&(staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0)) {
- staProtocol.setPakMk(true);
- }
-
- }
}
@@ -684,6 +636,89 @@
// }
// }
+ private void write2(StaProtocol staProtocol) throws InterruptedException {
+ if (null == staProtocol) {
+ return;
+ }
+ ArrayList<Integer> staNos = getStaNo();
+
+ int index = staNos.indexOf(staProtocol.getSiteId());
+ short[] array = new short[2];
+ array[0] = staProtocol.getWorkNo();
+ array[1] = staProtocol.getStaNo();
+
+ OperateResult writeResult;
+ //浠诲姟涓嬪彂娆℃暟
+ int writeCount = 0;
+ //浠诲姟涓嬪彂鎴愬姛鏍囪瘑
+ boolean writeFlag = false;
+ while (writeCount < 5) {
+ writeResult = siemensS7Net.Write("DB100." + index * 4, array); // 宸ヤ綔鍙枫�佺洰鏍囩珯
+
+ if (writeResult.IsSuccess) {
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index * 4, (short) 4);
+ if (readResult.IsSuccess) {
+ short workNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 0);
+ short staNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 2);
+ if (staProtocol.getWorkNo().equals(workNo) && staProtocol.getStaNo().equals(staNo)) {
+ //浠诲姟鍛戒护鍐欏叆鎴愬姛
+ writeFlag = true;
+ log.info("鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝骞朵笖鍥炶鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+
+ Date now = new Date();
+ break;
+ } else {//杩斿洖缁撴灉鏄垚鍔熶簡锛屼絾鏄湡瀹炲�间笉鐩稿悓
+ writeCount++;
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝浣嗘槸璇诲彇浠诲姟鍊间笉涓�鑷淬�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2},鍐欏叆娆℃暟={3}",
+ slave.getId(), JSON.toJSON(staProtocol), writeCount));
+ log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝浣嗘槸璇诲彇浠诲姟鍊间笉涓�鑷淬�傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+
+ }
+ } else {
+ writeCount++;
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2},鍐欏叆娆℃暟={3}",
+ slave.getId(), JSON.toJSON(staProtocol), writeCount));
+ log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+
+ }
+ } else {
+ writeCount++;
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2},鍐欏叆娆℃暟={3}",
+ slave.getId(), JSON.toJSON(staProtocol), writeCount));
+ log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+
+ }
+ Thread.sleep(200);
+ }
+
+ //鍐欏懡浠ゅ皾璇曚簡5娆¤繕鏄け璐ヤ簡
+ if (!writeFlag) {
+ staProtocol = station.get(staProtocol.getSiteId());
+ if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() == 0) {
+ staProtocol.setPakMk(true);
+ }
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
+ log.error("鍐欏叆杈撻�佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
+
+ //閲嶆柊娣诲姞鏁版嵁鍒颁换鍔￠槦鍒�
+ boolean result = MessageQueue.offer(SlaveType.Devp, slave.getId(), new Task(3, staProtocol));
+ read();//璇诲彇1娆¤澶囩姸鎬�
+ return;
+ } else {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂鎴愬姛 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
+ //log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂鎴愬姛锛� {}", slave.getId(), JSON.toJSON(staProtocol));
+
+ Integer siteId = staProtocol.getSiteId();
+ staProtocol = station.get(siteId);
+ if ((siteId == 101 || siteId == 201) && (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() == 0)) {
+ staProtocol.setPakMk(true);
+ }
+
+ }
+
+ }
+
// 鏇存柊鍏ュ嚭搴撴ā寮�
private void updateIoMode() throws InterruptedException {
if (this.ioModeOf2F != IoModeType.NONE) {
@@ -697,7 +732,7 @@
/**
* 蹇冭烦
*/
- private void heartbeat(){
+ private void heartbeat() {
if (heartBeatVal == 1) {
heartBeatVal = 2;
} else {
@@ -723,20 +758,6 @@
@Override
public void close() {
siemensS7Net.ConnectClose();
- }
-
- public static void main(String[] args) {
- ArrayList<Integer> staNos = staNos1;
- System.out.println(staNos.indexOf(129));
- System.out.println(staNos.size());
- for (int i = 0; i<staNos.size(); i++) {
-// System.out.println(i*2);
-// System.out.println(i*2 + 200);
-// System.out.println(i);
- }
- int index = staNos.indexOf(128);
- System.out.println(index*2);
- System.out.println(index*2 + 200);
}
// public static void main(String[] args) throws Exception {
diff --git a/src/main/java/com/zy/system/controller/ApiController.java b/src/main/java/com/zy/system/controller/ApiController.java
index 126983d..6511967 100644
--- a/src/main/java/com/zy/system/controller/ApiController.java
+++ b/src/main/java/com/zy/system/controller/ApiController.java
@@ -29,11 +29,11 @@
@RequestMapping(value = "/api/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<Api> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -41,8 +41,8 @@
return R.ok(apiService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
} else if (entry.getKey().endsWith("<")) {
@@ -56,10 +56,10 @@
@RequestMapping(value = "/api/edit/auth")
@ManagerAuth
public R edit(Api api) {
- if (Cools.isEmpty(api)){
+ if (Cools.isEmpty(api)) {
return R.error();
}
- if (null == api.getId()){
+ if (null == api.getId()) {
apiService.insert(api);
} else {
apiService.updateById(api);
@@ -74,10 +74,10 @@
return R.ok();
}
- @RequestMapping(value = "/api/update/auth")
+ @RequestMapping(value = "/api/update/auth")
@ManagerAuth
- public R update(Api api){
- if (Cools.isEmpty(api) || null==api.getId()){
+ public R update(Api api) {
+ if (Cools.isEmpty(api) || null == api.getId()) {
return R.error();
}
apiService.updateById(api);
@@ -86,8 +86,8 @@
@RequestMapping(value = "/api/delete/auth")
@ManagerAuth
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
+ public R delete(Integer[] ids) {
+ if (Cools.isEmpty(ids)) {
return R.error();
}
apiService.deleteBatchIds(Arrays.asList(ids));
@@ -96,7 +96,7 @@
@RequestMapping(value = "/api/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<Api> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("api"));
@@ -112,7 +112,7 @@
wrapper.like("id", condition);
Page<Api> page = apiService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Api api : page.getRecords()){
+ for (Api api : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", api.getId());
map.put("value", api.getId());
diff --git a/src/main/java/com/zy/system/controller/ConfigController.java b/src/main/java/com/zy/system/controller/ConfigController.java
index a005512..5bea2f9 100644
--- a/src/main/java/com/zy/system/controller/ConfigController.java
+++ b/src/main/java/com/zy/system/controller/ConfigController.java
@@ -23,6 +23,15 @@
@Autowired
private ConfigService configService;
+ private static boolean checkJson(String val) {
+ Object parse = null;
+ try {
+ parse = JSON.parse(val);
+ } catch (Exception ignore) {
+ }
+ return parse != null;
+ }
+
@RequestMapping(value = "/config/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
@@ -31,11 +40,11 @@
@RequestMapping(value = "/config/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<Config> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -43,8 +52,8 @@
return R.ok(configService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
} else if (entry.getKey().endsWith("<")) {
@@ -58,15 +67,15 @@
@RequestMapping(value = "/config/edit/auth")
@ManagerAuth
public R edit(Config config) {
- if (Cools.isEmpty(config)){
+ if (Cools.isEmpty(config)) {
return R.error();
}
- if (config.getType() == 2){
- if (!checkJson(config.getValue())){
+ if (config.getType() == 2) {
+ if (!checkJson(config.getValue())) {
return R.error("json瑙ｆ瀽澶辫触");
}
}
- if (null == config.getId()){
+ if (null == config.getId()) {
configService.insert(config);
} else {
configService.updateById(config);
@@ -78,8 +87,8 @@
@RequestMapping(value = "/config/add/auth")
@ManagerAuth
public R add(Config config) {
- if (config.getType() == 2){
- if (!checkJson(config.getValue())){
+ if (config.getType() == 2) {
+ if (!checkJson(config.getValue())) {
return R.error("json瑙ｆ瀽澶辫触");
}
}
@@ -87,14 +96,14 @@
return R.ok();
}
- @RequestMapping(value = "/config/update/auth")
+ @RequestMapping(value = "/config/update/auth")
@ManagerAuth
- public R update(Config config){
- if (Cools.isEmpty(config) || null==config.getId()){
+ public R update(Config config) {
+ if (Cools.isEmpty(config) || null == config.getId()) {
return R.error();
}
- if (config.getType() == 2){
- if (!checkJson(config.getValue())){
+ if (config.getType() == 2) {
+ if (!checkJson(config.getValue())) {
return R.error("json瑙ｆ瀽澶辫触");
}
}
@@ -105,8 +114,8 @@
@RequestMapping(value = "/config/delete/auth")
@ManagerAuth
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
+ public R delete(Integer[] ids) {
+ if (Cools.isEmpty(ids)) {
return R.error();
}
configService.deleteBatchIds(Arrays.asList(ids));
@@ -115,7 +124,7 @@
@RequestMapping(value = "/config/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<Config> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("config"));
@@ -131,7 +140,7 @@
wrapper.like("id", condition);
Page<Config> page = configService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Config config : page.getRecords()){
+ for (Config config : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", config.getId());
map.put("value", config.getId());
@@ -145,7 +154,7 @@
*/
@RequestMapping(value = "/config/refresh/auth")
@ManagerAuth
- public R refresh(){
+ public R refresh() {
Parameter parameter;
try {
parameter = Parameter.reset();
@@ -153,20 +162,10 @@
e.printStackTrace();
return R.error();
}
- if (Cools.isEmpty(parameter)){
+ if (Cools.isEmpty(parameter)) {
return R.error();
}
return R.ok();
- }
-
-
- private static boolean checkJson(String val){
- Object parse = null;
- try {
- parse = JSON.parse(val);
- } catch (Exception ignore){
- }
- return parse != null;
}
}
diff --git a/src/main/java/com/zy/system/controller/HomeController.java b/src/main/java/com/zy/system/controller/HomeController.java
index 6568c90..a659fb7 100644
--- a/src/main/java/com/zy/system/controller/HomeController.java
+++ b/src/main/java/com/zy/system/controller/HomeController.java
@@ -30,7 +30,7 @@
@RequestMapping("/top")
@ManagerAuth
- public R top(){
+ public R top() {
int logTotal = operateLogService.selectCount(new EntityWrapper<>());
int logWeek = operateLogService.selectCountByCurrentWeek();
int userTotal = userService.selectCount(new EntityWrapper<>());
@@ -40,14 +40,14 @@
result.put("logTotal", logTotal);
result.put("logWeek", logWeek);
result.put("userTotal", userTotal);
- result.put("live", Arith.multiplys(0, Arith.divides(2, loginWeek, userTotal), 100)+"%");
+ result.put("live", Arith.multiplys(0, Arith.divides(2, loginWeek, userTotal), 100) + "%");
return R.ok(result);
}
@RequestMapping("/report")
@ManagerAuth
- public R top(@RequestParam(defaultValue = "1", value = "type", required = false)Integer type){
+ public R top(@RequestParam(defaultValue = "1", value = "type", required = false) Integer type) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date());
@@ -71,15 +71,15 @@
/**
* 鑷姩琛ラ浂
*/
- private List<Map<String, Object>> fill(List<Map<String, Object>> list, int start, int end){
- for (int i = start ; i <= end; i++){
+ private List<Map<String, Object>> fill(List<Map<String, Object>> list, int start, int end) {
+ for (int i = start; i <= end; i++) {
boolean exist = false;
- for (Map seq : list){
- if (Integer.parseInt(String.valueOf(seq.get("node"))) == i){
+ for (Map seq : list) {
+ if (Integer.parseInt(String.valueOf(seq.get("node"))) == i) {
exist = true;
}
}
- if (!exist){
+ if (!exist) {
HashMap<String, Object> map = new HashMap<>();
map.put("node", i);
map.put("val", 0);
@@ -94,12 +94,12 @@
* x杞村崟浣嶈浆鎹�
* @param dot y杞存暟鍊间繚鐣欏皬鏁颁綅
*/
- private List<Map<String, Object>> convert(List<Map<String, Object>> list, StatsType statsType, int dot){
- for (Map<String, Object> map : list){
+ private List<Map<String, Object>> convert(List<Map<String, Object>> list, StatsType statsType, int dot) {
+ for (Map<String, Object> map : list) {
Object val = map.get("val");
map.put("val", Arith.multiplys(dot, 1, (Number) val));
Object node = map.get("node");
- switch (statsType){
+ switch (statsType) {
case MONTH:
map.put("node", node + "鍙�");
break;
@@ -113,15 +113,16 @@
return list;
}
- enum StatsType{
+ enum StatsType {
- YEAR(1,1, 12),
- MONTH(2,1, 30),
+ YEAR(1, 1, 12),
+ MONTH(2, 1, 30),
;
int id;
int start;
int end;
+
StatsType(int id, int start, int end) {
this.id = id;
this.start = start;
@@ -130,8 +131,8 @@
static StatsType get(int id) {
StatsType[] values = StatsType.values();
- for (StatsType statsType : values){
- if (statsType.id == id){
+ for (StatsType statsType : values) {
+ if (statsType.id == id) {
return statsType;
}
}
diff --git a/src/main/java/com/zy/system/controller/HostController.java b/src/main/java/com/zy/system/controller/HostController.java
index bad930a..07c1639 100644
--- a/src/main/java/com/zy/system/controller/HostController.java
+++ b/src/main/java/com/zy/system/controller/HostController.java
@@ -29,11 +29,11 @@
@RequestMapping(value = "/host/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<Host> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -41,8 +41,8 @@
return R.ok(hostService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
} else if (entry.getKey().endsWith("<")) {
@@ -56,10 +56,10 @@
@RequestMapping(value = "/host/edit/auth")
@ManagerAuth
public R edit(Host host) {
- if (Cools.isEmpty(host)){
+ if (Cools.isEmpty(host)) {
return R.error();
}
- if (null == host.getId()){
+ if (null == host.getId()) {
hostService.insert(host);
} else {
hostService.updateById(host);
@@ -74,10 +74,10 @@
return R.ok();
}
- @RequestMapping(value = "/host/update/auth")
+ @RequestMapping(value = "/host/update/auth")
@ManagerAuth
- public R update(Host host){
- if (Cools.isEmpty(host) || null==host.getId()){
+ public R update(Host host) {
+ if (Cools.isEmpty(host) || null == host.getId()) {
return R.error();
}
hostService.updateById(host);
@@ -86,8 +86,8 @@
@RequestMapping(value = "/host/delete/auth")
@ManagerAuth
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
+ public R delete(Integer[] ids) {
+ if (Cools.isEmpty(ids)) {
return R.error();
}
hostService.deleteBatchIds(Arrays.asList(ids));
@@ -96,7 +96,7 @@
@RequestMapping(value = "/host/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<Host> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("host"));
@@ -112,7 +112,7 @@
wrapper.like("name", condition);
Page<Host> page = hostService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Host host : page.getRecords()){
+ for (Host host : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", host.getId());
map.put("value", host.getName());
diff --git a/src/main/java/com/zy/system/controller/LicenseCreatorController.java b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
index 0aafb3b..9cb7cd7 100644
--- a/src/main/java/com/zy/system/controller/LicenseCreatorController.java
+++ b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
@@ -34,10 +34,10 @@
* 鑾峰彇鏈嶅姟鍣ㄧ‖浠朵俊鎭�
* @param osName 鎿嶄綔绯荤粺绫诲瀷锛屽鏋滀负绌哄垯鑷姩鍒ゆ柇
*/
- @RequestMapping(value = "/getServerInfos",produces = {MediaType.APPLICATION_JSON_UTF8_VALUE})
- public LicenseCheck getServerInfos(@RequestParam(value = "osName",required = false) String osName) {
+ @RequestMapping(value = "/getServerInfos", produces = {MediaType.APPLICATION_JSON_UTF8_VALUE})
+ public LicenseCheck getServerInfos(@RequestParam(value = "osName", required = false) String osName) {
//鎿嶄綔绯荤粺绫诲瀷
- if(Cools.isEmpty(osName)){
+ if (Cools.isEmpty(osName)) {
osName = System.getProperty("os.name");
}
osName = osName.toLowerCase();
@@ -49,7 +49,7 @@
abstractServerInfos = new WindowsServerInfos();
} else if (osName.startsWith("linux")) {
// abstractServerInfos = new LinuxServerInfos();
- }else{//鍏朵粬鏈嶅姟鍣ㄧ被鍨�
+ } else {//鍏朵粬鏈嶅姟鍣ㄧ被鍨�
abstractServerInfos = new WindowsServerInfos();
}
@@ -77,7 +77,7 @@
}
@RequestMapping(value = "/updateLicense")
- public R updateLicense(@RequestParam("file") MultipartFile[] files){
+ public R updateLicense(@RequestParam("file") MultipartFile[] files) {
MultipartFile file = files[0];
String licensePathFileName = this.getClass().getClassLoader().getResource(licensePath).getPath();
diff --git a/src/main/java/com/zy/system/controller/OperateLogController.java b/src/main/java/com/zy/system/controller/OperateLogController.java
index da7f7b1..6315740 100644
--- a/src/main/java/com/zy/system/controller/OperateLogController.java
+++ b/src/main/java/com/zy/system/controller/OperateLogController.java
@@ -29,11 +29,11 @@
@RequestMapping(value = "/operateLog/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<OperateLog> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -41,8 +41,8 @@
return R.ok(operateLogService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
} else if (entry.getKey().endsWith("<")) {
@@ -56,10 +56,10 @@
@RequestMapping(value = "/operateLog/edit/auth")
@ManagerAuth
public R edit(OperateLog operateLog) {
- if (Cools.isEmpty(operateLog)){
+ if (Cools.isEmpty(operateLog)) {
return R.error();
}
- if (null == operateLog.getId()){
+ if (null == operateLog.getId()) {
operateLogService.insert(operateLog);
} else {
operateLogService.updateById(operateLog);
@@ -74,10 +74,10 @@
return R.ok();
}
- @RequestMapping(value = "/operateLog/update/auth")
+ @RequestMapping(value = "/operateLog/update/auth")
@ManagerAuth
- public R update(OperateLog operateLog){
- if (Cools.isEmpty(operateLog) || null==operateLog.getId()){
+ public R update(OperateLog operateLog) {
+ if (Cools.isEmpty(operateLog) || null == operateLog.getId()) {
return R.error();
}
operateLogService.updateById(operateLog);
@@ -86,8 +86,8 @@
@RequestMapping(value = "/operateLog/delete/auth")
@ManagerAuth
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
+ public R delete(Integer[] ids) {
+ if (Cools.isEmpty(ids)) {
return R.error();
}
operateLogService.deleteBatchIds(Arrays.asList(ids));
@@ -96,7 +96,7 @@
@RequestMapping(value = "/operateLog/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<OperateLog> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("operateLog"));
@@ -112,7 +112,7 @@
wrapper.like("id", condition);
Page<OperateLog> page = operateLogService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (OperateLog operateLog : page.getRecords()){
+ for (OperateLog operateLog : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", operateLog.getId());
map.put("value", operateLog.getId());
diff --git a/src/main/java/com/zy/system/controller/PermissionController.java b/src/main/java/com/zy/system/controller/PermissionController.java
index c943808..5df7853 100644
--- a/src/main/java/com/zy/system/controller/PermissionController.java
+++ b/src/main/java/com/zy/system/controller/PermissionController.java
@@ -29,11 +29,11 @@
@RequestMapping(value = "/permission/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<Permission> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -41,8 +41,8 @@
return R.ok(permissionService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
} else if (entry.getKey().endsWith("<")) {
@@ -56,10 +56,10 @@
@RequestMapping(value = "/permission/edit/auth")
@ManagerAuth
public R edit(Permission permission) {
- if (Cools.isEmpty(permission)){
+ if (Cools.isEmpty(permission)) {
return R.error();
}
- if (null == permission.getId()){
+ if (null == permission.getId()) {
permissionService.insert(permission);
} else {
permissionService.updateById(permission);
@@ -74,10 +74,10 @@
return R.ok();
}
- @RequestMapping(value = "/permission/update/auth")
+ @RequestMapping(value = "/permission/update/auth")
@ManagerAuth
- public R update(Permission permission){
- if (Cools.isEmpty(permission) || null==permission.getId()){
+ public R update(Permission permission) {
+ if (Cools.isEmpty(permission) || null == permission.getId()) {
return R.error();
}
permissionService.updateById(permission);
@@ -86,8 +86,8 @@
@RequestMapping(value = "/permission/delete/auth")
@ManagerAuth
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
+ public R delete(Integer[] ids) {
+ if (Cools.isEmpty(ids)) {
return R.error();
}
permissionService.deleteBatchIds(Arrays.asList(ids));
@@ -96,7 +96,7 @@
@RequestMapping(value = "/permission/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<Permission> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("permission"));
@@ -112,7 +112,7 @@
wrapper.like("name", condition);
Page<Permission> page = permissionService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Permission permission : page.getRecords()){
+ for (Permission permission : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", permission.getId());
map.put("value", permission.getName());
diff --git a/src/main/java/com/zy/system/controller/ResourceController.java b/src/main/java/com/zy/system/controller/ResourceController.java
index 64717f8..17b421a 100644
--- a/src/main/java/com/zy/system/controller/ResourceController.java
+++ b/src/main/java/com/zy/system/controller/ResourceController.java
@@ -29,11 +29,11 @@
@RequestMapping(value = "/resource/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<Resource> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -43,23 +43,24 @@
@RequestMapping(value = "/resource/tree/auth")
@ManagerAuth
- public R tree(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R tree(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<Resource> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("sort");
}
return R.parse("0-鎿嶄綔鎴愬姛").add(resourceService.selectList(wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
} else if (entry.getKey().endsWith("<")) {
@@ -73,11 +74,11 @@
@RequestMapping(value = "/resource/edit/auth")
@ManagerAuth(memo = "鑿滃崟缂栬緫")
public R edit(Resource resource) {
- if (Cools.isEmpty(resource)){
+ if (Cools.isEmpty(resource)) {
return R.error();
}
- if (null == resource.getId()){
- if (resource.getSort() == null){
+ if (null == resource.getId()) {
+ if (resource.getSort() == null) {
resource.setSort(999);
}
resourceService.insert(resource);
@@ -94,10 +95,10 @@
return R.ok();
}
- @RequestMapping(value = "/resource/update/auth")
+ @RequestMapping(value = "/resource/update/auth")
@ManagerAuth(memo = "鑿滃崟淇敼")
- public R update(Resource resource){
- if (Cools.isEmpty(resource) || null==resource.getId()){
+ public R update(Resource resource) {
+ if (Cools.isEmpty(resource) || null == resource.getId()) {
return R.error();
}
resourceService.updateById(resource);
@@ -106,8 +107,8 @@
@RequestMapping(value = "/resource/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
resourceService.deleteById(id);
}
return R.ok();
@@ -115,7 +116,7 @@
@RequestMapping(value = "/resource/export/auth")
@ManagerAuth(memo = "鑿滃崟瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<Resource> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("resource"));
@@ -131,7 +132,7 @@
wrapper.like("name", condition);
Page<Resource> page = resourceService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Resource resource : page.getRecords()){
+ for (Resource resource : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", resource.getId());
map.put("value", resource.getName().concat("(").concat(resource.getLevel$().substring(0, 2).concat(")")));
diff --git a/src/main/java/com/zy/system/controller/RoleController.java b/src/main/java/com/zy/system/controller/RoleController.java
index ef9d380..f3b19a6 100644
--- a/src/main/java/com/zy/system/controller/RoleController.java
+++ b/src/main/java/com/zy/system/controller/RoleController.java
@@ -29,11 +29,11 @@
@RequestMapping(value = "/role/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<Role> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -61,8 +61,8 @@
return R.ok(roleService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
} else if (entry.getKey().endsWith("<")) {
@@ -76,10 +76,10 @@
@RequestMapping(value = "/role/edit/auth")
@ManagerAuth(memo = "瑙掕壊缂栬緫")
public R edit(Role role) {
- if (Cools.isEmpty(role)){
+ if (Cools.isEmpty(role)) {
return R.error();
}
- if (null == role.getId()){
+ if (null == role.getId()) {
roleService.insert(role);
} else {
roleService.updateById(role);
@@ -94,10 +94,10 @@
return R.ok();
}
- @RequestMapping(value = "/role/update/auth")
+ @RequestMapping(value = "/role/update/auth")
@ManagerAuth(memo = "瑙掕壊淇敼")
- public R update(Role role){
- if (Cools.isEmpty(role) || null==role.getId()){
+ public R update(Role role) {
+ if (Cools.isEmpty(role) || null == role.getId()) {
return R.error();
}
roleService.updateById(role);
@@ -106,8 +106,8 @@
@RequestMapping(value = "/role/delete/auth")
@ManagerAuth(memo = "瑙掕壊鍒犻櫎")
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
+ public R delete(Integer[] ids) {
+ if (Cools.isEmpty(ids)) {
return R.error();
}
roleService.deleteBatchIds(Arrays.asList(ids));
@@ -116,7 +116,7 @@
@RequestMapping(value = "/role/export/auth")
@ManagerAuth(memo = "瑙掕壊瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<Role> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("role"));
@@ -151,7 +151,7 @@
Page<Role> page = roleService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Role role : page.getRecords()){
+ for (Role role : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", role.getId());
map.put("value", role.getName());
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index 70bc84f..d77609c 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -33,11 +33,11 @@
@RequestMapping(value = "/user/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<User> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -63,8 +63,8 @@
return R.ok(userService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
} else if (entry.getKey().endsWith("<")) {
@@ -78,10 +78,10 @@
@RequestMapping(value = "/user/edit/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛缂栬緫")
public R edit(User user) {
- if (Cools.isEmpty(user)){
+ if (Cools.isEmpty(user)) {
return R.error();
}
- if (null == user.getId()){
+ if (null == user.getId()) {
userService.insert(user);
} else {
userService.updateById(user);
@@ -96,20 +96,20 @@
return R.ok();
}
- @RequestMapping(value = "/user/update/auth")
+ @RequestMapping(value = "/user/update/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛淇敼")
- public R update(User user){
- if (Cools.isEmpty(user) || null==user.getId()){
+ public R update(User user) {
+ if (Cools.isEmpty(user) || null == user.getId()) {
return R.error();
}
User entity = userService.selectById(user.getId());
- if (user.getPassword()!=null) {
+ if (user.getPassword() != null) {
entity.setPassword(user.getPassword());
}
- if (user.getUsername()!=null) {
+ if (user.getUsername() != null) {
entity.setUsername(user.getUsername());
}
- if (user.getMobile()!=null) {
+ if (user.getMobile() != null) {
entity.setMobile(user.getMobile());
}
userService.updateById(entity);
@@ -118,8 +118,8 @@
@RequestMapping(value = "/user/delete/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛鍒犻櫎")
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
userService.deleteById(id);
}
return R.ok();
@@ -127,7 +127,7 @@
@RequestMapping(value = "/user/export/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<User> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("user"));
@@ -143,7 +143,7 @@
wrapper.like("username", condition);
Page<User> page = userService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (User user : page.getRecords()){
+ for (User user : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", user.getId());
map.put("value", user.getUsername());
diff --git a/src/main/java/com/zy/system/controller/UserLoginController.java b/src/main/java/com/zy/system/controller/UserLoginController.java
index 69960f1..d5a5587 100644
--- a/src/main/java/com/zy/system/controller/UserLoginController.java
+++ b/src/main/java/com/zy/system/controller/UserLoginController.java
@@ -29,11 +29,11 @@
@RequestMapping(value = "/userLogin/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<UserLogin> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -41,8 +41,8 @@
return R.ok(userLoginService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
} else if (entry.getKey().endsWith("<")) {
@@ -56,10 +56,10 @@
@RequestMapping(value = "/userLogin/edit/auth")
@ManagerAuth
public R edit(UserLogin userLogin) {
- if (Cools.isEmpty(userLogin)){
+ if (Cools.isEmpty(userLogin)) {
return R.error();
}
- if (null == userLogin.getId()){
+ if (null == userLogin.getId()) {
userLoginService.insert(userLogin);
} else {
userLoginService.updateById(userLogin);
@@ -74,10 +74,10 @@
return R.ok();
}
- @RequestMapping(value = "/userLogin/update/auth")
+ @RequestMapping(value = "/userLogin/update/auth")
@ManagerAuth
- public R update(UserLogin userLogin){
- if (Cools.isEmpty(userLogin) || null==userLogin.getId()){
+ public R update(UserLogin userLogin) {
+ if (Cools.isEmpty(userLogin) || null == userLogin.getId()) {
return R.error();
}
userLoginService.updateById(userLogin);
@@ -86,8 +86,8 @@
@RequestMapping(value = "/userLogin/delete/auth")
@ManagerAuth
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
+ public R delete(Integer[] ids) {
+ if (Cools.isEmpty(ids)) {
return R.error();
}
userLoginService.deleteBatchIds(Arrays.asList(ids));
@@ -96,7 +96,7 @@
@RequestMapping(value = "/userLogin/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<UserLogin> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("userLogin"));
@@ -112,7 +112,7 @@
wrapper.like("token", condition);
Page<UserLogin> page = userLoginService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (UserLogin userLogin : page.getRecords()){
+ for (UserLogin userLogin : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", userLogin.getId());
map.put("value", userLogin.getToken());
diff --git a/src/main/java/com/zy/system/entity/Api.java b/src/main/java/com/zy/system/entity/Api.java
index 9342543..e851941 100644
--- a/src/main/java/com/zy/system/entity/Api.java
+++ b/src/main/java/com/zy/system/entity/Api.java
@@ -58,9 +58,10 @@
*/
private Short status;
- public Api() {}
+ public Api() {
+ }
- public Api(String namespace,Short oauth,String request,String response,Date createTime,Date updateTime,Short status) {
+ public Api(String namespace, Short oauth, String request, String response, Date createTime, Date updateTime, Short status) {
this.namespace = namespace; // 鍛藉悕绌洪棿[闈炵┖]
this.oauth = oauth; // 鎺堟潈[闈炵┖]
this.request = request; // 璇锋眰缁撴瀯
@@ -90,9 +91,15 @@
return oauth;
}
- public String getOauth$(){
- if (null == this.oauth){ return null; }
- switch (this.oauth){
+ public void setOauth(Short oauth) {
+ this.oauth = oauth;
+ }
+
+ public String getOauth$() {
+ if (null == this.oauth) {
+ return null;
+ }
+ switch (this.oauth) {
case 0:
return "鏃犻渶鎺堟潈";
case 1:
@@ -100,10 +107,6 @@
default:
return String.valueOf(this.oauth);
}
- }
-
- public void setOauth(Short oauth) {
- this.oauth = oauth;
}
public String getRequest() {
@@ -126,39 +129,45 @@
return createTime;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
}
public Short getStatus() {
return status;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public void setStatus(Short status) {
+ this.status = status;
+ }
+
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "鏈夋晥";
case 0:
@@ -166,10 +175,6 @@
default:
return String.valueOf(this.status);
}
- }
-
- public void setStatus(Short status) {
- this.status = status;
}
diff --git a/src/main/java/com/zy/system/entity/Config.java b/src/main/java/com/zy/system/entity/Config.java
index 9b6a39a..e8341ed 100644
--- a/src/main/java/com/zy/system/entity/Config.java
+++ b/src/main/java/com/zy/system/entity/Config.java
@@ -42,9 +42,10 @@
*/
private Short status;
- public Config() {}
+ public Config() {
+ }
- public Config(String name,String code,String value,Short type,Short status) {
+ public Config(String name, String code, String value, Short type, Short status) {
this.name = name;
this.code = code;
this.value = value;
@@ -96,9 +97,15 @@
return type;
}
- public String getType$(){
- if (null == this.type){ return null; }
- switch (this.type){
+ public void setType(Short type) {
+ this.type = type;
+ }
+
+ public String getType$() {
+ if (null == this.type) {
+ return null;
+ }
+ switch (this.type) {
case 1:
return "String";
case 2:
@@ -108,17 +115,19 @@
}
}
- public void setType(Short type) {
- this.type = type;
- }
-
public Short getStatus() {
return status;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public void setStatus(Short status) {
+ this.status = status;
+ }
+
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -126,10 +135,6 @@
default:
return String.valueOf(this.status);
}
- }
-
- public void setStatus(Short status) {
- this.status = status;
}
diff --git a/src/main/java/com/zy/system/entity/Host.java b/src/main/java/com/zy/system/entity/Host.java
index 28b85ab..63d501d 100644
--- a/src/main/java/com/zy/system/entity/Host.java
+++ b/src/main/java/com/zy/system/entity/Host.java
@@ -48,9 +48,10 @@
*/
private Integer status;
- public Host() {}
+ public Host() {
+ }
- public Host(String name,String flag,Date createTime,Date updateTime,Integer status) {
+ public Host(String name, String flag, Date createTime, Date updateTime, Integer status) {
this.name = name;
this.flag = flag;
this.createTime = createTime;
@@ -94,39 +95,45 @@
return createTime;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
}
public Integer getStatus() {
return status;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -134,10 +141,6 @@
default:
return String.valueOf(this.status);
}
- }
-
- public void setStatus(Integer status) {
- this.status = status;
}
diff --git a/src/main/java/com/zy/system/entity/OperateLog.java b/src/main/java/com/zy/system/entity/OperateLog.java
index eb93fad..b82d653 100644
--- a/src/main/java/com/zy/system/entity/OperateLog.java
+++ b/src/main/java/com/zy/system/entity/OperateLog.java
@@ -75,16 +75,17 @@
return userId;
}
- public String getUserId$(){
+ public void setUserId(Long userId) {
+ this.userId = userId;
+ }
+
+ public String getUserId$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.userId);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return user.getUsername();
}
return null;
- }
- public void setUserId(Long userId) {
- this.userId = userId;
}
public String getIp() {
@@ -115,15 +116,15 @@
return createTime;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
}
diff --git a/src/main/java/com/zy/system/entity/Permission.java b/src/main/java/com/zy/system/entity/Permission.java
index 8373e0f..e416a06 100644
--- a/src/main/java/com/zy/system/entity/Permission.java
+++ b/src/main/java/com/zy/system/entity/Permission.java
@@ -42,9 +42,10 @@
*/
private Short status;
- public Permission() {}
+ public Permission() {
+ }
- public Permission(String name,String action,Long resourceId,Short status) {
+ public Permission(String name, String action, Long resourceId, Short status) {
this.name = name;
this.action = action;
this.resourceId = resourceId;
@@ -86,26 +87,32 @@
return resourceId;
}
- public String getResourceName(){
+ public void setResourceId(Long resourceId) {
+ this.resourceId = resourceId;
+ }
+
+ public String getResourceName() {
ResourceService service = SpringUtils.getBean(ResourceService.class);
Resource resource = service.selectById(this.resourceId);
- if (!Cools.isEmpty(resource)){
+ if (!Cools.isEmpty(resource)) {
return resource.getName();
}
return null;
- }
-
- public void setResourceId(Long resourceId) {
- this.resourceId = resourceId;
}
public Short getStatus() {
return status;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public void setStatus(Short status) {
+ this.status = status;
+ }
+
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -113,10 +120,6 @@
default:
return String.valueOf(this.status);
}
- }
-
- public void setStatus(Short status) {
- this.status = status;
}
diff --git a/src/main/java/com/zy/system/entity/Resource.java b/src/main/java/com/zy/system/entity/Resource.java
index 01b81f9..a5440b7 100644
--- a/src/main/java/com/zy/system/entity/Resource.java
+++ b/src/main/java/com/zy/system/entity/Resource.java
@@ -52,9 +52,10 @@
*/
private Short status;
- public Resource() {}
+ public Resource() {
+ }
- public Resource(String code,String name,Long resourceId,Short level,Integer sort,Short status) {
+ public Resource(String code, String name, Long resourceId, Short level, Integer sort, Short status) {
this.code = code;
this.name = name;
this.resourceId = resourceId;
@@ -100,26 +101,32 @@
return resourceId;
}
- public String getResourceName(){
+ public void setResourceId(Long resourceId) {
+ this.resourceId = resourceId;
+ }
+
+ public String getResourceName() {
ResourceService service = SpringUtils.getBean(ResourceService.class);
Resource resource = service.selectById(this.resourceId);
- if (!Cools.isEmpty(resource)){
+ if (!Cools.isEmpty(resource)) {
return resource.getName();
}
return null;
- }
-
- public void setResourceId(Long resourceId) {
- this.resourceId = resourceId;
}
public Short getLevel() {
return level;
}
- public String getLevel$(){
- if (null == this.level){ return null; }
- switch (this.level){
+ public void setLevel(Short level) {
+ this.level = level;
+ }
+
+ public String getLevel$() {
+ if (null == this.level) {
+ return null;
+ }
+ switch (this.level) {
case 1:
return "涓�绾ц彍鍗�";
case 2:
@@ -129,10 +136,6 @@
default:
return String.valueOf(this.level);
}
- }
-
- public void setLevel(Short level) {
- this.level = level;
}
public Integer getSort() {
@@ -147,9 +150,15 @@
return status;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public void setStatus(Short status) {
+ this.status = status;
+ }
+
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -157,10 +166,6 @@
default:
return String.valueOf(this.status);
}
- }
-
- public void setStatus(Short status) {
- this.status = status;
}
diff --git a/src/main/java/com/zy/system/entity/Role.java b/src/main/java/com/zy/system/entity/Role.java
index 9f6a998..af1b7ea 100644
--- a/src/main/java/com/zy/system/entity/Role.java
+++ b/src/main/java/com/zy/system/entity/Role.java
@@ -18,37 +18,38 @@
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 缂栫爜
*/
- @ApiModelProperty(value= "缂栫爜")
+ @ApiModelProperty(value = "缂栫爜")
private String code;
/**
* 鍚嶇О
*/
- @ApiModelProperty(value= "鍚嶇О")
+ @ApiModelProperty(value = "鍚嶇О")
private String name;
/**
* 涓婄骇
*/
- @ApiModelProperty(value= "涓婄骇")
+ @ApiModelProperty(value = "涓婄骇")
private Long leader;
/**
* 瑙掕壊绛夌骇 1: 涓�绾� 2: 浜岀骇 3: 涓夌骇 4: 鍥涚骇 5: 浜旂骇
*/
- @ApiModelProperty(value= "瑙掕壊绛夌骇 1: 涓�绾� 2: 浜岀骇 3: 涓夌骇 4: 鍥涚骇 5: 浜旂骇 ")
+ @ApiModelProperty(value = "瑙掕壊绛夌骇 1: 涓�绾� 2: 浜岀骇 3: 涓夌骇 4: 鍥涚骇 5: 浜旂骇 ")
private Short level;
- public Role() {}
+ public Role() {
+ }
- public Role(String code,String name,Long leader,Short level) {
+ public Role(String code, String name, Long leader, Short level) {
this.code = code;
this.name = name;
this.leader = leader;
@@ -90,26 +91,32 @@
return leader;
}
- public String getLeader$(){
+ public void setLeader(Long leader) {
+ this.leader = leader;
+ }
+
+ public String getLeader$() {
RoleService service = SpringUtils.getBean(RoleService.class);
Role role = service.selectById(this.leader);
- if (!Cools.isEmpty(role)){
+ if (!Cools.isEmpty(role)) {
return String.valueOf(role.getName());
}
return null;
- }
-
- public void setLeader(Long leader) {
- this.leader = leader;
}
public Short getLevel() {
return level;
}
- public String getLevel$(){
- if (null == this.level){ return null; }
- switch (this.level){
+ public void setLevel(Short level) {
+ this.level = level;
+ }
+
+ public String getLevel$() {
+ if (null == this.level) {
+ return null;
+ }
+ switch (this.level) {
case 1:
return "涓�绾�";
case 2:
@@ -123,10 +130,6 @@
default:
return String.valueOf(this.level);
}
- }
-
- public void setLevel(Short level) {
- this.level = level;
}
diff --git a/src/main/java/com/zy/system/entity/RolePermission.java b/src/main/java/com/zy/system/entity/RolePermission.java
index d846f50..e182a10 100644
--- a/src/main/java/com/zy/system/entity/RolePermission.java
+++ b/src/main/java/com/zy/system/entity/RolePermission.java
@@ -36,9 +36,10 @@
@TableField("permission_id")
private Long permissionId;
- public RolePermission() {}
+ public RolePermission() {
+ }
- public RolePermission(Long roleId,Long permissionId) {
+ public RolePermission(Long roleId, Long permissionId) {
this.roleId = roleId;
this.permissionId = permissionId;
}
@@ -60,34 +61,34 @@
return roleId;
}
- public String getRoleName(){
+ public void setRoleId(Long roleId) {
+ this.roleId = roleId;
+ }
+
+ public String getRoleName() {
RoleService service = SpringUtils.getBean(RoleService.class);
Role role = service.selectById(this.roleId);
- if (!Cools.isEmpty(role)){
+ if (!Cools.isEmpty(role)) {
return role.getName();
}
return null;
- }
-
- public void setRoleId(Long roleId) {
- this.roleId = roleId;
}
public Long getPermissionId() {
return permissionId;
}
- public String getPermissionName(){
+ public void setPermissionId(Long permissionId) {
+ this.permissionId = permissionId;
+ }
+
+ public String getPermissionName() {
PermissionService service = SpringUtils.getBean(PermissionService.class);
Permission permission = service.selectById(this.permissionId);
- if (!Cools.isEmpty(permission)){
+ if (!Cools.isEmpty(permission)) {
return permission.getName();
}
return null;
- }
-
- public void setPermissionId(Long permissionId) {
- this.permissionId = permissionId;
}
diff --git a/src/main/java/com/zy/system/entity/User.java b/src/main/java/com/zy/system/entity/User.java
index c5086aa..53e1aea 100644
--- a/src/main/java/com/zy/system/entity/User.java
+++ b/src/main/java/com/zy/system/entity/User.java
@@ -76,25 +76,25 @@
return username;
}
- public Long getHostId() {
- return hostId;
+ public void setUsername(String username) {
+ this.username = username;
}
- public String getHostName() {
- HostService service = SpringUtils.getBean(HostService.class);
- Host host = service.selectById(this.hostId);
- if (!Cools.isEmpty(host)){
- return host.getName();
- }
- return null;
+ public Long getHostId() {
+ return hostId;
}
public void setHostId(Long hostId) {
this.hostId = hostId;
}
- public void setUsername(String username) {
- this.username = username;
+ public String getHostName() {
+ HostService service = SpringUtils.getBean(HostService.class);
+ Host host = service.selectById(this.hostId);
+ if (!Cools.isEmpty(host)) {
+ return host.getName();
+ }
+ return null;
}
public String getMobile() {
@@ -117,41 +117,47 @@
return roleId;
}
- public String getRoleName(){
+ public void setRoleId(Long roleId) {
+ this.roleId = roleId;
+ }
+
+ public String getRoleName() {
RoleService service = SpringUtils.getBean(RoleService.class);
Role role = service.selectById(this.roleId);
- if (!Cools.isEmpty(role)){
+ if (!Cools.isEmpty(role)) {
return role.getName();
}
return null;
- }
-
- public void setRoleId(Long roleId) {
- this.roleId = roleId;
}
public Date getCreateTime() {
return createTime;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
}
public Integer getStatus() {
return status;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "鍚敤";
case 2:
@@ -161,10 +167,6 @@
default:
return String.valueOf(this.status);
}
- }
-
- public void setStatus(Integer status) {
- this.status = status;
}
diff --git a/src/main/java/com/zy/system/entity/UserLogin.java b/src/main/java/com/zy/system/entity/UserLogin.java
index a5660aa..800de88 100644
--- a/src/main/java/com/zy/system/entity/UserLogin.java
+++ b/src/main/java/com/zy/system/entity/UserLogin.java
@@ -52,16 +52,17 @@
return userId;
}
- public String getUserUsername(){
+ public void setUserId(Long userId) {
+ this.userId = userId;
+ }
+
+ public String getUserUsername() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.userId);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return user.getUsername();
}
return null;
- }
- public void setUserId(Long userId) {
- this.userId = userId;
}
public String getToken() {
@@ -76,15 +77,15 @@
return createTime;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
}
diff --git a/src/main/java/com/zy/system/entity/license/AbstractServerInfos.java b/src/main/java/com/zy/system/entity/license/AbstractServerInfos.java
index f771d16..0bcb433 100644
--- a/src/main/java/com/zy/system/entity/license/AbstractServerInfos.java
+++ b/src/main/java/com/zy/system/entity/license/AbstractServerInfos.java
@@ -19,7 +19,7 @@
/**
* 缁勮闇�瑕侀澶栨牎楠岀殑License鍙傛暟
*/
- public LicenseCheck getServerInfos(){
+ public LicenseCheck getServerInfos() {
LicenseCheck result = new LicenseCheck();
try {
@@ -27,8 +27,8 @@
result.setMacAddress(this.getMacAddress());
result.setCpuSerial(this.getCPUSerial());
result.setMainBoardSerial(this.getMainBoardSerial());
- }catch (Exception e){
- logger.error("鑾峰彇鏈嶅姟鍣ㄧ‖浠朵俊鎭け璐�",e);
+ } catch (Exception e) {
+ logger.error("鑾峰彇鏈嶅姟鍣ㄧ‖浠朵俊鎭け璐�", e);
}
return result;
@@ -68,8 +68,8 @@
InetAddress inetAddr = (InetAddress) inetAddresses.nextElement();
//鎺掗櫎LoopbackAddress銆丼iteLocalAddress銆丩inkLocalAddress銆丮ulticastAddress绫诲瀷鐨処P鍦板潃
- if(!inetAddr.isLoopbackAddress() /*&& !inetAddr.isSiteLocalAddress()*/
- && !inetAddr.isLinkLocalAddress() && !inetAddr.isMulticastAddress()){
+ if (!inetAddr.isLoopbackAddress() /*&& !inetAddr.isSiteLocalAddress()*/
+ && !inetAddr.isLinkLocalAddress() && !inetAddr.isMulticastAddress()) {
result.add(inetAddr);
}
}
@@ -81,21 +81,21 @@
/**
* 鑾峰彇鏌愪釜缃戠粶鎺ュ彛鐨凪ac鍦板潃
*/
- protected String getMacByInetAddress(InetAddress inetAddr){
+ protected String getMacByInetAddress(InetAddress inetAddr) {
try {
byte[] mac = NetworkInterface.getByInetAddress(inetAddr).getHardwareAddress();
StringBuffer stringBuffer = new StringBuffer();
- for(int i=0;i<mac.length;i++){
- if(i != 0) {
+ for (int i = 0; i < mac.length; i++) {
+ if (i != 0) {
stringBuffer.append("-");
}
//灏嗗崄鍏繘鍒禸yte杞寲涓哄瓧绗︿覆
String temp = Integer.toHexString(mac[i] & 0xff);
- if(temp.length() == 1){
+ if (temp.length() == 1) {
stringBuffer.append("0" + temp);
- }else{
+ } else {
stringBuffer.append(temp);
}
}
diff --git a/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java b/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java
index a0cd9e8..4c081f9 100644
--- a/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java
+++ b/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java
@@ -16,13 +16,12 @@
/**
* 鑷畾涔塋icenseManager锛岀敤浜庡鍔犻澶栫殑鏈嶅姟鍣ㄧ‖浠朵俊鎭牎楠�
*/
-public class CustomLicenseManager extends LicenseManager{
- private static Logger logger = LogManager.getLogger(CustomLicenseManager.class);
-
+public class CustomLicenseManager extends LicenseManager {
//XML缂栫爜
private static final String XML_CHARSET = "UTF-8";
//榛樿BUFSIZE
private static final int DEFAULT_BUFSIZE = 8 * 1024;
+ private static Logger logger = LogManager.getLogger(CustomLicenseManager.class);
public CustomLicenseManager() {
@@ -57,7 +56,7 @@
final GenericCertificate certificate = getPrivacyGuard().key2cert(key);
notary.verify(certificate);
- final LicenseContent content = (LicenseContent)this.load(certificate.getEncoded());
+ final LicenseContent content = (LicenseContent) this.load(certificate.getEncoded());
this.validate(content);
setLicenseKey(key);
setCertificate(certificate);
@@ -75,13 +74,13 @@
// Load license key from preferences,
final byte[] key = getLicenseKey();
- if (null == key){
+ if (null == key) {
throw new NoLicenseInstalledException(getLicenseParam().getSubject());
}
certificate = getPrivacyGuard().key2cert(key);
notary.verify(certificate);
- final LicenseContent content = (LicenseContent)this.load(certificate.getEncoded());
+ final LicenseContent content = (LicenseContent) this.load(certificate.getEncoded());
this.validate(content);
setCertificate(certificate);
@@ -98,14 +97,14 @@
final Date now = new Date();
final Date notBefore = content.getNotBefore();
final Date notAfter = content.getNotAfter();
- if (null != notAfter && now.after(notAfter)){
+ if (null != notAfter && now.after(notAfter)) {
throw new LicenseContentException("璇佷功澶辨晥鏃堕棿涓嶈兘鏃╀簬褰撳墠鏃堕棿");
}
- if (null != notBefore && null != notAfter && notAfter.before(notBefore)){
+ if (null != notBefore && null != notAfter && notAfter.before(notBefore)) {
throw new LicenseContentException("璇佷功鐢熸晥鏃堕棿涓嶈兘鏅氫簬璇佷功澶辨晥鏃堕棿");
}
final String consumerType = content.getConsumerType();
- if (null == consumerType){
+ if (null == consumerType) {
throw new LicenseContentException("鐢ㄦ埛绫诲瀷涓嶈兘涓虹┖");
}
}
@@ -126,27 +125,27 @@
//褰撳墠鏈嶅姟鍣ㄧ湡瀹炵殑鍙傛暟淇℃伅
LicenseCheck serverCheckModel = getServerInfos();
- if(expectedCheckModel != null && serverCheckModel != null){
+ if (expectedCheckModel != null && serverCheckModel != null) {
//鏍￠獙IP鍦板潃
- if(!checkIpAddress(expectedCheckModel.getIpAddress(),serverCheckModel.getIpAddress())){
+ if (!checkIpAddress(expectedCheckModel.getIpAddress(), serverCheckModel.getIpAddress())) {
//throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑IP娌″湪鎺堟潈鑼冨洿鍐�");
}
//鏍￠獙Mac鍦板潃
- if(!checkIpAddress(expectedCheckModel.getMacAddress(),serverCheckModel.getMacAddress())){
+ if (!checkIpAddress(expectedCheckModel.getMacAddress(), serverCheckModel.getMacAddress())) {
//throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑Mac鍦板潃娌″湪鎺堟潈鑼冨洿鍐�");
}
//鏍￠獙涓绘澘搴忓垪鍙�
- if(!checkSerial(expectedCheckModel.getMainBoardSerial(),serverCheckModel.getMainBoardSerial())){
+ if (!checkSerial(expectedCheckModel.getMainBoardSerial(), serverCheckModel.getMainBoardSerial())) {
throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑涓绘澘搴忓垪鍙锋病鍦ㄦ巿鏉冭寖鍥村唴");
}
//鏍￠獙CPU搴忓垪鍙�
- if(!checkSerial(expectedCheckModel.getCpuSerial(),serverCheckModel.getCpuSerial())){
+ if (!checkSerial(expectedCheckModel.getCpuSerial(), serverCheckModel.getCpuSerial())) {
throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑CPU搴忓垪鍙锋病鍦ㄦ巿鏉冭寖鍥村唴");
}
- }else{
+ } else {
throw new LicenseContentException("涓嶈兘鑾峰彇鏈嶅姟鍣ㄧ‖浠朵俊鎭�");
}
}
@@ -155,27 +154,27 @@
/**
* 閲嶅啓XMLDecoder瑙ｆ瀽XML
*/
- private Object load(String encoded){
+ private Object load(String encoded) {
BufferedInputStream inputStream = null;
XMLDecoder decoder = null;
try {
inputStream = new BufferedInputStream(new ByteArrayInputStream(encoded.getBytes(XML_CHARSET)));
- decoder = new XMLDecoder(new BufferedInputStream(inputStream, DEFAULT_BUFSIZE),null,null);
+ decoder = new XMLDecoder(new BufferedInputStream(inputStream, DEFAULT_BUFSIZE), null, null);
return decoder.readObject();
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
} finally {
try {
- if(decoder != null){
+ if (decoder != null) {
decoder.close();
}
- if(inputStream != null){
+ if (inputStream != null) {
inputStream.close();
}
} catch (Exception e) {
- logger.error("XMLDecoder瑙ｆ瀽XML澶辫触",e);
+ logger.error("XMLDecoder瑙ｆ瀽XML澶辫触", e);
}
}
@@ -185,7 +184,7 @@
/**
* 鑾峰彇褰撳墠鏈嶅姟鍣ㄩ渶瑕侀澶栨牎楠岀殑License鍙傛暟
*/
- private LicenseCheck getServerInfos(){
+ private LicenseCheck getServerInfos() {
//鎿嶄綔绯荤粺绫诲瀷
String osName = System.getProperty("os.name").toLowerCase();
AbstractServerInfos abstractServerInfos = null;
@@ -195,7 +194,7 @@
abstractServerInfos = new WindowsServerInfos();
} else if (osName.startsWith("linux")) {
// abstractServerInfos = new LinuxServerInfos();
- }else{//鍏朵粬鏈嶅姟鍣ㄧ被鍨�
+ } else {//鍏朵粬鏈嶅姟鍣ㄧ被鍨�
abstractServerInfos = new WindowsServerInfos();
}
@@ -206,18 +205,18 @@
* 鏍￠獙褰撳墠鏈嶅姟鍣ㄧ殑IP/Mac鍦板潃鏄惁鍦ㄥ彲琚厑璁哥殑IP鑼冨洿鍐�<br/>
* 濡傛灉瀛樺湪IP鍦ㄥ彲琚厑璁哥殑IP/Mac鍦板潃鑼冨洿鍐咃紝鍒欒繑鍥瀟rue
*/
- private boolean checkIpAddress(List<String> expectedList,List<String> serverList){
- if(expectedList != null && expectedList.size() > 0){
- if(serverList != null && serverList.size() > 0){
- for(String expected : expectedList){
- if(serverList.contains(expected.trim())){
+ private boolean checkIpAddress(List<String> expectedList, List<String> serverList) {
+ if (expectedList != null && expectedList.size() > 0) {
+ if (serverList != null && serverList.size() > 0) {
+ for (String expected : expectedList) {
+ if (serverList.contains(expected.trim())) {
return true;
}
}
}
return false;
- }else {
+ } else {
return true;
}
}
@@ -225,15 +224,15 @@
/**
* 鏍￠獙褰撳墠鏈嶅姟鍣ㄧ‖浠讹紙涓绘澘銆丆PU绛夛級搴忓垪鍙锋槸鍚﹀湪鍙厑璁歌寖鍥村唴
*/
- private boolean checkSerial(String expectedSerial,String serverSerial){
- if(!Cools.isEmpty(expectedSerial)){
- if(!Cools.isEmpty(serverSerial)){
- if(expectedSerial.equals(serverSerial)){
+ private boolean checkSerial(String expectedSerial, String serverSerial) {
+ if (!Cools.isEmpty(expectedSerial)) {
+ if (!Cools.isEmpty(serverSerial)) {
+ if (expectedSerial.equals(serverSerial)) {
return true;
}
}
return false;
- }else{
+ } else {
return true;
}
}
diff --git a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
index 1659df2..143bcec 100644
--- a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
+++ b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
@@ -53,14 +53,14 @@
public void onApplicationEvent(ContextRefreshedEvent event) {
//root application context 娌℃湁parent
ApplicationContext context = event.getApplicationContext().getParent();
- if(context == null){
+ if (context == null) {
loadLicense();
}
}
//鍔犺浇璇佷功
public boolean loadLicense() {
- if(!Cools.isEmpty(licensePath)){
+ if (!Cools.isEmpty(licensePath)) {
logger.info("++++++++ 寮�濮嬪姞杞借鍙瘉 ++++++++");
try {
diff --git a/src/main/java/com/zy/system/entity/license/LicenseCreator.java b/src/main/java/com/zy/system/entity/license/LicenseCreator.java
index 01f2ad1..ad2bd06 100644
--- a/src/main/java/com/zy/system/entity/license/LicenseCreator.java
+++ b/src/main/java/com/zy/system/entity/license/LicenseCreator.java
@@ -13,8 +13,8 @@
* License鐢熸垚绫�
*/
public class LicenseCreator {
- private static Logger logger = LogManager.getLogger(LicenseCreator.class);
private final static X500Principal DEFAULT_HOLDER_AND_ISSUER = new X500Principal("CN=localhost, OU=localhost, O=localhost, L=SH, ST=SH, C=CN");
+ private static Logger logger = LogManager.getLogger(LicenseCreator.class);
private LicenseCreatorParam param;
public LicenseCreator(LicenseCreatorParam param) {
@@ -24,16 +24,16 @@
/**
* 鐢熸垚License璇佷功
*/
- public boolean generateLicense(){
+ public boolean generateLicense() {
try {
LicenseManager licenseManager = new CustomLicenseManager(initLicenseParam());
LicenseContent licenseContent = initLicenseContent();
- licenseManager.store(licenseContent,new File(param.getLicensePath()));
+ licenseManager.store(licenseContent, new File(param.getLicensePath()));
return true;
- }catch (Exception e){
- logger.error(MessageFormat.format("璇佷功鐢熸垚澶辫触锛歿0}",param),e);
+ } catch (Exception e) {
+ logger.error(MessageFormat.format("璇佷功鐢熸垚澶辫触锛歿0}", param), e);
return false;
}
}
@@ -41,22 +41,22 @@
/**
* 鍒濆鍖栬瘉涔︾敓鎴愬弬鏁�
*/
- private LicenseParam initLicenseParam(){
+ private LicenseParam initLicenseParam() {
Preferences preferences = Preferences.userNodeForPackage(LicenseCreator.class);
//璁剧疆瀵硅瘉涔﹀唴瀹瑰姞瀵嗙殑绉橀挜
CipherParam cipherParam = new DefaultCipherParam(param.getStorePass());
KeyStoreParam privateStoreParam = new CustomKeyStoreParam(LicenseCreator.class
- ,param.getPrivateKeysStorePath()
- ,param.getPrivateAlias()
- ,param.getStorePass()
- ,param.getKeyPass());
+ , param.getPrivateKeysStorePath()
+ , param.getPrivateAlias()
+ , param.getStorePass()
+ , param.getKeyPass());
LicenseParam licenseParam = new DefaultLicenseParam(param.getSubject()
- ,preferences
- ,privateStoreParam
- ,cipherParam);
+ , preferences
+ , privateStoreParam
+ , cipherParam);
return licenseParam;
}
@@ -64,7 +64,7 @@
/**
* 璁剧疆璇佷功鐢熸垚姝ｆ枃淇℃伅
*/
- private LicenseContent initLicenseContent(){
+ private LicenseContent initLicenseContent() {
LicenseContent licenseContent = new LicenseContent();
licenseContent.setHolder(DEFAULT_HOLDER_AND_ISSUER);
licenseContent.setIssuer(DEFAULT_HOLDER_AND_ISSUER);
diff --git a/src/main/java/com/zy/system/entity/license/LicenseVerify.java b/src/main/java/com/zy/system/entity/license/LicenseVerify.java
index 2175930..df818ed 100644
--- a/src/main/java/com/zy/system/entity/license/LicenseVerify.java
+++ b/src/main/java/com/zy/system/entity/license/LicenseVerify.java
@@ -19,19 +19,19 @@
/**
* 瀹夎License璇佷功
*/
- public synchronized LicenseContent install(LicenseVerifyParam param){
+ public synchronized LicenseContent install(LicenseVerifyParam param) {
LicenseContent result = null;
DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//1. 瀹夎璇佷功
- try{
+ try {
LicenseManager licenseManager = LicenseManagerHolder.getInstance(initLicenseParam(param));
licenseManager.uninstall();
result = licenseManager.install(new File(param.getLicensePath()));
- logger.info(MessageFormat.format("璁稿彲璇佸姞杞芥垚鍔燂紝璁稿彲璇佹湁鏁堟湡锛歿0} - {1}",format.format(result.getNotBefore()),format.format(result.getNotAfter())));
- }catch (Exception e){
- logger.error("璁稿彲璇佸姞杞藉け璐ワ紒",e);
+ logger.info(MessageFormat.format("璁稿彲璇佸姞杞芥垚鍔燂紝璁稿彲璇佹湁鏁堟湡锛歿0} - {1}", format.format(result.getNotBefore()), format.format(result.getNotAfter())));
+ } catch (Exception e) {
+ logger.error("璁稿彲璇佸姞杞藉け璐ワ紒", e);
}
return result;
@@ -40,7 +40,7 @@
/**
* 鏍￠獙License璇佷功
*/
- public boolean verify(){
+ public boolean verify() {
try {
LicenseManager licenseManager = LicenseManagerHolder.getInstance(null);
DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -51,10 +51,10 @@
}
LicenseContent licenseContent = licenseManager.verify();
- logger.info(MessageFormat.format("璁稿彲璇佹牎楠岄�氳繃锛岃鍙瘉鏈夋晥鏈燂細{0} - {1}",format.format(licenseContent.getNotBefore()),format.format(licenseContent.getNotAfter())));
+ logger.info(MessageFormat.format("璁稿彲璇佹牎楠岄�氳繃锛岃鍙瘉鏈夋晥鏈燂細{0} - {1}", format.format(licenseContent.getNotBefore()), format.format(licenseContent.getNotAfter())));
return true;
- }catch (Exception e){
- logger.error("璁稿彲璇佹牎楠屽け璐ワ紒",e);
+ } catch (Exception e) {
+ logger.error("璁稿彲璇佹牎楠屽け璐ワ紒", e);
return false;
}
}
@@ -62,7 +62,7 @@
/**
* 鏍￠獙License璇佷功骞惰幏鍙栬瘉涔︿俊鎭�
*/
- public LicenseContent getVerifyInfo(){
+ public LicenseContent getVerifyInfo() {
LicenseManager licenseManager = LicenseManagerHolder.getInstance(null);
if (!updateSystemTime()) {
@@ -74,8 +74,8 @@
try {
LicenseContent licenseContent = licenseManager.verify();
return licenseContent;
- }catch (Exception e){
- logger.error("璁稿彲璇佹牎楠屽け璐ワ紒",e);
+ } catch (Exception e) {
+ logger.error("璁稿彲璇佹牎楠屽け璐ワ紒", e);
return null;
}
}
@@ -85,21 +85,21 @@
* @param param License鏍￠獙绫婚渶瑕佺殑鍙傛暟
* @return de.schlichtherle.license.LicenseParam
*/
- private LicenseParam initLicenseParam(LicenseVerifyParam param){
+ private LicenseParam initLicenseParam(LicenseVerifyParam param) {
Preferences preferences = Preferences.userNodeForPackage(LicenseVerify.class);
CipherParam cipherParam = new DefaultCipherParam(param.getStorePass());
KeyStoreParam publicStoreParam = new CustomKeyStoreParam(LicenseVerify.class
- ,param.getPublicKeysStorePath()
- ,param.getPublicAlias()
- ,param.getStorePass()
- ,null);
+ , param.getPublicKeysStorePath()
+ , param.getPublicAlias()
+ , param.getStorePass()
+ , null);
return new DefaultLicenseParam(param.getSubject()
- ,preferences
- ,publicStoreParam
- ,cipherParam);
+ , preferences
+ , publicStoreParam
+ , cipherParam);
}
/**
@@ -122,7 +122,7 @@
node.put(key, String.valueOf(System.currentTimeMillis()));
return true;
}
- }else {
+ } else {
// 鍐欏叆娉ㄥ唽琛�
node.put(key, String.valueOf(System.currentTimeMillis()));
return true;
diff --git a/src/main/java/com/zy/system/entity/license/WindowsServerInfos.java b/src/main/java/com/zy/system/entity/license/WindowsServerInfos.java
index c575e6d..6f8b774 100644
--- a/src/main/java/com/zy/system/entity/license/WindowsServerInfos.java
+++ b/src/main/java/com/zy/system/entity/license/WindowsServerInfos.java
@@ -17,7 +17,7 @@
//鑾峰彇鎵�鏈夌綉缁滄帴鍙�
List<InetAddress> inetAddresses = getLocalAllInetAddress();
- if(inetAddresses != null && inetAddresses.size() > 0){
+ if (inetAddresses != null && inetAddresses.size() > 0) {
result = inetAddresses.stream().map(InetAddress::getHostAddress).distinct().map(String::toLowerCase).collect(Collectors.toList());
}
@@ -31,7 +31,7 @@
//1. 鑾峰彇鎵�鏈夌綉缁滄帴鍙�
List<InetAddress> inetAddresses = getLocalAllInetAddress();
- if(inetAddresses != null && inetAddresses.size() > 0){
+ if (inetAddresses != null && inetAddresses.size() > 0) {
//2. 鑾峰彇鎵�鏈夌綉缁滄帴鍙ｇ殑Mac鍦板潃
result = inetAddresses.stream().map(this::getMacByInetAddress).distinct().collect(Collectors.toList());
}
@@ -49,11 +49,11 @@
process.getOutputStream().close();
Scanner scanner = new Scanner(process.getInputStream());
- if(scanner.hasNext()){
+ if (scanner.hasNext()) {
scanner.next();
}
- if(scanner.hasNext()){
+ if (scanner.hasNext()) {
serialNumber = scanner.next().trim();
}
@@ -71,11 +71,11 @@
process.getOutputStream().close();
Scanner scanner = new Scanner(process.getInputStream());
- if(scanner.hasNext()){
+ if (scanner.hasNext()) {
scanner.next();
}
- if(scanner.hasNext()){
+ if (scanner.hasNext()) {
serialNumber = scanner.next().trim();
}
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 9af468b..c775615 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -44,9 +44,30 @@
lev: 2
backSta: 106
devpPlcId: ${wcs-slave.devp[0].id}
+ crn[2]: #鍫嗗灈鏈�3
+ id: 3
+ ip: 10.10.10.130
+ slot: 0
+ demo: false
+ rack: 0
+ offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ port: 102
+ crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ staNo: 115
+ row: 7
+ bay: 1
+ lev: 2
+ devpPlcId: ${wcs-slave.devp[0].id}
+ crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+ staNo: 120
+ row: 6
+ bay: 1
+ lev: 2
+ backSta: 106
+ devpPlcId: ${wcs-slave.devp[0].id}
devp[0]: #杈撻�佺嚎
id: 1
- ip: 10.10.10.130
+ ip: 10.10.10.140
rack: 0
port: 102
slot: 0
diff --git a/src/main/resources/mapper/TaskWrkReportLogMapper.xml b/src/main/resources/mapper/TaskWrkReportLogMapper.xml
new file mode 100644
index 0000000..2f14d4d
--- /dev/null
+++ b/src/main/resources/mapper/TaskWrkReportLogMapper.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.TaskWrkReportLogMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.TaskWrkReportLog">
+ <id column="id" property="id" />
+ <result column="task_no" property="taskNo" />
+ <result column="status" property="status" />
+ <result column="wrk_no" property="wrkNo" />
+ <result column="create_time" property="createTime" />
+ <result column="io_type" property="ioType" />
+ <result column="io_pri" property="ioPri" />
+ <result column="start_point" property="startPoint" />
+ <result column="target_point" property="targetPoint" />
+ <result column="modi_user" property="modiUser" />
+ <result column="modi_time" property="modiTime" />
+ <result column="memo" property="memo" />
+ <result column="barcode" property="barcode" />
+ <result column="assign_time" property="assignTime" />
+ <result column="execute_time" property="executeTime" />
+ <result column="complete_time" property="completeTime" />
+ <result column="cancel_time" property="cancelTime" />
+ <result column="wrk_sts" property="wrkSts" />
+ <result column="crn_no" property="crnNo" />
+ <result column="command_step" property="commandStep" />
+ <result column="transfer_mark" property="transferMark" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/TaskWrkReportMapper.xml b/src/main/resources/mapper/TaskWrkReportMapper.xml
new file mode 100644
index 0000000..5b6b784
--- /dev/null
+++ b/src/main/resources/mapper/TaskWrkReportMapper.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.TaskWrkReportMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.TaskWrkReport">
+ <result column="task_no" property="taskNo" />
+ <result column="status" property="status" />
+ <result column="wrk_no" property="wrkNo" />
+ <result column="create_time" property="createTime" />
+ <result column="io_type" property="ioType" />
+ <result column="io_pri" property="ioPri" />
+ <result column="start_point" property="startPoint" />
+ <result column="target_point" property="targetPoint" />
+ <result column="modi_user" property="modiUser" />
+ <result column="modi_time" property="modiTime" />
+ <result column="memo" property="memo" />
+ <result column="barcode" property="barcode" />
+ <result column="assign_time" property="assignTime" />
+ <result column="execute_time" property="executeTime" />
+ <result column="complete_time" property="completeTime" />
+ <result column="cancel_time" property="cancelTime" />
+ <result column="wrk_sts" property="wrkSts" />
+ <result column="crn_no" property="crnNo" />
+ <result column="command_step" property="commandStep" />
+ <result column="transfer_mark" property="transferMark" />
+ <result column="mark_start" property="markStart"/>
+
+ </resultMap>
+
+
+</mapper>
--
Gitblit v1.9.1