From fa8ba6f204061b07638651b6a331c6d2036ec2fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=A5=E5=BE=B7=E5=BD=AA=E6=9C=AC=E5=BD=AA=5C92525?= Date: Mon, 26 Aug 2024 19:48:02 +0800 Subject: [PATCH] no message --- .../com/youchain/utils/CodeForYmYtil.java | 10 +++---- .../java/com/youchain/utils/DateUtil.java | 8 +++--- .../youchain/service/impl/LogServiceImpl.java | 2 +- .../youchain/Netty/ServerListenerHandler.java | 2 +- .../appupdate/inputJson/FullStockIn.java | 2 +- .../appupdate/rest/ScreenMdController.java | 27 ++++++++++--------- .../basicdata/rest/PointController.java | 12 ++++----- .../service/impl/StockServiceImpl.java | 2 +- .../service/impl/StockTypeServiceImpl.java | 2 -- .../service/impl/AgvTaskServiceImpl.java | 2 +- .../service/impl/AsnDetailServiceImpl.java | 2 +- .../service/impl/CountPlanServiceImpl.java | 4 +-- .../service/impl/PickDetailServiceImpl.java | 6 ++--- .../youchain/config/thread/BaseComponent.java | 2 +- .../system/service/impl/UserServiceImpl.java | 12 +++++---- .../icepear/echarts/charts/bar/BarLabel.java | 5 +++- 16 files changed, 52 insertions(+), 48 deletions(-) diff --git a/youchain-common/src/main/java/com/youchain/utils/CodeForYmYtil.java b/youchain-common/src/main/java/com/youchain/utils/CodeForYmYtil.java index 1b77da6..1bc02f3 100644 --- a/youchain-common/src/main/java/com/youchain/utils/CodeForYmYtil.java +++ b/youchain-common/src/main/java/com/youchain/utils/CodeForYmYtil.java @@ -14,25 +14,25 @@ public class CodeForYmYtil { new Thread(()->{ CodeForYmYtil codeForYmYtil=new CodeForYmYtil(); for (int i = 0; i < 100; i++) { - String code = codeForYmYtil.CodeForYmYtil("ce",5); + String code = CodeForYmYtil("ce",5); } }).start(); new Thread(()->{ CodeForYmYtil codeForYmYtil=new CodeForYmYtil(); for (int i = 0; i < 100; i++) { - String code = codeForYmYtil.CodeForYmYtil("ce",5); + String code = CodeForYmYtil("ce",5); } }).start(); new Thread(()->{ CodeForYmYtil codeForYmYtil=new CodeForYmYtil(); for (int i = 0; i < 100; i++) { - String code = codeForYmYtil.CodeForYmYtil("ce",5); + String code = CodeForYmYtil("ce",5); } }).start(); new Thread(()->{ CodeForYmYtil codeForYmYtil=new CodeForYmYtil(); for (int i = 0; i < 100; i++) { - String code = codeForYmYtil.CodeForYmYtil("ce",5); + String code = CodeForYmYtil("ce",5); } }).start(); } @@ -53,7 +53,7 @@ public class CodeForYmYtil { String value; // value = ops.get(key).toString(); - if (ops.get(key)==null||ops.get(key).equals("")){ + if (ops.get(key)==null|| "".equals(ops.get(key))){ ops.set(key, "0"); } value = (Integer.valueOf(ops.get(key).toString())+1)+""; diff --git a/youchain-common/src/main/java/com/youchain/utils/DateUtil.java b/youchain-common/src/main/java/com/youchain/utils/DateUtil.java index 20950f4..71c9ba3 100644 --- a/youchain-common/src/main/java/com/youchain/utils/DateUtil.java +++ b/youchain-common/src/main/java/com/youchain/utils/DateUtil.java @@ -136,16 +136,16 @@ public class DateUtil { public static String formatChageDay(Date date, String type, int value) { Calendar cal = new java.util.GregorianCalendar(); cal.setTime(date); - if (type.equals("DAY")) { + if ("DAY".equals(type)) { cal.add(Calendar.DATE , value); } - if (type.equals("HOUR")) { + if ("HOUR".equals(type)) { cal.add(Calendar.HOUR, value); } - if (type.equals("MINUTE")) { + if ("MINUTE".equals(type)) { cal.add(Calendar.MINUTE, value); } - if (type.equals("SECOND")) { + if ("SECOND".equals(type)) { cal.add(Calendar.SECOND, value); } return ymd.format(cal.getTime()); diff --git a/youchain-logging/src/main/java/com/youchain/service/impl/LogServiceImpl.java b/youchain-logging/src/main/java/com/youchain/service/impl/LogServiceImpl.java index 0b29d61..75a6f68 100644 --- a/youchain-logging/src/main/java/com/youchain/service/impl/LogServiceImpl.java +++ b/youchain-logging/src/main/java/com/youchain/service/impl/LogServiceImpl.java @@ -103,7 +103,7 @@ public class LogServiceImpl implements LogService { log_data.setUsername(username); log_data.setParams(getParameter(method, joinPoint.getArgs())); // 记录登录用户，隐藏密码信息 - if(signature.getName().equals("login") && StringUtils.isNotEmpty(log_data.getParams())){ + if("login".equals(signature.getName()) && StringUtils.isNotEmpty(log_data.getParams())){ JSONObject obj = JSONUtil.parseObj(log_data.getParams()); log_data.setUsername(obj.getStr("username", "")); log_data.setParams(JSONUtil.toJsonStr(Dict.create().set("username", log_data.getUsername()))); diff --git a/youchain-system/src/main/java/com/youchain/Netty/ServerListenerHandler.java b/youchain-system/src/main/java/com/youchain/Netty/ServerListenerHandler.java index 93a5867..27309a1 100644 --- a/youchain-system/src/main/java/com/youchain/Netty/ServerListenerHandler.java +++ b/youchain-system/src/main/java/com/youchain/Netty/ServerListenerHandler.java @@ -170,7 +170,7 @@ public class ServerListenerHandler extends SimpleChannelInboundHandler { bean1.updateBoxLampStatus(ip,ButtonCode,"1"); //处理业务 String boxCode=lampLog.getButtonBox(); - if(boxCode!=null&&!boxCode.equals("")) { + if(boxCode!=null&&!"".equals(boxCode)) { this.buttonService(boxCode);//按钮3的业务处理 } save.setReturnContent((String) redisUtils.get(String.valueOf(save.getId()))); diff --git a/youchain-system/src/main/java/com/youchain/appupdate/inputJson/FullStockIn.java b/youchain-system/src/main/java/com/youchain/appupdate/inputJson/FullStockIn.java index 0eb7119..22c1527 100644 --- a/youchain-system/src/main/java/com/youchain/appupdate/inputJson/FullStockIn.java +++ b/youchain-system/src/main/java/com/youchain/appupdate/inputJson/FullStockIn.java @@ -18,7 +18,7 @@ public class FullStockIn { String stockCode; @ApiModelProperty(value = "按钮盒") - Long boxId=0l; + Long boxId=0L; @ApiModelProperty(value = "作业场景") String agvScene; diff --git a/youchain-system/src/main/java/com/youchain/appupdate/rest/ScreenMdController.java b/youchain-system/src/main/java/com/youchain/appupdate/rest/ScreenMdController.java index a6465db..019444c 100644 --- a/youchain-system/src/main/java/com/youchain/appupdate/rest/ScreenMdController.java +++ b/youchain-system/src/main/java/com/youchain/appupdate/rest/ScreenMdController.java @@ -20,6 +20,9 @@ import java.util.HashMap; import java.util.List; +/** + * @author 92525 + */ @RestController @RequiredArgsConstructor @Api(tags = "美的大屏数据显示") @@ -62,19 +65,19 @@ public class ScreenMdController { Object barCode=obj[4]; Object lot=obj[5]; Object disabled=obj[6]; - String inv_status=obj[7]==null?"":obj[7].toString(); - Object loc_status=obj[8]; + String invStatus =obj[7]==null?"":obj[7].toString(); + Object locStatus =obj[8]; String type="4";//1禁用，2满料，3AGV未送物料占用，4 空闲，5空车占用 //禁用（红色，白×），有物料（绿，白车），4，空（紫，百空），空占用（紫，橙空） - if(disabled.toString().equals("true")){ + if("true".equals(disabled.toString())){ type="1"; - }else if(loc_status.equals("OCCUPY")&&inv_status.equals("OPEN")){ + }else if("OCCUPY".equals(locStatus)&& "OPEN".equals(invStatus)){ type="2"; - }else if(loc_status.equals("OCCUPY")&&inv_status.equals("ZY")){ + }else if("OCCUPY".equals(locStatus)&& "ZY".equals(invStatus)){ type="3"; - }else if(loc_status.equals("FREE")&&inv_status.equals("")){ + }else if("FREE".equals(locStatus)&& "".equals(invStatus)){ type="4"; - }else if(loc_status.equals("OCCUPY")&&inv_status.equals("")){ + }else if("OCCUPY".equals(locStatus)&& "".equals(invStatus)){ type="5"; } d.put("id", obj[0]+""); @@ -125,23 +128,23 @@ public class ScreenMdController { double percentage=sjCount*100*0.1*10/locCount; // percentage=Math.round(percentage); percentage=Double.parseDouble(df.format(percentage)); - if(type.equals("1")){ + if("1".equals(type)){ // color0="#04CDE6"; color1="#0CC8E6"; color1="#021334FF"; - }else if(type.equals("2")){ + }else if("2".equals(type)){ // color0="#73E239"; color1="#35B45E"; color1="#021334FF"; - }else if(type.equals("3")){ + }else if("3".equals(type)){ // color0="#FEBA6B"; color1="#F29961"; color1="#021334FF"; - }else if(type.equals("4")){ + }else if("4".equals(type)){ // color0="#E15E68"; color1="#E53240"; color1="#021334FF"; - }else if(type.equals("5")){ + }else if("5".equals(type)){ // color0="#A682E6"; color1="#6244E6"; color1="#021334FF"; diff --git a/youchain-system/src/main/java/com/youchain/basicdata/rest/PointController.java b/youchain-system/src/main/java/com/youchain/basicdata/rest/PointController.java index 469eb42..e16c0f1 100644 --- a/youchain-system/src/main/java/com/youchain/basicdata/rest/PointController.java +++ b/youchain-system/src/main/java/com/youchain/basicdata/rest/PointController.java @@ -251,14 +251,14 @@ public class PointController { JSONObject jsonObject = JSON.parseObject(json); String smallArea = jsonObject.getString("smallArea") == null ? "" : jsonObject.getString("smallArea");//小库区 String description = jsonObject.getString("description") == null ? "" : jsonObject.getString("description");//存储类型 - String areaId = jsonObject.getString("areaId") == null || jsonObject.getString("areaId").equals("") ? "0" : jsonObject.getString("areaId");//库区 - String enabled = jsonObject.getString("enabled") == null || jsonObject.getString("enabled").equals("") ? "" : jsonObject.getString("enabled");//是否启用 + String areaId = jsonObject.getString("areaId") == null || "".equals(jsonObject.getString("areaId")) ? "0" : jsonObject.getString("areaId");//库区 + String enabled = jsonObject.getString("enabled") == null || "".equals(jsonObject.getString("enabled")) ? "" : jsonObject.getString("enabled");//是否启用 - if ((description == null || description.length() <= 0) && (areaId.equals("0"))) { + if ((description == null || description.length() <= 0) && ("0".equals(areaId))) { return new ResponseEntity<>(ApiResult.success(BAD_REQUEST.value(), "存储类型和库区至少选择一项!", ""), HttpStatus.BAD_REQUEST); } - if ((description != null && description.length() > 0) && (!areaId.equals("0"))) { + if ((description != null && description.length() > 0) && (!"0".equals(areaId))) { return new ResponseEntity<>(ApiResult.success(BAD_REQUEST.value(), "存储类型和库区只能选择一项!", ""), HttpStatus.BAD_REQUEST); } @@ -271,7 +271,7 @@ public class PointController { if (description != null && description.length() > 0) { Point point2 = pointList.get(0); Area area = point2.getArea(); - if (area.getName().equals("前后桶空车区")) { + if ("前后桶空车区".equals(area.getName())) { return new ResponseEntity<>(ApiResult.success(BAD_REQUEST.value(), smallArea + "小库区为前后桶空车区，不能绑定存储类型!", ""), HttpStatus.BAD_REQUEST); } for (Point point : pointList) { @@ -282,7 +282,7 @@ public class PointController { } //批量调整库区 - if (!areaId.equals("0")) { + if (!"0".equals(areaId)) { AreaDto areaDto = areaService.findById(Long.parseLong(areaId)); Area area = areaService.toEntity(areaDto); for (Point point : pointList) { diff --git a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java index 2e274c0..e437d0c 100644 --- a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java @@ -401,7 +401,7 @@ public class StockServiceImpl implements StockService { private AsnDetail createAsnDetail(Item item, Stock stock, Point srcPoint, String propC1, String boxNumber, String propC3, Timestamp propD1, double orderQty, String mo) { AsnDetail asnDetail = new AsnDetail(); asnDetail.setItem(item); - asnDetail.setLineNo(1l); + asnDetail.setLineNo(1L); asnDetail.setStatus(BizStatus.OPEN); asnDetail.setOrderQty(orderQty); asnDetail.setDept(item.getDept()); diff --git a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockTypeServiceImpl.java b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockTypeServiceImpl.java index 470c7e1..13a6a01 100644 --- a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockTypeServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockTypeServiceImpl.java @@ -84,8 +84,6 @@ public class StockTypeServiceImpl implements StockTypeService { @Override @Transactional(rollbackFor = Exception.class) public StockTypeDto create(StockType resources) { - Snowflake snowflake = IdUtil.createSnowflake(1, 1); - resources.setId(snowflake.nextId()); return stockTypeMapper.toDto(stockTypeRepository.save(resources)); } diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AgvTaskServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AgvTaskServiceImpl.java index 568f4bd..1bf20e0 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AgvTaskServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AgvTaskServiceImpl.java @@ -268,7 +268,7 @@ public class AgvTaskServiceImpl implements AgvTaskService { String resultJson = HttpPostUtil.sendPostReq(UrlApi.submitMission(), jsonObject.toString()); JSONObject resulObject = JSON.parseObject(resultJson); String code = resulObject.getString("code") == null ? "" : resulObject.getString("code"); - if (code.equals("0")) { + if ("0".equals(code)) { for (int i = 0; i < agvTasks.size(); i++) { AgvTask agvTask = agvTasks.get(i); agvTask.setJobForce(agvCode);//任务组 diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AsnDetailServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AsnDetailServiceImpl.java index e24a1aa..52a8e61 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AsnDetailServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AsnDetailServiceImpl.java @@ -146,7 +146,7 @@ public class AsnDetailServiceImpl implements AsnDetailService { public AsnDetail createAsnDetail(Item item, Stock stock, Point srcPoint, String propC1, String gdh, String propC3, Timestamp propD1, Double orderQty, String Po) { AsnDetail asnDetail = new AsnDetail(); asnDetail.setItem(item); - asnDetail.setLineNo(1l); + asnDetail.setLineNo(1L); asnDetail.setStatus(BizStatus.OPEN); asnDetail.setOrderQty(orderQty); asnDetail.setDept(item.getDept()); diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/CountPlanServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/CountPlanServiceImpl.java index d2238eb..8972063 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/CountPlanServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/CountPlanServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2020 Zheng Jie + * Copyright 2019-2020 Jie * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -78,8 +78,6 @@ public class CountPlanServiceImpl implements CountPlanService { @Override @Transactional(rollbackFor = Exception.class) public CountPlanDto create(CountPlan resources) { - Snowflake snowflake = IdUtil.createSnowflake(1, 1); - resources.setId(snowflake.nextId()); return countPlanMapper.toDto(countPlanRepository.save(resources)); } diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/PickDetailServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/PickDetailServiceImpl.java index 92b970c..6c36768 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/PickDetailServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/PickDetailServiceImpl.java @@ -286,11 +286,11 @@ public class PickDetailServiceImpl implements PickDetailService { public List queryOut(String type, String date) { String hql = ""; - if (type.equals("Day")) { + if ("Day".equals(type)) { hql = "select sum(d.orderQty),sum(d.pickedQty) from PickDetail d " + " where DATE_FORMAT(d.createTime,'%Y-%m-%d')=DATE_FORMAT(now(),'%Y-%m-%d')"; - } else if (type.equals("Month")) { + } else if ("Month".equals(type)) { hql = "select sum(d.orderQty),sum(d.pickedQty) from PickDetail d " + " where DATE_FORMAT(d.createTime,'%Y-%m')=DATE_FORMAT(now(),'%Y-%m')"; - } else if (type.equals("InOutDay")) { + } else if ("InOutDay".equals(type)) { hql = "select DATE_FORMAT(d.createTime,'%Y-%m-%d'),sum(d.pickedQty) from PickDetail d " + " where DATE_FORMAT(d.createTime,'%Y-%m-%d')>='" + date + "' " + " group by DATE_FORMAT(d.createTime,'%Y-%m-%d')"; } Query query = entityMapper.createQuery(hql); diff --git a/youchain-system/src/main/java/com/youchain/config/thread/BaseComponent.java b/youchain-system/src/main/java/com/youchain/config/thread/BaseComponent.java index 0977dd0..bb52233 100644 --- a/youchain-system/src/main/java/com/youchain/config/thread/BaseComponent.java +++ b/youchain-system/src/main/java/com/youchain/config/thread/BaseComponent.java @@ -18,6 +18,6 @@ public class BaseComponent { } @PostConstruct public void configUrlApi(){ - UserUtils.isDept=deptRepository.findById(7l); + UserUtils.isDept=deptRepository.findById(7L); } } diff --git a/youchain-system/src/main/java/com/youchain/modules/system/service/impl/UserServiceImpl.java b/youchain-system/src/main/java/com/youchain/modules/system/service/impl/UserServiceImpl.java index 512e340..10ffd6e 100644 --- a/youchain-system/src/main/java/com/youchain/modules/system/service/impl/UserServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/modules/system/service/impl/UserServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2020 Zheng Jie + * Copyright 2019-2020 Jie * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -126,15 +126,17 @@ public class UserServiceImpl implements UserService { log.error(JSONObject.toJSONString(user.getRoles())); log.error("------------"); log.error(JSONObject.toJSONString(resources.getRoles())); - List list_role=roleRepository.findAll(); + List listRole =roleRepository.findAll(); log.error("------------"); - log.error(JSONObject.toJSONString(list_role)); + log.error(JSONObject.toJSONString(listRole)); Set roleSet=new HashSet<>(); for (Role r1:resources.getRoles() ) { - for (Role r:list_role) { - if(r1.getId()==r.getId()) + for (Role r:listRole) { + if(r1.getId().equals(r.getId())){ roleSet.add(r); + } + } } user.setRoles(roleSet); diff --git a/youchain-system/src/main/java/org/icepear/echarts/charts/bar/BarLabel.java b/youchain-system/src/main/java/org/icepear/echarts/charts/bar/BarLabel.java index d3baf37..03f516e 100644 --- a/youchain-system/src/main/java/org/icepear/echarts/charts/bar/BarLabel.java +++ b/youchain-system/src/main/java/org/icepear/echarts/charts/bar/BarLabel.java @@ -10,6 +10,9 @@ import lombok.experimental.Accessors; import org.icepear.echarts.origin.chart.bar.BarLabelOption; import org.icepear.echarts.origin.util.TextCommonOption; +/** + * @author 92525 + */ @Accessors(chain = true) @Data public class BarLabel implements BarLabelOption { @@ -141,7 +144,7 @@ public class BarLabel implements BarLabelOption { private Number rotate; - private Number[] offset; + private Number[] offset=null; private Number minMargin;