数字社区初始化接口调整

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java

@@ -52,9 +52,10 @@ public class IcFormController {
 
     /**
      * desc: 初始化 客户表单配置
+     * 运营端-数字社区初始化
      *
      * @param customerId
-     * @param formCode
+     * @param formCode value: resi_base_info
      * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.CustomerFormResultDTO>
      * @author LiuJanJun
      * @date 2021/12/8 4:28 下午

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java

@@ -172,7 +172,7 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
         defaultIcForm.setCreatedTime(new Date());
         defaultIcForm.setUpdatedBy("init_user");
         defaultIcForm.setUpdatedTime(new Date());
-
+        // 1、设置ic_form
         int insert = baseDao.insert(defaultIcForm);
         log.info("insert icForm:" + insert);
 
@@ -184,7 +184,7 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
             return "默认配置错误";
         }
         String defaultBaseInfoGroupId = "default_0";
-        //设置ic_form_item
+        //2、设置ic_form_item
         itemList.forEach(item -> {
             item.setId(newPrefixed + item.getId());
             item.setCustomerId(customerId);
@@ -215,7 +215,7 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
             icFormItemDao.insert(item);
         });
 
-        //设置ic_form_item_options
+        //3、设置ic_form_item_options
         LambdaQueryWrapper<IcFormItemOptionsEntity> wrapperOptions = new LambdaQueryWrapper<>();
         wrapperOptions.eq(IcFormItemOptionsEntity::getCustomerId, defaultCustomerId);
         wrapperOptions.eq(IcFormItemOptionsEntity::getFormCode, formCode);
@@ -233,7 +233,7 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
             icFormItemOptionsDao.insert(item);
         });
 
-        //设置ic_form_item_group
+        //4、设置ic_form_item_group
         LambdaQueryWrapper<IcFormItemGroupEntity> wrapperGroup = new LambdaQueryWrapper<>();
         wrapperGroup.eq(IcFormItemGroupEntity::getCustomerId, defaultCustomerId);
         wrapperGroup.eq(IcFormItemGroupEntity::getFormCode, formCode);
@@ -255,7 +255,7 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
             icFormItemGroupDao.insert(item);
         });
 
-        //设置ic_form_query_builder
+        //5、设置ic_form_query_builder
         LambdaQueryWrapper<IcFormQueryBuilderEntity> wrapperQuery = new LambdaQueryWrapper<>();
         wrapperQuery.eq(IcFormQueryBuilderEntity::getCustomerId, defaultCustomerId);
         wrapperQuery.eq(IcFormQueryBuilderEntity::getFormCode, formCode);
@@ -272,6 +272,26 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
             icFormQueryBuilderDao.insert(item);
         });
 
+        //6、设置ic_form_list_item
+        LambdaQueryWrapper<IcFormListItemEntity> listItemWapper = new LambdaQueryWrapper<>();
+        listItemWapper.eq(IcFormListItemEntity::getCustomerId, defaultCustomerId);
+        listItemWapper.eq(IcFormListItemEntity::getFormCode, formCode);
+        List<IcFormListItemEntity> listItemList = icFormListItemDao.selectList(listItemWapper);
+        if (CollectionUtils.isEmpty(listItemList)) {
+            return "默认配置错误";
+        }
+        listItemList.forEach(item -> {
+            item.setId(newPrefixed + item.getId());
+            item.setCustomerId(customerId);
+            item.setFormItemId(newPrefixed + item.getFormItemId());
+            item.setCreatedBy("init_user");
+            item.setCreatedTime(new Date());
+            item.setUpdatedBy("init_user");
+            item.setUpdatedTime(new Date());
+            log.debug("stats:"+ JSON.toJSONString(item));
+            icFormListItemDao.insert(item);
+        });
+
         //设置ic_resi_category_stats_config
         LambdaQueryWrapper<IcResiCategoryStatsConfigEntity> wrapperStats = new LambdaQueryWrapper<>();
         wrapperStats.eq(IcResiCategoryStatsConfigEntity::getCustomerId, defaultCustomerId);
@@ -302,26 +322,6 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
             icResiCategoryWarnConfigDao.insert(item);
         });
 
-        //设置ic_form_list_item
-        LambdaQueryWrapper<IcFormListItemEntity> listItemWapper = new LambdaQueryWrapper<>();
-        listItemWapper.eq(IcFormListItemEntity::getCustomerId, defaultCustomerId);
-        listItemWapper.eq(IcFormListItemEntity::getFormCode, formCode);
-        List<IcFormListItemEntity> listItemList = icFormListItemDao.selectList(listItemWapper);
-        if (CollectionUtils.isEmpty(listItemList)) {
-            return "默认配置错误";
-        }
-        listItemList.forEach(item -> {
-            item.setId(newPrefixed + item.getId());
-            item.setCustomerId(customerId);
-            item.setFormItemId(newPrefixed + item.getFormItemId());
-            item.setCreatedBy("init_user");
-            item.setCreatedTime(new Date());
-            item.setUpdatedBy("init_user");
-            item.setUpdatedTime(new Date());
-            log.debug("stats:"+ JSON.toJSONString(item));
-            icFormListItemDao.insert(item);
-        });
-
         //设置ic_service_item_dict和ic_resi_demand_dict
         Result result = epmetHeartOpenFeignClient.customerInit(customerId);
         if (!result.success()) {