Merge branch 'develop_station' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_station

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

@@ -28,6 +28,9 @@ import com.yeejoin.equipmanage.mapper.*;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
 import com.yeejoin.equipmanage.service.*;
 import com.yeejoin.equipmanage.utils.BeanUtil;
+
+import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -46,7 +49,7 @@ import java.net.SocketException;
 import java.util.*;
 import java.util.stream.Collectors;
 
-
+@Slf4j
 @Service
 public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSystemMapper, FireFightingSystemEntity> implements IFireFightingSystemService {
 
@@ -595,26 +598,14 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     }
 
     @Override
+    @Transactional
     public Boolean deleteSystem(Long id) {
-//        QueryWrapper<FormInstance> fqw = new QueryWrapper<>();
-//        fqw.eq("field_value",id);
-//        fqw.groupBy("instance_id");
-//        List<FormInstance> formInstances = formInstanceMapper.selectList(fqw);
-//        if (formInstances != null && formInstances.size()>0){
-//            QueryWrapper<FormInstance> one = new QueryWrapper<>();
-//            one.eq("instance_id",formInstances.get(0).getInstanceId());
-//            one.eq("field_name","name");
-//            List<FormInstance> formInstances1 = formInstanceMapper.selectList(one);
-//            FormInstance formInstance = formInstances1.get(0);
-//            String name = formInstance.getFieldValue();
-//            throw new BadRequest(name+"建筑与该系统存在绑定关系，请清除后再进行删除！");
-//        }
         FireFightingSystemEntity entity = baseMapper.selectById(id);
         if (entity.getSceneId() != null) {
             try {
                 FeignUtil.remoteCall(() -> Morphic.morphicSubjectClient.delete(entity.getSceneId()));
             } catch (Exception e) {
-                throw new RuntimeException("远程调用 MORPHIC 服务的删除操作出错");
+            	log.error("远程调用 MORPHIC 服务的删除操作出错:"+e.getMessage().toString(),e);
             }
         }
         formInstanceMapper.clearSystemId(id);
@@ -626,8 +617,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
             syncDataService.syncDeletedFireFightingSystem(Arrays.asList(id));
         }
         //删除系统图与设备关系表
-        QueryWrapper<SourceScene> ssWrapper = new QueryWrapper<>();
-        ssWrapper.eq("sourceId", id);
+        QueryWrapper<SourceScene> ssWrapper = new QueryWrapper<SourceScene>();
+        ssWrapper.lambda().eq(SourceScene::getSourceId, id);
         sourceSceneMapper.delete(ssWrapper);
         //删除动态关联表单实例数据
         if (entity.getInstanceId() != null) {