JX.Li 1 рік тому
батько
коміт
02ee0d9dce

+ 64 - 52
.idea/workspace.xml

@@ -4,46 +4,20 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="b5706414-aab4-4b84-9189-e0bf939b95e1" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GRegulatorBoxController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GEmergencyRepairPhoto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GRegulatorBox.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GRegulatorBoxPhoto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GEmergencyRepairPhotoBo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GRegulatorBoxBo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GRegulatorBoxPhotoBo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GEmergencyRepairPhotoVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GRegulatorBoxPhotoVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GRegulatorBoxVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GEmergencyRepairPhotoMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GRegulatorBoxMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GRegulatorBoxPhotoMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGEmergencyRepairPhotoService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGRegulatorBoxPhotoService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGRegulatorBoxService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GEmergencyRepairPhotoServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRegulatorBoxPhotoServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRegulatorBoxServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GEmergencyRepairPhotoMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GRegulatorBoxMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GRegulatorBoxPhotoMapper.xml" afterDir="false" />
+    <list default="true" id="b5706414-aab4-4b84-9189-e0bf939b95e1" name="Changes" comment="提交代码">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/logs/ruoyi-xxl-job-admin.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/ruoyi-xxl-job-admin.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/sys-console.2023-10-23.log" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/logs/sys-console.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sys-console.log" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/logs/sys-error.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sys-error.log" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/logs/sys-info.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sys-info.log" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/logs/sys-user.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sys-user.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GEmergencyRepairBo.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GEmergencyRepairBo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GEmergencyRepairVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GEmergencyRepairVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GEmergencyRepairMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GEmergencyRepairMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application-dev.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GAreaServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GAreaServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GEmergencyRepairServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GEmergencyRepairServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GEmergencyRepairMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GEmergencyRepairMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/domain/bo/GEmergencyRepairBo.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/domain/bo/GEmergencyRepairBo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/domain/vo/GEmergencyRepairVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/domain/vo/GEmergencyRepairVo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/mapper/GEmergencyRepairMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/mapper/GEmergencyRepairMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRegulatorBoxServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRegulatorBoxServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GAreaPhotoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GAreaPhotoMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/service/impl/GAreaServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/service/impl/GAreaServiceImpl.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/service/impl/GEmergencyRepairServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/target/classes/com/ruoyi/gas/service/impl/GEmergencyRepairServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/target/classes/mapper/GEmergencyRepairMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/target/classes/mapper/GEmergencyRepairMapper.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -84,26 +58,26 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RequestMappingsPanelOrder0": "0",
-    "RequestMappingsPanelOrder1": "1",
-    "RequestMappingsPanelWidth0": "75",
-    "RequestMappingsPanelWidth1": "75",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "git-widget-placeholder": "master",
-    "last_opened_file_path": "D:/project/java/zhendashizheng/ruoyi-gas/src/main/resources/mapper",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "settings.editor.selected.configurable": "com.zeroturnaround.javarebel.idea.plugin.settings.AdvancedConfigurable",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
+    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
+    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
+    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;last_opened_file_path&quot;: &quot;D:/project/java/zhendashizheng/ruoyi-gas/src/main/resources/mapper&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;com.zeroturnaround.javarebel.idea.plugin.settings.AdvancedConfigurable&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="ReactorSettings">
     <option name="notificationShown" value="true" />
   </component>
@@ -165,11 +139,49 @@
       <workItem from="1698108724618" duration="7941000" />
       <workItem from="1698129688036" duration="3327000" />
       <workItem from="1698194223613" duration="3556000" />
-      <workItem from="1698201966791" duration="2001000" />
+      <workItem from="1698201966791" duration="7531000" />
+      <workItem from="1698281101623" duration="4087000" />
+    </task>
+    <task id="LOCAL-00001" summary="提交代码">
+      <option name="closed" value="true" />
+      <created>1698203984719</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1698203984719</updated>
     </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="VcsManagerConfiguration">
