From caf6eebe5758fa4e6d74811e128187531f4d9c46 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期四, 15 八月 2024 17:05:34 +0800
Subject: [PATCH] 修改webDownloadPath及下载文件路径拼接
---
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 deletions(-)
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 3890a5a..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
@@ -1,13 +1,13 @@
package com.dy.pmsPlatform.station;
-import cn.hutool.core.codec.Base64;
import com.alibaba.excel.util.StringUtils;
import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pmsGlobal.daoPlt.PltProductionLineMapper;
import com.dy.pmsGlobal.daoPlt.PltStationMapper;
-import com.dy.pmsGlobal.pojoPlt.PltProduct;
+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 com.google.zxing.WriterException;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +15,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -24,7 +23,8 @@
public class StationSv {
private PltStationMapper dao;
- private static final String stationPrefix = "103" ;
+ private PltProductionLineMapper lineDao;
+// private static final String stationPrefix = "103" ;
private static final String DEFAULT_CODE = "0001";
private static final String CODE_FORMAT = "%04d";
@@ -32,13 +32,17 @@
public void setDao(PltStationMapper dao) {
this.dao = dao;
}
+ @Autowired
+ public void setLineDao(PltProductionLineMapper lineDao) {
+ this.lineDao = lineDao;
+ }
@Transactional
public int save(PltStation station) throws RuntimeException {
-// if(dao.selectByCodeId(station.id,station.code)>0){
-// throw new RuntimeException("宸ョ珯缂栧彿宸插瓨鍦�");
-// }
+ if(dao.selectByName(station.getName()).size() > 0){
+ throw new RuntimeException("宸ョ珯鍚嶇О("+station.getName()+")宸插瓨鍦�,鍚嶇О涓嶅厑璁搁噸澶嶆坊鍔�,璇峰彉鏇�");
+ }
int count = 0;
int flag=0;
do {
@@ -81,13 +85,22 @@
return this.dao.deleteLogicById(id);
}
-
-
@Transactional
public int update(PltStation station) throws RuntimeException {
// if(dao.selectByCodeId(station.id,station.code)>0){
// throw new RuntimeException("宸ョ珯缂栧彿宸插瓨鍦�");
// }
+ boolean flag = false;
+ List<PltStation> stations = dao.selectByName(station.getName());
+ for (int i = 0; i < stations.size(); i++) {
+ if(!stations.get(i).getId().equals(station.getId())){
+ flag = true;
+ break;
+ }
+ }
+ if(flag){
+ throw new RuntimeException("宸ョ珯鍚嶇О("+station.getName()+")宸插瓨鍦�,鍚嶇О涓嶅厑璁搁噸澶嶆坊鍔�,璇峰彉鏇�");
+ }
int count = dao.updateByPrimaryKeySelective(station);
return count;
}
@@ -113,13 +126,20 @@
//鏌ヨ绗﹀悎鏉′欢鐨勮褰�
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 ;
}
@Transactional
public int disabled(Long id, Boolean disabled) {
+ if(!disabled){
+ PltStation station1 = dao.selectByPrimaryKey(id);
+ PltProductionLine line = lineDao.selectByPrimaryKey(station1.lineId);
+ if(line.disabled){
+ throw new RuntimeException("璇ュ伐绔欐墍灞炵敓浜х嚎宸茬鐢�,璇峰厛鍚敤璇ョ敓浜х嚎");
+ }
+ }
PltStation station = new PltStation();
station.setId(id);
station.setDisabled(disabled);
--
Gitblit v1.8.0