From 4c4bf4cc32a99435777f06bc281fe8e942f7c323 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 14 十二月 2023 12:03:24 +0800
Subject: [PATCH] 修改规约
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java | 4 ++--
consum-base/src/main/java/com/consum/base/core/DepFormScrappedCoreServiceImpl.java | 2 +-
consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java | 2 +-
consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java | 2 +-
consum-base/src/main/java/com/consum/base/core/utils/CommonUtil.java | 2 +-
consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java | 6 +++---
consum-base/src/main/java/com/consum/base/core/utils/SuperMap.java | 16 ++++++++--------
consum-base/src/main/java/com/consum/base/core/DepUsingFormBackCoreServiceImpl.java | 2 +-
consum-base/src/main/java/com/consum/base/controller/LWhHomeStatisticsController.java | 4 ++--
consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java | 3 ++-
10 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
index 69659d2..d21c7ea 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
@@ -74,8 +74,9 @@
}
int result = this.baseGoodsModelsService.add(models);
- if (result > 0)
+ if (result > 0) {
return ResponseValue.success();
+ }
return ResponseValue.error("鏂板澶辫触锛�");
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
index 81de09f..3b0d3a2 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
@@ -165,11 +165,11 @@
whStr.append(" and parent_id=:parent_id");
paramts.put("parent_id", param.getTenantId());
}
- if (param.getName() != null && !param.getName().equals("")) {
+ if (StringUtils.isNotEmpty(param.getName())) {
whStr.append(" and name like:name");
paramts.put("name", "%" + param.getName() + "%");
}
- if (param.getCode() != null && !param.getCode().equals("")) {
+ if (StringUtils.isNotEmpty(param.getCode())) {
whStr.append(" and code=:code");
paramts.put("code", param.getCode());
}
@@ -326,7 +326,7 @@
StringBuilder whStr = new StringBuilder("where 1=1 and status = 1 and is_delete = 0 ");
HashMap parameter = new HashMap<>();
- if (param.getFirstZmS() != null && !param.getFirstZmS().equals("")) {
+ if (StringUtils.isNotEmpty(param.getFirstZmS())) {
whStr.append(" and name is not null and(");
String upperCase = param.getFirstZmS().toUpperCase();
whStr.append(
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
index 8bbd0d5..42f11ce 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
@@ -210,7 +210,7 @@
tenantUser.setTenantCode(sysInfo.getTenantCode());
tenantUser.setTenantId(sysInfo.getTenantId());
// 杩愮淮绠＄悊
- tenantUser.setSysDeptId(2l);
+ tenantUser.setSysDeptId(2L);
}
}
@@ -585,7 +585,7 @@
// 鏌ヨ鐖剁被鐨刼rgcode 闇�瑕佸皢鑷繁鐨刼rg鍏堟煡鍑烘潵 鍐嶆牴鎹畃arentid 鏌ョ埗绫�
String tenantId = sysInfo.getTenantId();
- if (tenantId != null && !tenantId.equals("")) {
+ if (StringUtils.isNotEmpty(tenantId)) {
List<FinSysTenant> select = finSysTenantService.select(new FinSysTenant(Long.valueOf(tenantId)));
if (select != null && select.size() > 0) {
FinSysTenant finSysTenant = select.get(0);
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhHomeStatisticsController.java b/consum-base/src/main/java/com/consum/base/controller/LWhHomeStatisticsController.java
index afdc8a7..f178344 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhHomeStatisticsController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhHomeStatisticsController.java
@@ -43,7 +43,7 @@
/*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
FinSysTenantUser sysInfo = this.getSysInfo();
String tenantId = sysInfo.getTenantId();
- List<Map<String, Object>> goodsNumPrice = lWhGoodsService.getGoodsNumPrice(Convert.toLong(tenantId, 0l));
+ List<Map<String, Object>> goodsNumPrice = lWhGoodsService.getGoodsNumPrice(Convert.toLong(tenantId, 0L));
if (CollectionUtils.isEmpty(goodsNumPrice)){
return ResponseValue.success();
}
@@ -55,7 +55,7 @@
/*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
FinSysTenantUser sysInfo = this.getSysInfo();
String tenantId = sysInfo.getTenantId();
- List<Map<String, Object>> goodsNumPrice = lWhGoodsService.getGoodsNumByMonth(Convert.toLong(tenantId, 0l));
+ List<Map<String, Object>> goodsNumPrice = lWhGoodsService.getGoodsNumByMonth(Convert.toLong(tenantId, 0L));
return ResponseValue.success(goodsNumPrice);
}
}
diff --git a/consum-base/src/main/java/com/consum/base/core/DepFormScrappedCoreServiceImpl.java b/consum-base/src/main/java/com/consum/base/core/DepFormScrappedCoreServiceImpl.java
index d0239ea..2d0c206 100644
--- a/consum-base/src/main/java/com/consum/base/core/DepFormScrappedCoreServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/core/DepFormScrappedCoreServiceImpl.java
@@ -88,7 +88,7 @@
Map<String, Integer> procureModelMap = new HashMap<>();
for (Object key : groupByModelIdMap.keySet()) {
- Long modelTotalPrice = 0l;
+ Long modelTotalPrice = 0L;
//瑕佹姤搴熺殑鎬绘暟閲�
int modelTotalNum = 0;
diff --git a/consum-base/src/main/java/com/consum/base/core/DepUsingFormBackCoreServiceImpl.java b/consum-base/src/main/java/com/consum/base/core/DepUsingFormBackCoreServiceImpl.java
index dc79300..c0c25fd 100644
--- a/consum-base/src/main/java/com/consum/base/core/DepUsingFormBackCoreServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/core/DepUsingFormBackCoreServiceImpl.java
@@ -92,7 +92,7 @@
Map<String, Integer> procureModelMap = new HashMap<>();
for (Object key : groupByModelIdMap.keySet()) {
- Long modelTotalPrice = 0l;
+ Long modelTotalPrice = 0L;
//瑕佹姤搴熺殑鎬绘暟閲�
int modelTotalNum = 0;
diff --git a/consum-base/src/main/java/com/consum/base/core/utils/CommonUtil.java b/consum-base/src/main/java/com/consum/base/core/utils/CommonUtil.java
index d555066..f55c199 100644
--- a/consum-base/src/main/java/com/consum/base/core/utils/CommonUtil.java
+++ b/consum-base/src/main/java/com/consum/base/core/utils/CommonUtil.java
@@ -64,7 +64,7 @@
*/
public static String Underline2camel(String para) {
StringBuilder result = new StringBuilder();
- String a[] = para.split("_");
+ String[] a = para.split("_");
for (String s : a) {
if (!para.contains("_")) {
result.append(s);
diff --git a/consum-base/src/main/java/com/consum/base/core/utils/SuperMap.java b/consum-base/src/main/java/com/consum/base/core/utils/SuperMap.java
index 18f2196..d1795d1 100644
--- a/consum-base/src/main/java/com/consum/base/core/utils/SuperMap.java
+++ b/consum-base/src/main/java/com/consum/base/core/utils/SuperMap.java
@@ -5,31 +5,31 @@
public class SuperMap extends HashMap {
- public SuperMap(Map map){
+ public SuperMap(Map map) {
super(map);
}
- public SuperMap putMap(Map map){
+ public SuperMap putMap(Map map) {
super.putAll(map);
return this;
}
- public String getString(String key){
+ public String getString(String key) {
Object obj = this.get(key);
- if (obj == null) return null;
+ if (obj == null) {
+ return null;
+ }
return obj.toString();
}
- public Long getLong(String key){
+ public Long getLong(String key) {
String value = getString(key);
return value == null ? null : Long.valueOf(value);
}
- public Integer getInteger(String key){
+ public Integer getInteger(String key) {
String value = getString(key);
return value == null ? null : Integer.valueOf(value);
}
-
-
}
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java
index 544a523..23c88db 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java
@@ -49,7 +49,7 @@
List<S_role> roleAll = finSysTenantUserService.getRoleAll();
if (!CollectionUtils.isEmpty(roleAll)) {
S_role sRole =
- roleAll.stream().filter(item -> item.getRole_name().equals("浠撳簱绠＄悊鍛�")).findFirst().orElse(null);
+ roleAll.stream().filter(item -> "浠撳簱绠＄悊鍛�".equals(item.getRole_name())).findFirst().orElse(null);
if (sRole != null) {
roleId = sRole.getRole_id();
}
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java
index 7cf993b..b3e992c 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java
@@ -258,7 +258,7 @@
model.setBusinessType(WhBusinessEnum.CAIGOU.getValue() + 0);
model.setBusinessId(whFormProcureId);
model.setBaseGoodsModelsId(baseGoodsModelsId);
- model.setPrice(0l);
+ model.setPrice(0L);
model.setCounts(counts);
model.setWorehouseCount(goodsModelNum);
model.setSupplier(null);
--
Gitblit v1.9.1