+    <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
+    <option name="CHECK_NEW_TODO" value="false" />
+    <MESSAGE value="提交代码" />
+    <option name="LAST_COMMIT_MESSAGE" value="提交代码" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GAreaServiceImpl.java</url>
+          <line>153</line>
+          <option name="timeStamp" value="1" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
 </project>

Різницю між файлами не показано, бо вона завелика
+ 1709 - 33171
logs/ruoyi-xxl-job-admin.log


Різницю між файлами не показано, бо вона завелика
+ 1203 - 2450
logs/sys-console.log


Різницю між файлами не показано, бо вона завелика
+ 877 - 927
logs/sys-error.log


Різницю між файлами не показано, бо вона завелика
+ 288 - 1264
logs/sys-info.log


+ 3 - 8
logs/sys-user.log

@@ -1,8 +1,3 @@
-2023-10-25 09:52:58 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
-2023-10-25 10:27:53 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
-2023-10-25 10:31:56 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
-2023-10-25 10:35:32 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
-2023-10-25 10:40:58 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
-2023-10-25 10:58:32 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
-2023-10-25 11:02:22 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
-2023-10-25 11:03:38 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
+2023-10-26 10:43:12 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
+2023-10-26 10:44:11 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
+2023-10-26 10:48:10 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====

+ 3 - 3
ruoyi-admin/src/main/resources/application-dev.yml

@@ -57,7 +57,7 @@ spring:
 #          url: jdbc:mysql://123.249.30.140:3307/gas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
 #          username: root
 #          password: szrqwx123456
-          url: jdbc:mysql://124.221.101.24:13306/zhendashizheng?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://49.232.253.249:3306/sj_zdsz_new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
           username: root
           password: Lanyuxinxi@88.com
 #          szrqwx123456
@@ -120,13 +120,13 @@ spring:
 spring:
   redis:
     # 地址
-    host: 124.221.101.24
+    host: 49.232.253.249
     # 端口,默认为6379
     port: 16379
     # 数据库索引
     database: 0
     # 密码
-    password: sooka123456
+    password: Lanyuxinxi@88.com
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl

+ 12 - 8
ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GAreaServiceImpl.java

@@ -63,6 +63,7 @@ public class GAreaServiceImpl extends ServicePlusImpl<GAreaMapper, GArea, GAreaV
     public void deleteDirectory(String dir) {
         deleteFile(new File(path + dir));
     }
