From d22b530fa0fbd910d8d7baefa29d88d755568e68 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 15 十二月 2025 10:01:41 +0800
Subject: [PATCH] 1、 修复权限相关的bug

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java |   87 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 82 insertions(+), 5 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
index 29a1038..7fde5fe 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
@@ -1,21 +1,98 @@
 package com.mes.damage.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mes.damage.entity.Damage;
+import com.mes.damage.entity.DamagePrint;
+import com.mes.damage.entity.dto.DamageDTO;
+import com.mes.damage.service.DamageService;
+import com.mes.opctask.entity.LoadGlassDeviceTaskHistory;
+import com.mes.utils.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
- *  鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
  * </p>
  *
  * @author wu
- * @since 2024-06-13
+ * @since 2024-06-25
  */
+@Api(tags = "鎶ュ伐淇℃伅")
 @RestController
-@RequestMapping("/glassinfo/damage")
+@RequestMapping("/damage")
+@ResponseBody
 public class DamageController {
 
+    @Autowired(required = true)
+    private DamageService damageService;
+
+    @ApiOperation("鎶ュ伐鏁版嵁鏌ヨ")
+    @PostMapping("/selectDamage")
+    public Result<Page<DamageDTO>> selectDamage(@RequestBody Map map) {
+        String startTime = map.get("startTime").toString();
+        String endTime = map.get("endTime").toString();
+        int type = Integer.parseInt(map.get("type").toString());
+        int status = Integer.parseInt(map.get("status").toString());
+        String workingProcedure = map.get("workingProcedure").toString();
+        int pageNo = Integer.parseInt(map.get("pageNo").toString());
+        int pageSize = Integer.parseInt(map.get("pageSize").toString());
+        return Result.build(200, "鏌ヨ鎴愬姛", damageService.selectDamage(startTime, endTime, type, status, workingProcedure, pageNo, pageSize));
+    }
+
+    @ApiOperation("鎶ュ伐")
+    @PostMapping("/submitDamage")
+    public Result submitDamage(@RequestBody List<Damage> damageList) {
+        damageService.submitDamage(damageList);
+        if (damageList.get(0).getStatus() == 1) {
+            damageList.forEach(damage -> damage.setStatus(3));
+        } else {
+            damageList.forEach(damage -> damage.setStatus(8));
+        }
+        damageService.updateBatchById(damageList);
+        return Result.build(200, "鎶ュ伐鎴愬姛", 1);
+    }
+
+    @ApiOperation("鎶ュ伐鏁版嵁淇敼")
+    @PostMapping("/updateDamage")
+    public Result updateDamage(@RequestBody List<Damage> damageList) {
+        damageService.updateBatchById(damageList);
+        return Result.build(200, "淇敼鎴愬姛", 1);
+    }
+
+    @ApiOperation("鎶ュ伐鏁版嵁鏂板")
+    @PostMapping("/insertDamage")
+    public Result insertDamage(@RequestBody Damage damage) {
+        damageService.insertDamage(damage);
+        return Result.build(200, "鏂板鎴愬姛", 1);
+    }
+
+    @ApiOperation("鎷胯蛋鏁版嵁鏌ヨ")
+    @PostMapping("/selectDamagePrint")
+    public Result selectDamagePrint(@RequestBody Damage damage) {
+        List<DamagePrint> damage2 = damageService.selectDamagePrint(damage);
+        return Result.build(200, "鏌ヨ鎴愬姛", damage2);
+    }
+
+    @ApiOperation("鎷胯蛋鎵撳嵃鏌ヨ")
+    @PostMapping("/selectDamagePrintDetails")
+    public Result selectDamagePrintDetails(@RequestBody Damage damage) {
+        List<DamagePrint> damage2 = damageService.selectDamagePrintDetails(damage);
+        return Result.build(200, "鏌ヨ鎴愬姛", damage2);
+    }
+
+    @ApiOperation("鑷姩鎶ュ伐")
+    @PostMapping("/autoSubmitReport")
+    public Result autoSubmitReport(String glassId, int deviceId, String workingProcedure, String remark, int type) {
+        damageService.autoSubmitReport(glassId, deviceId, workingProcedure, remark, type);
+        return Result.build(200, "鏌ヨ鎴愬姛", "");
+    }
+
 }
 

--
Gitblit v1.8.0