配电图相关接口7

fiveep-controller/pom.xml

@@ -65,6 +65,12 @@
             <artifactId>spring-web</artifactId>
             <version>5.2.7.RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.4</version>
+        </dependency>
+
 
 <!--        <dependency>-->
 <!--            <groupId>org.springframework.cloud</groupId>-->

fiveep-service/pom.xml

@@ -96,6 +96,10 @@
             </exclusions>
             <version>2.3.2</version>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
 
     </dependencies>
 

fiveep-service/src/main/java/com/bizmatics/service/impl/HookupServiceImpl.java

@@ -1,5 +1,6 @@
 package com.bizmatics.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.bizmatics.common.core.exception.BusinessException;
@@ -20,7 +21,9 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -162,8 +165,18 @@ public class HookupServiceImpl extends AbstractCrudService<HookupMapper, Hookup>
     @Override
     @Transactional
     public void setHookupComponentComplete(List<HookupComponentCompleteOneVo> hookupComponentCompleteOneVoList) {
-        try {
+//        try {
             SysUser user = SecurityUtils.getLoginUser().getUser();
+            LambdaQueryWrapper<HookupComponentComplete> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.eq(HookupComponentComplete::getSiteId, hookupComponentCompleteOneVoList.get(0).getSiteId());
+            List<HookupComponentComplete> List = hookupComponentCompleteService.list(queryWrapper);
+            if (List.size()>0){
+                Map<String, Object> columnMap = new HashMap<>();
+//                Map<String, Object> columnMap = null;
+                columnMap.put("site_id",hookupComponentCompleteOneVoList.get(0).getSiteId());
+                hookupComponentCompleteService.removeByMap(columnMap);
+            }
+
             for (int i = 0; i < hookupComponentCompleteOneVoList.size(); i++) {
                 HookupComponentComplete hookupComponentComplete = new HookupComponentComplete();
                 hookupComponentComplete.setSort(hookupComponentCompleteOneVoList.get(i).getSort());
@@ -181,15 +194,17 @@ public class HookupServiceImpl extends AbstractCrudService<HookupMapper, Hookup>
                 hookupComponentComplete.setAngle(hookupComponentCompleteOneVoList.get(i).getAngle());
                 hookupComponentComplete.setTableRowCount(hookupComponentCompleteOneVoList.get(i).getTableRowCount());
                 hookupComponentComplete.setTableColCount(hookupComponentCompleteOneVoList.get(i).getTableColCount());
-                if (hookupComponentCompleteOneVoList.get(i).getTableData() == null) {
-                    hookupComponentComplete.setTableData("");
+                String TableData = JSON.toJSONString(hookupComponentCompleteOneVoList.get(i).getTableData());
+                if (TableData.equals("\"\"")) {
+                    hookupComponentComplete.setTableData(null);
                 } else {
-                    hookupComponentComplete.setTableData(hookupComponentCompleteOneVoList.get(i).getTableData().toString().replace("[","").replace("]","").replace(" ",""));
+                    hookupComponentComplete.setTableData(TableData.replace(" ", ""));
                 }
-                if (hookupComponentCompleteOneVoList.get(i).getElementBool() == null) {
-                    hookupComponentComplete.setElementBool("");
+                if (hookupComponentCompleteOneVoList.get(i).getElementBool().toString().equals("") || hookupComponentCompleteOneVoList.get(i).getElementBool().toString().equals("[]")) {
+                    hookupComponentComplete.setElementBool(null);
                 } else {
-                    hookupComponentComplete.setElementBool(hookupComponentCompleteOneVoList.get(i).getElementBool().toString().replace("[","").replace("]","").replace(" ",""));
+                    String ElementBool = hookupComponentCompleteOneVoList.get(i).getElementBool().toString().replace("[", "").replace("]", "").replace(" ", "");
+                    hookupComponentComplete.setElementBool(ElementBool);
                 }
                 hookupComponentComplete.setSiteId(hookupComponentCompleteOneVoList.get(i).getSiteId());
                 hookupComponentComplete.setDeviceId(hookupComponentCompleteOneVoList.get(i).getDeviceId());
@@ -199,9 +214,11 @@ public class HookupServiceImpl extends AbstractCrudService<HookupMapper, Hookup>
                 hookupComponentCompleteService.save(hookupComponentComplete);
             }
 
-        } catch (Exception e) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            throw new BusinessException("数据错误，新增失败");
-        }
+
+
+//        } catch (Exception e) {
+//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+//            throw new BusinessException("数据错误，新增失败");
+//        }
     }
 }