+
     private void deleteFile(File file) {
         if (file.exists()) {
             if (file.isFile()) {
@@ -78,13 +79,14 @@ public class GAreaServiceImpl extends ServicePlusImpl<GAreaMapper, GArea, GAreaV
             System.out.println("所删除的" + file.getAbsolutePath() + "不存在!");
         }
     }
+
     @Override
     public List<String> getPhoto(Long id) {
         return baseMapper.getPhoto(id);
     }
 
     @Override
-    public GAreaVo queryById(Long id){
+    public GAreaVo queryById(Long id) {
         GAreaVo voById = getVoById(id);
         voById.setPhotoList(baseMapper.getPhoto(id));
         return voById;
@@ -149,11 +151,13 @@ public class GAreaServiceImpl extends ServicePlusImpl<GAreaMapper, GArea, GAreaV
             List<String> inslist = piclist.stream().filter(i -> !photolist.contains(i)).collect(Collectors.toList());
             if (inslist.size() > 0) {
                 for (int i = 0; i < inslist.size(); i++) {
-                    //添加照片
-                    GAreaPhotoBo photo = new GAreaPhotoBo();
-                    photo.setAreaId(bo.getId());
-                    photo.setPicUrl(inslist.get(i));
-                    igAreaPhotoService.insertByBo(photo);
+                    if (StringUtils.isNotEmpty(inslist.get(i))) {
+                        //添加照片
+                        GAreaPhotoBo photo = new GAreaPhotoBo();
+                        photo.setAreaId(bo.getId());
+                        photo.setPicUrl(inslist.get(i));
+                        igAreaPhotoService.insertByBo(photo);
+                    }
                 }
             }
         }
@@ -165,13 +169,13 @@ public class GAreaServiceImpl extends ServicePlusImpl<GAreaMapper, GArea, GAreaV
      *
      * @param entity 实体类数据
      */
-    private void validEntityBeforeSave(GArea entity){
+    private void validEntityBeforeSave(GArea entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return removeByIds(ids);

+ 11 - 8
ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GEmergencyRepairServiceImpl.java

@@ -34,8 +34,9 @@ public class GEmergencyRepairServiceImpl extends ServicePlusImpl<GEmergencyRepai
 
     @Autowired
     private IGEmergencyRepairPhotoService igEmergencyRepairPhotoService;
+
     @Override
-    public GEmergencyRepairVo queryById(Long id){
+    public GEmergencyRepairVo queryById(Long id) {
         GEmergencyRepairVo byId = baseMapper.getById(id);
         byId.setPhotoList(baseMapper.getPhoto(id));
         return byId;
@@ -99,11 +100,13 @@ public class GEmergencyRepairServiceImpl extends ServicePlusImpl<GEmergencyRepai
             List<String> inslist = piclist.stream().filter(i -> !photolist.contains(i)).collect(Collectors.toList());
             if (inslist.size() > 0) {
                 for (int i = 0; i < inslist.size(); i++) {
-                    //添加照片
-                    GEmergencyRepairPhotoBo photo = new GEmergencyRepairPhotoBo();
-                    photo.setEmergencyRepairId(bo.getId());
-                    photo.setPicUrl(inslist.get(i));
-                    igEmergencyRepairPhotoService.insertByBo(photo);
+                    if (StringUtils.isNotEmpty(inslist.get(i))) {
+                        //添加照片
+                        GEmergencyRepairPhotoBo photo = new GEmergencyRepairPhotoBo();
+                        photo.setEmergencyRepairId(bo.getId());
+                        photo.setPicUrl(inslist.get(i));
+                        igEmergencyRepairPhotoService.insertByBo(photo);
+                    }
                 }
             }
         }
@@ -115,13 +118,13 @@ public class GEmergencyRepairServiceImpl extends ServicePlusImpl<GEmergencyRepai
      *
      * @param entity 实体类数据
      */
-    private void validEntityBeforeSave(GEmergencyRepair entity){
+    private void validEntityBeforeSave(GEmergencyRepair entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return removeByIds(ids);

+ 7 - 5
ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRegulatorBoxServiceImpl.java

@@ -134,11 +134,13 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
             List<String> inslist = piclist.stream().filter(i -> !photolist.contains(i)).collect(Collectors.toList());
             if (inslist.size() > 0) {
                 for (int i = 0; i < inslist.size(); i++) {
-                    //添加照片
-                    GRegulatorBoxPhotoBo photo = new GRegulatorBoxPhotoBo();
-                    photo.setRegulatorBoxId(bo.getId());
-                    photo.setPicUrl(inslist.get(i));
-                    igRegulatorBoxPhotoService.insertByBo(photo);
+                    if (StringUtils.isNotEmpty(inslist.get(i))) {
+                        //添加照片
+                        GRegulatorBoxPhotoBo photo = new GRegulatorBoxPhotoBo();
+                        photo.setRegulatorBoxId(bo.getId());
+                        photo.setPicUrl(inslist.get(i));
+                        igRegulatorBoxPhotoService.insertByBo(photo);
+                    }
                 }
             }
         }

+ 1 - 1
ruoyi-gas/src/main/resources/mapper/GAreaPhotoMapper.xml

@@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <delete id="deleteByUrl" parameterType="String">
-        delete from g_order_photo where order_id = #{areaId}
+        delete from g_area_photo where area_id = #{areaId}
         and pic_url in
         <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
             #{item}

BIN
ruoyi-gas/target/classes/com/ruoyi/gas/service/impl/GAreaServiceImpl.class


BIN
ruoyi-gas/target/classes/com/ruoyi/gas/service/impl/GEmergencyRepairServiceImpl.class