From 9c3da520c38c813d6b615adb5b49e7519c994f6b Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期五, 13 六月 2025 12:53:45 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/controller/MapController.java | 4 src/main/java/com/zy/asrs/controller/DataResourceController.java | 51 src/main/java/com/zy/asrs/controller/SiteController.java | 126 + 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/controller/MonitorController.java | 94 src/main/java/com/zy/asrs/controller/WrkMastLogController.java | 46 src/main/resources/application-prod.yml | 460 ------ 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/TaskWrkLogController.java | 57 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/controller/BasCrnpController.java | 40 src/main/java/com/zy/asrs/controller/StaDescController.java | 38 src/main/java/com/zy/core/MainProcess.java | 11 src/main/java/com/zy/asrs/controller/BasCrnErrorController.java | 39 src/main/java/com/zy/asrs/controller/CommandInfoLogController.java | 65 src/main/java/com/zy/core/thread/SiemensDevpThread.java | 809 ----------- src/main/java/com/zy/asrs/controller/BasLocStsController.java | 42 src/main/java/com/zy/core/model/CrnSlave.java | 6 src/main/java/com/zy/asrs/controller/BasDevpController.java | 42 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/controller/OpenController.java | 239 ++- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 239 -- src/main/java/com/zy/asrs/controller/BasPlcerrorController.java | 50 src/main/java/com/zy/asrs/controller/CrnController.java | 162 +- src/main/java/com/zy/asrs/controller/BasErrLogController.java | 38 src/main/java/com/zy/core/ServerBootstrap.java | 28 src/main/java/com/zy/asrs/controller/CommandInfoController.java | 59 src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 53 src/main/java/com/zy/asrs/controller/WrkDetlController.java | 20 src/main/java/com/zy/core/thread/SiemensCrnThread.java | 9 src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java | 42 src/main/java/com/zy/asrs/controller/ConsoleController.java | 68 src/main/java/com/zy/asrs/controller/BasCrnStatusController.java | 40 src/main/java/com/zy/asrs/controller/ApiConfigController.java | 45 src/main/java/com/zy/asrs/controller/WrkLastnoController.java | 40 src/main/java/com/zy/asrs/controller/TaskWrkController.java | 151 +- src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 19 src/main/java/com/zy/asrs/controller/ReportQueryController.java | 404 +++--- 42 files changed, 1,393 insertions(+), 2,583 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("鍙d护閿欒"); } } 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 dcdfe29..d5c4fb6 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("鍙d护閿欒"); } 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绯荤粺鐘舵�佷负寮�鍚�"); @@ -392,12 +392,12 @@ command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒� command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞� // command.setCommand((short)1); - return crnControl(command)?R.ok():R.error(); + 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绯荤粺鐘舵�佷负寮�鍚�"); @@ -414,12 +414,12 @@ command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒� command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞� // command.setCommand((short)1); - return crnControl(command)?R.ok():R.error(); + 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绯荤粺鐘舵�佷负寮�鍚�"); @@ -441,12 +441,12 @@ 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..cb58bb7 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; diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java index d0afabe..54863c6 100644 --- a/src/main/java/com/zy/asrs/controller/MonitorController.java +++ b/src/main/java/com/zy/asrs/controller/MonitorController.java @@ -32,7 +32,7 @@ @RequestMapping("/monitor") public class MonitorController { - private static final String[] WEEK = {"鏄熸湡鏃�","鏄熸湡涓�","鏄熸湡浜�","鏄熸湡涓�","鏄熸湡鍥�","鏄熸湡浜�","鏄熸湡鍏�"}; + private static final String[] WEEK = {"鏄熸湡鏃�", "鏄熸湡涓�", "鏄熸湡浜�", "鏄熸湡涓�", "鏄熸湡鍥�", "鏄熸湡浜�", "鏄熸湡鍏�"}; @Autowired private ReportQueryMapper reportQueryMapper; @@ -49,12 +49,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]) ); } @@ -109,13 +109,13 @@ 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("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) // 鏄剧ず鍐呭 ); @@ -126,11 +126,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)); } } @@ -141,32 +141,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); } @@ -182,7 +182,7 @@ outqty.setData(data2.toArray(array2)); list.add(outqty); } - map.put("rows",list); + map.put("rows", list); return R.ok(map); } @@ -192,11 +192,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()); @@ -228,26 +228,27 @@ 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); @@ -260,14 +261,15 @@ /** * 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; @@ -281,15 +283,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; @@ -298,8 +301,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; } } @@ -307,6 +310,7 @@ } } + /** * 寮傚父閫氱煡 */ diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index 52da4d3..8b60abe 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -3,18 +3,17 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.core.annotations.AppAuth; -import com.core.common.BaseRes; 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.entity.param.CarryParam; +import com.zy.asrs.entity.param.CrnStatusParam; +import com.zy.asrs.entity.param.TaskCreateParam; +import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam; import com.zy.asrs.service.*; import com.zy.asrs.utils.Utils; import com.zy.common.web.BaseController; -import com.zy.core.model.DevpSlave; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -22,11 +21,11 @@ import org.springframework.web.bind.annotation.*; 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 @@ -88,129 +87,192 @@ } } - //浠诲姟涓嬪彂鎺ュ彛 - @PostMapping("/outboundTaskSend") + @PostMapping("/inboundTaskSend") @Transactional - public HashMap<String, Object> outboundTaskSend(@RequestBody HashMap<String,Object> hashMap) { + public HashMap<String, Object> inboundTaskSend(@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("ReturnStatus",1); - map.put("ErrorMessage","鍙傛暟涓虹┖锛�"); + List<WMSAndAGVInterfaceParam> params1 = new ArrayList<>(); + for (CarryParam param : params) { + if (Cools.isEmpty(param)) { + map.put("ReturnStatus", 1); + map.put("ErrorMessage", "鍙傛暟涓虹┖锛�"); return map; - } else if (Cools.isEmpty(param.getTaskNo())){ - map.put("ReturnStatus",1); - map.put("ErrorMessage","浠诲姟鍙蜂负绌猴紒"); + } else if (Cools.isEmpty(param.getTaskNo())) { + map.put("ReturnStatus", 1); + map.put("ErrorMessage", "浠诲姟鍙蜂负绌猴紒"); return map; - } else if (Cools.isEmpty(param.getStereoscopicTaskType())){ - map.put("ReturnStatus",1); - map.put("ErrorMessage","浠诲姟绫诲瀷涓虹┖锛�"); + } else if (Cools.isEmpty(param.getStereoscopicTaskType())) { + map.put("ReturnStatus", 1); + map.put("ErrorMessage", "浠诲姟绫诲瀷涓虹┖锛�"); 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("ReturnStatus",1); - map.put("ErrorMessage","鍒濆搴撲綅鏃犳硶鎵惧埌锛�"); + if (Cools.isEmpty(locMast)) { + map.put("ReturnStatus", 1); + map.put("ErrorMessage", "鍒濆搴撲綅鏃犳硶鎵惧埌锛�"); return map; } - HashMap<String,Object> r = new HashMap<>(); + HashMap<String, Object> r = new HashMap<>(); - if(param.getStereoscopicTaskType() == 2){ + if (param.getStereoscopicTaskType() == 1) { //鍑哄簱浠诲姟鍒涘缓 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("ReturnStatus",1); - map.put("ErrorMessage","鍑哄簱璺姴涓嶅瓨鍦紒"); + .eq("type_no", 1) + .eq("crn_no", locMast.getCrnNo()) + .eq("stn_no", param.getTerminalNo())); + if (Cools.isEmpty(staDesc)) { + map.put("ReturnStatus", 1); + map.put("ErrorMessage", "鍏ュ簱璺緞涓嶅瓨鍦紒"); return map; } - r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo())); - if(r.get("ReturnStatus").equals(1)){ - return r; - } - }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("ReturnStatus").equals(1)){ + r = openService.taskCreate(new TaskCreateParam(param, staDesc.getCrnNo())); + if (r.get("ReturnStatus").equals(1)) { return r; } } - apiLogService.save("Wms浠诲姟涓嬪彂鎺ュ彛" - ,request.getRemoteAddr()+request.getRequestURI() - ,"" - ,request.getRemoteAddr() - ,JSON.toJSONString(param) - ,r.toString() - ,true + apiLogService.save("Wms鍏ュ簱浠诲姟涓嬪彂鎺ュ彛" + , request.getRemoteAddr() + request.getRequestURI() + , "" + , request.getRemoteAddr() + , JSON.toJSONString(param) + , r.toString() + , true ); } - map.put("ReturnStatus",0); - map.put("ErrorMessage","ok"); + map.put("ReturnStatus", 0); + map.put("ErrorMessage", "ok"); + return map; + } + + + //浠诲姟涓嬪彂鎺ュ彛 + @PostMapping("/outboundTaskSend") + @Transactional + 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); + HashMap<String, Object> map = new HashMap<>(); + List<WMSAndAGVInterfaceParam> params1 = new ArrayList<>(); + for (CarryParam param : params) { + if (Cools.isEmpty(param)) { + map.put("ReturnStatus", 1); + map.put("ErrorMessage", "鍙傛暟涓虹┖锛�"); + return map; + } else if (Cools.isEmpty(param.getTaskNo())) { + map.put("ReturnStatus", 1); + map.put("ErrorMessage", "浠诲姟鍙蜂负绌猴紒"); + return map; + } else if (Cools.isEmpty(param.getStereoscopicTaskType())) { + map.put("ReturnStatus", 1); + map.put("ErrorMessage", "浠诲姟绫诲瀷涓虹┖锛�"); + 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("ReturnStatus", 1); + map.put("ErrorMessage", "鍒濆搴撲綅鏃犳硶鎵惧埌锛�"); + return map; + } + + HashMap<String, Object> r = new HashMap<>(); + + 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("ReturnStatus", 1); + map.put("ErrorMessage", "鍑哄簱璺姴涓嶅瓨鍦紒"); + return map; + } + r = openService.taskCreate(new TaskCreateParam(param, staDesc.getCrnNo())); + if (r.get("ReturnStatus").equals(1)) { + return r; + } + } 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("ReturnStatus").equals(1)) { + return r; + } + } + apiLogService.save("Wms鍑虹Щ搴撲换鍔′笅鍙戞帴鍙�" + , request.getRemoteAddr() + request.getRequestURI() + , "" + , request.getRemoteAddr() + , JSON.toJSONString(param) + , r.toString() + , true + ); + } + map.put("ReturnStatus", 0); + map.put("ErrorMessage", "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://姝e父鍙栨秷 - if (taskWrk.getStatus()>1){ + if (taskWrk.getStatus() > 1) { return R.error("浠诲姟宸插紑濮嬫墽琛�"); } break; case 2://姝e父瀹屾垚 - 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(); } } @@ -219,39 +281,39 @@ @GetMapping("/deviceStatus") @Transactional public HashMap<String, Object> deviceStatus() { - HashMap<String,Object> map=new HashMap<>(); - List<CrnStatusParam> crnStatusParams=new ArrayList<>(); + HashMap<String, Object> map = new HashMap<>(); + List<CrnStatusParam> crnStatusParams = new ArrayList<>(); List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>()); List<BasDevp> basDevps = basDevpService.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); } for (BasDevp basDevp : basDevps) { - CrnStatusParam crnStatusParam=new CrnStatusParam(); + CrnStatusParam crnStatusParam = new CrnStatusParam(); crnStatusParam.setDevpNo(basDevp.getDevNo()); crnStatusParam.setOutEnable(basDevp.getOutEnable()); crnStatusParam.setInEnable(basDevp.getInEnable()); crnStatusParam.setLoading(basDevp.getLoading()); - if(!Cools.isEmpty(basDevp.getAutoing())&&basDevp.getAutoing().equals("Y")){ + if (!Cools.isEmpty(basDevp.getAutoing()) && basDevp.getAutoing().equals("Y")) { crnStatusParam.setCrnSts(3); - }else{ + } else { crnStatusParam.setCrnSts(2); } crnStatusParams.add(crnStatusParam); } - map.put("ReturnStatus",0); - map.put("ErrorMessage",""); - map.put("data",crnStatusParams); + map.put("ReturnStatus", 0); + map.put("ErrorMessage", ""); + map.put("data", crnStatusParams); return map; } @@ -279,6 +341,7 @@ return list; } + private static void setFieldValue(Object obj, Field field, Object value) throws IllegalAccessException { Class<?> fieldType = field.getType(); diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java index cd42ffc..ca4023a 100644 --- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java +++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java @@ -22,6 +22,7 @@ /** * 鏃ュ織缁熻鎺у埗鍣ㄥ眰 + * * @author admin * @date 2018骞�11鏈�23鏃� */ @@ -29,221 +30,222 @@ @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..183e4c1 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,14 +42,14 @@ @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()); Map<String, Object> map2 = new HashMap<>(); map2.put("floor", 2); - map2.put("modeVal", devpThread.ioModeOf2F.id); - map2.put("modeDesc", devpThread.ioModeOf2F.desc); + map2.put("modeVal", devpThread.ioModeOf1F.id); + map2.put("modeDesc", devpThread.ioModeOf1F.desc); res.add(map2); } return R.ok().add(res); @@ -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 b9b6763..bd37506 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; @@ -59,22 +56,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 +90,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 +102,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 +120,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 +129,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 +145,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 +158,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 +175,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 +228,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 +250,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 +282,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 +304,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);//瀹岀粨鏃堕棿 @@ -336,8 +335,8 @@ return R.ok(); } - public static String getTaskType(Integer paramIoType){ - switch (paramIoType){ + public static String getTaskType(Integer paramIoType) { + switch (paramIoType) { case 1: return "RK"; case 2: 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 = "宸ヤ綔妗f槑缁嗗垹闄�") - 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 = "宸ヤ綔妗f槑缁嗗鍑�") - 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 = "宸ヤ綔妗d慨鏀�") - public R update(WrkMast wrkMast){ - if (Cools.isEmpty(wrkMast) || null==wrkMast.getWrkNo()){ + @RequestMapping(value = "/wrkMast/update/auth") + @ManagerAuth(memo = "宸ヤ綔妗d慨鏀�") + 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 = "宸ヤ綔妗e垹闄�") - 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 = "宸ヤ綔妗e鍑�") - 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 = "宸ヤ綔鍘嗗彶妗d慨鏀�") - public R update(WrkMastLog wrkMastLog){ - if (Cools.isEmpty(wrkMastLog) || null==wrkMastLog.getId()){ + @RequestMapping(value = "/wrkMastLog/update/auth") + @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗d慨鏀�") + 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 = "宸ヤ綔鍘嗗彶妗e垹闄�") - 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 = "宸ヤ綔鍘嗗彶妗e鍑�") - 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/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index a6f9389..7ee9bc6 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; @@ -31,7 +33,6 @@ import com.zy.core.model.DevpSlave; import com.zy.core.model.LedSlave; 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; @@ -39,20 +40,17 @@ import com.zy.core.thread.BarcodeThread; import com.zy.core.thread.LedThread; import com.zy.core.thread.SiemensDevpThread; -import com.zy.system.entity.Config; import com.zy.system.service.ConfigService; import lombok.Synchronized; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import java.io.IOException; import java.util.*; -import java.util.concurrent.CompletableFuture; /** * 绔嬩綋浠撳簱WCS绯荤粺涓绘祦绋嬩笟鍔� @@ -336,169 +334,55 @@ errMsg = "瓒呴噸"; back = true; } - if (!back && staProtocol.isBarcodeErr()) { - errMsg = "鎵爜澶辫触"; - back = true; - } +// if (!back && staProtocol.isBarcodeErr()) { +// errMsg = "鎵爜澶辫触"; +// back = true; +// } // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢 if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && workNo >= 9990 && staProtocol.isPakMk()) { - // 鑾峰彇鏉$爜鎵弿浠俊鎭� - BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode()); - String BoxNo = ""; - if (barcodeThread != null) { - BoxNo = barcodeThread.getBarcode(); - TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", BoxNo)); - if (!Cools.isEmpty(taskWrk1)) { - log.info("鎵樼洏鐮侊細" + BoxNo + "浠诲姟妗e瓨鍦�"); - 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); - // led 寮傚父鏄剧ず - if (ledThread != null) { - String errorMsg = errMsg; - MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg)); - } + if (back) { + // led 寮傚父鏄剧ず + if (ledThread != null) { + String errorMsg = errMsg; + MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg)); } } - - storageEscalationParam.setBoxNo(BoxNo); - //鏄惁婊℃澘 1婊℃澘 0绌烘澘 - storageEscalationParam.setStaType(staProtocol.isEmptyMk() ? 0 : 1); - //搴撲綅绫诲瀷 1楂樺簱浣� 0浣庡簱浣� - storageEscalationParam.setLocType(staProtocol.isHigh() ? 1 : 0); - storageEscalationParam.setTerminalNo(staProtocol.getSiteId()); - log.info("缁勬墭鍏ュ簱={}", storageEscalationParam); - String response = ""; - Boolean success = false; - try { - response = new HttpHandler.Builder() + TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().orderBy("create_time")); + if (taskWrk != null) { + HashMap<String, Object> hashMap = new HashMap<>(); + hashMap.put("TaskNo", taskWrk.getTaskNo()); + //寮�濮嬩笂鎶�,浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS + String response = new HttpHandler.Builder() .setUri(wmsUrl) - .setPath(inboundTaskApplyPath) - .setJson(JSON.toJSONString(storageEscalationParam)) + .setPath(taskStatusFeedbackPath) + .setJson(JSON.toJSONString(hashMap)) .build() .doPost(); - JSONObject jsonObject = JSON.parseObject(response); - if (back) { - staProtocol.setWorkNo((short) 9991); - 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,staProtocol.getSiteId()); - 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)) { - taskWrk.setStatus(2);//娲惧彂浠诲姟 - bool = true; - taskWrkService.updateById(taskWrk); - } - apiLogService.save("wcs寮�濮嬪叆搴撲换鍔′笂鎶ms" - , wmsUrl + TaskExecCallback - , null - , "127.0.0.1" - , JSON.toJSONString(hashMap) - , response - , bool - ); - } catch (Exception e) { - - } - } - } else { - // led 寮傚父鏄剧ず - if (ledThread != null) { - String errorMsg = "宸叉湁鍏ュ簱浠诲姟锛侊紒锛�"; - MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg)); - } - staProtocol.setWorkNo((short) 9991); - staProtocol.setStaNo(inSta.getBackSta().shortValue()); - devpThread.setPakMk(staProtocol.getSiteId(), false); - MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); - } - - } else { - - // led 寮傚父鏄剧ず - if (ledThread != null) { - String errorMsg = jsonObject.getString("ErrorMessage"); - MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg)); - } - - staProtocol.setWorkNo((short) 9991); - staProtocol.setStaNo(inSta.getBackSta().shortValue()); - devpThread.setPakMk(staProtocol.getSiteId(), false); - MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); - } + JSONObject jsonObject1 = JSON.parseObject(response); + Boolean bool = false; + if (jsonObject1.get("ReturnStatus").equals(0)) { + taskWrk.setStatus(2);//娲惧彂浠诲姟 + bool = true; + taskWrkService.updateById(taskWrk); } - } 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 + apiLogService.save("wcs寮�濮嬪叆搴撲换鍔′笂鎶ms" + , wmsUrl + TaskExecCallback , null , "127.0.0.1" - , JSON.toJSONString(storageEscalationParam) + , JSON.toJSONString(hashMap) , response - , success + , bool ); } - log.info("鍏ュ簱璇锋眰鍙傛暟=" + JSON.toJSONString(BoxNo)); - log.info("鍏ュ簱璇锋眰杩斿洖鍙傛暟=" + JSON.toJSONString(response)); } } } - } catch (Exception e) { + } catch ( + Exception e) { log.error("generateStoreWrkFile e", e); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); } @@ -531,11 +415,11 @@ // 鑾峰彇鏉$爜鎵弿浠俊鎭� String BoxNo = ""; //绔欑偣鎷f枡鍥炲簱浠诲姟鏄細鏈変竴鏉� - TaskWrk taskWrkk =taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("start_point",staProtocol.getSiteId())); + TaskWrk taskWrkk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("start_point", staProtocol.getSiteId())); if (!Cools.isEmpty(taskWrkk)) { continue; } - if(!staProtocol.isEmptyMk()&&staProtocol.getWorkNo()<9990){ + if (!staProtocol.isEmptyMk() && staProtocol.getWorkNo() < 9990) { TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("wrk_no", workNo)); @@ -572,7 +456,7 @@ // 鍒涙柊涓�涓叆搴撳伐浣滄。 TaskWrk taskWrk = taskWrkService.selectByTaskNo(result.getTaskNo()); if (Cools.isEmpty(taskWrk)) { - taskWrk = createTask1(result, BoxNo,staProtocol.getSiteId()); + taskWrk = createTask1(result, BoxNo, staProtocol.getSiteId()); if (Cools.isEmpty(taskWrk)) { log.error("搴撲綅寮傚父锛屽簱浣嶅彿锛�={}", taskWrk.getOriginTargetPoint()); } else { @@ -969,28 +853,28 @@ 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, crnStn.getDevpPlcId(), new Task(2, staProtocol)); - } catch (Exception e) { - log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:" + e); - log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:offer:" + offer); - } +// 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, crnStn.getDevpPlcId(), 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)); +// 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)); - } +// } else { +// log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛歵askWrk:" + JSON.toJSONString(taskWrk)); +//// log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯镐俊鎭�:"+JSON.toJSONString(r)); +// } } } catch (Exception e) { log.error("鍑哄簱鍒板嚭搴撶珯寮傚父:寮傚父淇℃伅锛�" + e); @@ -1173,7 +1057,7 @@ } if (locMast.getRow1() == 8) { LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>() - .eq("row1", (locMast.getRow1() - 1 )) + .eq("row1", (locMast.getRow1() - 1)) .eq("bay1", locMast.getBay1()) .eq("lev1", locMast.getLev1()).eq("loc_sts", "F")); if (!Cools.isEmpty(locMast1)) { @@ -1387,9 +1271,9 @@ } - /** - * 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣� - */ +/** + * 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣� + */ // public void storeFinished() { // for (CrnSlave crn : slaveProperties.getCrn()) { // // 鑾峰彇鍫嗗灈鏈轰俊鎭� @@ -1821,7 +1705,7 @@ return response; } - private TaskWrk createTask1(Result result, String barcode,Integer staNo) { + private TaskWrk createTask1(Result result, String barcode, Integer staNo) { String locNo = Utils.Fusion(result.getRow(), result.getFloor(), result.getColumn()); Date now = new Date(); @@ -1835,7 +1719,7 @@ taskWrk.setIoPri(13);//浼樺厛绾� taskWrk.setBarcode(barcode);//鏉$爜 taskWrk.setTargetPoint(locNo); - taskWrk.setStartPoint(staNo+""); + taskWrk.setStartPoint(staNo + ""); taskWrk.setCrnNo(Integer.valueOf(result.getAlley()));//鍫嗗灈鏈哄彿 if (taskWrk.getIoType() == 1) { @@ -1889,7 +1773,8 @@ return taskWrk; } - //----------------------------------------------------------鐢佃鏈烘樉绀哄鐞�---------------------------------------- +//----------------------------------------------------------鐢佃鏈烘樉绀哄鐞�---------------------------------------- + /** * 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅 */ @@ -1919,7 +1804,7 @@ if (reset && !ledThread.isLedMk()) { ledThread.setLedMk(true); if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(4, new ArrayList<>()))) { - log.error(""+mark+" - 1"+" - {}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort()); + log.error("" + mark + " - 1" + " - {}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort()); } else { } 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 3cf81fc..d664fe1 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; @@ -53,6 +52,8 @@ @Value("${wms.url}") private String wmsUrl; + + public ArrayList<String> wharfCode1 = new ArrayList<String>() {{ add("J-1101"); add("J-1103"); @@ -67,11 +68,11 @@ @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("ReturnStatus",1); - map.put("ErrorMessage",param.getTaskNo()+"浠诲姟宸茬粡鐢熸垚锛�"); + map.put("ReturnStatus", 1); + map.put("ErrorMessage", param.getTaskNo() + "浠诲姟宸茬粡鐢熸垚锛�"); return map; } @@ -124,12 +125,12 @@ } if (!taskWrkService.insert(taskWrk)) { - map.put("ReturnStatus",1); - map.put("ErrorMessage",param.getTaskNo()+"鍒涘缓浠诲姟澶辫触锛�"); + map.put("ReturnStatus", 1); + map.put("ErrorMessage", param.getTaskNo() + "鍒涘缓浠诲姟澶辫触锛�"); return map; } - map.put("ReturnStatus",0); - map.put("ErrorMessage","ok"); + map.put("ReturnStatus", 0); + map.put("ErrorMessage", "ok"); return map; } diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java index 51c67c8..95a133f 100644 --- a/src/main/java/com/zy/core/MainProcess.java +++ b/src/main/java/com/zy/core/MainProcess.java @@ -9,7 +9,6 @@ import org.springframework.stereotype.Component; import javax.annotation.PreDestroy; -import java.util.ArrayList; /** * WCS涓绘祦绋� @@ -33,7 +32,7 @@ /** * =====>> 寮�濮嬪伐浣� */ - public void start(){ + public void start() { thread = new Thread(() -> { while (!Thread.currentThread().isInterrupted()) { try { @@ -47,11 +46,11 @@ } // 婕旂ず - mainService.crnDemoOfLocMove1(); + //mainService.crnDemoOfLocMove1(); // 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。 mainService.generateStoreWrkFile1(); // 缁勬墭 // 鍏ュ簱 ===>> 鎷f枡鐩樼偣鍥炲簱锛岃緭閫佺嚎宸ヤ綔鍙蜂繚鐣欑殑鎯呭喌涓嬪叆搴� - mainService.PickingAndReturningToTheWarehouse(); + //mainService.PickingAndReturningToTheWarehouse(); // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯 mainService.crnStnToOutStn(); // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 @@ -81,7 +80,7 @@ // } //鑷姩娲惧彂浠诲姟 - // mainService.autoDistribute(); + // mainService.autoDistribute(); //鑷姩瀹屾垚浠诲姟 // mainService.autoCompleteTask(); //agv鍙栨斁璐у畬鎴� @@ -96,7 +95,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 c840a5b..46d19ea 100644 --- a/src/main/java/com/zy/core/ServerBootstrap.java +++ b/src/main/java/com/zy/core/ServerBootstrap.java @@ -88,20 +88,20 @@ new Thread((Runnable) devpThread).start(); SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread); } - // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼ - log.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼..................................................."); - for (Slave barcode : slaveProperties.getBarcode()) { - BarcodeThread barcodeThread = new BarcodeThread(barcode); -// new Thread(barcodeThread).start(); - SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread); - } - // 鍒濆鍖朙ED绾跨▼ - log.info("鍒濆鍖朙ED绾跨▼..................................................."); - for (LedSlave led : slaveProperties.getLed()) { - LedThread ledThread = new LedThread(led); - new Thread(ledThread).start(); - SlaveConnection.put(SlaveType.Led, led.getId(), ledThread); - } +// // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼ +// log.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼..................................................."); +// for (Slave barcode : slaveProperties.getBarcode()) { +// BarcodeThread barcodeThread = new BarcodeThread(barcode); +//// new Thread(barcodeThread).start(); +// SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread); +// } +// // 鍒濆鍖朙ED绾跨▼ +// log.info("鍒濆鍖朙ED绾跨▼..................................................."); +// for (LedSlave led : slaveProperties.getLed()) { +// LedThread ledThread = new LedThread(led); +// new Thread(ledThread).start(); +// SlaveConnection.put(SlaveType.Led, led.getId(), ledThread); +// } // // 鍒濆鍖栫绉ょ嚎绋� // log.info("鍒濆鍖栫绉ょ嚎绋�..................................................."); // for (Slave scale : slaveProperties.getScale()) { diff --git a/src/main/java/com/zy/core/model/CrnSlave.java b/src/main/java/com/zy/core/model/CrnSlave.java index f84dcdc..e080c40 100644 --- a/src/main/java/com/zy/core/model/CrnSlave.java +++ b/src/main/java/com/zy/core/model/CrnSlave.java @@ -31,9 +31,6 @@ @Data public static class CrnStn { - // 杈撻�佺嚎plc缂栧彿 - private Integer devpPlcId; - // 鍫嗗灈鏈虹珯鐐圭紪鍙� private Integer staNo; @@ -49,6 +46,9 @@ //閫�鍥炵珯鐐� private Integer backSta; + private Integer devpPlcId; + + } } diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java index 2701a91..1a54e6a 100644 --- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java +++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java @@ -17,12 +17,14 @@ import com.zy.core.CrnThread; import com.zy.core.cache.MessageQueue; import com.zy.core.cache.OutputQueue; +import com.zy.core.cache.SlaveConnection; import com.zy.core.enums.*; 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 com.zy.core.model.protocol.StaProtocol; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -190,10 +192,15 @@ crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48)); crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52)); - + // TODO + //鏇存柊铏氭嫙杈撻�佺嚎鐘舵�� + SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1); + //devpThread.setData(); OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId())); + + // 澶嶄綅淇″彿 if (crnProtocol.getTaskFinish() == 0) { if (resetFlag) { diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java index 9e5dc64..9139aaa 100644 --- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java +++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java @@ -1,38 +1,14 @@ package com.zy.core.thread; -import HslCommunication.Core.Types.OperateResult; -import HslCommunication.Core.Types.OperateResultExOne; -import HslCommunication.Profinet.Siemens.SiemensPLCS; import HslCommunication.Profinet.Siemens.SiemensS7Net; -import com.alibaba.fastjson.JSON; -import com.core.common.Cools; -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.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; -import com.zy.core.model.Task; -import com.zy.core.model.protocol.Cycle; import com.zy.core.model.protocol.StaProtocol; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import java.text.MessageFormat; import java.util.ArrayList; -import java.util.Date; -import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -48,72 +24,9 @@ private SiemensS7Net siemensS7Net; private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>(); private short heartBeatVal = 1; - public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{ - add(1001); - add(1002); - add(1003); - add(1004); - add(1005); - add(1006); - add(1007); - add(1008); - add(1009); - add(1010); - add(1011); - add(1012); - add(1013); - add(1014); - add(1015); - add(1016); - add(1017); - add(1018); - add(1019); - add(1020); - - }}; - public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{ - add(2001); - add(2002); - add(2003); - add(2004); - add(2005); - add(2006); - add(2007); - add(2008); - add(2009); - add(2010); - add(2011); - add(2012); - add(2013); - add(2014); - add(2015); - add(2016); - add(2017); - add(2018); - add(2019); - - }}; - public static final ArrayList<Integer> staNos3 = new ArrayList<Integer>() {{ - add(1051); - add(1052); - add(1053); - add(1054); - add(1055); - add(1056); - add(1057); - add(1058); - }}; - public static final ArrayList<Integer> staNos4 = new ArrayList<Integer>() {{ - add(2051); - add(2052); - add(2053); - add(2054); - add(2055); - add(2056); - add(2057); - add(2058); - + public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{ + add(100); }}; /** @@ -129,732 +42,56 @@ * 3.鍑哄簱鍚姩涓� 锛堜笉鑳界敓鎴愬叆搴撳伐浣滄。锛� * 4.鍑哄簱妯″紡 */ - public IoModeType ioModeOf2F = IoModeType.NONE; - - // public IoModeType ioMode = IoModeType.NONE; - private ArrayList<Integer> getStaNo() { - switch (slave.getId()) { - case 1: - return staNos1; - case 2: - return staNos2; - case 3: - return staNos3; - case 4: - return staNos4; - default: - throw new CoolException("鏈嶅姟鍣ㄥ紓甯�"); - } - } + public IoModeType ioModeOf1F = IoModeType.NONE; public SiemensDevpThread(DevpSlave slave) { this.slave = slave; } - @Override - @SuppressWarnings("InfiniteLoopStatement") - public void run() { - connect(); - while (true) { - try { - int step = 1; - Task task = MessageQueue.poll(SlaveType.Devp, slave.getId()); - if (task != null) { - step = task.getStep(); - } - switch (step) { - // 璇绘暟鎹� - case 1: - read(); - break; - // 鍐欐暟鎹� ID+鐩爣绔� - case 2: - write((StaProtocol) task.getData()); - read(); - break; - // 鍐欐暟鎹� ID+鐩爣绔� - case 4: - writeCycle((StaProtocol) task.getData()); - read(); - break; - /* case 3: - write2((StaProtocol)task.getData()); - read(); - break;*/ - default: - break; - } - // 蹇冭烦 -// heartbeat(); - Thread.sleep(400); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - /** - * 鍒濆鍖栫珯鐐圭姸鎬� - */ - private void initSite() { - ArrayList<Integer> staNos = getStaNo(); + public void setData(Integer siteId, boolean loading, boolean inEnable, boolean outEnable) { // 绔欑偣缂栧彿 - for (Integer siteId : staNos) { - StaProtocol staProtocol = station.get(siteId); - if (null == staProtocol) { - staProtocol = new StaProtocol(); - staProtocol.setSiteId(siteId); - station.put(siteId, staProtocol); - } - staProtocol.setWorkNo((short) 0); // ID - staProtocol.setAutoing(false); // 鑷姩 - staProtocol.setLoading(false); // 鏈夌墿 - staProtocol.setInEnable(false); // 鍙叆 - staProtocol.setOutEnable(false); // 鍙嚭 - staProtocol.setEmptyMk(false); // 绌烘澘淇″彿 - staProtocol.setStaNo((short) 0); // 鐩爣绔� - - if (!staProtocol.isPakMk() && !staProtocol.isLoading()) { - staProtocol.setPakMk(true); - } - } - } - - @Override - public boolean connect() { - boolean result = false; - siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp()); - siemensS7Net.setRack(slave.getRack().byteValue()); - siemensS7Net.setSlot(slave.getSlot().byteValue()); - OperateResult connect = siemensS7Net.ConnectServer(); - 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())); - 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())); - log.error("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort()); -// DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class); -// deviceErrorService.addDeviceError("devp", slave.getId(), "杈撻�佺嚎plc杩炴帴澶辫触"); - initSite(); - } - siemensS7Net.ConnectClose(); - return result; - } - - /** - * 璇诲彇鐘舵�� ====> 鏁村潡plc - */ - private void read() throws InterruptedException { -// // 鏇存柊鍏ュ嚭搴撴ā寮� -// updateIoMode(); - ArrayList<Integer> staNos = getStaNo(); - int staNoSize = staNos.size(); - 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); // 绔欑偣缂栧彿 + for (Integer sta : staNos) { + if (sta.equals(siteId)) { StaProtocol staProtocol = station.get(siteId); if (null == staProtocol) { staProtocol = new StaProtocol(); staProtocol.setSiteId(siteId); station.put(siteId, staProtocol); } - staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, i * 8)); // 宸ヤ綔鍙� - - staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 8 + 4)); // 鐩爣绔� - - boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i * 8 + 6, 2); - staProtocol.setAutoing(status[0]); // 鑷姩 - staProtocol.setLoading(status[1]); // 鏈夌墿 - staProtocol.setInEnable(status[2]); // 鍙叆 - staProtocol.setOutEnable(status[3]);// 鍙嚭 - staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿 - staProtocol.setFullPlt(status[5]); // 婊℃墭鐩� - staProtocol.setHigh(status[6]); // 楂樺簱浣� - staProtocol.setLow(status[7]); // 浣庡簱浣� - + staProtocol.setWorkNo((short) 0); // ID + staProtocol.setAutoing(true); // 鑷姩 + staProtocol.setLoading(loading); // 鏈夌墿 + staProtocol.setInEnable(inEnable); // 鍙叆 + staProtocol.setOutEnable(outEnable); // 鍙嚭 + staProtocol.setEmptyMk(false); // 绌烘澘淇″彿 + staProtocol.setStaNo((short) 0); // 鐩爣绔� if (!staProtocol.isPakMk() && !staProtocol.isLoading()) { staProtocol.setPakMk(true); } } } - - //鏉$爜 - Thread.sleep(200); - OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840.0", (short) 8); - if (result2.IsSuccess) { - for (int i = 0; i < 1; i++) { - String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8"); - BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, slave.getId()); - if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) { - barcodeThread.setBarcode(barcode); - } - } - } - - //澶栧舰妫�娴� - OperateResultExOne<byte[]> resultErr1 = siemensS7Net.Read("DB101.802.0", (short) (barcodeSize * 1)); - if (resultErr1.IsSuccess) { - int sta = 0; - switch (slave.getId()) { - case 1: - sta = 1014; - break; - case 2: - sta = 2007; - break; - case 3: - sta = 1052; - break; - case 4: - sta = 2056; - break; - } - StaProtocol staProtocol1 = station.get(sta); - boolean[] status1 = siemensS7Net.getByteTransform().TransBool(resultErr1.Content, 0, 1); - staProtocol1.setFrontErr(status1[0]); - staProtocol1.setBackErr(status1[1]); - staProtocol1.setHighErr(status1[2]); - staProtocol1.setLeftErr(status1[3]); - staProtocol1.setRightErr(status1[4]); - staProtocol1.setWeightErr(status1[5]); - staProtocol1.setBarcodeErr(status1[6]); - } - - -// OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.922.0", (short) (staNoSize * 4)); -// if (resultErr.IsSuccess) { -// for (int i = 0; i < staNoSize; i++) { -// Integer siteId = staNos.get(i); // 绔欑偣缂栧彿 -// boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 4, 1); -// StaProtocol staProtocol = station.get(siteId); -// staProtocol.setBreakerErr(status[0]); -// staProtocol.setInfraredErr(status[1]); -// staProtocol.setOutTimeErr(status[2]); -// staProtocol.setSeizeSeatErr(status[3]); -// staProtocol.setWrkYgoodsN(status[4]); -// staProtocol.setInverterErr(status[5]); -// staProtocol.setContactErr(status[6]); -// staProtocol.setUpcontactErr(status[7]); -// -// } -// } - - -// //RGV鍙拌溅浣嶇疆 -// Thread.sleep(200); -// OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.0",(short)4); -// if (result3.IsSuccess) { -// for (int i = 0; i < 2; i++) { -// Integer siteId = i==0 ? 1 : 2; // 绔欑偣缂栧彿 -// StaProtocol staProtocol = station.get(siteId); -// if (null == staProtocol) { -// staProtocol = new StaProtocol(); -// staProtocol.setSiteId(siteId); -// station.put(siteId, staProtocol); -// } -// staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2))); -//// String aa = staProtocol.getNearbySta(); -//// System.out.println(siteId + "===>>" + staProtocol.getNearbySta()); -// } -// } - -// OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0"); -// if (result2.IsSuccess) { -// this.ioMode = IoModeType.get(result2.Content); -// } - - if (result.IsSuccess) { - OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId())); - - // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴� - try { - List<BasDevp> basDevps = new ArrayList<>(); - for (Integer siteId : staNos) { - StaProtocol staProtocol = station.get(siteId); - basDevps.add(staProtocol.toSqlModel()); - } - - BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class); - if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) { - throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�"); - } - } catch (Exception e) { - e.printStackTrace(); - OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戞洿鏂版暟鎹簱鏁版嵁澶辫触 ===>> [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("鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()); - } - - DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class); - deviceErrorService.deleteDeviceError("devp", slave.getId()); - } 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())); -// log.error("璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()); - DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class); - deviceErrorService.addDeviceError("devp", slave.getId(), "璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐�"); - } - } - - /** - * 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏� - */ - private void writeAgvOk(StaProtocol staProtocol) throws InterruptedException { - if (null == staProtocol) { - return; - } - ArrayList<Integer> staNos = getStaNo(); - int index = staNos.indexOf(staProtocol.getSiteId()); - if (staProtocol.getAgvTypeSign() == 0 || staProtocol.getAgvTypeSign() == 2) { //0鍙栬揣 - switch (staProtocol.getSiteId()) { - case 100: - index = 32; - break; - case 101: - index = 34; - break; - case 102: - index = 38; - break; - case 103: - index = 40; - break; - case 104: - index = 44; - break; - case 105: - index = 46; - break; - case 106: - index = 50; - break; - case 107: - index = 52; - break; - default: - return; - } - } else { - switch (staProtocol.getSiteId()) { - case 100: - index = 30; - break; - case 102: - index = 36; - break; - case 104: - index = 42; - break; - case 106: - index = 48; - break; - default: - return; - } - } - - OperateResult write = null; - //浠诲姟涓嬪彂娆℃暟 - int writeCount = 0; - do { - short textWrite = 1;// 浠诲姟瀹屾垚 - if (staProtocol.getAgvTypeSign() > 1) { - textWrite = 0;// 浠诲姟澶嶄綅 - } - write = siemensS7Net.Write("DB102." + index, textWrite); - if (write.IsSuccess) { - writeCount = 6; - } else { - writeCount++; - log.error("鍐欏叆杈撻�佺嚎鍙栨斁璐у畬鎴愬懡浠ゅ悗璇诲彇澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount); - } - } 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)); - } - - - } - - private void write(StaProtocol staProtocol) throws InterruptedException { - if (staProtocol == null) { - return; - } - - ArrayList<Integer> staNos = getStaNo(); - int index = staNos.indexOf(staProtocol.getSiteId()); - - if (index == -1) { - log.error("绔欑偣缂栧彿 {} 涓嶅湪宸茬煡鍒楄〃涓紝鏃犳硶鍐欏叆浠诲姟锛�", staProtocol.getSiteId()); - return; - } - - int writeCount = 0; // 浠诲姟涓嬪彂灏濊瘯娆℃暟 - boolean writeFlag = false; // 浠诲姟涓嬪彂鎴愬姛鏍囪 - String plcAddressWorkNo = "DB100." + index * 6; - String plcAddressStaNo = "DB100." + (index * 6 + 4); - Thread.sleep(100); - while (writeCount < 5) { - // **璇诲彇褰撳墠PLC鐘舵�侊紝閬垮厤涓嶅繀瑕佺殑鍐欏叆** - OperateResultExOne<byte[]> readResult = siemensS7Net.Read(plcAddressWorkNo, (short) 6); - if (readResult.IsSuccess) { - int currentWorkNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0); - short currentStaNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 4); - - if (currentWorkNo == staProtocol.getWorkNo().intValue() && currentStaNo == staProtocol.getStaNo()) { - log.info("绔欑偣 {} 褰撳墠鐘舵�佸凡鍖归厤锛屾棤闇�閲嶅鍐欏叆", staProtocol.getSiteId()); - return; - } - } - - // **娓呴浂骞剁‘璁�** - if (!clearPLCData(plcAddressWorkNo, plcAddressStaNo, staProtocol.getSiteId())) { - writeCount++; - continue; // 閲嶆柊灏濊瘯娓呴浂 - } - - // **鍐欏叆鏂颁换鍔�** - if (writeTaskToPLC(plcAddressWorkNo, plcAddressStaNo, staProtocol)) { - writeFlag = true; - log.info("杈撻�佺嚎鍛戒护鍐欏叆鎴愬姛锛孭LC缂栧彿={}锛岀珯鐐规暟鎹�={}锛屽皾璇曟鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount); - break; - } - - log.warn("杈撻�佺嚎鍛戒护鍐欏叆澶辫触锛孭LC缂栧彿={}锛岀珯鐐规暟鎹�={}锛屽皾璇曟鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount); - writeCount++; - } - - // **鍐欏叆澶辫触澶勭悊** - handleWriteFailure(staProtocol, writeFlag); - } - - private void writeCycle(StaProtocol staProtocol) throws InterruptedException { - if (staProtocol == null) { - return; - } - - ArrayList<Integer> staNos = getStaNo(); - int index = staNos.indexOf(staProtocol.getSiteId()); - - if (index == -1) { - log.error("绔欑偣缂栧彿 {} 涓嶅湪宸茬煡鍒楄〃涓紝鏃犳硶鍐欏叆浠诲姟锛�", staProtocol.getSiteId()); - return; - } - - int writeCount = 0; // 浠诲姟涓嬪彂灏濊瘯娆℃暟 - boolean writeFlag = false; // 浠诲姟涓嬪彂鎴愬姛鏍囪 - String plcAddressWorkNo = ""; - String plcAddressStaNo = ""; - switch (staProtocol.getSiteId()) { - case 105: - plcAddressWorkNo = "DB73." + 0; - plcAddressStaNo = "DB73." + 4; - break; - case 106: - plcAddressWorkNo = "DB73." + 6; - plcAddressStaNo = "DB73." + (6 + 4); - break; - case 108: - plcAddressWorkNo = "DB73." + 2 * 6; - plcAddressStaNo = "DB73." + (2 * 6 + 4); - break; - case 110: - plcAddressWorkNo = "DB73." + 3 * 6; - plcAddressStaNo = "DB73." + (3 * 6 + 4); - break; - case 112: - plcAddressWorkNo = "DB73." + 4 * 6; - plcAddressStaNo = "DB73." + (4 * 6 + 4); - break; - } - - - // **鍐欏叆鏂颁换鍔�** - if (writeTaskToPLC(plcAddressWorkNo, plcAddressStaNo, staProtocol)) { - writeFlag = true; - log.info("杈撻�佺嚎鍛戒护鍐欏叆鎴愬姛锛孭LC缂栧彿={}锛岀珯鐐规暟鎹�={}锛屽皾璇曟鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount); - } - - // **鍐欏叆澶辫触澶勭悊** - handleWriteFailure(staProtocol, writeFlag); - } - - /** - * 娓呴浂 PLC 鏁版嵁骞堕獙璇佹竻闆舵槸鍚︽垚鍔� - */ - private boolean clearPLCData(String plcAddressWorkNo, String plcAddressStaNo, int siteId) throws InterruptedException { - siemensS7Net.Write(plcAddressWorkNo, 0); - siemensS7Net.Write(plcAddressStaNo, (short) 0); - Thread.sleep(100); // 绛夊緟PLC璇嗗埆 - - OperateResultExOne<byte[]> readResult = siemensS7Net.Read(plcAddressWorkNo, (short) 6); - if (readResult.IsSuccess) { - int readWorkNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0); - short readStaNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 4); - if (readWorkNo == 0 && readStaNo == 0) { - return true; // 娓呴浂鎴愬姛 - } - } - - log.warn("绔欑偣 {} 娓呴浂澶辫触锛屽皾璇曢噸鏂版竻闆�...", siteId); - return false; - } - - /** - * 鍐欏叆鏂颁换鍔″埌 PLC 骞堕獙璇佹槸鍚︽垚鍔� - */ - private boolean writeTaskToPLC(String plcAddressWorkNo, String plcAddressStaNo, StaProtocol staProtocol) throws InterruptedException { - OperateResult writeResult2 = siemensS7Net.Write(plcAddressStaNo, staProtocol.getStaNo()); - - OperateResult writeResult1 = siemensS7Net.Write(plcAddressWorkNo, staProtocol.getWorkNo().intValue()); - - if (writeResult1.IsSuccess && writeResult2.IsSuccess) { - Thread.sleep(200); // 绛夊緟 PLC 璇嗗埆鏂板�� - OperateResultExOne<byte[]> readResult = siemensS7Net.Read(plcAddressWorkNo, (short) 6); - if (readResult.IsSuccess) { - int workNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0); - short staNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 4); - return workNo == staProtocol.getWorkNo().intValue() && staNo == staProtocol.getStaNo(); - } - } - return false; - } - - private boolean writeTaskToPLC(String plcAddressWorkNo, String plcAddressStaNo, Cycle cycle) throws InterruptedException { - OperateResult writeResult1 = siemensS7Net.Write(plcAddressWorkNo, cycle.getWorkNo().intValue()); - OperateResult writeResult2 = siemensS7Net.Write(plcAddressStaNo, cycle.getStaNo()); - - if (writeResult1.IsSuccess && writeResult2.IsSuccess) { - Thread.sleep(200); // 绛夊緟 PLC 璇嗗埆鏂板�� - OperateResultExOne<byte[]> readResult = siemensS7Net.Read(plcAddressWorkNo, (short) 6); - if (readResult.IsSuccess) { - int workNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0); - short staNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 4); - return workNo == cycle.getWorkNo().intValue() && staNo == cycle.getStaNo(); - } - } - return false; - } - - /** - * 澶勭悊鍐欏叆澶辫触鐨勬儏鍐� - */ - private void handleWriteFailure(StaProtocol staProtocol, boolean writeFlag) { - if (!writeFlag) { - StaProtocol currentStaProtocol = station.get(staProtocol.getSiteId()); - if (currentStaProtocol.getWorkNo() == 0 && currentStaProtocol.getStaNo() == 0) { - currentStaProtocol.setPakMk(true); - } - OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣緭閫佺嚎鍛戒护灏濊瘯5娆″け璐ャ�侾LC缂栧彿={1}锛岀珯鐐规暟鎹�={2}", - slave.getId(), JSON.toJSON(currentStaProtocol))); - log.error("杈撻�佺嚎鍛戒护灏濊瘯5娆″け璐ワ紝PLC缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(currentStaProtocol)); - } 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)); - } } - 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); - } - - } - - } - -// /** -// * 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏� -// */ -// private void write(StaProtocol staProtocol) throws InterruptedException { -// if (null == staProtocol) { -// return; -// } -// int index = staNos.indexOf(staProtocol.getSiteId()); -// short[] array = new short[2]; -// array[0] = staProtocol.getWorkNo(); -// array[1] = staProtocol.getStaNo(); -// OperateResult write = siemensS7Net.Write("DB100." + index*4, array); -// -//// OperateResult write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo()); // 宸ヤ綔鍙� -//// Thread.sleep(500); -//// OperateResult write1 = siemensS7Net.Write("DB101." + index*2, staProtocol.getStaNo()); // 鐩爣绔� -// -// if (!write.IsSuccess) { -// staProtocol = station.get(staProtocol.getSiteId()); -// if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) { -// staProtocol.setPakMk(true); -// } -// 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)); -// -// 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) { - if (!siemensS7Net.Write("DB100.180", this.ioModeOf2F.id).IsSuccess) { - OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId())); - log.error("鍐欏叆杈撻�佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId()); - } - } - } - - /** - * 蹇冭烦 - */ - private void heartbeat() { - if (heartBeatVal == 1) { - heartBeatVal = 2; - } else { - heartBeatVal = 1; - } - OperateResult write = siemensS7Net.Write("DB100.50", heartBeatVal); - if (!write.IsSuccess) { - log.error("杈撻�佺嚎plc缂栧彿={} 蹇冭烦澶辫触", slave.getId()); - } - } - - /** - * 璁剧疆鍏ュ簱鏍囪 - */ @Override - public void setPakMk(Integer siteId, boolean pakMk) { - StaProtocol staProtocol = station.get(siteId); - if (null != staProtocol) { - staProtocol.setPakMk(pakMk); - } + public boolean connect() { + return false; } @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); + + @Override + public void setPakMk(Integer siteId, boolean pakMk) { + } -// public static void main(String[] args) throws Exception { -// DevpSlave slave = new DevpSlave(); -// slave.setIp("192.168.2.125"); -// SiemensDevpThread devpThread = new SiemensDevpThread(slave); -// devpThread.connect(); -// devpThread.read(); -// // 鍐� -// StaProtocol staProtocol = devpThread.getStation().get(1); -// staProtocol.setWorkNo((short) 232); -// staProtocol.setStaNo((short) 6); -// staProtocol.setAutoing(true); -// staProtocol.setEmptyMk(true); -// staProtocol.setInEnable(true); -// devpThread.write(staProtocol); -// System.out.println("----------------------------------------"); -// // 璇� -// devpThread.read(); -// System.out.println(JSON.toJSONString(devpThread.station)); -// -// } + @Override + public void run() { + } } diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index dcf1649..d90d3da 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,6 +1,6 @@ wcs-slave: doubleDeep: true #鍙屾繁 - doubleLocs: 5,8 #鍙屾繁搴撲綅鎺掑彿 1,4 + doubleLocs: 1,4 #鍙屾繁搴撲綅鎺掑彿 1,4 groupCount: 4 #涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁� crn[0]: #鍫嗗灈鏈�1 id: 1 @@ -11,463 +11,19 @@ offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 port: 102 crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�--1F杈撻�佺嚎 鏀捐揣鍙� - staNo: 1002 + staNo: 100 row: 1 bay: 1 lev: 1 - devpPlcId: ${wcs-slave.devp[0].id} + devpPlcId: 1 crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1--1F杈撻�佺嚎 鍙栬揣鍙� - staNo: 1004 + staNo: 100 row: 2 bay: 1 lev: 1 - backSta: 102 - devpPlcId: ${wcs-slave.devp[0].id} - crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�--2F杈撻�佺嚎 鏀捐揣鍙� - staNo: 2002 - row: 1 - bay: 59 - lev: 11 - devpPlcId: ${wcs-slave.devp[1].id} - crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�--2F杈撻�佺嚎 鍙栬揣鍙� - staNo: 2003 - row: 2 - bay: 59 - lev: 11 - backSta: 102 - devpPlcId: ${wcs-slave.devp[1].id} - crn[1]: #鍫嗗灈鏈�2 - id: 2 - ip: 192.168.110.90 - slot: 0 - demo: false - rack: 0 - offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 - port: 102 - crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�--1F杈撻�佺嚎 鏀捐揣鍙� - staNo: 1006 - row: 3 - bay: 1 - lev: 1 - devpPlcId: ${wcs-slave.devp[0].id} - crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1--1F杈撻�佺嚎 鍙栬揣鍙� - staNo: 1008 - row: 4 - bay: 1 - lev: 1 - backSta: 106 - devpPlcId: ${wcs-slave.devp[0].id} - crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�--2F杈撻�佺嚎 鏀捐揣鍙� - staNo: 2013 - row: 4 - bay: 59 - lev: 11 - devpPlcId: ${wcs-slave.devp[1].id} - crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�1--2F杈撻�佺嚎 鍙栬揣鍙� - staNo: 2012 - row: 3 - bay: 59 - lev: 11 - backSta: 106 - devpPlcId: ${wcs-slave.devp[1].id} - crn[2]: #鍫嗗灈鏈�3 - id: 3 - ip: 192.168.110.10 - slot: 0 - demo: false - rack: 0 - offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 - port: 102 - crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�--1F杈撻�佺嚎 鏀捐揣鍙� - staNo: 1056 - row: 7 - bay: 1 - lev: 1 - devpPlcId: ${wcs-slave.devp[2].id} - crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1--1F杈撻�佺嚎 鍙栬揣鍙� - staNo: 1058 - row: 6 - bay: 1 - lev: 1 - backSta: 106 - devpPlcId: ${wcs-slave.devp[2].id} - crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�--2F杈撻�佺嚎 鏀捐揣鍙� - staNo: 2057 - row: 7 - bay: 1 - lev: 13 - devpPlcId: ${wcs-slave.devp[3].id} - crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�1--2F杈撻�佺嚎 鍙栬揣鍙� - staNo: 2057 - row: 7 - bay: 1 - lev: 13 - backSta: 106 - devpPlcId: ${wcs-slave.devp[3].id} - crnOutStn[2]: #鍫嗗灈鏈哄嚭搴撶珯鐐�--2F杈撻�佺嚎 鏀捐揣鍙� - staNo: 2058 - row: 6 - bay: 1 - lev: 13 - devpPlcId: ${wcs-slave.devp[3].id} - crnInStn[2]: #鍫嗗灈鏈哄叆搴撶珯鐐�1--2F杈撻�佺嚎 鍙栬揣鍙� - staNo: 2058 - row: 6 - bay: 1 - lev: 13 - backSta: 106 - devpPlcId: ${wcs-slave.devp[3].id} - crnOutStn[3]: #鍫嗗灈鏈哄嚭搴撶珯鐐�--2F杈撻�佺嚎 鏀捐揣鍙� - staNo: 2051 - row: 7 - bay: 13 - lev: 13 - devpPlcId: ${wcs-slave.devp[3].id} - crnInStn[3]: #鍫嗗灈鏈哄叆搴撶珯鐐�1--2F杈撻�佺嚎 鍙栬揣鍙� - staNo: 2051 - row: 7 - bay: 13 - lev: 13 - backSta: 106 - devpPlcId: ${wcs-slave.devp[3].id} - crnOutStn[4]: #鍫嗗灈鏈哄嚭搴撶珯鐐�--2F杈撻�佺嚎 鏀捐揣鍙� - staNo: 2052 - row: 7 - bay: 10 - lev: 13 - devpPlcId: ${wcs-slave.devp[3].id} - crnInStn[4]: #鍫嗗灈鏈哄叆搴撶珯鐐�1--2F杈撻�佺嚎 鍙栬揣鍙� - staNo: 2052 - row: 7 - bay: 10 - lev: 13 - backSta: 106 - devpPlcId: ${wcs-slave.devp[3].id} - crnOutStn[5]: #鍫嗗灈鏈哄嚭搴撶珯鐐�--2F杈撻�佺嚎 鏀捐揣鍙� - staNo: 2054 - row: 7 - bay: 4 - lev: 13 - devpPlcId: ${wcs-slave.devp[3].id} - crnInStn[5]: #鍫嗗灈鏈哄叆搴撶珯鐐�1--2F杈撻�佺嚎 鍙栬揣鍙� - staNo: 2056 - row: 7 - bay: 2 - lev: 13 - backSta: 106 - devpPlcId: ${wcs-slave.devp[3].id} - devp[0]: #杈撻�佺嚎--鍗婃垚鍝�1F - id: 1 - ip: 192.168.110.50 - rack: 0 - port: 102 - slot: 0 - emptyInSta[0]: #绌烘澘鍏ュ簱鍙�0 - staNo: 1014 - inSta[0]: #鍏ュ簱鍙�1 - staNo: 1014 - backSta: 1015 - barcode: ${wcs-slave.barcode[0].id} - led: ${wcs-slave.led[2].id} - outSta[0]: #鍑哄簱鍙�1 - staNo: 1019 - outSta[1]: #鍑哄簱鍙�2 - staNo: 1010 - outSta[2]: #鍑哄簱鍙�2 - staNo: 1020 - devp[1]: #杈撻�佺嚎--鍗婃垚鍝�2F - id: 2 - ip: 192.168.110.70 - rack: 0 - port: 102 - slot: 0 - emptyInSta[0]: #绌烘澘鍏ュ簱鍙�0 - staNo: 2007 - inSta[0]: #鍏ュ簱鍙�1 - staNo: 2007 - backSta: 2006 - barcode: ${wcs-slave.barcode[1].id} - led: ${wcs-slave.led[8].id} - outSta[0]: #鍑哄簱鍙�1 - staNo: 2001 - outSta[1]: #鍑哄簱鍙�2 - staNo: 2019 - devp[2]: #杈撻�佺嚎--鎴愬搧1F - id: 3 - ip: 192.168.110.30 - rack: 0 - port: 102 - slot: 0 - inSta[0]: #鍏ュ簱鍙�1 - staNo: 1052 - backSta: 1051 - barcode: ${wcs-slave.barcode[2].id} - led: ${wcs-slave.led[0].id} - inSta[1]: #绌烘澘鍏ュ簱鍙�0 - staNo: 1058 - outSta[0]: #鍑哄簱鍙�1 - staNo: 1053 - devp[3]: #杈撻�佺嚎--鎴愬搧2F - id: 4 - ip: 192.168.110.40 - rack: 0 - port: 102 - slot: 0 - emptyInSta[0]: #绌烘澘鍏ュ簱鍙�0 - staNo: 2056 - led: ${wcs-slave.led[3].id} - inSta[0]: #鍏ュ簱鍙�1 - staNo: 2056 - backSta: 2055 - barcode: ${wcs-slave.barcode[3].id} - led: ${wcs-slave.led[4].id} - outSta[0]: #鍑哄簱鍙�1 - staNo: 1053 - outSta[1]: #鍑哄簱鍙�1 - staNo: 251 - outSta[2]: #鍑哄簱鍙�1 - staNo: 252 - outSta[3]: #鍑哄簱鍙�1 - staNo: 257 - outSta[4]: #鍑哄簱鍙�1 - staNo: 258 - # 鎷f枡鍏ュ簱鍙�1 - pickSta[0]: - staNo: 2051 - led: ${wcs-slave.led[6].id} - # 鎷f枡鍏ュ簱鍙�2 - pickSta[1]: - staNo: 2052 - # 鎷f枡鍏ュ簱鍙�3 - pickSta[2]: - staNo: 2057 - led: ${wcs-slave.led[3].id} - # 鎷f枡鍏ュ簱鍙�4 - pickSta[3]: - staNo: 2058 - barcode[0]: #鏉$爜鎵弿浠� - port: 51236 - ip: 172.17.91.39 - id: 1 - barcode[1]: #鏉$爜鎵弿浠� - port: 51236 - ip: 172.17.91.39 - id: 2 - barcode[2]: #鏉$爜鎵弿浠� - port: 51236 - ip: 172.17.91.39 - id: 3 - barcode[3]: #鏉$爜鎵弿浠� - port: 51236 - ip: 172.17.91.39 - id: 4 - # LED1 鎴愬搧搴�1F - led[0]: - id: 1 - ip: 192.168.110.210 - port: 5005 - devpPlcId: ${wcs-slave.devp[2].id} - staArr: 1052 - # LED2 鎴愬搧搴�1F - led[1]: - id: 2 - ip: 192.168.110.211 - port: 5005 - devpPlcId: ${wcs-slave.devp[2].id} - staArr: 1051 - # LED3 鍗婃垚鍝佸簱1F - led[2]: - id: 3 - ip: 192.168.110.212 - port: 5005 - devpPlcId: ${wcs-slave.devp[0].id} - staArr: 1014 - # LED4 鎴愬搧搴�2F - led[3]: - id: 4 - ip: 192.168.110.213 - port: 5005 - devpPlcId: ${wcs-slave.devp[3].id} - staArr: 2057 - # LED5 鎴愬搧搴�2F - led[4]: - id: 5 - ip: 192.168.110.214 - port: 5005 - devpPlcId: ${wcs-slave.devp[3].id} - staArr: 2056 - # LED6 鎴愬搧搴�2F - led[5]: - id: 6 - ip: 192.168.110.215 - port: 5005 - devpPlcId: ${wcs-slave.devp[3].id} - staArr: 2054 - # LED7 鎴愬搧搴�2F - led[6]: - id: 7 - ip: 192.168.110.216 - port: 5005 - devpPlcId: ${wcs-slave.devp[3].id} - staArr: 2051 - # LED8 鍗婃垚鍝佸簱2F - led[7]: - id: 8 - ip: 192.168.110.217 - port: 5005 - devpPlcId: ${wcs-slave.devp[1].id} - staArr: 2002 - # LED9 鍗婃垚鍝佸簱2F - led[8]: - id: 9 - ip: 192.168.110.218 - port: 5005 - devpPlcId: ${wcs-slave.devp[1].id} - staArr: 2007 - # LED10 鍗婃垚鍝佸簱2F - led[9]: - id: 10 - ip: 192.168.110.219 - port: 5005 - devpPlcId: ${wcs-slave.devp[1].id} - staArr: 2018 -# crn[0]: #鍫嗗灈鏈�1 -# rack: 0 -# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 -# port: 102 -# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐� -# staNo: 101 -# row: 2 -# bay: 1 -# lev: 1 -# devpPlcId: ${wcs-slave.devp[0].id} -# ip: 192.168.1.100 -# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1 -# staNo: 100 -# row: 1 -# bay: 1 -# lev: 1 -# devpPlcId: ${wcs-slave.devp[0].id} -# id: 1 -# slot: 0 -# demo: false -# crn[1]: #鍫嗗灈鏈�2 -# rack: 0 -# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 -# port: 102 -# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐� -# staNo: 103 -# row: 5 -# bay: 1 -# lev: 1 -# devpPlcId: ${wcs-slave.devp[0].id} -# ip: 192.168.1.110 -# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1 -# staNo: 102 -# row: 4 -# bay: 1 -# lev: 1 -# devpPlcId: ${wcs-slave.devp[0].id} -# id: 2 -# slot: 0 -# demo: false -# barcode[3]: #鏉$爜鎵弿浠�4 -# port: 51236 -# ip: 10.10.10.52 -# id: 4 -# barcode[2]: #鏉$爜鎵弿浠�3 -# port: 51236 -# ip: 10.10.10.52 -# id: 3 -# -# barcode[1]: #鏉$爜鎵弿浠�2 -# port: 51236 -# ip: 10.10.10.52 -# id: 2 -# -# devp[0]: #杈撻�佺嚎 -# emptyInSta[2]: #绌烘澘鍏ュ簱鍙�3 -# staNo: 104 -# emptyInSta[1]: #绌烘澘鍏ュ簱鍙�2 -# staNo: 102 -# rack: 0 -# emptyInSta[0]: #绌烘澘鍏ュ簱鍙�1 -# staNo: 100 -# ip: 192.168.1.140 -# outSta[4]: #鍑哄簱鍙�5 -# staNo: 104 -# outSta[3]: #鍑哄簱鍙�4 -# staNo: 103 -# outSta[6]: #鍑哄簱鍙�7 -# staNo: 106 -# slot: 0 -# outSta[5]: #鍑哄簱鍙�6 -# staNo: 105 -# outSta[0]: #鍑哄簱鍙�1 -# staNo: 100 -# outSta[2]: #鍑哄簱鍙�3 -# staNo: 102 -# emptyInSta[3]: #绌烘澘鍏ュ簱鍙�4 -# staNo: 106 -# outSta[1]: #鍑哄簱鍙�2 -# staNo: 101 -# inSta[2]: -# staNo: 104 -# barcode: ${wcs-slave.barcode[2].id} -# inSta[3]: -# staNo: 106 -# barcode: ${wcs-slave.barcode[3].id} -# port: 102 -# outSta[7]: #鍑哄簱鍙�8 -# staNo: 107 -# inSta[0]: #鍏ュ簱鍙�1 -# staNo: 100 -# barcode: ${wcs-slave.barcode[0].id} -# inSta[1]: #鍏ュ簱鍙�2 -# staNo: 102 -# barcode: ${wcs-slave.barcode[1].id} -# id: 1 -# -# -# crn[2]: #鍫嗗灈鏈�3 -# rack: 0 -# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 -# port: 102 -# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐� -# staNo: 105 -# row: 9 -# bay: 1 -# lev: 1 -# devpPlcId: ${wcs-slave.devp[0].id} -# ip: 192.168.1.120 -# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1 -# staNo: 104 -# row: 8 -# bay: 1 -# lev: 1 -# devpPlcId: ${wcs-slave.devp[0].id} -# id: 3 -# slot: 0 -# demo: false -# crn[3]: #鍫嗗灈鏈�4 -# rack: 0 -# offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 -# port: 102 -# crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐� -# staNo: 107 -# row: 12 -# bay: 1 -# lev: 1 -# devpPlcId: ${wcs-slave.devp[0].id} -# ip: 192.168.1.130 -# crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1 -# staNo: 106 -# row: 11 -# bay: 1 -# lev: 1 -# devpPlcId: ${wcs-slave.devp[0].id} -# id: 4 -# slot: 0 -# demo: false + backSta: 100 + devpPlcId: 1 + + -- Gitblit v1.9.1