Преглед на файлове

后台web诊断报告接口

bmmx преди 1 година
родител
ревизия
cc2a632137
променени са 3 файла, в които са добавени 34 реда и са изтрити 15 реда
  1. 1 1
      .idea/JavaSceneConfigState.xml
  2. 25 10
      .idea/workspace.xml
  3. 8 4
      src/main/java/com/om/service/impl/RepairServiceImpl.java

+ 1 - 1
.idea/JavaSceneConfigState.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="SmartInputSourceJavaSceneConfigState">
-    <option name="customChineseScenes" value="{&quot;capsLockState&quot;:false,&quot;code&quot;:&quot;;ApiModelProperty(value);debug(s);Api(tags);ApiOperation();BadReqException(message);info(s)&quot;,&quot;enable&quot;:true,&quot;languageType&quot;:&quot;CHINESE&quot;,&quot;name&quot;:&quot;自定义中文切换&quot;,&quot;tip&quot;:&quot;&quot;}" />
+    <option name="customChineseScenes" value="{&quot;capsLockState&quot;:false,&quot;code&quot;:&quot;;ApiModelProperty(value);debug(s);Api(tags);ApiOperation();BadReqException(message);info(s);BizException(message)&quot;,&quot;enable&quot;:true,&quot;languageType&quot;:&quot;CHINESE&quot;,&quot;name&quot;:&quot;自定义中文切换&quot;,&quot;tip&quot;:&quot;&quot;}" />
   </component>
 </project>

+ 25 - 10
.idea/workspace.xml

@@ -4,15 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="46b159bd-08ca-42f0-b80f-41d4944a8a29" name="Changes" comment="添加用户id">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/entity/dto/RepairDTO.java" afterDir="false" />
+    <list default="true" id="46b159bd-08ca-42f0-b80f-41d4944a8a29" name="Changes" comment="后台web诊断报告接口">
       <change beforePath="$PROJECT_DIR$/.idea/JavaSceneConfigState.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/JavaSceneConfigState.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/om/config/CORSConfig.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/om/config/WebMvcConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/om/config/WebMvcConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/RepairController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/RepairController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/om/controller/user/APPRepairController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/user/APPRepairController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/om/service/IRepairService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/om/service/IRepairService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/om/service/impl/RepairServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/om/service/impl/RepairServiceImpl.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -90,6 +84,10 @@
       <recent name="B:\WorkSpace\PracticalRojects\OperationSystem\src\main\java\com\om\utils" />
       <recent name="B:\WorkSpace\PracticalRojects\OperationSystem\src\main\java\com\om" />
     </key>
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="B:\WorkSpace\PracticalRojects\OperationSystem\src\main\java\com\om\entity\dto" />
+      <recent name="B:\WorkSpace\PracticalRojects\OperationSystem\src\main\java\com\om\entity\vo" />
+    </key>
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="com.om.entity.vo" />
       <recent name="com.om.entity.dto" />
@@ -187,7 +185,7 @@
       <workItem from="1708224080726" duration="11870000" />
       <workItem from="1708413994818" duration="314000" />
       <workItem from="1708414851331" duration="16812000" />
-      <workItem from="1708492515944" duration="7612000" />
+      <workItem from="1708492515944" duration="9952000" />
     </task>
     <task id="LOCAL-00001" summary="管理员登录">
       <option name="closed" value="true" />
@@ -293,7 +291,23 @@
       <option name="project" value="LOCAL" />
       <updated>1708432756419</updated>
     </task>
-    <option name="localTasksCounter" value="14" />
+    <task id="LOCAL-00014" summary="后台web诊断报告接口">
+      <option name="closed" value="true" />
+      <created>1708516992034</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1708516992034</updated>
+    </task>
+    <task id="LOCAL-00015" summary="后台web诊断报告接口">
+      <option name="closed" value="true" />
+      <created>1708518319767</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1708518319767</updated>
+    </task>
+    <option name="localTasksCounter" value="16" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -311,7 +325,8 @@
     <MESSAGE value="诊断报告模块mp生成代码,mapper对应4个表,service对应4个,而controller只有一个repair" />
     <MESSAGE value="客户端诊断报告" />
     <MESSAGE value="添加用户id" />
-    <option name="LAST_COMMIT_MESSAGE" value="添加用户id" />
+    <MESSAGE value="后台web诊断报告接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="后台web诊断报告接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>

+ 8 - 4
src/main/java/com/om/service/impl/RepairServiceImpl.java

@@ -21,10 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -151,11 +148,18 @@ public class RepairServiceImpl extends ServiceImpl<RepairMapper, Repair> impleme
     @Override
     @Transactional
     public Result AppDelete(Integer id) {
+        Integer userId = UserContext.getUserId();
+        if (userId==null){
+            throw new BizException("用户不存在");
+        }
         //根据id查询
         Repair repair = this.getById(id);
         if (BeanUtil.isEmpty(repair)) {
             throw new BadReqException("该诊断报告不存在");
         }
+        if (!Objects.equals(repair.getUserId(), userId)){
+            throw new BadReqException("不能删除他人的诊断报告");
+        }
         Integer electronicControlId = repair.getElectronicControlId();
 
         List<FaultCode> faultCodeList = faultCodeService.lambdaQuery()