房屋增加

huanghongfa

2021-01-20 f79a9d336cb136aa0a7b94136398b9505dbfd481

房屋增加

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -23,7 +23,8 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructHouseServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructHouseServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -403,7 +404,7 @@
      <workItem from="1610934956567" duration="1325000" />
      <workItem from="1610939265133" duration="8588000" />
      <workItem from="1610956684718" duration="7037000" />
      <workItem from="1611019208339" duration="30174000" />
      <workItem from="1611019208339" duration="31106000" />
    </task>
    <servers />
  </component>
@@ -523,10 +524,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="639" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1611044794794" />
    <state x="233" y="42" width="766" height="782" key="find.popup" timestamp="1611111138317">
    <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611112062666">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="233" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611111138317" />
    <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611112062666" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <screen x="0" y="0" width="1536" height="824" />
    </state>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -655,15 +655,19 @@
        R r=comMngStructAreaService.selectAreaByAreaCode(batchhouseVO.getAreaCode());
        if (R.isOk(r)) {
            ComMngStructAreaDO comMngStructAreaDO = (ComMngStructAreaDO)r.getData();
            R r1 = null;
            try {
                r1 = comMngStructHouseService.addHouse(batchhouseVO, comMngStructAreaDO);
                R   r1 = comMngStructHouseService.addHouse(batchhouseVO, comMngStructAreaDO);
                return r1;
            } catch (Exception e) {
                if (e.getMessage().contains("unique_house_name")) {
                    return R.fail("房屋地址重复");
                }else {
                    log.error("添加同级地址失败【{}】",e.getMessage());
                    return R.fail("添加房屋失败");
                }
            }
            return r1;


        }
        return r;
    }