From df6bb7f982ca8a4ba57a87ef85aad58bfc4dd524 Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期三, 09 四月 2025 17:37:30 +0800
Subject: [PATCH] 焊缝统计相关
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java | 119 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 82 insertions(+), 37 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java
index 4cb7abd..19e02b1 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java
@@ -1,49 +1,46 @@
package com.aps.core.controller;
-import java.util.List;
-import java.io.IOException;
-
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.aps.common.core.utils.poi.ExcelUtil;
+import com.aps.common.core.utils.uuid.IdUtils;
+import com.aps.common.core.web.controller.BaseController;
+import com.aps.common.core.web.domain.AjaxResult;
+import com.aps.common.core.web.page.TableDataInfo;
import com.aps.common.log.annotation.Log;
import com.aps.common.log.enums.BusinessType;
import com.aps.common.security.annotation.RequiresPermissions;
+import com.aps.common.security.utils.DictUtils;
import com.aps.core.domain.ApsPartPlan;
+import com.aps.core.domain.ApsPartPlanTemp;
import com.aps.core.service.IApsPartPlanService;
-import com.aps.common.core.web.controller.BaseController;
-import com.aps.common.core.web.domain.AjaxResult;
-import com.aps.common.core.utils.poi.ExcelUtil;
-import com.aps.common.core.web.page.TableDataInfo;
+import com.aps.core.service.IApsPartPlanTempService;
+import com.aps.system.api.domain.SysDictData;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
/**
* 闆朵欢璁″垝绠＄悊Controller
- *
+ *
* @author wwj
* @date 2025-04-08
*/
@RestController
@RequestMapping("/partPlan")
-public class ApsPartPlanController extends BaseController
-{
+public class ApsPartPlanController extends BaseController {
@Autowired
private IApsPartPlanService apsPartPlanService;
-
+ @Autowired
+ private IApsPartPlanTempService apsPartPlanTempService;
/**
* 鏌ヨ闆朵欢璁″垝绠＄悊鍒楄〃
*/
@RequiresPermissions("partPlan:list")
@GetMapping("/list")
- public TableDataInfo list(ApsPartPlan apsPartPlan)
- {
- startPage();
+ public TableDataInfo list(ApsPartPlan apsPartPlan) {
+// startPage();
List<ApsPartPlan> list = apsPartPlanService.selectApsPartPlanList(apsPartPlan);
return getDataTable(list);
}
@@ -54,11 +51,19 @@
@RequiresPermissions("partPlan:export")
@Log(title = "闆朵欢璁″垝绠＄悊", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, ApsPartPlan apsPartPlan)
- {
- List<ApsPartPlan> list = apsPartPlanService.selectApsPartPlanList(apsPartPlan);
+ public void export(HttpServletResponse response, ApsPartPlan apsPartPlan) {
+ List<ApsPartPlan> apsPartPlans = apsPartPlanService.selectApsPartPlanList(apsPartPlan);
+ List<SysDictData> list = DictUtils.getDictCache("aps_is_suspended");
+ for (int i = 0; i < apsPartPlans.size(); i++) {
+ for (int j = 0; j < list.size(); j++) {
+ if (apsPartPlans.get(i).getIsSuspended().equals(Integer.parseInt(list.get(j).getDictValue()))) {
+ apsPartPlans.get(i).setIsSuspendedTxt(list.get(j).getDictLabel());
+ break;
+ }
+ }
+ }
ExcelUtil<ApsPartPlan> util = new ExcelUtil<ApsPartPlan>(ApsPartPlan.class);
- util.exportExcel(response, list, "闆朵欢璁″垝绠＄悊鏁版嵁");
+ util.exportExcel(response, apsPartPlans, "闆朵欢璁″垝绠＄悊鏁版嵁");
}
/**
@@ -66,8 +71,7 @@
*/
@RequiresPermissions("partPlan:query")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") String id)
- {
+ public AjaxResult getInfo(@PathVariable("id") String id) {
return success(apsPartPlanService.selectApsPartPlanById(id));
}
@@ -77,8 +81,7 @@
@RequiresPermissions("partPlan:add")
@Log(title = "闆朵欢璁″垝绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody ApsPartPlan apsPartPlan)
- {
+ public AjaxResult add(@RequestBody ApsPartPlan apsPartPlan) {
return toAjax(apsPartPlanService.insertApsPartPlan(apsPartPlan));
}
@@ -88,8 +91,7 @@
@RequiresPermissions("partPlan:edit")
@Log(title = "闆朵欢璁″垝绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody ApsPartPlan apsPartPlan)
- {
+ public AjaxResult edit(@RequestBody ApsPartPlan apsPartPlan) {
return toAjax(apsPartPlanService.updateApsPartPlan(apsPartPlan));
}
@@ -98,9 +100,52 @@
*/
@RequiresPermissions("partPlan:remove")
@Log(title = "闆朵欢璁″垝绠＄悊", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable String[] ids)
- {
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable String[] ids) {
return toAjax(apsPartPlanService.deleteApsPartPlanByIds(ids));
}
+
+ /**
+ * 闆朵欢璁″垝瀵煎叆
+ */
+ @PostMapping("/importData")
+ public AjaxResult importData(MultipartFile file) throws Exception {
+ ExcelUtil<ApsPartPlanTemp> util = new ExcelUtil<ApsPartPlanTemp>(ApsPartPlanTemp.class);
+ List<ApsPartPlanTemp> apsPartPlans = util.importExcel(file.getInputStream());
+ //鍒ゆ柇瀵煎叆鏁版嵁鏄惁涓虹┖
+ if (apsPartPlans.size() > 0) {
+ String batchNum= IdUtils.fastUUID();
+ List<SysDictData> list = DictUtils.getDictCache("aps_is_suspended");
+ for (int i = 0; i < apsPartPlans.size(); i++) {
+ for (int j = 0; j < list.size(); j++) {
+ if (apsPartPlans.get(i).getIsSuspendedTxt().equals(list.get(j).getDictLabel())) {
+ apsPartPlans.get(i).setIsSuspended(Integer.parseInt(list.get(j).getDictValue()));
+ break;
+ }
+ }
+ //鎻掑叆鐗堟湰鍙�
+ apsPartPlans.get(i).setBatchNumber(batchNum);
+ //鎻掑叆涓存椂琛�
+ apsPartPlanTempService.insertApsPartPlanTemp(apsPartPlans.get(i));
+ }
+
+ return AjaxResult.success("瀵煎叆鎴愬姛",batchNum);
+ } else {
+ return AjaxResult.error("妯℃澘鍐呭涓虹┖");
+ }
+ }
+ /***
+ * @Description: 纭涓婁紶
+ * @Param: [apsPartPlan]
+ * @return: com.aps.common.core.web.domain.AjaxResult
+ * @Author: wwj
+ * @Date: 2025/4/9
+ */
+ @GetMapping("/confirmPart")
+ public AjaxResult confirmPart(ApsPartPlanTemp apsPartPlanTemp) {
+ return toAjax(apsPartPlanService.confirmPart(apsPartPlanTemp));
+ }
+
+
+
}
--
Gitblit v1.9.3