提交代码

.idea/workspace.xml

@@ -5,261 +5,45 @@
   </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/GEmergencyRepairController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GEmergencyRepair.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GEmergencyRepairBo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GEmergencyRepairVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GAreaPhotoMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GEmergencyRepairMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGAreaPhotoService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGEmergencyRepairService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GEmergencyRepairMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/Backup.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GAreaController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GAreaController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GBuildingController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GBuildingController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GEnginePhotoController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GHouseController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GOrderController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GOrderPhotoController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GOtherEngineController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GParameterController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GPipeLengthController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GPipeTypeController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GUnitController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GUnitController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GValveController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MAboutUsController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MAreaController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MBuildingController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MEnginePhotoController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MExplainController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MHouseController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MNoticeController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MOrderController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MOrderPhotoController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MOtherEngineController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MPipeLengthController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MPipeTypeController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MRotationController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MUnitController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MUserController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MValveController.java" beforeDir="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-extend/ruoyi-extend.iml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-extend/ruoyi-extend.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GArea.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GArea.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GBuilding.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GBuilding.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GEnginePhoto.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GAreaPhoto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GHouse.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GOrder.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GOrderPhoto.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GOtherEngine.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GParameter.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GPipeLength.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GPipeType.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GUnit.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GUnit.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GValve.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GAreaBo.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GAreaBo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GBuildingBo.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GBuildingBo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GEnginePhotoBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GHouseBo.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GAreaPhotoBo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GOrderBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GOrderPhotoBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GOtherEngineBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GParameterBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GPipeLengthBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GPipeTypeBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GUnitBo.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GUnitBo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GValveBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GAreaExportVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GAreaVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GAreaVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GBuildingVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GBuildingVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GDownloadVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GEnginePhotoVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GAreaPhotoVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GExportVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GExportsVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GHouseVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GImportVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GOrderExportVoAnJian.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GOrderExportVoWeiXiu.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GOrderPhotoVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GOrderVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GOtherEngineVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GParameterVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GPipeLengthVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GPipeTypeVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GUnitVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GUnitVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GValveVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GAreaMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GAreaMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GBuildingMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GBuildingMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GEnginePhotoMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GHouseMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GOrderMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GOrderPhotoMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GOtherEngineMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GParameterMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GPipeLengthMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GPipeTypeMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GUnitMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GUnitMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GUserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GUserMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GValveMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGAreaService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGAreaService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGBuildingService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGBuildingService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGEnginePhotoService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGHouseService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGOrderPhotoService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGOrderService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGOtherEngineService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGParameterService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGPipeLengthService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGPipeTypeService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGUnitService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGUnitService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGUserService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGValveService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GAboutUsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GAboutUsServiceImpl.java" 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/GBuildingServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GBuildingServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GEnginePhotoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GAreaPhotoServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GHouseServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GOrderPhotoServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GOrderServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GOtherEngineServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GParameterServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GPipeLengthServiceImpl.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/java/com/ruoyi/gas/service/impl/GPipeTypeServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GUnitServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GUnitServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GUserServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GValveServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GAreaMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GAreaMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GBuildingMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GBuildingMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GEnginePhotoMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GHouseMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GOrderMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GOrderPhotoMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GOtherEngineMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GParameterMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GPipeLengthMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GPipeTypeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GAreaPhotoMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GUnitMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GUnitMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-gas/src/main/resources/mapper/GValveMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/MAboutUs.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/MArea.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/MBuilding.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/MEnginePhoto.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/MExplain.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/MHouse.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/MNotice.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/MOrder.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/MOrderPhoto.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/MOtherEngine.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/MPipeLength.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/MPipeType.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/MRotation.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/MUnit.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/MValve.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/bo/MAboutUsBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/bo/MAreaBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/bo/MBuildingBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/bo/MEnginePhotoBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/bo/MExplainBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/bo/MHouseBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/bo/MNoticeBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/bo/MOrderBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/bo/MOrderPhotoBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/bo/MOtherEngineBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/bo/MPipeLengthBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/bo/MPipeTypeBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/bo/MRotationBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/bo/MUnitBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/bo/MUserBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/bo/MValveBo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/vo/MAboutUsVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/vo/MAreaVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/vo/MBuildingVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/vo/MCensusVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/vo/MDicVO.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/vo/MDownloadVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/vo/MEnginePhotoVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/vo/MExplainVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/vo/MHouseVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/vo/MNoticeVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/vo/MOrderPhotoVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/vo/MOrderVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/vo/MOtherEngineVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/vo/MPipeLengthVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/vo/MPipeTypeVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/vo/MRotationVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/vo/MUnitVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/vo/MUserForemanVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/vo/MUserVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/vo/MValveVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/mapper/MAboutUsMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/mapper/MAreaMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/mapper/MBuildingMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/mapper/MEnginePhotoMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/mapper/MExplainMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/mapper/MHouseMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/mapper/MNoticeMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/mapper/MOrderMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/mapper/MOrderPhotoMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/mapper/MOtherEngineMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/mapper/MPipeLengthMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/mapper/MPipeTypeMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/mapper/MRotationMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/mapper/MUnitMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/mapper/MUserMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/mapper/MValveMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/IMAboutUsService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/IMAreaService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/IMBuildingService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/IMEnginePhotoService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/IMExplainService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/IMHouseService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/IMNoticeService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/IMOrderPhotoService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/IMOrderService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/IMOtherEngineService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/IMPipeLengthService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/IMPipeTypeService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/IMRotationService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/IMUnitService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/IMUserService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/IMValveService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/impl/MAboutUsServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/impl/MAreaServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/impl/MBuildingServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/impl/MEnginePhotoServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/impl/MExplainServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/impl/MHouseServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/impl/MNoticeServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/impl/MOrderPhotoServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/impl/MOrderServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/impl/MOtherEngineServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/impl/MPipeLengthServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/impl/MPipeTypeServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/impl/MRotationServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/impl/MUnitServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/impl/MUserServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/impl/MValveServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/resources/mapper/mobile/MAboutUsMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/resources/mapper/mobile/MAreaMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/resources/mapper/mobile/MBuildingMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/resources/mapper/mobile/MEnginePhotoMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/resources/mapper/mobile/MExplainMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/resources/mapper/mobile/MHouseMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/resources/mapper/mobile/MNoticeMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/resources/mapper/mobile/MOrderMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/resources/mapper/mobile/MOrderPhotoMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/resources/mapper/mobile/MOtherEngineMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/resources/mapper/mobile/MPipeLengthMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/resources/mapper/mobile/MPipeTypeMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/resources/mapper/mobile/MRotationMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/resources/mapper/mobile/MUnitMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/resources/mapper/mobile/MUserMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-mobile/src/main/resources/mapper/mobile/MValveMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-vue-plus.iml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-vue-plus.iml" afterDir="false" />
+      <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" />
+      <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-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/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" />
@@ -300,26 +84,26 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <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 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>
+}]]></component>
   <component name="ReactorSettings">
     <option name="notificationShown" value="true" />
   </component>
@@ -329,8 +113,8 @@
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\project\java\zhendashizheng\ruoyi-gas\src\main\resources\mapper" />
-      <recent name="D:\project\java\zhendashizheng\ruoyi-admin\src\main\java\com\ruoyi\web\controller\gas" />
       <recent name="D:\project\java\zhendashizheng\ruoyi-gas\src\main\java\com\ruoyi\gas" />
+      <recent name="D:\project\java\zhendashizheng\ruoyi-admin\src\main\java\com\ruoyi\web\controller\gas" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -379,6 +163,9 @@
       <workItem from="1698023956889" duration="286000" />
       <workItem from="1698041358897" duration="5107000" />
       <workItem from="1698108724618" duration="7941000" />
+      <workItem from="1698129688036" duration="3327000" />
+      <workItem from="1698194223613" duration="3556000" />
+      <workItem from="1698201966791" duration="2001000" />
     </task>
     <servers />
   </component>

logs/sys-user.log

