From a2093e0389656b3485303da48204f0939c95e8fb Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期五, 26 七月 2024 17:31:47 +0800
Subject: [PATCH] 静态常量整理
---
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java | 5 +++--
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java | 4 ++--
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 14 +++++++-------
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserSv.java | 4 ++--
4 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserSv.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserSv.java
index 3c041a8..630f72e 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserSv.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserSv.java
@@ -6,6 +6,7 @@
import com.dy.pmsGlobal.daoBa.BaUserRoleMapper;
import com.dy.pmsGlobal.pojoBa.BaUser;
import com.dy.pmsGlobal.pojoBa.BaUserRole;
+import com.dy.pmsGlobal.util.QrCodeConstant;
import com.dy.pmsGlobal.util.QrCodeUtil;
import com.google.zxing.WriterException;
import lombok.extern.slf4j.Slf4j;
@@ -27,7 +28,6 @@
private BaUserMapper dao;
@Autowired
private BaUserRoleMapper urDao;
- private static final String stationPrefix = "101" ;
/**
* 鐢熸垚鎸囧畾浣嶆暟闅忔満鏁板瓧瀵嗙爜
@@ -78,7 +78,7 @@
rsVo.obj = this.dao.selectSome(params) ;
rsVo.obj.parallelStream().forEach(item->{
try {
- byte[] codes = QrCodeUtil.genQrCode(stationPrefix+item.id);
+ byte[] codes = QrCodeUtil.genQrCode(QrCodeConstant.TypeWorker+item.id);
item.qrCode = "data:image/jpeg;base64," + Base64.encode(codes);
} catch (IOException e) {
e.printStackTrace();
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java
index 3508e08..4646f65 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java
@@ -8,6 +8,7 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pmsGlobal.aop.Log;
import com.dy.pmsGlobal.pojoPlt.PltStation;
+import com.dy.pmsGlobal.util.QrCodeConstant;
import com.dy.pmsGlobal.util.QrCodeUtil;
import com.google.zxing.WriterException;
import jakarta.servlet.http.HttpServletResponse;
@@ -30,7 +31,6 @@
public class StationCtrl {
private static final String fileName = "宸ョ珯淇℃伅" ;
private static final String sheetName = "宸ョ珯淇℃伅" ;
- private static final String stationPrefix = "103" ;
private StationSv sv;
@Autowired
public StationCtrl(StationSv sv){
@@ -143,7 +143,7 @@
// vo.code = "103"+station.id;
vo.lineName = station.lineName;
try {
- vo.qrCode = QrCodeUtil.genQrCode(stationPrefix+station.id);
+ vo.qrCode = QrCodeUtil.genQrCode(QrCodeConstant.TypeStation+station.id);
} catch (IOException e) {
e.printStackTrace();
} catch (WriterException e) {
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java
index 783a93c..fceba39 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java
@@ -6,6 +6,7 @@
import com.dy.pmsGlobal.daoPlt.PltStationMapper;
import com.dy.pmsGlobal.pojoPlt.PltProductionLine;
import com.dy.pmsGlobal.pojoPlt.PltStation;
+import com.dy.pmsGlobal.util.QrCodeConstant;
import com.dy.pmsGlobal.util.QrCodeUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
@@ -23,7 +24,7 @@
private PltStationMapper dao;
private PltProductionLineMapper lineDao;
- private static final String stationPrefix = "103" ;
+// private static final String stationPrefix = "103" ;
private static final String DEFAULT_CODE = "0001";
private static final String CODE_FORMAT = "%04d";
@@ -125,7 +126,7 @@
//鏌ヨ绗﹀悎鏉′欢鐨勮褰�
rsVo.obj = this.dao.selectSome(params) ;
rsVo.obj.parallelStream().forEach(item->{
- item.qrCode = QrCodeUtil.genQrCodeString(stationPrefix+item.id);
+ item.qrCode = QrCodeUtil.genQrCodeString(QrCodeConstant.TypeStation+item.id);
});
return rsVo ;
}
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
index 16f4d06..f25ca7e 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
@@ -41,8 +41,8 @@
private static final String WORK_TYPE_INSPECTION = "3";
private static final String WORK_TYPE_REPAIR = "4";
- private static final String USER_PREFIX = "101";
- private static final String STATION_PREFIX = "103";
+// private static final String USER_PREFIX = "101";
+// private static final String STATION_PREFIX = "103";
private PrAssemblyPlanMapper assemblyDao;
private BaUserMapper baUserDao;
@@ -99,7 +99,7 @@
throw new RuntimeException("鍛樺伐缂栫爜涓嶈兘涓虹┖");
}
//鐢ㄦ埛101
- if (id.startsWith(USER_PREFIX)) {
+ if (id.startsWith(QrCodeConstant.TypeWorker)) {
userId = Long.parseLong(id.toString().substring(3));
} else {
userId = Long.parseLong(id.toString());
@@ -120,7 +120,7 @@
throw new RuntimeException("宸ョ珯缂栫爜涓嶈兘涓虹┖");
}
//宸ョ珯103
- if (id.startsWith(STATION_PREFIX)) {
+ if (id.startsWith(QrCodeConstant.TypeStation)) {
stationId = Long.parseLong(id.toString().substring(3));
} else {
stationId = Long.parseLong(id.toString());
@@ -149,12 +149,12 @@
throw new RuntimeException("宸ョ珯缂栫爜鎴栧憳宸ョ紪鐮佸潎涓嶈兘涓虹┖,璇锋鏌�");
}
//宸ョ珯103
- if (vo.getStationId().startsWith(USER_PREFIX)) {
+ if (vo.getStationId().startsWith(QrCodeConstant.TypeWorker)) {
userInfo = getUserInfo(vo.getStationId());
} else {
stationInfo = getStationInfo(vo.getStationId());
}
- if (vo.getUserId().startsWith(STATION_PREFIX)) {
+ if (vo.getUserId().startsWith(QrCodeConstant.TypeStation)) {
stationInfo = getStationInfo(vo.getUserId());
} else {
userInfo = getUserInfo(vo.getUserId());
@@ -412,7 +412,7 @@
if (workLast == null) {
throw new RuntimeException("绯荤粺涓病鏈夊綋鍓嶇櫥褰曚俊鎭�,璇锋鏌ユ垨閲嶆柊鐧诲綍");
}
- if ((!StringUtils.isBlank(assistant)) && assistant.startsWith(USER_PREFIX)) {
+ if ((!StringUtils.isBlank(assistant)) && assistant.startsWith(QrCodeConstant.TypeWorker)) {
assistant = assistant.substring(3);
}
if (!StringUtils.isBlank(workLast.getAssistants())) {
--
Gitblit v1.8.0