From 0062682d301d5a7f2b3a161aa0ceab34904044ce Mon Sep 17 00:00:00 2001 From: erdanergou Date: Sun, 25 Jun 2023 10:01:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=9E=8B=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E6=97=B6=E6=9C=89,=E5=87=BA=E9=94=99=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EPSON/EPDM/EPDMSelectData.java | 5 +-- .../controller/DepositoryController.java | 18 +++++----- .../DepositoryRecordController.java | 4 +-- .../controller/MaterialController.java | 2 +- .../controller/MaterialTypeController.java | 2 +- .../controller/PageController.java | 24 ++++++------- .../controller/PlaceController.java | 4 +-- .../controller/QyWxOperationController.java | 8 ++--- .../depository_manage/entity/Inventory.java | 3 +- .../pojo/ApplicationOutRecordP.java | 3 +- .../depository_manage/pojo/SimpleTaskP.java | 11 +++--- .../impl/DepositoryRecordServiceImpl.java | 24 ++++++------- .../service/impl/DepositoryServiceImpl.java | 2 +- .../service/impl/ExcelServiceImpl.java | 2 +- .../service/impl/MaterialServiceImpl.java | 34 +++++++++---------- .../service/impl/MaterialTypeServiceImpl.java | 4 +-- .../service/impl/QyWxOperationService.java | 22 ++++++------ .../depository_manage/utils/DateUtil.java | 6 ++-- .../depository_manage/BarChartTest.java | 2 +- .../depository_manage/LineChartTest.java | 2 +- .../depository_manage/SomeTest.java | 6 ++-- .../depository_manage/SunburstChartTest.java | 6 ++-- 22 files changed, 99 insertions(+), 95 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/EPSON/EPDM/EPDMSelectData.java b/src/main/java/com/dreamchaser/depository_manage/EPSON/EPDM/EPDMSelectData.java index 2f69cc29..5794049f 100644 --- a/src/main/java/com/dreamchaser/depository_manage/EPSON/EPDM/EPDMSelectData.java +++ b/src/main/java/com/dreamchaser/depository_manage/EPSON/EPDM/EPDMSelectData.java @@ -3,6 +3,7 @@ package com.dreamchaser.depository_manage.EPSON.EPDM; import com.dreamchaser.depository_manage.EPSON.epsonException.EPDMException; import com.dreamchaser.depository_manage.config.EPSON.EPDM.Global_MEDIA_EPDM; import com.dreamchaser.depository_manage.exception.MyException; +import com.dreamchaser.depository_manage.utils.ObjectFormatUtil; import com.sun.jna.Memory; import com.sun.jna.Native; import com.sun.jna.Pointer; @@ -110,11 +111,11 @@ public class EPDMSelectData extends EPDM{ data = Global_MEDIA_EPDM.epdm_select_data_int64.get(p.getInt(0)); break; case 4: - data = Long.valueOf(Global_MEDIA_EPDM.epdm_select_data_int32.get(p.getInt(0))); + data = ObjectFormatUtil.toLong(Global_MEDIA_EPDM.epdm_select_data_int32.get(p.getInt(0))); break; case 2: default: - data = Long.valueOf(Global_MEDIA_EPDM.epdm_select_data_int16.get(p.getInt(0))); + data = ObjectFormatUtil.toLong(Global_MEDIA_EPDM.epdm_select_data_int16.get(p.getInt(0))); break; } return data; diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java index d3cb2e17..fd4143fd 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java @@ -337,10 +337,10 @@ public class DepositoryController { for (int num = 0; num < months.size() - 1; num++) { for (MaterialType materialType : materialTypeAll) { Map parm = new HashMap<>(); - parm.put("type", Integer.parseInt(type)); - if (Integer.parseInt(type) == 1) { + parm.put("type", ObjectFormatUtil.toInteger(type)); + if (ObjectFormatUtil.toInteger(type) == 1) { parm.put("state", "已入库"); - } else if (Integer.parseInt(type) == 2) { + } else if (ObjectFormatUtil.toInteger(type) == 2) { parm.put("state", "已出库"); } parm.put("start", months.get(num + 1)); @@ -855,7 +855,7 @@ public class DepositoryController { token = (String) request.getSession().getAttribute("userToken"); userKey = (String) request.getSession().getAttribute("userKey"); } - Material materialById = materialService.findMaterialById(Integer.parseInt(mid)); + Material materialById = materialService.findMaterialById(ObjectFormatUtil.toInteger(mid)); Map param = new HashMap<>(); param.put("depositoryId", materialById.getDepositoryId()); List depositoryId = depositoryService.findDepositoryByCondition(param, userKey, token); @@ -1576,7 +1576,7 @@ public class DepositoryController { for (i = days.size() - 1; i > 0; i--) { // 遍历 Map并计算各仓库的入库数 // 获取一段时间内的库存额度 - Double depositoryRecordByDate1 = depositoryRecordService.findApplicationRecordByDate(days.get(i), days.get(i - 1), Integer.parseInt(type), val); + Double depositoryRecordByDate1 = depositoryRecordService.findApplicationRecordByDate(days.get(i), days.get(i - 1), ObjectFormatUtil.toInteger(type), val); drCountbyDrName.add(depositoryRecordByDate1); } Collections.reverse(drCountbyDrName); @@ -1661,7 +1661,7 @@ public class DepositoryController { for (i = days.size() - 1; i > 0; i--) { // 遍历 Map并计算各仓库的入库数 // 获取一段时间内的库存额度 - Double depositoryRecordByDate1 = depositoryRecordService.findApplicationRecordByDate(days.get(i - 1), days.get(i), Integer.parseInt(type), val); + Double depositoryRecordByDate1 = depositoryRecordService.findApplicationRecordByDate(days.get(i - 1), days.get(i), ObjectFormatUtil.toInteger(type), val); if ("2".equals(type)) { depositoryRecordByDate1 = -depositoryRecordByDate1; } @@ -1825,10 +1825,10 @@ public class DepositoryController { @Override public Object call() throws Exception { Map map = new HashMap<>(); - map.put("type", Integer.parseInt(type)); - if (Integer.parseInt(type) == 1) { + map.put("type", ObjectFormatUtil.toInteger(type)); + if (ObjectFormatUtil.toInteger(type) == 1) { map.put("state", "已入库"); - } else if (Integer.parseInt(type) == 2) { + } else if (ObjectFormatUtil.toInteger(type) == 2) { map.put("state", "已出库"); } map.put("start", start); diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index 7b6d3516..5dcf5942 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -193,7 +193,7 @@ public class DepositoryRecordController { ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(applicationOutMinById.getParentId()); // 创建展示对象 SimpleApplicationOutMinRecordP simpleApplicationOutMinRecordP = new SimpleApplicationOutMinRecordP(applicationOutMinById); - simpleApplicationOutMinRecordP.setApplicantTime(DateUtil.TimeStampToDateTime(Long.valueOf(applicationOutRecordPById.getApplicantTime()))); + simpleApplicationOutMinRecordP.setApplicantTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(applicationOutRecordPById.getApplicantTime()))); simpleApplicationOutMinRecordP.setApplyRemark(applicationOutRecordPById.getApplyRemark()); simpleApplicationOutMinRecordP.setDepositoryId(depositoryRecordById.getId()); simpleApplicationOutMinRecordP.setDepositoryName(depositoryRecordById.getDname()); @@ -987,7 +987,7 @@ public class DepositoryRecordController { } } - simpleApplicationOutMinRecordP.setApplicantTime(DateUtil.TimeStampToDateTime(Long.valueOf(applicationOutRecordPById.getApplicantTime()))); + simpleApplicationOutMinRecordP.setApplicantTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(applicationOutRecordPById.getApplicantTime()))); simpleApplicationOutMinRecordP.setApplyRemark(applicationOutRecordPById.getApplyRemark()); simpleApplicationOutMinRecordP.setDepositoryId(depositoryRecordById.getId()); simpleApplicationOutMinRecordP.setDepositoryName(depositoryRecordById.getDname()); diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java index 31574052..605e235e 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java @@ -1738,7 +1738,7 @@ public class MaterialController { @PostMapping("/closeTreeChildren") public void closeTreeChildren(@RequestBody Map map, HttpServletRequest request) { if (map.containsKey("mtId")) { - Long mtId = Long.valueOf(map.get("mtId").toString()); + Long mtId = ObjectFormatUtil.toLong(map.get("mtId").toString()); materialService.closeTreeChildren(mtId); } else { throw new MyException("缺少必要参数"); diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialTypeController.java b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialTypeController.java index 0330eeae..07ac9598 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialTypeController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialTypeController.java @@ -135,7 +135,7 @@ public class MaterialTypeController { for (MaterialType materialType : materialTypeByCondition) { Long oldId = materialType.getOldId();// 获取当前物料id RealDeleteSonDepository(oldId.toString()); // 递归查询物料类型 - materialTypeService.deleteMaterialTypeById(Integer.parseInt(oldId.toString())); // 删除物料类型 + materialTypeService.deleteMaterialTypeById(ObjectFormatUtil.toInteger(oldId.toString())); // 删除物料类型 } } diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index 0f2edef6..398a809d 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -2049,7 +2049,7 @@ public class PageController { } String balancePosterTime = recordP.getBalancePosterTime(); if (balancePosterTime != null && !"".equals(balancePosterTime) && !"0".equals(balancePosterTime)) { - recordP.setBalancePosterTime(DateUtil.TimeStampToDateTime(Long.valueOf(balancePosterTime))); + recordP.setBalancePosterTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(balancePosterTime))); } } @@ -2072,8 +2072,8 @@ public class PageController { } } recordP.setPCode(placeCode.toString()); - recordP.setApplicantTime(DateUtil.TimeStampToDateTime(Long.valueOf(recordP.getApplicantTime()))); - recordP.setDepartmentheadTime(DateUtil.TimeStampToDateTime(Long.valueOf(recordP.getDepartmentheadTime()))); + recordP.setApplicantTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(recordP.getApplicantTime()))); + recordP.setDepartmentheadTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(recordP.getDepartmentheadTime()))); recordP.setDepositoryManagerName(depositoryManagerNames.toString()); recordP.setBalancePosterName(balancePosterName.toString()); recordP.setApplicantName(userByPort.getMaindeparmentname() + "_" + userByPort.getName()); @@ -2116,7 +2116,7 @@ public class PageController { String airapproverTime = applicationInRecordPById.getAirapproverTime(); if (airapproverTime != null && !"".equals(airapproverTime)) { - airapproverTime = DateUtil.TimeStampToDateTime(Long.valueOf(airapproverTime)); + airapproverTime = DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(airapproverTime)); applicationInRecordPById.setAirapproverTime(airapproverTime); } @@ -2145,7 +2145,7 @@ public class PageController { // 如果不是组合 UserByPort userByPort = PublicConfig.FindUserById(applicationInRecordPById.getApplicantId(), userKey, token); applicationInRecordPById.setApplicantName(userByPort.getMaindeparmentname() + "_" + userByPort.getName()); - applicationInRecordPById.setApplicantTime(DateUtil.TimeStampToDateTime(Long.valueOf(applicationInRecordPById.getApplicantTime()))); + applicationInRecordPById.setApplicantTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(applicationInRecordPById.getApplicantTime()))); if (applicationInRecordPById.getPrice() != null) { applicationInRecordPById.setPrice(applicationInRecordPById.getPrice() / 100); } else { @@ -2195,7 +2195,7 @@ public class PageController { String airapproverTime = applicationInRecordPById.getAirapproverTime(); if (airapproverTime != null && !"".equals(airapproverTime)) { - airapproverTime = DateUtil.TimeStampToDateTime(Long.valueOf(airapproverTime)); + airapproverTime = DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(airapproverTime)); applicationInRecordPById.setAirapproverTime(airapproverTime); } @@ -2225,7 +2225,7 @@ public class PageController { // 如果不是组合 UserByPort userByPort = PublicConfig.FindUserById(applicationInRecordPById.getApplicantId(), userKey, token); applicationInRecordPById.setApplicantName(userByPort.getMaindeparmentname() + "_" + userByPort.getName()); - applicationInRecordPById.setApplicantTime(DateUtil.TimeStampToDateTime(Long.valueOf(applicationInRecordPById.getApplicantTime()))); + applicationInRecordPById.setApplicantTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(applicationInRecordPById.getApplicantTime()))); if (applicationInRecordPById.getPrice() != null) { applicationInRecordPById.setPrice(applicationInRecordPById.getPrice() / 100); } else { @@ -2386,11 +2386,11 @@ public class PageController { String[] split = balancePoster.split(","); for (String s : split) { if (!"".equals(s)) { - UserByPort userByPort = PublicConfig.FindUserById(Integer.parseInt(s), userKey, token); + UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(s), userKey, token); balancePosterName.append(userByPort.getName()).append(","); } } - applicationOutRecordPById.setBalancePosterTime(DateUtil.TimeStampToDateTime(Long.valueOf(applicationOutRecordPById.getBalancePosterTime()))); + applicationOutRecordPById.setBalancePosterTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(applicationOutRecordPById.getBalancePosterTime()))); } else { applicationOutRecordPById.setBalancePosterTime(""); } @@ -2571,9 +2571,9 @@ public class PageController { applicationOutRecordPById.setApplicantName(userByPort.getMaindeparmentname() + "_" + userByPort.getName()); applicationOutRecordPById.setDepartmentheadName(departmentHeadName.toString()); applicationOutRecordPById.setDepositoryManagerName(depositoryManagerNames.toString()); - applicationOutRecordPById.setApplicantTime(DateUtil.TimeStampToDateTime(Long.valueOf(applicationOutRecordPById.getApplicantTime()))); - applicationOutRecordPById.setDepartmentheadTime(DateUtil.TimeStampToDateTime(Long.valueOf(applicationOutRecordPById.getDepartmentheadTime()))); - applicationOutRecordPById.setDepositoryManagerTime(DateUtil.TimeStampToDateTime(Long.valueOf(applicationOutRecordPById.getDepositoryManagerTime()))); + applicationOutRecordPById.setApplicantTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(applicationOutRecordPById.getApplicantTime()))); + applicationOutRecordPById.setDepartmentheadTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(applicationOutRecordPById.getDepartmentheadTime()))); + applicationOutRecordPById.setDepositoryManagerTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(applicationOutRecordPById.getDepositoryManagerTime()))); applicationOutRecordPById.setPrice(sumPrice); applicationOutRecordPById.setQuantity(sumQuantity); applicationOutRecordPById.setMname(mname.toString()); diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java index 47c2ce3d..7c00545f 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java @@ -475,7 +475,7 @@ public class PlaceController { // 如果当前位置为库位 // 获取当前库位 - Place place = placeService.findPlaceById(Integer.parseInt(locationByQrCode.getPid().toString())); + Place place = placeService.findPlaceById(ObjectFormatUtil.toInteger(locationByQrCode.getPid().toString())); PlaceP placeP = new PlaceP(place); if (Integer.compare(0, placeP.getId()) == 0) { @@ -491,7 +491,7 @@ public class PlaceController { // 如果当前位置为仓库 // 获取当前仓库 - Depository depository = depositoryService.findDepositoryById(Integer.parseInt(locationByQrCode.getDepositoryId().toString())); + Depository depository = depositoryService.findDepositoryById(ObjectFormatUtil.toInteger(locationByQrCode.getDepositoryId().toString())); result.put("flag", 2); result.put("depository", depository); } diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java b/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java index 68321dd1..ed7e08b2 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java @@ -350,7 +350,7 @@ public class QyWxOperationController { s = (String) redisPool.getRedisTemplateByDb(14).opsForHash().get("wms_QyWxScanQrCodeSignature", "jsapi_ticket_app"); if (s != null) { s1 = (String) redisPool.getRedisTemplateByDb(14).opsForHash().get("wms_QyWxScanQrCodeSignature", "jsapi_ticket_enterprises"); - timestamp = Long.parseLong((String) Objects.requireNonNull(redisPool.getRedisTemplateByDb(14).opsForHash().get("wms_QyWxScanQrCodeSignature", "timestamp"))); + timestamp = ObjectFormatUtil.toLong((String) Objects.requireNonNull(redisPool.getRedisTemplateByDb(14).opsForHash().get("wms_QyWxScanQrCodeSignature", "timestamp"))); url = (String) redisPool.getRedisTemplateByDb(14).opsForHash().get("wms_QyWxScanQrCodeSignature", "url"); noncestr = (String) redisPool.getRedisTemplateByDb(14).opsForHash().get("wms_QyWxScanQrCodeSignature", "noncestr"); } else { @@ -584,10 +584,10 @@ public class QyWxOperationController { // 如果已经获取到审批节点 // 获取当前审批节点处理时间 - long aLong = Long.parseLong(spTime); + long aLong = ObjectFormatUtil.toLong(spTime); // 获取之前节点的审批时间 - long aLong1 = Long.parseLong(as_SpTime); + long aLong1 = ObjectFormatUtil.toLong(as_SpTime); if (aLong >= aLong1) { // 如果当前审批节点是最近处理 @@ -625,7 +625,7 @@ public class QyWxOperationController { boolean flagForLabel = true; // 默认为标签 // 获取当前的主订单 - ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(Integer.parseInt(mainId)); + ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(ObjectFormatUtil.toInteger(mainId)); if (Integer.compare(applicationOutRecordPById.getFlagForOpenDepository(), 2) == 0) { // 如果是申请的开放仓库 diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/Inventory.java b/src/main/java/com/dreamchaser/depository_manage/entity/Inventory.java index e99cb33f..22486907 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/Inventory.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/Inventory.java @@ -1,6 +1,7 @@ package com.dreamchaser.depository_manage.entity; import com.dreamchaser.depository_manage.pojo.MaterialAndPlaceForViewP; +import com.dreamchaser.depository_manage.utils.ObjectFormatUtil; import lombok.Data; import java.util.List; @@ -181,7 +182,7 @@ public class Inventory { this.mid = mpv.getMid(); this.mname = mpv.getMname(); this.code = mpv.getMcode(); - this.materialTypeId = Long.valueOf(mpv.getType_id()); + this.materialTypeId = ObjectFormatUtil.toLong(mpv.getType_id()); this.typeName = mpv.getTname(); this.version = mpv.getVersion(); this.quantity = mpv.getInventory().intValue(); diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java index 72019d66..8f9a4765 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java @@ -2,6 +2,7 @@ package com.dreamchaser.depository_manage.pojo; import com.dreamchaser.depository_manage.entity.ApplicationOutRecord; import com.dreamchaser.depository_manage.utils.DateUtil; +import com.dreamchaser.depository_manage.utils.ObjectFormatUtil; import lombok.Data; import java.util.List; @@ -289,7 +290,7 @@ public class ApplicationOutRecordP { this.constructionUnitId = aor.getConstructionUnitId(); this.constructionUnitName = aor.getConstructionUnitName(); this.adminorgId = aor.getAdminorgId(); - this.outTime = aor.getOutTime() == null ? "" : DateUtil.TimeStampToDateTime(Long.valueOf(aor.getOutTime())); + this.outTime = aor.getOutTime() == null ? "" : DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(aor.getOutTime())); this.abstracts = aor.getAbstracts(); this.outType = aor.getOutType(); this.outTypeName = aor.getOutTypeName(); diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/SimpleTaskP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/SimpleTaskP.java index 01d0da58..5d987ad3 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/SimpleTaskP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/SimpleTaskP.java @@ -3,6 +3,7 @@ package com.dreamchaser.depository_manage.pojo; import com.dreamchaser.depository_manage.entity.ApplicationInRecord; import com.dreamchaser.depository_manage.entity.ApplicationOutRecordMin; import com.dreamchaser.depository_manage.utils.DateUtil; +import com.dreamchaser.depository_manage.utils.ObjectFormatUtil; import lombok.Data; @@ -47,7 +48,7 @@ public class SimpleTaskP { * @param d 出库任务 */ public SimpleTaskP(SimpleApplicationOutOrInRecordP d) { - this.id= Long.valueOf(d.getId().toString()); + this.id= ObjectFormatUtil.toLong(d.getId().toString()); this.applicantTime = d.getApplicantTime(); this.applicantName = d.getApplicantName(); this.type = d.getType() == 1? "出库请求" : "入库请求"; @@ -67,15 +68,15 @@ public class SimpleTaskP { } public SimpleTaskP(ApplicationOutRecordP aor,ApplicationOutRecordMinP aorm){ - this.id = Long.valueOf(aorm.getDepositoryId().toString()); + this.id = ObjectFormatUtil.toLong(aorm.getDepositoryId().toString()); this.code = aorm.getCode(); - this.applicantTime = DateUtil.TimeStampToDateTime(Long.valueOf(aor.getApplicantTime())); + this.applicantTime = DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(aor.getApplicantTime())); this.applicantName = aor.getApplicantName(); this.type = "物料出库请求"; } public SimpleTaskP(ApplicationOutRecordP aor){ - this.id = Long.valueOf(aor.getId()); + this.id = ObjectFormatUtil.toLong(aor.getId()); this.code = aor.getCode(); this.applicantTime = aor.getApplicantTime(); this.applicantName = aor.getApplicantName(); @@ -83,7 +84,7 @@ public class SimpleTaskP { } public SimpleTaskP(ApplicationInRecordP aip) { - this.id = Long.valueOf(aip.getId()); + this.id = ObjectFormatUtil.toLong(aip.getId()); this.code = aip.getCode(); this.applicantTime = aip.getApplicantTime(); this.applicantName = aip.getApplicantName(); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index ed249fb4..c6152eb7 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -84,7 +84,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { map.put("applyTime", DateUtil.DateTimeToTimeStamp(simpleTime)); map.put("state", "待审核"); String mname = (String) map.get("mname"); - double quantity = Double.parseDouble((String) map.get("quantity")); + double quantity = ObjectFormatUtil.toDouble((String) map.get("quantity")); Map param = new HashMap<>(); param.put("mname", mname); List list = materialMapper.findMaterialByCondition(param); @@ -118,7 +118,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { Integer Inventory = depositoryMapper.getToDayInventoryByDName(temp); //构造单号 String code = createCode(depositoryRecordById.getDname(), "InOrderNumber", "in", ""); - double quantity = Double.parseDouble((String) map.get("quantity")); + double quantity = ObjectFormatUtil.toDouble((String) map.get("quantity")); Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); // 根据物料id查询物料 Material material = materialMapper.findMaterialById(mid); @@ -248,7 +248,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (placeId == null || "".equals(placeId) || "0".equals(placeId)) { map.put("placeId", 0); } - double quantity = Double.parseDouble((String) map.get("quantity")) * 100; + double quantity = ObjectFormatUtil.toDouble((String) map.get("quantity")) * 100; Long time = DateUtil.DateTimeToTimeStamp(DateUtil.getSimpleTime(new Date())); map.put("applicantTime", time); Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); @@ -596,7 +596,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } if (Double.compare(priceForYesterday, 0.0) != 0) { - ratioForPrice = (priceForToday - priceForYesterday) / Double.parseDouble(Double.toString(priceForYesterday)); + ratioForPrice = (priceForToday - priceForYesterday) / ObjectFormatUtil.toDouble(Double.toString(priceForYesterday)); } BigDecimal bgForSum = new BigDecimal(ratioForCount); BigDecimal bgForPrice = new BigDecimal(ratioForPrice); @@ -674,7 +674,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { ratioForCount = ((countForToday - countForYesterday) / countForYesterday); } if (Double.compare(priceForYesterday, 0.0) != 0) { - ratioForPrice = (priceForToday - priceForYesterday) / Double.parseDouble(Double.toString(priceForYesterday)); + ratioForPrice = (priceForToday - priceForYesterday) / ObjectFormatUtil.toDouble(Double.toString(priceForYesterday)); } BigDecimal bgForSum = new BigDecimal(ratioForCount); BigDecimal bgForPrice = new BigDecimal(ratioForPrice); @@ -1919,7 +1919,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { StringBuilder sb = new StringBuilder(); if ("mt".equals(type.toString())) { // 获取当前类型的管理员 - List materialTypeIdForIn = roleService.findRoleAndMaterialTypeByMtId(Long.valueOf(mtId.toString())); + List materialTypeIdForIn = roleService.findRoleAndMaterialTypeByMtId(ObjectFormatUtil.toLong(mtId.toString())); for (RoleAndMaterialType mt : materialTypeIdForIn ) { @@ -2888,7 +2888,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { @Transactional(rollbackFor = Exception.class) public Integer transferApply(Map map, UserByPort userByPort, String userKey, String token) { Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); - double quantity = Double.parseDouble((String) map.get("quantity")); + double quantity = ObjectFormatUtil.toDouble((String) map.get("quantity")); Inventory material = materialMapper.findInventoryById(mid); map.put("depositoryId", material.getDepositoryId()); map.put("mid", mid); @@ -4523,7 +4523,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { for (ApplicationInRecord applicationInRecord : list) { UserByPort userByPortById = PublicConfig.FindUserById(applicationInRecord.getApplicantId(), userKey, token); - String time = DateUtil.TimeStampToDateTime(Long.valueOf(applicationInRecord.getApplicantTime())); + String time = DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(applicationInRecord.getApplicantTime())); applicationInRecord.setApplicantName(userByPortById.getName()); applicationInRecord.setApplicantTime(time); applicationInRecord.setApplyRemark(applicationInRecord.getApplyRemark() == null ? "" : applicationInRecord.getApplyRemark()); @@ -4578,7 +4578,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { List result = new ArrayList<>(); for (ApplicationInRecord applicationInRecord : list) { UserByPort userByPortById = PublicConfig.FindUserById(applicationInRecord.getApplicantId(), userKey, token); - String time = DateUtil.TimeStampToDateTime(Long.valueOf(applicationInRecord.getApplicantTime())); + String time = DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(applicationInRecord.getApplicantTime())); applicationInRecord.setApplicantName(userByPortById.getName()); applicationInRecord.setApplicantTime(time); applicationInRecord.setApplyRemark(applicationInRecord.getApplyRemark() == null ? "" : applicationInRecord.getApplyRemark()); @@ -4654,7 +4654,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { List result = new ArrayList<>(); for (ApplicationOutRecord record : list) { UserByPort userByPortById = PublicConfig.FindUserById(record.getApplicantId(), userKey, token); - String time = DateUtil.TimeStampToDateTime(Long.valueOf(record.getApplicantTime())); + String time = DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(record.getApplicantTime())); record.setApplicantName(userByPortById.getName()); record.setApplicantTime(time); record.setApplyRemark(record.getApplyRemark() == null ? "" : record.getApplyRemark()); @@ -4733,7 +4733,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { continue; } UserByPort userByPortById = PublicConfig.FindUserById(recordP.getApplicantId(), userKey, token); - String time = DateUtil.TimeStampToDateTime(Long.valueOf(recordP.getApplicantTime())); + String time = DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(recordP.getApplicantTime())); recordP.setApplicantName(userByPortById.getName()); recordP.setApplicantTime(time); recordP.setApplyRemark(recordP.getApplyRemark() == null ? "" : recordP.getApplyRemark()); @@ -5042,7 +5042,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { List allMtByParent = null; if (o != null) { String oldId = String.valueOf(o); - MaterialType mt = materialTypeMapper.findMaterialTypeByOldId(Long.valueOf(oldId)); + MaterialType mt = materialTypeMapper.findMaterialTypeByOldId(ObjectFormatUtil.toLong(oldId)); allMtByParent = findChildForMaterialTypeByParent(mt); map.put("list", allMtByParent); } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java index 6a4cca34..ceeed0d0 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java @@ -1027,7 +1027,7 @@ public class DepositoryServiceImpl implements DepositoryService { // 定义开启线程数 int openThreadSize = 0; for (Depository depository : depositories) { - if (("".equals(adminorg) || PublicConfig.roleAdminorgList.contains(Integer.parseInt(adminorg))) && !"21".equals(type)) { // 如果不按部门分类或是仓储中心人员且不是入库、库存转移，则全部加载 + if (("".equals(adminorg) || PublicConfig.roleAdminorgList.contains(ObjectFormatUtil.toInteger(adminorg))) && !"21".equals(type)) { // 如果不按部门分类或是仓储中心人员且不是入库、库存转移，则全部加载 Future submit = completionService.submit(new PlaceTask(depository)); futureList.add(submit); openThreadSize++; diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java index 4079bf41..6e490699 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java @@ -479,7 +479,7 @@ public class ExcelServiceImpl implements ExcelService { if (outTime == null || "".equals(outTime)) { excelInfoByWrite.setOutTime(""); } else { - excelInfoByWrite.setOutTime(DateUtil.TimeStampToDateTimeForDay(Long.valueOf(outTime))); + excelInfoByWrite.setOutTime(DateUtil.TimeStampToDateTimeForDay(ObjectFormatUtil.toLong(outTime))); } // 设置仓库名称 excelInfoByWrite.setDname(record.getDepositoryName()); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java index ef864345..c279753e 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java @@ -84,7 +84,7 @@ public class MaterialServiceImpl implements MaterialService { @Override public Integer insertMaterial(Map map) { if (map.containsKey("price")) { - int price = (int) (Double.parseDouble(map.get("price").toString()) * 100); + int price = (int) (ObjectFormatUtil.toDouble(map.get("price").toString()) * 100); map.put("price", price); } // 判断是否有保质期 @@ -121,7 +121,7 @@ public class MaterialServiceImpl implements MaterialService { if (maxCode == null) { newCode = String.format("%04d", 1); } else { - newCode = String.format("%04d", Long.parseLong(maxCode) + 1); + newCode = String.format("%04d", ObjectFormatUtil.toLong(maxCode) + 1); } map.put("code", newCode); @@ -157,7 +157,7 @@ public class MaterialServiceImpl implements MaterialService { @Override public Integer updateMaterial(Map map) { if (map.containsKey("price")) { - Double price = Double.parseDouble((String) map.get("price")) * 100; + Double price = ObjectFormatUtil.toDouble((String) map.get("price")) * 100; map.put("price", price); } // 判断是否有保质期 @@ -623,7 +623,7 @@ public class MaterialServiceImpl implements MaterialService { } //1年2月3天，后面为数目 - material.setShelfLife(Long.valueOf(shelfLife.substring(1))); + material.setShelfLife(ObjectFormatUtil.toLong(shelfLife.substring(1))); } return material; } @@ -1052,7 +1052,7 @@ public class MaterialServiceImpl implements MaterialService { } material.setRemark(materialRemark + map.get("remark").toString()); } - double quantity = Double.parseDouble(map.get("quantity").toString()); + double quantity = ObjectFormatUtil.toDouble(map.get("quantity").toString()); double quantity_residue = 0; int splitInfoScaleQuantity = 0; SplitInfo baseSplitInfoForMid = null; @@ -1330,7 +1330,7 @@ public class MaterialServiceImpl implements MaterialService { */ @Override public List AddInitTreeMenus(Map map) { - Long mtId = Long.valueOf(map.get("mtId").toString()); + Long mtId = ObjectFormatUtil.toLong(map.get("mtId").toString()); List result = new ArrayList<>(); MaterialType mt = materialTypeMapper.findMaterialTypeByOldId(mtId); List materialTypeByParent = materialTypeMapper.findMaterialTypeByParent(mt.getOldId()); @@ -1367,7 +1367,7 @@ public class MaterialServiceImpl implements MaterialService { for (int i = 0; i < objectList.size(); i++) { String s = objectList.get(i); JSONObject jsonObject = JSONObject.parseObject(s); - Long id = Long.valueOf(jsonObject.getString("id")); + Long id = ObjectFormatUtil.toLong(jsonObject.getString("id")); if (Long.compare(parentMt.getOldId(), id) == 0) { if (mtLevel == 1) { @@ -1409,7 +1409,7 @@ public class MaterialServiceImpl implements MaterialService { for (int i = 0; i < objectList.size(); i++) { String s = objectList.get(i); JSONObject jsonObject = JSONObject.parseObject(s); - Long id = Long.valueOf(jsonObject.getString("id")); + Long id = ObjectFormatUtil.toLong(jsonObject.getString("id")); if (Long.compare(id, parent.getOldId()) == 0) { jsonObject = setTreeChildrenSpreadIsTrue(jsonObject, mt, mtLevel - 1, map); } @@ -1438,7 +1438,7 @@ public class MaterialServiceImpl implements MaterialService { JSONArray children = jsonObject.getJSONArray("children"); for (int i = 0; i < children.size(); i++) { JSONObject object = children.getJSONObject(i); - Long id = Long.valueOf(object.getString("id")); + Long id = ObjectFormatUtil.toLong(object.getString("id")); if (Long.compare(id, parent.getOldId()) == 0) { JSONObject object1 = setTreeChildrenSpreadIsTrue(object, mt, level - 1, map); children.set(i, object1); @@ -1544,7 +1544,7 @@ public class MaterialServiceImpl implements MaterialService { for (int i = 0; i < objectList.size(); i++) { String s = objectList.get(i); JSONObject jsonObject = JSONObject.parseObject(s); - Long id = Long.valueOf(jsonObject.getString("id")); + Long id = ObjectFormatUtil.toLong(jsonObject.getString("id")); if (Long.compare(id, parentMt.getOldId()) == 0) { // 如果是打开的顶级 JSONArray children = closeTree(jsonObject.getJSONArray("children"), mtLevel - 1, mt); @@ -1875,7 +1875,7 @@ public class MaterialServiceImpl implements MaterialService { // 如果到当前等级 for (int i = 0; i < jsonArray.size(); i++) { JSONObject object = jsonArray.getJSONObject(i); - Long oId = Long.valueOf(object.getString("id")); + Long oId = ObjectFormatUtil.toLong(object.getString("id")); if (Long.compare(oId, mt.getOldId()) == 0) { // 如果是当前关闭类别 object.remove("spread"); @@ -1888,7 +1888,7 @@ public class MaterialServiceImpl implements MaterialService { } for (int i = 0; i < jsonArray.size(); i++) { JSONObject object = jsonArray.getJSONObject(i); - Long oId = Long.valueOf(object.getString("id")); + Long oId = ObjectFormatUtil.toLong(object.getString("id")); if (Long.compare(oId, parent.getOldId()) == 0) { // 如果是当前要关闭的父类 JSONArray children = object.getJSONArray("children"); @@ -1926,11 +1926,11 @@ public class MaterialServiceImpl implements MaterialService { // 获取当前树形菜单数据 JSONObject jsonObject = (JSONObject) childrenList.get(i); // 获取当前菜单id - Long id = Long.valueOf(jsonObject.getString("id")); + Long id = ObjectFormatUtil.toLong(jsonObject.getString("id")); // 如果当前类型id与菜单id一致 if (Long.compare(somId, id) == 0) { - Long childrenId = Long.valueOf(stringObjectMap.get("id").toString()); + Long childrenId = ObjectFormatUtil.toLong(stringObjectMap.get("id").toString()); if (Long.compare(childrenId, id) == 0) { list.add(stringObjectMap); } else { @@ -1961,14 +1961,14 @@ public class MaterialServiceImpl implements MaterialService { */ public List updateTreeChildren(List childrenList, Map map, Integer level, Integer nowLevel) { // 获取数据中的id - Long somId = Long.valueOf(map.get("id").toString()); + Long somId = ObjectFormatUtil.toLong(map.get("id").toString()); List children = new ArrayList<>(); if (level - nowLevel == 0) { // 如果不需要递归 for (int i = 0; i < childrenList.size(); i++) { JSONObject o = (JSONObject) childrenList.get(i); // 获取当前子列表中的数据id - Long id = Long.valueOf(o.getString("id")); + Long id = ObjectFormatUtil.toLong(o.getString("id")); if (Long.compare(somId, id) == 0) { // 如果当前数据需要进行修改 children.add(map); @@ -1987,7 +1987,7 @@ public class MaterialServiceImpl implements MaterialService { for (int i = 0; i < childrenList.size(); i++) { JSONObject o = (JSONObject) childrenList.get(i); // 获取当前子列表中的数据id - Long id = Long.valueOf(o.getString("id")); + Long id = ObjectFormatUtil.toLong(o.getString("id")); if (Long.compare(id, parent.getOldId()) == 0) { List objectList = updateTreeChildren(o.getJSONArray("children"), map, level, nowLevel + 1); o.put("children", objectList); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialTypeServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialTypeServiceImpl.java index a8f19a0a..52c7ab6c 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialTypeServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialTypeServiceImpl.java @@ -44,12 +44,12 @@ public class MaterialTypeServiceImpl implements MaterialTypeService { } Object oldId = map.get("oldId"); if (oldId == null) { - Long parentId = Long.valueOf(map.get("parentId").toString()); + Long parentId = ObjectFormatUtil.toLong(map.get("parentId").toString()); MaterialType materialTypeById = materialTypeMapper.findMaterialTypeByOldId(parentId); Integer size = 0; String firstName = ""; if (materialTypeById == null) { - List materialTypeByParent = materialTypeMapper.findMaterialTypeByParent(Long.valueOf("0")); + List materialTypeByParent = materialTypeMapper.findMaterialTypeByParent(ObjectFormatUtil.toLong("0")); size = materialTypeByParent.size(); } else { List materialTypeByParent = materialTypeMapper.findMaterialTypeByParent(materialTypeById.getOldId()); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java index c491cd2e..127f7c76 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java @@ -130,7 +130,7 @@ public class QyWxOperationService { TemplateCard_main_title main_title = new TemplateCard_main_title(); // main_title.setTitle(applicant+"的出库申请"); main_title.setTitle(applicant.getName() + "的出库申请"); - main_title.setDesc("申请时间：" + DateUtil.TimeStampToDateTime(Long.valueOf(applicationOutRecordPById.getApplicantTime()))); + main_title.setDesc("申请时间：" + DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(applicationOutRecordPById.getApplicantTime()))); // 设置一级标题 templateCard_button_interaction.setMain_title(main_title); @@ -348,7 +348,7 @@ public class QyWxOperationService { TemplateCard_main_title main_title = new TemplateCard_main_title(); // main_title.setTitle(applicant+"的出库申请"); main_title.setTitle(originator.getName() + "的仓库盘点"); - main_title.setDesc("申请时间：" + DateUtil.TimeStampToDateTime(Long.valueOf(mainRecord.getCreateTime()))); + main_title.setDesc("申请时间：" + DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(mainRecord.getCreateTime()))); // 设置一级标题 templateCard_button_interaction.setMain_title(main_title); @@ -585,7 +585,7 @@ public class QyWxOperationService { TemplateCard_main_title main_title = new TemplateCard_main_title(); // main_title.setTitle(applicant+"的出库申请"); main_title.setTitle("盘点记录处理"); - main_title.setDesc("发起时间：" + DateUtil.TimeStampToDateTime(Long.valueOf(mainRecord.getCreateTime()))); + main_title.setDesc("发起时间：" + DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(mainRecord.getCreateTime()))); // 设置一级标题 templateCard_button_interaction.setMain_title(main_title); @@ -752,7 +752,7 @@ public class QyWxOperationService { // 设置content Map markdown = new HashMap<>(); StringBuilder content = new StringBuilder("## `抄送信息：`%n"); - content.append(">### **" + applicant.getName() + "的出库申请** %n申请时间：" + DateUtil.TimeStampToDateTime(Long.valueOf(recordP.getApplicantTime())) + " %n"); + content.append(">### **" + applicant.getName() + "的出库申请** %n申请时间：" + DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(recordP.getApplicantTime())) + " %n"); content.append("%n---%n"); for (ApplicationOutRecordMin recordMin : applicationOutRecordMinByParent) { // 获取子订单信息 @@ -1166,7 +1166,7 @@ public class QyWxOperationService { // 设置主标题 TemplateCard_main_title main_title = new TemplateCard_main_title(); main_title.setTitle(applicant.getName() + "的出库请求"); - main_title.setDesc("申请时间：" + DateUtil.TimeStampToDateTime(Long.valueOf(outRecordP.getApplicantTime()))); + main_title.setDesc("申请时间：" + DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(outRecordP.getApplicantTime()))); text_notice.setMain_title(main_title); // 卡片右上角更多操作按钮 @@ -1749,7 +1749,7 @@ public class QyWxOperationService { summary_info_name.setText("发起人：" + userToken.getName()); summary_info_name.setLang("zh_CN"); Approval_template_summary_info summary_info_time = new Approval_template_summary_info(); - summary_info_time.setText("发起时间：" + DateUtil.TimeStampToDateTime(Long.valueOf(mainRecord.getApplicantTime()))); + summary_info_time.setText("发起时间：" + DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(mainRecord.getApplicantTime()))); summary_info_time.setLang("zh_CN"); Approval_template_summary_info summary_info_department = new Approval_template_summary_info(); summary_info_department.setText("所在部门：" + portName); @@ -2394,7 +2394,7 @@ public class QyWxOperationService { summary_info_name.setText("发起人：" + userToken.getName()); summary_info_name.setLang("zh_CN"); Approval_template_summary_info summary_info_time = new Approval_template_summary_info(); - summary_info_time.setText("发起时间：" + DateUtil.TimeStampToDateTime(Long.valueOf(mainRecord.getApplicantTime()))); + summary_info_time.setText("发起时间：" + DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(mainRecord.getApplicantTime()))); summary_info_time.setLang("zh_CN"); Approval_template_summary_info summary_info_department = new Approval_template_summary_info(); summary_info_department.setText("所在部门：" + portName); @@ -2672,7 +2672,7 @@ public class QyWxOperationService { Map members_time = new HashMap<>(); Map contact_time = new HashMap<>(); contact_time.put("type", "hour"); - contact_time.put("s_timestamp", String.valueOf(Long.parseLong(minRecordList.get(0).getApplicantTime()) / 1000)); + contact_time.put("s_timestamp", String.valueOf(ObjectFormatUtil.toLong(minRecordList.get(0).getApplicantTime()) / 1000)); members_time.put("date", contact_time); approval_template_apply_data_contents_time.setValue(members_time); @@ -2856,7 +2856,7 @@ public class QyWxOperationService { summary_info_name.setText("发起人：" + userByPort.getName()); summary_info_name.setLang("zh_CN"); Approval_template_summary_info summary_info_time = new Approval_template_summary_info(); - summary_info_time.setText("发起时间：" + DateUtil.TimeStampToDateTime(Long.valueOf(minRecordList.get(0).getApplicantTime()))); + summary_info_time.setText("发起时间：" + DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(minRecordList.get(0).getApplicantTime()))); summary_info_time.setLang("zh_CN"); Approval_template_summary_info summary_info_department = new Approval_template_summary_info(); summary_info_department.setText("所在部门：" + portName); @@ -3313,7 +3313,7 @@ public class QyWxOperationService { summary_info_name.setText("发起人：" + userToken.getName()); summary_info_name.setLang("zh_CN"); Approval_template_summary_info summary_info_time = new Approval_template_summary_info(); - summary_info_time.setText("发起时间：" + DateUtil.TimeStampToDateTime(Long.valueOf(mainRecord.getCreateTime()))); + summary_info_time.setText("发起时间：" + DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(mainRecord.getCreateTime()))); summary_info_time.setLang("zh_CN"); Approval_template_summary_info summary_info_department = new Approval_template_summary_info(); summary_info_department.setText("所在部门：" + portName); @@ -3464,7 +3464,7 @@ public class QyWxOperationService { // 获取发起人信息 if (aorp != null) { applicantId = aorp.getApplicantId(); - applicantTime = Long.valueOf(aorp.getApplicantTime()); + applicantTime = ObjectFormatUtil.toLong(aorp.getApplicantTime()); tempMessageTitle = "出库审批"; } else if (stockTaking != null) { applicantId = stockTaking.getOriginator(); diff --git a/src/main/java/com/dreamchaser/depository_manage/utils/DateUtil.java b/src/main/java/com/dreamchaser/depository_manage/utils/DateUtil.java index ddce2f69..c6476546 100644 --- a/src/main/java/com/dreamchaser/depository_manage/utils/DateUtil.java +++ b/src/main/java/com/dreamchaser/depository_manage/utils/DateUtil.java @@ -14,8 +14,8 @@ import java.util.*; public class DateUtil { private static final SimpleDateFormat TIME_FORMAT =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); private static final SimpleDateFormat DATE_FORMAT =new SimpleDateFormat("yyyy-MM-dd"); - public static final Long dayTime = Long.valueOf(86400000); // 一天的时长 - public static final Long warningTime = Long.valueOf(86400000 * 7); // 预定报警时间：7天 + public static final Long dayTime = ObjectFormatUtil.toLong(86400000); // 一天的时长 + public static final Long warningTime = ObjectFormatUtil.toLong(86400000 * 7); // 预定报警时间：7天 /** * 获取时间的字符串（精确到s） * @param date 时间 @@ -225,7 +225,7 @@ public class DateUtil { cale.add(Calendar.MONTH, 1); cale.set(Calendar.DAY_OF_MONTH, 0); Date lastDay = cale.getTime(); - return Long.parseLong(time) >= firstDay.getTime() && Long.parseLong(time) <= lastDay.getTime(); + return ObjectFormatUtil.toLong(time) >= firstDay.getTime() && ObjectFormatUtil.toLong(time) <= lastDay.getTime(); } /** diff --git a/src/test/java/com/dreamchaser/depository_manage/BarChartTest.java b/src/test/java/com/dreamchaser/depository_manage/BarChartTest.java index 7de77637..0a74aa64 100644 --- a/src/test/java/com/dreamchaser/depository_manage/BarChartTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/BarChartTest.java @@ -234,7 +234,7 @@ public class BarChartTest { for (i = days.size() - 1; i > 0; i--) { // 遍历 Map并计算各仓库的入库数 // 获取一段时间内的库存额度 - Double depositoryRecordByDate1 = depositoryRecordService.findApplicationRecordByDate(days.get(i - 1), days.get(i), Integer.parseInt(type), val); + Double depositoryRecordByDate1 = depositoryRecordService.findApplicationRecordByDate(days.get(i - 1), days.get(i), ObjectFormatUtil.toInteger(type), val); if("2".equals(type)){ depositoryRecordByDate1 = -depositoryRecordByDate1; } diff --git a/src/test/java/com/dreamchaser/depository_manage/LineChartTest.java b/src/test/java/com/dreamchaser/depository_manage/LineChartTest.java index 2b9872d2..04ef1410 100644 --- a/src/test/java/com/dreamchaser/depository_manage/LineChartTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/LineChartTest.java @@ -164,7 +164,7 @@ public class LineChartTest { for (i = days.size() - 1; i > 0; i--) { // 遍历 Map并计算各仓库的入库数 // 获取一段时间内的库存额度 - Double depositoryRecordByDate1 = depositoryRecordService.findApplicationRecordByDate(days.get(i - 1), days.get(i), Integer.parseInt(type), val); + Double depositoryRecordByDate1 = depositoryRecordService.findApplicationRecordByDate(days.get(i - 1), days.get(i), ObjectFormatUtil.toInteger(type), val); drCountbyDrName.add(depositoryRecordByDate1); } map.put("data", drCountbyDrName); diff --git a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java b/src/test/java/com/dreamchaser/depository_manage/SomeTest.java index 017582cc..56e23829 100644 --- a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/SomeTest.java @@ -125,10 +125,10 @@ public class SomeTest { // 如果已经获取到审批节点 // 获取当前审批节点处理时间 - long aLong = Long.parseLong(spTime); + long aLong = ObjectFormatUtil.toLong(spTime); // 获取之前节点的审批时间 - long aLong1 = Long.parseLong(as_SpTime); + long aLong1 = ObjectFormatUtil.toLong(as_SpTime); if (aLong >= aLong1) { // 如果当前审批节点是最近处理 @@ -164,7 +164,7 @@ public class SomeTest { boolean flagForLabel = true; // 默认为标签 // 获取当前的主订单 - ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(Integer.parseInt(mainId)); + ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(ObjectFormatUtil.toInteger(mainId)); if (Integer.compare(applicationOutRecordPById.getFlagForOpenDepository(), 2) == 0) { // 如果是申请的开放仓库 diff --git a/src/test/java/com/dreamchaser/depository_manage/SunburstChartTest.java b/src/test/java/com/dreamchaser/depository_manage/SunburstChartTest.java index d5a68db9..7a8eeb19 100644 --- a/src/test/java/com/dreamchaser/depository_manage/SunburstChartTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/SunburstChartTest.java @@ -150,10 +150,10 @@ public class SunburstChartTest { @Override public Object call() throws Exception { Map map = new HashMap<>(); - map.put("type", Integer.parseInt(type)); - if (Integer.parseInt(type) == 1) { + map.put("type", ObjectFormatUtil.toInteger(type)); + if (ObjectFormatUtil.toInteger(type) == 1) { map.put("state", "已入库"); - } else if (Integer.parseInt(type) == 2) { + } else if (ObjectFormatUtil.toInteger(type) == 2) { map.put("state", "已出库"); } map.put("start", start);