@@ -1,12 +1,8 @@
-2023-10-24 10:41:24 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
-2023-10-24 10:52:38 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
-2023-10-24 13:10:55 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
-2023-10-24 13:13:16 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
-2023-10-24 13:51:06 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
-2023-10-24 14:07:03 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
-2023-10-24 14:09:50 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
-2023-10-24 14:15:09 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
-2023-10-24 14:17:39 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
-2023-10-24 14:19:09 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
-2023-10-24 14:22:09 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
-2023-10-24 14:41:09 [SpringApplicationShutdownHook] INFO  sys-user - ====关闭后台任务任务线程池====
+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 - ====关闭后台任务任务线程池====

ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GRegulatorBoxController.java

@@ -0,0 +1,113 @@
+package com.ruoyi.web.controller.gas;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.gas.domain.bo.GRegulatorBoxBo;
+import com.ruoyi.gas.domain.vo.GRegulatorBoxVo;
+import com.ruoyi.gas.service.IGRegulatorBoxService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 调压箱管理Controller
+ *
+ * @author JX.Li
+ * @date 2023-10-24
+ */
+@Validated
+@Api(value = "调压箱管理控制器", tags = {"调压箱管理管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/gas/regulatorBox")
+public class GRegulatorBoxController extends BaseController {
+
+    private final IGRegulatorBoxService iGRegulatorBoxService;
+
+    /**
+     * 查询调压箱管理列表
+     */
+    @ApiOperation("查询调压箱管理列表")
+    @PreAuthorize("@ss.hasPermi('gas:regulatorBox:list')")
+    @GetMapping("/list")
+    public TableDataInfo<GRegulatorBoxVo> list(@Validated(QueryGroup.class) GRegulatorBoxBo bo) {
+        return iGRegulatorBoxService.queryPageList(bo);
+    }
+
+    /**
+     * 导出调压箱管理列表
+     */
+    @ApiOperation("导出调压箱管理列表")
+    @PreAuthorize("@ss.hasPermi('gas:regulatorBox:export')")
+    @Log(title = "调压箱管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public void export(@Validated GRegulatorBoxBo bo, HttpServletResponse response) {
+        List<GRegulatorBoxVo> list = iGRegulatorBoxService.queryList(bo);
+        ExcelUtil.exportExcel(list, "调压箱管理", GRegulatorBoxVo.class, response);
+    }
+
+    /**
+     * 获取调压箱管理详细信息
+     */
+    @ApiOperation("获取调压箱管理详细信息")
+    @PreAuthorize("@ss.hasPermi('gas:regulatorBox:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<GRegulatorBoxVo> getInfo(@NotNull(message = "主键不能为空")
+                                                  @PathVariable("id") Long id) {
+        return AjaxResult.success(iGRegulatorBoxService.queryById(id));
+    }
+
+    /**
+     * 新增调压箱管理
+     */
+    @ApiOperation("新增调压箱管理")
+    @PreAuthorize("@ss.hasPermi('gas:regulatorBox:add')")
+    @Log(title = "调压箱管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody GRegulatorBoxBo bo) {
+        return toAjax(iGRegulatorBoxService.insertByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改调压箱管理
+     */
+    @ApiOperation("修改调压箱管理")
+    @PreAuthorize("@ss.hasPermi('gas:regulatorBox:edit')")
+    @Log(title = "调压箱管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody GRegulatorBoxBo bo) {
+        return toAjax(iGRegulatorBoxService.updateByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除调压箱管理
+     */
+    @ApiOperation("删除调压箱管理")
+    @PreAuthorize("@ss.hasPermi('gas:regulatorBox:remove')")
+    @Log(title = "调压箱管理" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
+                                       @PathVariable Long[] ids) {
+        return toAjax(iGRegulatorBoxService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GEmergencyRepairPhoto.java

@@ -0,0 +1,42 @@
+package com.ruoyi.gas.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 抢险维修照片对象 g_emergency_repair_photo
+ *
+ * @author JX.Li
+ * @date 2023-10-24
+ */
+@Data
+@Accessors(chain = true)
+@TableName("g_emergency_repair_photo")
+public class GEmergencyRepairPhoto extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 抢险维修id
+     */
+    private Long emergencyRepairId;
+    /**
+     * 照片
+     */
+    private String picUrl;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private String delFlag;
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GRegulatorBox.java

@@ -0,0 +1,172 @@
+package com.ruoyi.gas.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+ * 调压箱管理对象 g_regulator_box
+ *
+ * @author JX.Li
+ * @date 2023-10-24
+ */
+@Data
+@Accessors(chain = true)
+@TableName("g_regulator_box")
+public class GRegulatorBox extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 单元id
+     */
+    private Long unitId;
+    /**
+     * 管理所
+     */
+    private String administrativeOffice;
+    /**
+     * 编号
+     */
+    private String number;
+    /**
+     * 商服
+     */
+    private Boolean businessService;
+    /**
+     * 外观
+     */
+    private String appearance;
+    /**
+     * 方砖
+     */
+    private String squareBrick;
+    /**
+     * 护栏
+     */
+    private String guardrail;
+    /**
+     * 基础
+     */
+    private String foundation;
+    /**
+     * 压力表
+     */
+    private String pressureGage;
+    /**
+     * 阀门
+     */
+    private String valve;
+    /**
+     * 是否泄露
+     */
+    private Boolean isThereALeak;
+    /**
+     * 调压器
+     */
+    private String voltageRegulator;
+    /**
+     * 入口压力
+     */
+    private BigDecimal inletPressure;
+    /**
+     * 出口压力(主路)
+     */
+    private BigDecimal exportPressureMain;
+    /**
+     * 出口压力(副路)
+     */
+    private BigDecimal exportPressureAccessory;
+    /**
+     * 关闭压力(主路)
+     */
+    private BigDecimal closingPressureMain;
+    /**
+     * 关闭压力(副路)
+     */
+    private BigDecimal closingPressureAccessory;
+    /**
+     * 伴热带
+     */
+    private String xtv;
+    /**
+     * 有无控温器
+     */
+    private Boolean thermostat;
+    /**
+     * 有无防爆开关
+     */
+    private Boolean explosionProofSwitch;
+    /**
+     * 切断器测试
+     */
+    private Boolean cutterTested;
+    /**
+     * 切断器(放散阀)测试情况
+     */
+    private String disconnectorTestStatus;
+    /**
+     * 切断压力(主路)
+     */
+    private BigDecimal cutOffPressureMain;
+    /**
+     * 切断压力(副路)
+     */
+    private BigDecimal cutOffPressureAccessory;
+    /**
+     * 放散压力
+     */
+    private BigDecimal releasePressure;
+    /**
+     * 主副路交替
+     */
+    private Boolean manOfAccessoryAlternating;
+    /**
+     * 过滤器
+     */
+    private String filter;
+    /**
+     * 调压设施特例
+     */
+    private String specialCaseOfPressureRegulatingFacilities;
+    /**
+     * 超期巡检天数
+     */
+    private String overdueInspectionDays;
+    /**
+     * 超期巡检原因
+     */
+    private String reasonForOverdueInspection;
+    /**
+     * 超期巡检其他原因
+     */
+    private String otherReasonsForOverdueInspection;
+    /**
+     * 阀井测试
+     */
+    private Boolean valveWellTesting;
+    /**
+     * 阀井情况
+     */
+    private String valveWellCondition;
+    /**
+     * 备注
+     */
+    private String remarks;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private String delFlag;
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GRegulatorBoxPhoto.java

@@ -0,0 +1,42 @@
+package com.ruoyi.gas.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 调压箱照片对象 g_regulator_box_photo
+ *
+ * @author JX.Li
+ * @date 2023-10-25
+ */
+@Data
+@Accessors(chain = true)
+@TableName("g_regulator_box_photo")
+public class GRegulatorBoxPhoto extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 调压箱id
+     */
+    private Long regulatorBoxId;
+    /**
+     * 照片
+     */
+    private String picUrl;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private String delFlag;
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GEmergencyRepairBo.java

@@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 抢险维修业务对象 g_emergency_repair
@@ -24,6 +25,8 @@ import java.util.Date;
 @ApiModel("抢险维修业务对象")
 public class GEmergencyRepairBo extends BaseEntity {
 
+    private List<String> photoList;
+
     /**
      * 主键id
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GEmergencyRepairPhotoBo.java

@@ -0,0 +1,72 @@
+package com.ruoyi.gas.domain.bo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 抢险维修照片业务对象 g_emergency_repair_photo
+ *
+ * @author JX.Li
+ * @date 2023-10-24
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("抢险维修照片业务对象")
+public class GEmergencyRepairPhotoBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(value = "主键id", required = true)
+    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 抢险维修id
+     */
+    @ApiModelProperty(value = "抢险维修id", required = true)
+    @NotNull(message = "抢险维修id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long emergencyRepairId;
+
+    /**
+     * 照片
+     */
+    @ApiModelProperty(value = "照片", required = true)
+    @NotBlank(message = "照片不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String picUrl;
+
+
+    /**
+     * 分页大小
+     */
+    @ApiModelProperty("分页大小")
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    @ApiModelProperty("当前页数")
+    private Integer pageNum;
+
+    /**
+     * 排序列
+     */
+    @ApiModelProperty("排序列")
+    private String orderByColumn;
+
+    /**
+     * 排序的方向desc或者asc
+     */
+    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
+    private String isAsc;
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GRegulatorBoxBo.java

@@ -0,0 +1,299 @@
+package com.ruoyi.gas.domain.bo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 调压箱管理业务对象 g_regulator_box
+ *
+ * @author JX.Li
+ * @date 2023-10-24
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("调压箱管理业务对象")
+public class GRegulatorBoxBo extends BaseEntity {
+
+    private List<String> photoList;
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键", required = true)
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 单元id
+     */
+    @ApiModelProperty(value = "单元id", required = true)
+    @NotNull(message = "单元id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long unitId;
+
+    /**
+     * 管理所
+     */
+    @ApiModelProperty(value = "管理所", required = true)
+    @NotBlank(message = "管理所不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String administrativeOffice;
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty(value = "编号", required = true)
+    @NotBlank(message = "编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String number;
+
+    /**
+     * 商服
+     */
+    @ApiModelProperty(value = "商服", required = true)
+    @NotNull(message = "商服不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Boolean businessService;
+
+    /**
+     * 外观
+     */
+    @ApiModelProperty(value = "外观", required = true)
+    @NotBlank(message = "外观不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String appearance;
+
+    /**
+     * 方砖
+     */
+    @ApiModelProperty(value = "方砖", required = true)
+    @NotBlank(message = "方砖不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String squareBrick;
+
+    /**
+     * 护栏
+     */
+    @ApiModelProperty(value = "护栏", required = true)
+    @NotBlank(message = "护栏不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String guardrail;
+
+    /**
+     * 基础
+     */
+    @ApiModelProperty(value = "基础", required = true)
+    @NotBlank(message = "基础不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String foundation;
+
+    /**
+     * 压力表
+     */
+    @ApiModelProperty(value = "压力表", required = true)
+    @NotBlank(message = "压力表不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String pressureGage;
+
+    /**
+     * 阀门
+     */
+    @ApiModelProperty(value = "阀门", required = true)
+    @NotBlank(message = "阀门不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String valve;
+
+    /**
+     * 是否泄露
+     */
+    @ApiModelProperty(value = "是否泄露", required = true)
+    @NotNull(message = "是否泄露不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Boolean isThereALeak;
+
+    /**
+     * 调压器
+     */
+    @ApiModelProperty(value = "调压器", required = true)
+    @NotBlank(message = "调压器不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String voltageRegulator;
+
+    /**
+     * 入口压力
+     */
+    @ApiModelProperty(value = "入口压力", required = true)
+    @NotNull(message = "入口压力不能为空", groups = { AddGroup.class, EditGroup.class })
+    private BigDecimal inletPressure;
+
+    /**
+     * 出口压力(主路)
+     */
+    @ApiModelProperty(value = "出口压力(主路)", required = true)
+    @NotNull(message = "出口压力(主路)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private BigDecimal exportPressureMain;
+
+    /**
+     * 出口压力(副路)
+     */
+    @ApiModelProperty(value = "出口压力(副路)", required = true)
+    @NotNull(message = "出口压力(副路)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private BigDecimal exportPressureAccessory;
+
+    /**
+     * 关闭压力(主路)
+     */
+    @ApiModelProperty(value = "关闭压力(主路)", required = true)
+    @NotNull(message = "关闭压力(主路)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private BigDecimal closingPressureMain;
+
+    /**
+     * 关闭压力(副路)
+     */
+    @ApiModelProperty(value = "关闭压力(副路)", required = true)
+    @NotNull(message = "关闭压力(副路)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private BigDecimal closingPressureAccessory;
+
+    /**
+     * 伴热带
+     */
+    @ApiModelProperty(value = "伴热带", required = true)
+    @NotBlank(message = "伴热带不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String xtv;
+
+    /**
+     * 有无控温器
+     */
+    @ApiModelProperty(value = "有无控温器", required = true)
+    @NotNull(message = "有无控温器不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Boolean thermostat;
+
+    /**
+     * 有无防爆开关
+     */
+    @ApiModelProperty(value = "有无防爆开关", required = true)
+    @NotNull(message = "有无防爆开关不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Boolean explosionProofSwitch;
+
+    /**
+     * 切断器测试
+     */
+    @ApiModelProperty(value = "切断器测试", required = true)
+    @NotNull(message = "切断器测试不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Boolean cutterTested;
+
+    /**
+     * 切断器(放散阀)测试情况
+     */
+    @ApiModelProperty(value = "切断器(放散阀)测试情况", required = true)
+    @NotBlank(message = "切断器(放散阀)测试情况不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String disconnectorTestStatus;
+
+    /**
+     * 切断压力(主路)
+     */
+    @ApiModelProperty(value = "切断压力(主路)", required = true)
+    @NotNull(message = "切断压力(主路)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private BigDecimal cutOffPressureMain;
+
+    /**
+     * 切断压力(副路)
+     */
+    @ApiModelProperty(value = "切断压力(副路)", required = true)
+    @NotNull(message = "切断压力(副路)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private BigDecimal cutOffPressureAccessory;
+
+    /**
+     * 放散压力
+     */
+    @ApiModelProperty(value = "放散压力", required = true)
+    @NotNull(message = "放散压力不能为空", groups = { AddGroup.class, EditGroup.class })
+    private BigDecimal releasePressure;
+
+    /**
+     * 主副路交替
+     */
+    @ApiModelProperty(value = "主副路交替", required = true)
+    @NotNull(message = "主副路交替不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Boolean manOfAccessoryAlternating;
+
+    /**
+     * 过滤器
+     */
+    @ApiModelProperty(value = "过滤器", required = true)
+    @NotBlank(message = "过滤器不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String filter;
+
+    /**
+     * 调压设施特例
+     */
+    @ApiModelProperty(value = "调压设施特例", required = true)
+    @NotBlank(message = "调压设施特例不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String specialCaseOfPressureRegulatingFacilities;
+
+    /**
+     * 超期巡检天数
+     */
+    @ApiModelProperty(value = "超期巡检天数", required = true)
+    @NotBlank(message = "超期巡检天数不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String overdueInspectionDays;
+
+    /**
+     * 超期巡检原因
+     */
+    @ApiModelProperty(value = "超期巡检原因", required = true)
+    @NotBlank(message = "超期巡检原因不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String reasonForOverdueInspection;
+
+    /**
+     * 超期巡检其他原因
+     */
+    @ApiModelProperty(value = "超期巡检其他原因", required = true)
+    @NotBlank(message = "超期巡检其他原因不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String otherReasonsForOverdueInspection;
+
+    /**
+     * 阀井测试
+     */
+    @ApiModelProperty(value = "阀井测试", required = true)
+    @NotNull(message = "阀井测试不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Boolean valveWellTesting;
+
+    /**
+     * 阀井情况
+     */
+    @ApiModelProperty(value = "阀井情况", required = true)
+    @NotBlank(message = "阀井情况不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String valveWellCondition;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", required = true)
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remarks;
+
+
+    /**
+     * 分页大小
+     */
+    @ApiModelProperty("分页大小")
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    @ApiModelProperty("当前页数")
+    private Integer pageNum;
+
+    /**
+     * 排序列
+     */
+    @ApiModelProperty("排序列")
+    private String orderByColumn;
+
+    /**
+     * 排序的方向desc或者asc
+     */
+    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
+    private String isAsc;
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GRegulatorBoxPhotoBo.java

@@ -0,0 +1,73 @@
+package com.ruoyi.gas.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 调压箱照片业务对象 g_regulator_box_photo
+ *
+ * @author JX.Li
+ * @date 2023-10-25
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("调压箱照片业务对象")
+public class GRegulatorBoxPhotoBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(value = "主键id", required = true)
+    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 调压箱id
+     */
+    @ApiModelProperty(value = "调压箱id", required = true)
+    @NotNull(message = "调压箱id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long regulatorBoxId;
+
+    /**
+     * 照片
+     */
+    @ApiModelProperty(value = "照片", required = true)
+    @NotBlank(message = "照片不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String picUrl;
+
+
+    /**
+     * 分页大小
+     */
+    @ApiModelProperty("分页大小")
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    @ApiModelProperty("当前页数")
+    private Integer pageNum;
+
+    /**
+     * 排序列
+     */
+    @ApiModelProperty("排序列")
+    private String orderByColumn;
+
+    /**
+     * 排序的方向desc或者asc
+     */
+    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
+    private String isAsc;
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GEmergencyRepairPhotoVo.java

@@ -0,0 +1,49 @@
+package com.ruoyi.gas.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 抢险维修照片视图对象 g_emergency_repair_photo
+ *
+ * @author JX.Li
+ * @date 2023-10-24
+ */
+@Data
+@ApiModel("抢险维修照片视图对象")
+@ExcelIgnoreUnannotated
+public class GEmergencyRepairPhotoVo {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+	@ExcelProperty(value = "主键id")
+	@ApiModelProperty("主键id")
+	private Long id;
+
+    /**
+     * 抢险维修id
+     */
+	@ExcelProperty(value = "抢险维修id")
+	@ApiModelProperty("抢险维修id")
+	private Long emergencyRepairId;
+
+    /**
+     * 照片
+     */
+	@ExcelProperty(value = "照片")
+	@ApiModelProperty("照片")
+	private String picUrl;
+
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GEmergencyRepairVo.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -28,6 +28,7 @@ public class GEmergencyRepairVo {
 	private Long buildingId;
 	private String buildingName;
 	private String unitName;
+	private List<String> photoList;
 
     /**
      * 主键ID

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GRegulatorBoxPhotoVo.java

@@ -0,0 +1,49 @@
+package com.ruoyi.gas.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 调压箱照片视图对象 g_regulator_box_photo
+ *
+ * @author JX.Li
+ * @date 2023-10-25
+ */
+@Data
+@ApiModel("调压箱照片视图对象")
+@ExcelIgnoreUnannotated
+public class GRegulatorBoxPhotoVo {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+	@ExcelProperty(value = "主键id")
+	@ApiModelProperty("主键id")
+	private Long id;
+
+    /**
+     * 调压箱id
+     */
+	@ExcelProperty(value = "调压箱id")
+	@ApiModelProperty("调压箱id")
+	private Long regulatorBoxId;
+
+    /**
+     * 照片
+     */
+	@ExcelProperty(value = "照片")
+	@ApiModelProperty("照片")
+	private String picUrl;
+
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GRegulatorBoxVo.java

@@ -0,0 +1,294 @@
+package com.ruoyi.gas.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+
+/**
+ * 调压箱管理视图对象 g_regulator_box
+ *
+ * @author JX.Li
+ * @date 2023-10-24
+ */
+@Data
+@ApiModel("调压箱管理视图对象")
+@ExcelIgnoreUnannotated
+public class GRegulatorBoxVo {
+
+	private static final long serialVersionUID = 1L;
+
+	private Long areaId;
+	private String areaName;
+	private Long buildingId;
+	private String buildingName;
+	private String unitName;
+	private List<String> photoList;
+    /**
+     * 主键
+     */
+	@ExcelProperty(value = "主键")
+	@ApiModelProperty("主键")
+	private Long id;
+
+    /**
+     * 单元id
+     */
+	@ExcelProperty(value = "单元id")
+	@ApiModelProperty("单元id")
+	private Long unitId;
+
+    /**
+     * 管理所
+     */
+	@ExcelProperty(value = "管理所")
+	@ApiModelProperty("管理所")
+	private String administrativeOffice;
+
+    /**
+     * 编号
+     */
+	@ExcelProperty(value = "编号")
+	@ApiModelProperty("编号")
+	private String number;
+
+    /**
+     * 商服
+     */
+	@ExcelProperty(value = "商服")
+	@ApiModelProperty("商服")
+	private Boolean businessService;
+
+    /**
+     * 外观
+     */
+    @ExcelProperty(value = "外观", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "appearance")
+	@ApiModelProperty("外观")
+	private String appearance;
+
+    /**
+     * 方砖
+     */
+    @ExcelProperty(value = "方砖", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "square_brick")
+	@ApiModelProperty("方砖")
+	private String squareBrick;
+
+    /**
+     * 护栏
+     */
+    @ExcelProperty(value = "护栏", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "guardrail")
+	@ApiModelProperty("护栏")
+	private String guardrail;
+
+    /**
+     * 基础
+     */
+    @ExcelProperty(value = "基础", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "foundation")
+	@ApiModelProperty("基础")
+	private String foundation;
+
+    /**
+     * 压力表
+     */
+    @ExcelProperty(value = "压力表", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "pressure_gage")
+	@ApiModelProperty("压力表")
+	private String pressureGage;
+
+    /**
+     * 阀门
+     */
+    @ExcelProperty(value = "阀门", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "valve")
+	@ApiModelProperty("阀门")
+	private String valve;
+
+    /**
+     * 是否泄露
+     */
+	@ExcelProperty(value = "是否泄露")
+	@ApiModelProperty("是否泄露")
+	private Boolean isThereALeak;
+
+    /**
+     * 调压器
+     */
+    @ExcelProperty(value = "调压器", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "voltage_regulator")
+	@ApiModelProperty("调压器")
+	private String voltageRegulator;
+
+    /**
+     * 入口压力
+     */
+	@ExcelProperty(value = "入口压力")
+	@ApiModelProperty("入口压力")
+	private BigDecimal inletPressure;
+
+    /**
+     * 出口压力(主路)
+     */
+	@ExcelProperty(value = "出口压力(主路)")
+	@ApiModelProperty("出口压力(主路)")
+	private BigDecimal exportPressureMain;
+
+    /**
+     * 出口压力(副路)
+     */
+	@ExcelProperty(value = "出口压力(副路)")
+	@ApiModelProperty("出口压力(副路)")
+	private BigDecimal exportPressureAccessory;
+
+    /**
+     * 关闭压力(主路)
+     */
+	@ExcelProperty(value = "关闭压力(主路)")
+	@ApiModelProperty("关闭压力(主路)")
+	private BigDecimal closingPressureMain;
+
+    /**
+     * 关闭压力(副路)
+     */
+	@ExcelProperty(value = "关闭压力(副路)")
+	@ApiModelProperty("关闭压力(副路)")
+	private BigDecimal closingPressureAccessory;
+
+    /**
+     * 伴热带
+     */
+    @ExcelProperty(value = "伴热带", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "xtv")
+	@ApiModelProperty("伴热带")
+	private String xtv;
+
+    /**
+     * 有无控温器
+     */
+	@ExcelProperty(value = "有无控温器")
+	@ApiModelProperty("有无控温器")
+	private Boolean thermostat;
+
+    /**
+     * 有无防爆开关
+     */
+	@ExcelProperty(value = "有无防爆开关")
+	@ApiModelProperty("有无防爆开关")
+	private Boolean explosionProofSwitch;
+
+    /**
+     * 切断器测试
+     */
+	@ExcelProperty(value = "切断器测试")
+	@ApiModelProperty("切断器测试")
+	private Boolean cutterTested;
+
+    /**
+     * 切断器(放散阀)测试情况
+     */
+    @ExcelProperty(value = "切断器(放散阀)测试情况", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "disconnector_test_status")
+	@ApiModelProperty("切断器(放散阀)测试情况")
+	private String disconnectorTestStatus;
+
+    /**
+     * 切断压力(主路)
+     */
+	@ExcelProperty(value = "切断压力(主路)")
+	@ApiModelProperty("切断压力(主路)")
+	private BigDecimal cutOffPressureMain;
+
+    /**
+     * 切断压力(副路)
+     */
+	@ExcelProperty(value = "切断压力(副路)")
+	@ApiModelProperty("切断压力(副路)")
+	private BigDecimal cutOffPressureAccessory;
+
+    /**
+     * 放散压力
+     */
+	@ExcelProperty(value = "放散压力")
+	@ApiModelProperty("放散压力")
+	private BigDecimal releasePressure;
+
+    /**
+     * 主副路交替
+     */
+	@ExcelProperty(value = "主副路交替")
+	@ApiModelProperty("主副路交替")
+	private Boolean manOfAccessoryAlternating;
+
+    /**
+     * 过滤器
+     */
+    @ExcelProperty(value = "过滤器", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "filter")
+	@ApiModelProperty("过滤器")
+	private String filter;
+
+    /**
+     * 调压设施特例
+     */
+    @ExcelProperty(value = "调压设施特例", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "special_case_of_pressure_regulating_facilities")
+	@ApiModelProperty("调压设施特例")
+	private String specialCaseOfPressureRegulatingFacilities;
+
+    /**
+     * 超期巡检天数
+     */
+    @ExcelProperty(value = "超期巡检天数", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "overdue_inspection_days")
+	@ApiModelProperty("超期巡检天数")
+	private String overdueInspectionDays;
+
+    /**
+     * 超期巡检原因
+     */
+    @ExcelProperty(value = "超期巡检原因", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "reason_for_overdue_inspection")
+	@ApiModelProperty("超期巡检原因")
+	private String reasonForOverdueInspection;
+
+    /**
+     * 超期巡检其他原因
+     */
+	@ExcelProperty(value = "超期巡检其他原因")
+	@ApiModelProperty("超期巡检其他原因")
+	private String otherReasonsForOverdueInspection;
+
+    /**
+     * 阀井测试
+     */
+	@ExcelProperty(value = "阀井测试")
+	@ApiModelProperty("阀井测试")
+	private Boolean valveWellTesting;
+
+    /**
+     * 阀井情况
+     */
+    @ExcelProperty(value = "阀井情况", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "valve_well_condition")
+	@ApiModelProperty("阀井情况")
+	private String valveWellCondition;
+
+    /**
+     * 备注
+     */
+	@ExcelProperty(value = "备注")
+	@ApiModelProperty("备注")
+	private String remarks;
+
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GEmergencyRepairMapper.java

@@ -7,6 +7,8 @@ import com.ruoyi.gas.domain.bo.GEmergencyRepairBo;
 import com.ruoyi.gas.domain.vo.GEmergencyRepairVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 抢险维修Mapper接口
  *
@@ -16,6 +18,7 @@ import org.apache.ibatis.annotations.Param;
 public interface GEmergencyRepairMapper extends BaseMapperPlus<GEmergencyRepair> {
     Page<GEmergencyRepairVo> getList(@Param("p") GEmergencyRepairBo bo, Page<?> page);
 
+    List<String> getPhoto(Long id);
     GEmergencyRepairVo getById(Long unitId);
 
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GEmergencyRepairPhotoMapper.java

@@ -0,0 +1,19 @@
+package com.ruoyi.gas.mapper;
+
+import com.ruoyi.gas.domain.GEmergencyRepairPhoto;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 抢险维修照片Mapper接口
+ *
+ * @author JX.Li
+ * @date 2023-10-24
+ */
+public interface GEmergencyRepairPhotoMapper extends BaseMapperPlus<GEmergencyRepairPhoto> {
+
+    int deleteByUrl(@Param("emergencyRepairId") Long emergencyRepairId, @Param("list") List<String> list);
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GRegulatorBoxMapper.java

@@ -0,0 +1,24 @@
+package com.ruoyi.gas.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.gas.domain.GRegulatorBox;
+import com.ruoyi.gas.domain.bo.GRegulatorBoxBo;
+import com.ruoyi.gas.domain.vo.GRegulatorBoxVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 调压箱管理Mapper接口
+ *
+ * @author JX.Li
+ * @date 2023-10-24
+ */
+public interface GRegulatorBoxMapper extends BaseMapperPlus<GRegulatorBox> {
+    Page<GRegulatorBoxVo> getList(@Param("p") GRegulatorBoxBo bo, Page<?> page);
+
+    List<String> getPhoto(Long id);
+    GRegulatorBoxVo getById(Long id);
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GRegulatorBoxPhotoMapper.java

@@ -0,0 +1,18 @@
+package com.ruoyi.gas.mapper;
+
+import com.ruoyi.gas.domain.GRegulatorBoxPhoto;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 调压箱照片Mapper接口
+ *
+ * @author JX.Li
+ * @date 2023-10-25
+ */
+public interface GRegulatorBoxPhotoMapper extends BaseMapperPlus<GRegulatorBoxPhoto> {
+    int deleteByUrl(@Param("regulatorBoxId") Long regulatorBoxId, @Param("list") List<String> list);
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGEmergencyRepairPhotoService.java

@@ -0,0 +1,59 @@
+package com.ruoyi.gas.service;
+
+import com.ruoyi.gas.domain.GEmergencyRepairPhoto;
+import com.ruoyi.gas.domain.vo.GEmergencyRepairPhotoVo;
+import com.ruoyi.gas.domain.bo.GEmergencyRepairPhotoBo;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 抢险维修照片Service接口
+ *
+ * @author JX.Li
+ * @date 2023-10-24
+ */
+public interface IGEmergencyRepairPhotoService extends IServicePlus<GEmergencyRepairPhoto, GEmergencyRepairPhotoVo> {
+
+	void deleteByUrl(Long emergencyRepairId, List<String> list);
+
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	GEmergencyRepairPhotoVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+    TableDataInfo<GEmergencyRepairPhotoVo> queryPageList(GEmergencyRepairPhotoBo bo);
+
+	/**
+	 * 查询列表
+	 */
+	List<GEmergencyRepairPhotoVo> queryList(GEmergencyRepairPhotoBo bo);
+
+	/**
+	 * 根据新增业务对象插入抢险维修照片
+	 * @param bo 抢险维修照片新增业务对象
+	 * @return
+	 */
+	Boolean insertByBo(GEmergencyRepairPhotoBo bo);
+
+	/**
+	 * 根据编辑业务对象修改抢险维修照片
+	 * @param bo 抢险维修照片编辑业务对象
+	 * @return
+	 */
+	Boolean updateByBo(GEmergencyRepairPhotoBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGRegulatorBoxPhotoService.java

@@ -0,0 +1,59 @@
+package com.ruoyi.gas.service;
+
+import com.ruoyi.gas.domain.GRegulatorBoxPhoto;
+import com.ruoyi.gas.domain.vo.GRegulatorBoxPhotoVo;
+import com.ruoyi.gas.domain.bo.GRegulatorBoxPhotoBo;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 调压箱照片Service接口
+ *
+ * @author JX.Li
+ * @date 2023-10-25
+ */
+public interface IGRegulatorBoxPhotoService extends IServicePlus<GRegulatorBoxPhoto, GRegulatorBoxPhotoVo> {
+
+	void deleteByUrl(Long regulatorBoxId, List<String> list);
+
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	GRegulatorBoxPhotoVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+    TableDataInfo<GRegulatorBoxPhotoVo> queryPageList(GRegulatorBoxPhotoBo bo);
+
+	/**
+	 * 查询列表
+	 */
+	List<GRegulatorBoxPhotoVo> queryList(GRegulatorBoxPhotoBo bo);
+
+	/**
+	 * 根据新增业务对象插入调压箱照片
+	 * @param bo 调压箱照片新增业务对象
+	 * @return
+	 */
+	Boolean insertByBo(GRegulatorBoxPhotoBo bo);
+
+	/**
+	 * 根据编辑业务对象修改调压箱照片
+	 * @param bo 调压箱照片编辑业务对象
+	 * @return
+	 */
+	Boolean updateByBo(GRegulatorBoxPhotoBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGRegulatorBoxService.java

@@ -0,0 +1,56 @@
+package com.ruoyi.gas.service;
+
+import com.ruoyi.gas.domain.GRegulatorBox;
+import com.ruoyi.gas.domain.vo.GRegulatorBoxVo;
+import com.ruoyi.gas.domain.bo.GRegulatorBoxBo;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 调压箱管理Service接口
+ *
+ * @author JX.Li
+ * @date 2023-10-24
+ */
+public interface IGRegulatorBoxService extends IServicePlus<GRegulatorBox, GRegulatorBoxVo> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	GRegulatorBoxVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+    TableDataInfo<GRegulatorBoxVo> queryPageList(GRegulatorBoxBo bo);
+
+	/**
+	 * 查询列表
+	 */
+	List<GRegulatorBoxVo> queryList(GRegulatorBoxBo bo);
+
+	/**
+	 * 根据新增业务对象插入调压箱管理
+	 * @param bo 调压箱管理新增业务对象
+	 * @return
+	 */
+	Boolean insertByBo(GRegulatorBoxBo bo);
+
+	/**
+	 * 根据编辑业务对象修改调压箱管理
+	 * @param bo 调压箱管理编辑业务对象
+	 * @return
+	 */
+	Boolean updateByBo(GRegulatorBoxBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GEmergencyRepairPhotoServiceImpl.java

@@ -0,0 +1,94 @@
+package com.ruoyi.gas.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.gas.domain.bo.GEmergencyRepairPhotoBo;
+import com.ruoyi.gas.domain.vo.GEmergencyRepairPhotoVo;
+import com.ruoyi.gas.domain.GEmergencyRepairPhoto;
+import com.ruoyi.gas.mapper.GEmergencyRepairPhotoMapper;
+import com.ruoyi.gas.service.IGEmergencyRepairPhotoService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 抢险维修照片Service业务层处理
+ *
+ * @author JX.Li
+ * @date 2023-10-24
+ */
+@Service
+public class GEmergencyRepairPhotoServiceImpl extends ServicePlusImpl<GEmergencyRepairPhotoMapper, GEmergencyRepairPhoto, GEmergencyRepairPhotoVo> implements IGEmergencyRepairPhotoService {
+
+    @Override
+    public void deleteByUrl(Long emergencyRepairId, List<String> list) {
+        baseMapper.deleteByUrl(emergencyRepairId,list);
+    }
+
+    @Override
+    public GEmergencyRepairPhotoVo queryById(Long id){
+        return getVoById(id);
+    }
+
+    @Override
+    public TableDataInfo<GEmergencyRepairPhotoVo> queryPageList(GEmergencyRepairPhotoBo bo) {
+        PagePlus<GEmergencyRepairPhoto, GEmergencyRepairPhotoVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        return PageUtils.buildDataInfo(result);
+    }
+
+    @Override
+    public List<GEmergencyRepairPhotoVo> queryList(GEmergencyRepairPhotoBo bo) {
+        return listVo(buildQueryWrapper(bo));
+    }
+
+    private LambdaQueryWrapper<GEmergencyRepairPhoto> buildQueryWrapper(GEmergencyRepairPhotoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<GEmergencyRepairPhoto> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getEmergencyRepairId() != null, GEmergencyRepairPhoto::getEmergencyRepairId, bo.getEmergencyRepairId());
+        lqw.eq(StringUtils.isNotBlank(bo.getPicUrl()), GEmergencyRepairPhoto::getPicUrl, bo.getPicUrl());
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(GEmergencyRepairPhotoBo bo) {
+        GEmergencyRepairPhoto add = BeanUtil.toBean(bo, GEmergencyRepairPhoto.class);
+        validEntityBeforeSave(add);
+        boolean flag = save(add);
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    @Override
+    public Boolean updateByBo(GEmergencyRepairPhotoBo bo) {
+        GEmergencyRepairPhoto update = BeanUtil.toBean(bo, GEmergencyRepairPhoto.class);
+        validEntityBeforeSave(update);
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GEmergencyRepairPhoto entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return removeByIds(ids);
+    }
+}

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

@@ -10,14 +10,18 @@ import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.gas.domain.GEmergencyRepair;
 import com.ruoyi.gas.domain.bo.GEmergencyRepairBo;
+import com.ruoyi.gas.domain.bo.GEmergencyRepairPhotoBo;
 import com.ruoyi.gas.domain.vo.GEmergencyRepairVo;
 import com.ruoyi.gas.mapper.GEmergencyRepairMapper;
+import com.ruoyi.gas.service.IGEmergencyRepairPhotoService;
 import com.ruoyi.gas.service.IGEmergencyRepairService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 抢险维修Service业务层处理
@@ -28,9 +32,13 @@ import java.util.Map;
 @Service
 public class GEmergencyRepairServiceImpl extends ServicePlusImpl<GEmergencyRepairMapper, GEmergencyRepair, GEmergencyRepairVo> implements IGEmergencyRepairService {
 
+    @Autowired
+    private IGEmergencyRepairPhotoService igEmergencyRepairPhotoService;
     @Override
     public GEmergencyRepairVo queryById(Long id){
-        return baseMapper.getById(id);
+        GEmergencyRepairVo byId = baseMapper.getById(id);
+        byId.setPhotoList(baseMapper.getPhoto(id));
+        return byId;
     }
 
     @Override
@@ -59,6 +67,16 @@ public class GEmergencyRepairServiceImpl extends ServicePlusImpl<GEmergencyRepai
         boolean flag = save(add);
         if (flag) {
             bo.setId(add.getId());
+            //添加照片
+            List<String> piclist = bo.getPhotoList();
+            if (piclist != null) {
+                for (int i = 0; i < bo.getPhotoList().size(); i++) {
+                    GEmergencyRepairPhotoBo photo = new GEmergencyRepairPhotoBo();
+                    photo.setEmergencyRepairId(bo.getId());
+                    photo.setPicUrl(bo.getPhotoList().get(i));
+                    igEmergencyRepairPhotoService.insertByBo(photo);
+                }
+            }
         }
         return flag;
     }
@@ -67,6 +85,28 @@ public class GEmergencyRepairServiceImpl extends ServicePlusImpl<GEmergencyRepai
     public Boolean updateByBo(GEmergencyRepairBo bo) {
         GEmergencyRepair update = BeanUtil.toBean(bo, GEmergencyRepair.class);
         validEntityBeforeSave(update);
+        List<String> piclist = bo.getPhotoList();
+        if (piclist != null) {
+            //原有的照片
+            List<String> photolist = baseMapper.getPhoto(bo.getId());
+            //原有的照片不在新传的照片里
+            List<String> dellist = photolist.stream().filter(i -> !piclist.contains(i)).collect(Collectors.toList());
+            //删除照片
+            if (dellist.size() > 0) {
+                igEmergencyRepairPhotoService.deleteByUrl(bo.getId(), dellist);
+            }
+            //新传的照片不在原有的照片里
+            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);
+                }
+            }
+        }
         return updateById(update);
     }
 

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRegulatorBoxPhotoServiceImpl.java

@@ -0,0 +1,92 @@
+package com.ruoyi.gas.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.gas.domain.bo.GRegulatorBoxPhotoBo;
+import com.ruoyi.gas.domain.vo.GRegulatorBoxPhotoVo;
+import com.ruoyi.gas.domain.GRegulatorBoxPhoto;
+import com.ruoyi.gas.mapper.GRegulatorBoxPhotoMapper;
+import com.ruoyi.gas.service.IGRegulatorBoxPhotoService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 调压箱照片Service业务层处理
+ *
+ * @author JX.Li
+ * @date 2023-10-25
+ */
+@Service
+public class GRegulatorBoxPhotoServiceImpl extends ServicePlusImpl<GRegulatorBoxPhotoMapper, GRegulatorBoxPhoto, GRegulatorBoxPhotoVo> implements IGRegulatorBoxPhotoService {
+    @Override
+    public void deleteByUrl(Long regulatorBoxId, List<String> list) {
+        baseMapper.deleteByUrl(regulatorBoxId,list);
+    }
+    @Override
+    public GRegulatorBoxPhotoVo queryById(Long id){
+        return getVoById(id);
+    }
+
+    @Override
+    public TableDataInfo<GRegulatorBoxPhotoVo> queryPageList(GRegulatorBoxPhotoBo bo) {
+        PagePlus<GRegulatorBoxPhoto, GRegulatorBoxPhotoVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        return PageUtils.buildDataInfo(result);
+    }
+
+    @Override
+    public List<GRegulatorBoxPhotoVo> queryList(GRegulatorBoxPhotoBo bo) {
+        return listVo(buildQueryWrapper(bo));
+    }
+
+    private LambdaQueryWrapper<GRegulatorBoxPhoto> buildQueryWrapper(GRegulatorBoxPhotoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<GRegulatorBoxPhoto> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getRegulatorBoxId() != null, GRegulatorBoxPhoto::getRegulatorBoxId, bo.getRegulatorBoxId());
+        lqw.eq(StringUtils.isNotBlank(bo.getPicUrl()), GRegulatorBoxPhoto::getPicUrl, bo.getPicUrl());
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(GRegulatorBoxPhotoBo bo) {
+        GRegulatorBoxPhoto add = BeanUtil.toBean(bo, GRegulatorBoxPhoto.class);
+        validEntityBeforeSave(add);
+        boolean flag = save(add);
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    @Override
+    public Boolean updateByBo(GRegulatorBoxPhotoBo bo) {
+        GRegulatorBoxPhoto update = BeanUtil.toBean(bo, GRegulatorBoxPhoto.class);
+        validEntityBeforeSave(update);
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GRegulatorBoxPhoto entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return removeByIds(ids);
+    }
+}

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

@@ -0,0 +1,164 @@
+package com.ruoyi.gas.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.gas.domain.GRegulatorBox;
+import com.ruoyi.gas.domain.bo.GRegulatorBoxBo;
+import com.ruoyi.gas.domain.bo.GRegulatorBoxPhotoBo;
+import com.ruoyi.gas.domain.vo.GRegulatorBoxVo;
+import com.ruoyi.gas.mapper.GRegulatorBoxMapper;
+import com.ruoyi.gas.service.IGRegulatorBoxPhotoService;
+import com.ruoyi.gas.service.IGRegulatorBoxService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 调压箱管理Service业务层处理
+ *
+ * @author JX.Li
+ * @date 2023-10-24
+ */
+@Service
+public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMapper, GRegulatorBox, GRegulatorBoxVo> implements IGRegulatorBoxService {
+
+
+    @Autowired
+    private IGRegulatorBoxPhotoService igRegulatorBoxPhotoService;
+
+    @Override
+    public GRegulatorBoxVo queryById(Long id) {
+        GRegulatorBoxVo byId = baseMapper.getById(id);
+        byId.setPhotoList(baseMapper.getPhoto(id));
+        return byId;
+    }
+
+    @Override
+    public TableDataInfo<GRegulatorBoxVo> queryPageList(GRegulatorBoxBo bo) {
+        Page<GRegulatorBoxBo> page = new Page<>(bo.getPageNum(), bo.getPageSize());
+        Page<GRegulatorBoxVo> result = baseMapper.getList(bo, page);
+        return PageUtils.buildDataInfo(result);
+    }
+
+    @Override
+    public List<GRegulatorBoxVo> queryList(GRegulatorBoxBo bo) {
+        return listVo(buildQueryWrapper(bo));
+    }
+
+    private LambdaQueryWrapper<GRegulatorBox> buildQueryWrapper(GRegulatorBoxBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<GRegulatorBox> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getUnitId() != null, GRegulatorBox::getUnitId, bo.getUnitId());
+        lqw.eq(StringUtils.isNotBlank(bo.getAdministrativeOffice()), GRegulatorBox::getAdministrativeOffice, bo.getAdministrativeOffice());
+        lqw.eq(StringUtils.isNotBlank(bo.getNumber()), GRegulatorBox::getNumber, bo.getNumber());
+        lqw.eq(bo.getBusinessService() != null, GRegulatorBox::getBusinessService, bo.getBusinessService());
+        lqw.eq(StringUtils.isNotBlank(bo.getAppearance()), GRegulatorBox::getAppearance, bo.getAppearance());
+        lqw.eq(StringUtils.isNotBlank(bo.getSquareBrick()), GRegulatorBox::getSquareBrick, bo.getSquareBrick());
+        lqw.eq(StringUtils.isNotBlank(bo.getGuardrail()), GRegulatorBox::getGuardrail, bo.getGuardrail());
+        lqw.eq(StringUtils.isNotBlank(bo.getFoundation()), GRegulatorBox::getFoundation, bo.getFoundation());
+        lqw.eq(StringUtils.isNotBlank(bo.getPressureGage()), GRegulatorBox::getPressureGage, bo.getPressureGage());
+        lqw.eq(StringUtils.isNotBlank(bo.getValve()), GRegulatorBox::getValve, bo.getValve());
+        lqw.eq(bo.getIsThereALeak() != null, GRegulatorBox::getIsThereALeak, bo.getIsThereALeak());
+        lqw.eq(StringUtils.isNotBlank(bo.getVoltageRegulator()), GRegulatorBox::getVoltageRegulator, bo.getVoltageRegulator());
+        lqw.eq(bo.getInletPressure() != null, GRegulatorBox::getInletPressure, bo.getInletPressure());
+        lqw.eq(bo.getExportPressureMain() != null, GRegulatorBox::getExportPressureMain, bo.getExportPressureMain());
+        lqw.eq(bo.getExportPressureAccessory() != null, GRegulatorBox::getExportPressureAccessory, bo.getExportPressureAccessory());
+        lqw.eq(bo.getClosingPressureMain() != null, GRegulatorBox::getClosingPressureMain, bo.getClosingPressureMain());
+        lqw.eq(bo.getClosingPressureAccessory() != null, GRegulatorBox::getClosingPressureAccessory, bo.getClosingPressureAccessory());
+        lqw.eq(StringUtils.isNotBlank(bo.getXtv()), GRegulatorBox::getXtv, bo.getXtv());
+        lqw.eq(bo.getThermostat() != null, GRegulatorBox::getThermostat, bo.getThermostat());
+        lqw.eq(bo.getExplosionProofSwitch() != null, GRegulatorBox::getExplosionProofSwitch, bo.getExplosionProofSwitch());
+        lqw.eq(bo.getCutterTested() != null, GRegulatorBox::getCutterTested, bo.getCutterTested());
+        lqw.eq(StringUtils.isNotBlank(bo.getDisconnectorTestStatus()), GRegulatorBox::getDisconnectorTestStatus, bo.getDisconnectorTestStatus());
+        lqw.eq(bo.getCutOffPressureMain() != null, GRegulatorBox::getCutOffPressureMain, bo.getCutOffPressureMain());
+        lqw.eq(bo.getCutOffPressureAccessory() != null, GRegulatorBox::getCutOffPressureAccessory, bo.getCutOffPressureAccessory());
+        lqw.eq(bo.getReleasePressure() != null, GRegulatorBox::getReleasePressure, bo.getReleasePressure());
+        lqw.eq(bo.getManOfAccessoryAlternating() != null, GRegulatorBox::getManOfAccessoryAlternating, bo.getManOfAccessoryAlternating());
+        lqw.eq(StringUtils.isNotBlank(bo.getFilter()), GRegulatorBox::getFilter, bo.getFilter());
+        lqw.eq(StringUtils.isNotBlank(bo.getSpecialCaseOfPressureRegulatingFacilities()), GRegulatorBox::getSpecialCaseOfPressureRegulatingFacilities, bo.getSpecialCaseOfPressureRegulatingFacilities());
+        lqw.eq(StringUtils.isNotBlank(bo.getOverdueInspectionDays()), GRegulatorBox::getOverdueInspectionDays, bo.getOverdueInspectionDays());
+        lqw.eq(StringUtils.isNotBlank(bo.getReasonForOverdueInspection()), GRegulatorBox::getReasonForOverdueInspection, bo.getReasonForOverdueInspection());
+        lqw.eq(StringUtils.isNotBlank(bo.getOtherReasonsForOverdueInspection()), GRegulatorBox::getOtherReasonsForOverdueInspection, bo.getOtherReasonsForOverdueInspection());
+        lqw.eq(bo.getValveWellTesting() != null, GRegulatorBox::getValveWellTesting, bo.getValveWellTesting());
+        lqw.eq(StringUtils.isNotBlank(bo.getValveWellCondition()), GRegulatorBox::getValveWellCondition, bo.getValveWellCondition());
+        lqw.eq(StringUtils.isNotBlank(bo.getRemarks()), GRegulatorBox::getRemarks, bo.getRemarks());
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(GRegulatorBoxBo bo) {
+        GRegulatorBox add = BeanUtil.toBean(bo, GRegulatorBox.class);
+        validEntityBeforeSave(add);
+        boolean flag = save(add);
+        if (flag) {
+            bo.setId(add.getId());
+            //添加照片
+            List<String> piclist = bo.getPhotoList();
+            if (piclist != null) {
+                for (int i = 0; i < bo.getPhotoList().size(); i++) {
+                    GRegulatorBoxPhotoBo photo = new GRegulatorBoxPhotoBo();
+                    photo.setRegulatorBoxId(bo.getId());
+                    photo.setPicUrl(bo.getPhotoList().get(i));
+                    igRegulatorBoxPhotoService.insertByBo(photo);
+                }
+            }
+        }
+        return flag;
+    }
+
+    @Override
+    public Boolean updateByBo(GRegulatorBoxBo bo) {
+        GRegulatorBox update = BeanUtil.toBean(bo, GRegulatorBox.class);
+        validEntityBeforeSave(update);
+        List<String> piclist = bo.getPhotoList();
+        if (piclist != null) {
+            //原有的照片
+            List<String> photolist = baseMapper.getPhoto(bo.getId());
+            //原有的照片不在新传的照片里
+            List<String> dellist = photolist.stream().filter(i -> !piclist.contains(i)).collect(Collectors.toList());
+            //删除照片
+            if (dellist.size() > 0) {
+                igRegulatorBoxPhotoService.deleteByUrl(bo.getId(), dellist);
+            }
+            //新传的照片不在原有的照片里
+            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);
+                }
+            }
+        }
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GRegulatorBox entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return removeByIds(ids);
+    }
+}

ruoyi-gas/src/main/resources/mapper/GEmergencyRepairMapper.xml

@@ -25,6 +25,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
     </resultMap>
+
+    <select id="getPhoto" resultType="java.lang.String">
+        select pic_url AS picUrl
+        from g_emergency_repair_photo
+        where emergency_repair_id = #{id}
+          and del_flag = '0'
+    </select>
+
     <select id="getList" resultType="com.ruoyi.gas.domain.vo.GEmergencyRepairVo">
         select a.*,
                b.name AS unitName,

ruoyi-gas/src/main/resources/mapper/GEmergencyRepairPhotoMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.gas.mapper.GEmergencyRepairPhotoMapper">
+
+    <resultMap type="com.ruoyi.gas.domain.GEmergencyRepairPhoto" id="GEmergencyRepairPhotoResult">
+        <result property="id" column="id"/>
+        <result property="emergencyRepairId" column="emergency_repair_id"/>
+        <result property="picUrl" column="pic_url"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <delete id="deleteByUrl" parameterType="String">
+        delete from g_emergency_repair_photo where emergency_repair_id = #{emergencyRepairId}
+        and pic_url in
+        <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-gas/src/main/resources/mapper/GRegulatorBoxMapper.xml

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.gas.mapper.GRegulatorBoxMapper">
+
+    <resultMap type="com.ruoyi.gas.domain.GRegulatorBox" id="GRegulatorBoxResult">
+        <result property="id" column="id"/>
+        <result property="unitId" column="unit_id"/>
+        <result property="administrativeOffice" column="administrative_office"/>
+        <result property="number" column="number"/>
+        <result property="businessService" column="business_service"/>
+        <result property="appearance" column="appearance"/>
+        <result property="squareBrick" column="square_brick"/>
+        <result property="guardrail" column="guardrail"/>
+        <result property="foundation" column="foundation"/>
+        <result property="pressureGage" column="pressure_gage"/>
+        <result property="valve" column="valve"/>
+        <result property="isThereALeak" column="is_there_a_leak"/>
+        <result property="voltageRegulator" column="voltage_regulator"/>
+        <result property="inletPressure" column="inlet_pressure"/>
+        <result property="exportPressureMain" column="export_pressure_main"/>
+        <result property="exportPressureAccessory" column="export_pressure_accessory"/>
+        <result property="closingPressureMain" column="closing_pressure_main"/>
+        <result property="closingPressureAccessory" column="closing_pressure_accessory"/>
+        <result property="xtv" column="xtv"/>
+        <result property="thermostat" column="thermostat"/>
+        <result property="explosionProofSwitch" column="explosion_proof_switch"/>
+        <result property="cutterTested" column="cutter_tested"/>
+        <result property="disconnectorTestStatus" column="disconnector_test_status"/>
+        <result property="cutOffPressureMain" column="cut_off_pressure_main"/>
+        <result property="cutOffPressureAccessory" column="cut_off_pressure_accessory"/>
+        <result property="releasePressure" column="release_pressure"/>
+        <result property="manOfAccessoryAlternating" column="man_of_accessory_alternating"/>
+        <result property="filter" column="filter"/>
+        <result property="specialCaseOfPressureRegulatingFacilities" column="special_case_of_pressure_regulating_facilities"/>
+        <result property="overdueInspectionDays" column="overdue_inspection_days"/>
+        <result property="reasonForOverdueInspection" column="reason_for_overdue_inspection"/>
+        <result property="otherReasonsForOverdueInspection" column="other_reasons_for_overdue_inspection"/>
+        <result property="valveWellTesting" column="valve_well_testing"/>
+        <result property="valveWellCondition" column="valve_well_condition"/>
+        <result property="remarks" column="remarks"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+    <select id="getPhoto" resultType="java.lang.String">
+        select pic_url AS picUrl
+        from g_regulator_box_photo
+        where regulator_box_id = #{id}
+          and del_flag = '0'
+    </select>
+    <select id="getById" resultType="com.ruoyi.gas.domain.vo.GRegulatorBoxVo">
+        select a.*,
+               c.id AS buildingId,
+               d.id AS areaId
+        from g_regulator_box a
+                 left join g_unit b on a.unit_id = b.id and b.del_flag = '0'
+                 left join g_building c on b.building_id = c.id and c.del_flag = '0'
+                 left join g_area d on d.id = c.area_id and d.del_flag = '0'
+        where a.id = #{id}
+          and a.del_flag = '0'
+    </select>
+    <select id="getList" resultType="com.ruoyi.gas.domain.vo.GRegulatorBoxVo">
+        select a.*,
+        b.name AS unitName,
+        c.name AS buildingName,
+        d.name AS areaName
+        from g_regulator_box a
+        left join g_unit b on a.unit_id = b.id and b.del_flag = '0'
+        left join g_building c on b.building_id = c.id and c.del_flag = '0'
+        left join g_area d on d.id = c.area_id and d.del_flag = '0'
+        <where>
+            a.del_flag = '0'
+            <if test="p.administrativeOffice != null  and p.administrativeOffice != ''">
+                and a.administrative_office = #{p.administrativeOffice}
+            </if>
+            <if test="p.number != null  and p.number != ''">
+                and a.number = #{p.number}
+            </if>
+        </where>
+    </select>
+
+</mapper>

ruoyi-gas/src/main/resources/mapper/GRegulatorBoxPhotoMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.gas.mapper.GRegulatorBoxPhotoMapper">
+
+    <resultMap type="com.ruoyi.gas.domain.GRegulatorBoxPhoto" id="GRegulatorBoxPhotoResult">
+        <result property="id" column="id"/>
+        <result property="regulatorBoxId" column="regulator_box_id"/>
+        <result property="picUrl" column="pic_url"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+    <delete id="deleteByUrl" parameterType="String">
+        delete from g_regulator_box_photo where regulator_box_id = #{regulatorBoxId}
+        and pic_url in
+        <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-gas/target/classes/mapper/GEmergencyRepairMapper.xml

@@ -25,6 +25,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
     </resultMap>
+
+    <select id="getPhoto" resultType="java.lang.String">
+        select pic_url AS picUrl
+        from g_emergency_repair_photo
+        where emergency_repair_id = #{id}
+          and del_flag = '0'
+    </select>
+
     <select id="getList" resultType="com.ruoyi.gas.domain.vo.GEmergencyRepairVo">
         select a.*,
                b.name AS unitName,