From 986de1ea52ea40a848a8e8ffe478122850bb03a2 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 13 八月 2024 09:36:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java | 127 +++++++++++++++++++++++++-----------------
1 files changed, 76 insertions(+), 51 deletions(-)
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 40ae28b..e1284e0 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
@@ -1,5 +1,6 @@
package com.dy.pmsPlatform.station;
+import com.alibaba.excel.converters.Converter;
import com.alibaba.fastjson2.JSON;
import com.dy.common.aop.SsoPowerAop;
import com.dy.common.webUtil.BaseResponse;
@@ -7,14 +8,18 @@
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;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
+import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
-import java.util.Objects;
/**
* 宸ョ珯
@@ -24,6 +29,8 @@
@RequestMapping(path="station")
@SuppressWarnings("unchecked")
public class StationCtrl {
+ private static final String fileName = "宸ョ珯淇℃伅" ;
+ private static final String sheetName = "宸ョ珯淇℃伅" ;
private StationSv sv;
@Autowired
public StationCtrl(StationSv sv){
@@ -33,22 +40,19 @@
/**
* 淇濆瓨
* @param station
- * @param bindingResult
* @return
*/
@PostMapping(path="save")
- @SsoPowerAop(power = "10300001")
+ @SsoPowerAop(power = "10300007")
@Log("淇濆瓨宸ョ珯")
- public BaseResponse<PltStation> save(@RequestBody @Valid PltStation station,BindingResult bindingResult){
- try {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- station.deleted = false;
- return BaseResponseUtils.buildSuccess(sv.save(station));
- }catch (Exception e){
- log.error("淇濆瓨宸ョ珯寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
+ public BaseResponse<Boolean> save(@RequestBody @Valid PltStation station){
+ station.deleted = false;
+ int count = sv.save(station);
+
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -56,21 +60,18 @@
/**
* 鏇存柊
* @param station
- * @param bindingResult
* @return
*/
@PostMapping(path="update")
- @SsoPowerAop(power = "10300001")
+ @SsoPowerAop(power = "10300007")
@Log("鏇存柊宸ョ珯")
- public BaseResponse<PltStation> update(@RequestBody @Valid PltStation station,BindingResult bindingResult){
- try {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- return BaseResponseUtils.buildSuccess(sv.update(station));
- }catch (Exception e){
- log.error("鏇存柊宸ョ珯寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
+ public BaseResponse<Boolean> update(@RequestBody @Valid PltStation station){
+ int count = sv.update(station);
+
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
@@ -80,34 +81,27 @@
* @return
*/
@GetMapping(path="delete")
- @SsoPowerAop(power = "10300001")
+ @SsoPowerAop(power = "10300007")
@Log("鍒犻櫎宸ョ珯")
- public BaseResponse<PltStation> delete(String id){
- try {
- return BaseResponseUtils.buildSuccess(sv.delete(Long.parseLong(id)));
- }catch (Exception e){
- log.error("鍒犻櫎宸ョ珯寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
+ public BaseResponse<Boolean> delete(String id){
+ int count = sv.delete(Long.parseLong(id));
+
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
-
-
-
/**
* 鏍规嵁ID鏌ヨ
* @return
*/
@GetMapping(path="one")
- @SsoPowerAop(power = "10300000") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
+ @SsoPowerAop(power = "10300006") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
@Log("鏍规嵁ID鏌ヨ宸ョ珯")
public BaseResponse<PltStation> one(String id){
- try{
- PltStation param=sv.selectById(id);
- return BaseResponseUtils.buildSuccess(JSON.toJSON(param));
- }catch (Exception e){
- log.error("鏍规嵁ID鏌ヨ宸ョ珯寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ PltStation param=sv.selectById(id);
+ return BaseResponseUtils.buildSuccess(JSON.toJSON(param));
}
/**
@@ -116,17 +110,48 @@
* @return
*/
@PostMapping(path="some")
- @SsoPowerAop(power = "10300000")
+ @SsoPowerAop(power = "10300006")
@Log("鍒嗛〉鏌ヨ宸ョ珯")
public BaseResponse<QueryResultVo<List<PltStation>>> some(@RequestBody QueryVo vo){
- try {
- QueryResultVo<List<PltStation>> list = sv.selectSome(vo) ;
- return BaseResponseUtils.buildSuccess(list);
- }catch (Exception e){
- log.error("鍒嗛〉鏌ヨ宸ョ珯寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
- }
+ QueryResultVo<List<PltStation>> list = sv.selectSome(vo) ;
+ return BaseResponseUtils.buildSuccess(list);
}
+ @PostMapping(path="disabled")
+ @SsoPowerAop(power = "10300007")
+ @Log("绂佺敤鎴栧惎鐢ㄥ伐绔�")
+ public BaseResponse<Boolean> disabled(@RequestBody PltStation station){
+ int count = sv.disabled(station.id,station.disabled);
+
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
+ }
+ }
+ @PostMapping(path="export")
+ @SsoPowerAop(power = "10300007")
+ @Log("瀵煎嚭宸ョ珯淇℃伅")
+ public void export(HttpServletResponse response){
+ List<Converter> list = new ArrayList<>() ;
+
+ List<PltStation> stations = sv.selectAll();
+ // 浣跨敤骞惰娴佹彁楂樻�ц兘
+ stations.parallelStream().forEach(station -> {
+ ExcelVo vo = new ExcelVo();
+ vo.name = station.name;
+// vo.code = "103"+station.id;
+ vo.lineName = station.lineName;
+ try {
+ vo.qrCode = QrCodeUtil.genQrCode(QrCodeConstant.TypeStation+station.id);
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (WriterException e) {
+ e.printStackTrace();
+ }
+ list.add(vo);
+ });
+ QrCodeUtil.downloadExcel(response, fileName,sheetName,list);
+ }
}
--
Gitblit v1.8.0