From cc8efc81d2d35bed40e47d0a5b0920a4b6f8095f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 23 十月 2025 11:04:05 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java | 277 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 252 insertions(+), 25 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java
index be123fc..c4c586a 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java
@@ -1,6 +1,6 @@
package com.example.erp.controller.pp;
-import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.core.io.InputStreamResource;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.pp.LayoutsData;
@@ -10,7 +10,6 @@
import com.example.erp.service.pp.JsonToOptConverter;
import com.example.erp.service.userInfo.UserService;
import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +18,11 @@
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
+import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.sql.Date;
import java.util.Map;
@@ -33,10 +36,18 @@
private UserService userService;
//宸ョ▼淇℃伅
@ApiOperation("宸ョ▼淇℃伅鎺ュ彛")
- @PostMapping ("/projectInfo/{projectNo}")
+ @PostMapping ("/projectInfo/{projectNo}/{username}")
public Result projectInfo(
- @PathVariable String projectNo){
- return Result.seccess(glassOptimizeService.projectInfoSv(projectNo));
+ @PathVariable String projectNo,@PathVariable String username){
+ return Result.seccess(glassOptimizeService.projectInfoSv(projectNo,username));
+ }
+
+
+ // 浼樺寲淇℃伅浼犲叆
+ @ApiOperation("浼樺寲浼犲叆淇℃伅鎺ュ彛")
+ @PostMapping ("/optimizeInfo/{projectNo}/{username}")
+ public Result optimizeInfo(@PathVariable String projectNo,@PathVariable String username){
+ return Result.seccess(glassOptimizeService.optimizeInfoSv(projectNo,username));
}
//宸ョ▼淇℃伅娴佺▼鍗�
@@ -49,11 +60,12 @@
//搴撳瓨淇℃伅
@ApiOperation("搴撳瓨淇℃伅鎺ュ彛")
- @PostMapping ("/materialStore/{thickness}/{model}")
+ @GetMapping ("/materialStore/{thickness}/{model}/{projectNumber}")
public Result materialStore(
@PathVariable String thickness,
- @PathVariable String model ){
- return Result.seccess(glassOptimizeService.materialStoreSv(thickness,model));
+ @PathVariable String model,@PathVariable String projectNumber,
+ @RequestParam(name = "type", required = false) Integer type,@RequestParam(name = "username", required = false) String username ){
+ return Result.seccess(glassOptimizeService.materialStoreSv(thickness,model,projectNumber,type,username));
}
@@ -67,11 +79,30 @@
}
//宸ョ▼鏌ヨ娴佺▼鍗�
+ @ApiOperation("淇敼宸ョ▼鏌ヨ娴佺▼鍗℃帴鍙�")
+ @PostMapping ("/getUpdateFlowCardList/{type}/{thickness}/{radio}/{projectNo}")
+ public Result getUpdateFlowCardList(
+ @PathVariable String type,@PathVariable String thickness,
+ @PathVariable Integer radio,@PathVariable String projectNo){
+ return Result.seccess(glassOptimizeService.getUpdateFlowCardList(type,thickness,radio,projectNo));
+ }
+
+ //宸ョ▼鏌ヨ娴佺▼鍗�
@ApiOperation("宸ョ▼鏌ヨ娴佺▼鍗�")
@PostMapping ("/getProjectList")
public Result getProjectList(){
return Result.seccess(glassOptimizeService.getProjectListSv());
}
+
+ @ApiOperation("鏍规嵁宸ョ▼鍗″彿宸ョ▼鏌ヨ娴佺▼鍗�")
+ @PostMapping ("/getProjectByProjectNo/{projectNo}")
+ public Result getProjectByProjectNo(
+ @PathVariable String projectNo
+ ){
+ return Result.seccess(glassOptimizeService.getProjectByProjectNoSv(projectNo));
+ }
+
+
//宸ョ▼绠＄悊鏌ヨ
@ApiOperation("宸ョ▼绠＄悊鏌ヨ鎺ュ彛")
@@ -85,12 +116,14 @@
//淇敼宸ョ▼鐘舵��
@ApiOperation("淇敼宸ョ▼鐘舵�佹帴鍙�")
- @PostMapping("/updateProjectState/{projectNumber}/{state}")
+ @PostMapping("/updateProjectState/{projectNumber}/{state}/{states}/{code}")
public Result updateProjectState(
@PathVariable String projectNumber,
- @PathVariable Integer state
- ) {
- if (glassOptimizeService.updateProjectState(projectNumber, state)) {
+ @PathVariable Integer state,
+ @PathVariable Integer states,
+ @PathVariable Integer code
+ ) throws JsonProcessingException {
+ if (glassOptimizeService.updateProjectState(projectNumber, state,states,code)) {
return Result.seccess();
} else {
throw new ServiceException(Constants.Code_500, "淇敼澶辫触");
@@ -103,7 +136,7 @@
@PostMapping("/deleteProject/{projectNumber}")
public Result deleteProject(
@PathVariable String projectNumber){
- return Result.seccess(glassOptimizeService.deleteProject(projectNumber));
+ return Result.seccess(glassOptimizeService.deleteProject(projectNumber,1));
}
//妯℃嫙璁＄畻宸ョ▼鍙锋煡璇�
@@ -114,12 +147,20 @@
return Result.seccess(glassOptimizeService.selectProjectComputeSv(projectNumber));
}
+ //妯℃嫙璁＄畻宸ョ▼鍙锋煡璇�
+ @ApiOperation("妯℃嫙璁＄畻宸ョ▼鏁版嵁鏌ヨ")
+ @PostMapping ("/selectProjectComputeAll/{projectNumber}")
+ public Result selectProjectComputeAll(
+ @PathVariable String projectNumber){
+ return Result.seccess(glassOptimizeService.selectProjectComputeAll(projectNumber));
+ }
+
//妯℃嫙璁＄畻娴佺▼鍗¤鎯�
@ApiOperation("妯℃嫙璁＄畻娴佺▼鍗¤鎯�")
- @PostMapping ("/selectComputeDetail/{processId}")
+ @PostMapping ("/selectComputeDetail/{processId}/{technologyNumber}/{patchState}")
public Result selectComputeDetail(
- @PathVariable String processId){
- return Result.seccess(glassOptimizeService.selectComputeDetailSv(processId));
+ @PathVariable String processId, @PathVariable Integer technologyNumber,@PathVariable String patchState){
+ return Result.seccess(glassOptimizeService.selectComputeDetailSv(processId,technologyNumber,patchState));
}
@ApiOperation("妯℃嫙璁＄畻")
@@ -136,6 +177,7 @@
@ApiOperation("妯℃嫙璁＄畻淇濆瓨")
@PostMapping("/simulationSave")
public Result simulationSave(@RequestBody Map<String, Object> object) {
+ System.out.println("鎺ユ敹鍒扮殑妯℃嫙璁＄畻淇濆瓨鏁版嵁: " + object);
try {
return Result.seccess(glassOptimizeService.addSimulation(object));
} catch (Exception e) {
@@ -145,10 +187,10 @@
}
@ApiOperation("浼樺寲璁剧疆淇濆瓨")
- @PostMapping("/optimizeParms")
- public Result optimizeParmsSave(@RequestBody Map<String, Object> object) {
+ @PostMapping("/optimizeParms/{username}")
+ public Result optimizeParmsSave(@RequestBody Map<String, Object> object,@PathVariable String username) {
try {
- return Result.seccess(glassOptimizeService.optimizeParmsSave(object));
+ return Result.seccess(glassOptimizeService.optimizeParmsSave(object,username));
} catch (Exception e) {
e.printStackTrace();
return Result.error();
@@ -210,18 +252,45 @@
@ApiOperation("淇濆瓨浼樺寲缁撴灉鎺ュ彛")
- @PostMapping("/saveOptimizeResult")
- public Result saveOptimizeResult(
+ @PostMapping("/saveOptimizeData/{projectId}")
+ public Result saveOptimizeResult( @PathVariable String projectId,
@RequestBody Map<String,Object> object){
- return Result.seccess(glassOptimizeService.saveOptimizeResult(object));
+ return Result.seccess(glassOptimizeService.saveOptimizeResult(object,projectId));
}
+ @ApiOperation("鏌ヨ鎶ュ憡鏁版嵁鎺ュ彛")
+ @PostMapping("/getReportData/{processId}")
+ public Result getReportData(@PathVariable String processId){
+ return Result.seccess(glassOptimizeService.getReportDataSv(processId));
+ }
+
+ @ApiOperation("鏌ヨ鐗╂枡淇℃伅鎺ュ彛")
+ @PostMapping("/materialInfo/{processId}")
+ public Result materialInfo(
+ @PathVariable String processId){
+ return Result.seccess(glassOptimizeService.getMaterialInfoSv(processId));
+ }
+
+
+ @ApiOperation("鏌ヨ浜у搧鍒楄〃鎺ュ彛")
+ @PostMapping("/getProductList/{processId}")
+ public Result getProductList(
+ @PathVariable String processId){
+ return Result.seccess(glassOptimizeService.getProductListSv(processId));
+ }
@ApiOperation("鏌ヨ浼樺寲缁撴灉鎺ュ彛")
@PostMapping("/selectOptimizeResult/{processId}")
public Result selectOptimizeResult(
@PathVariable String processId){
return Result.seccess(glassOptimizeService.selectOptimizeResult(processId));
+ }
+
+ @ApiOperation("鏌ヨ浼樺寲缁撴灉淇℃伅鎺ュ彛")
+ @PostMapping("/getOptimizeInfo/{processId}")
+ public Result getOptimizeInfo(
+ @PathVariable String processId){
+ return Result.seccess(glassOptimizeService.getOptimizeInfoSv(processId));
}
@ApiOperation("鏇存柊浼樺寲缁撴灉鎺ュ彛")
@@ -251,9 +320,167 @@
return new ResponseEntity<>(optContent.getBytes(), headers, HttpStatus.OK);
}
- @PostMapping("/getConfiguration/{type}")
- public Result getConfiguration(@PathVariable String type) {
- return Result.seccess(glassOptimizeService.getConfiguration(type));
+ @PostMapping("/getConfiguration/{type}/{username}")
+ public Result getConfiguration(@PathVariable String type,@PathVariable String username) {
+ return Result.seccess(glassOptimizeService.getConfiguration(type,username));
+ }
+
+ @ApiOperation("淇墖纾ㄩ噺淇敼")
+ @PostMapping("/saveConfiguration/{type}/{username}")
+ public Result saveConfiguration(@PathVariable String type,@PathVariable String username, @RequestBody Map<String,Object> object){
+ return Result.seccess(glassOptimizeService.saveConfiguration(object,type,username));
+ }
+
+ @ApiOperation("妯℃嫙鎺掔増")
+ @PostMapping("/simulatedTypesetting")
+ public Result simulatedTypesetting(@RequestBody Map<String, Object> object) {
+ return Result.seccess(glassOptimizeService.simulatedTypesetting1(object));
+ }
+
+
+ @CrossOrigin(origins = "*")
+ @ApiOperation("PDF鏂囦欢涓嬭浇鎺ュ彛")
+ @GetMapping("/reports/pdf")
+ public ResponseEntity<InputStreamResource> downloadPdf(@RequestParam String filePath) {
+ try {
+ String decodedPath = java.net.URLDecoder.decode(filePath, "UTF-8");
+ System.out.println("鎺ユ敹鍒扮殑鏂囦欢璺緞: " + decodedPath);
+
+ // 鏀惧楠岃瘉鏉′欢锛屼粎妫�鏌ュ繀瑕佹潯浠�
+ if (decodedPath == null || decodedPath.trim().isEmpty()) {
+ System.out.println("鏂囦欢璺緞涓虹┖");
+ return ResponseEntity.badRequest().build();
+ }
+
+ // 妫�鏌ユ槸鍚︿负PDF鏂囦欢锛堜笉涓ユ牸妫�鏌ュ紑澶达級
+ if (!decodedPath.trim().toLowerCase().endsWith(".pdf")) {
+ System.out.println("鏂囦欢涓嶆槸PDF鏍煎紡: " + decodedPath);
+ return ResponseEntity.badRequest().build();
+ }
+
+ // 澶勭悊璺緞锛屾纭鐞哤indows缃戠粶璺緞
+ String processedPath = decodedPath.trim();
+ // 纭繚缃戠粶璺緞鏍煎紡姝ｇ‘
+ if (processedPath.startsWith("\\\\")) {
+ // 宸茬粡鏄纭殑缃戠粶璺緞鏍煎紡
+ System.out.println("妫�娴嬪埌Windows缃戠粶璺緞: " + processedPath);
+ } else if (processedPath.startsWith("\\")) {
+ // 琛ュ叏缃戠粶璺緞
+ processedPath = "\\" + processedPath;
+ System.out.println("琛ュ叏缃戠粶璺緞涓�: " + processedPath);
+ }
+
+ System.out.println("澶勭悊鍚庣殑鏂囦欢璺緞: " + processedPath);
+
+ // 鏋勯�犳枃浠惰矾寰�
+ File file = new File(processedPath);
+ System.out.println("鏋勯�犵殑鏂囦欢缁濆璺緞: " + file.getAbsolutePath());
+ System.out.println("鏂囦欢瑙勮寖璺緞: " + file.getCanonicalPath());
+
+ // 妫�鏌ユ枃浠舵槸鍚﹀瓨鍦�
+ if (!file.exists()) {
+ System.out.println("鏂囦欢涓嶅瓨鍦�: " + file.getAbsolutePath());
+ return ResponseEntity.notFound().build();
+ }
+
+ // 妫�鏌ユ槸鍚︿负鏂囦欢锛堣�岄潪鐩綍锛�
+ if (!file.isFile()) {
+ System.out.println("璺緞涓嶆槸鏂囦欢: " + file.getAbsolutePath());
+ return ResponseEntity.badRequest().build();
+ }
+
+ // 鍒涘缓Resource
+ InputStreamResource resource = new InputStreamResource(new FileInputStream(file));
+
+ // 璁剧疆鍝嶅簲澶�
+ HttpHeaders headers = new HttpHeaders();
+ headers.add(HttpHeaders.CONTENT_DISPOSITION, "inline; filename=\"" + file.getName() + "\"");
+ headers.add(HttpHeaders.CONTENT_TYPE, "application/pdf");
+ headers.add(HttpHeaders.CONTENT_LENGTH, String.valueOf(file.length()));
+ headers.add(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, HttpHeaders.CONTENT_DISPOSITION);
+
+ return ResponseEntity.ok()
+ .headers(headers)
+ .contentType(org.springframework.http.MediaType.APPLICATION_PDF)
+ .body(resource);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
+ }
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+ //妯℃嫙璁＄畻宸ョ▼鍙锋煡璇㈢涓夋柟
+ @ApiOperation("妯℃嫙璁＄畻宸ョ▼鍙锋煡璇�")
+ @PostMapping ("/selectProjectComputeMpThirdParty/{projectNumber}")
+ public Result selectProjectComputeMpThirdParty( @PathVariable String projectNumber){
+ return Result.seccess(glassOptimizeService.selectProjectComputeMpThirdParty(projectNumber));
+ }
+
+ //妯℃嫙璁＄畻娴佺▼鍗¤鎯呯涓夋柟
+ @ApiOperation("妯℃嫙璁＄畻娴佺▼鍗¤鎯�")
+ @PostMapping ("/selectComputeDetailThirdParty/{processId}/{technologyNumber}")
+ public Result selectComputeDetailThirdParty(
+ @PathVariable String processId, @PathVariable Integer technologyNumber){
+ return Result.seccess(glassOptimizeService.selectComputeDetailThirdParty(processId,technologyNumber));
+ }
+
+ @ApiOperation("妯℃嫙璁＄畻淇濆瓨")
+ @PostMapping("/simulationSaveThirdParty")
+ public Result simulationSaveThirdParty(@RequestBody Map<String, Object> object) {
+ try {
+ return Result.seccess(glassOptimizeService.simulationSaveThirdParty(object));
+ } catch (Exception e) {
+ e.printStackTrace();
+ return Result.error();
+ }
+ }
+
+ //鍒犻櫎宸ョ▼
+ @ApiOperation("宸ョ▼绠＄悊鍒犻櫎鎺ュ彛")
+ @PostMapping("/deleteProjectThirdParty/{projectNumber}")
+ public Result deleteProjectThirdParty(
+ @PathVariable String projectNumber){
+ return Result.seccess(glassOptimizeService.deleteProjectThirdParty(projectNumber));
+ }
+
+ @ApiOperation("宸ョ▼淇℃伅鎺ュ彛")
+ @PostMapping ("/projectInfoThirdParty/{projectNo}")
+ public Result projectInfoThirdParty(
+ @PathVariable String projectNo){
+ return Result.seccess(glassOptimizeService.projectInfoThirdParty(projectNo));
+ }
+
+ //搴撳瓨淇℃伅
+ @ApiOperation("搴撳瓨淇℃伅鎺ュ彛")
+ @GetMapping ("/materialStoreSvThirdParty/{projectNumber}")
+ public Result materialStoreSvThirdParty(@PathVariable String projectNumber ){
+ return Result.seccess(glassOptimizeService.materialStoreSvThirdParty(projectNumber));
+ }
+
+ //宸ョ▼淇℃伅娴佺▼鍗�
+ @ApiOperation("宸ョ▼淇℃伅娴佺▼鍗℃帴鍙�")
+ @PostMapping ("/getProcessCardMpThirdParty/{projectNo}")
+ public Result getProcessCardMpThirdParty(
+ @PathVariable String projectNo){
+ return Result.seccess(glassOptimizeService.getProcessCardMpThirdParty(projectNo));
+ }
+
+ @ApiOperation("mes宸ョ▼浠诲姟涓嬪彂鎺ュ彛")
+ @PostMapping("/getIssuingProjects")
+ public Result issuingProjects(@RequestBody String projectNo) throws JsonProcessingException {
+ return Result.seccess(glassOptimizeService.issuingProjects(projectNo));
}
--
Gitblit v1.8.0