房屋创建

huanghongfa

2021-01-20 c9e81fd841c6dc2828f97e252775264aaf69cf00

房屋创建

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -24,9 +24,9 @@
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java" 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" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructHouseUserDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructHouseUserDAO.java" afterDir="false" />
      <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" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -406,7 +406,7 @@
      <workItem from="1610934956567" duration="1325000" />
      <workItem from="1610939265133" duration="8588000" />
      <workItem from="1610956684718" duration="7037000" />
      <workItem from="1611019208339" duration="26626000" />
      <workItem from="1611019208339" duration="29757000" />
    </task>
    <servers />
  </component>
@@ -446,10 +446,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1536.824@0.0.1536.824" timestamp="1608878808962" />
    <state width="561" height="466" key="DebuggerActiveHint" timestamp="1611047155934">
    <state width="561" height="466" key="DebuggerActiveHint" timestamp="1611110375184">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="561" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1611047155934" />
    <state width="561" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1611110375184" />
    <state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1609316182000">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -458,54 +458,54 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1610606590056" />
    <state width="1031" height="485" key="GridCell.Tab.0.bottom" timestamp="1611106955772">
    <state width="1031" height="426" key="GridCell.Tab.0.bottom" timestamp="1611109059024">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="485" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611106955772" />
    <state width="1031" height="485" key="GridCell.Tab.0.center" timestamp="1611106955772">
    <state width="1031" height="426" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611109059024" />
    <state width="1031" height="426" key="GridCell.Tab.0.center" timestamp="1611109059024">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="485" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611106955772" />
    <state width="1031" height="485" key="GridCell.Tab.0.left" timestamp="1611106955772">
    <state width="1031" height="426" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611109059024" />
    <state width="1031" height="426" key="GridCell.Tab.0.left" timestamp="1611109059023">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="485" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611106955772" />
    <state width="1031" height="485" key="GridCell.Tab.0.right" timestamp="1611106955772">
    <state width="1031" height="426" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611109059023" />
    <state width="1031" height="426" key="GridCell.Tab.0.right" timestamp="1611109059024">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="485" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611106955772" />
    <state width="1031" height="485" key="GridCell.Tab.1.bottom" timestamp="1611106955772">
    <state width="1031" height="426" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611109059024" />
    <state width="1031" height="426" key="GridCell.Tab.1.bottom" timestamp="1611109059024">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="485" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611106955772" />
    <state width="1031" height="485" key="GridCell.Tab.1.center" timestamp="1611106955772">
    <state width="1031" height="426" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611109059024" />
    <state width="1031" height="426" key="GridCell.Tab.1.center" timestamp="1611109059024">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="485" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611106955772" />
    <state width="1031" height="485" key="GridCell.Tab.1.left" timestamp="1611106955772">
    <state width="1031" height="426" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611109059024" />
    <state width="1031" height="426" key="GridCell.Tab.1.left" timestamp="1611109059024">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="485" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611106955772" />
    <state width="1031" height="485" key="GridCell.Tab.1.right" timestamp="1611106955772">
    <state width="1031" height="426" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611109059024" />
    <state width="1031" height="426" key="GridCell.Tab.1.right" timestamp="1611109059024">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="485" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611106955772" />
    <state width="1031" height="485" key="GridCell.Tab.2.bottom" timestamp="1611106955773">
    <state width="1031" height="426" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611109059024" />
    <state width="1031" height="426" key="GridCell.Tab.2.bottom" timestamp="1611109059024">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="485" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611106955773" />
    <state width="1031" height="485" key="GridCell.Tab.2.center" timestamp="1611106955773">
    <state width="1031" height="426" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611109059024" />
    <state width="1031" height="426" key="GridCell.Tab.2.center" timestamp="1611109059024">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="485" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611106955773" />
    <state width="1031" height="485" key="GridCell.Tab.2.left" timestamp="1611106955773">
    <state width="1031" height="426" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611109059024" />
    <state width="1031" height="426" key="GridCell.Tab.2.left" timestamp="1611109059024">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="485" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611106955773" />
    <state width="1031" height="485" key="GridCell.Tab.2.right" timestamp="1611106955773">
    <state width="1031" height="426" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611109059024" />
    <state width="1031" height="426" key="GridCell.Tab.2.right" timestamp="1611109059024">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="485" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611106955773" />
    <state width="1031" height="426" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611109059024" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -526,10 +526,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="1611107322963">
    <state x="233" y="42" width="766" height="782" key="find.popup" timestamp="1611110758879">
      <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="1611107322963" />
    <state x="233" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611110758879" />
    <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,7 +655,15 @@
        R r=comMngStructAreaService.selectAreaByAreaCode(batchhouseVO.getAreaCode());
        if (R.isOk(r)) {
            ComMngStructAreaDO comMngStructAreaDO = (ComMngStructAreaDO)r.getData();
            return comMngStructHouseService.addHouse(batchhouseVO,comMngStructAreaDO);
            R r1 = null;
            try {
                r1 = comMngStructHouseService.addHouse(batchhouseVO, comMngStructAreaDO);
            } catch (Exception e) {
                if (e.getMessage().contains("unique_house_name")) {
                    return R.fail("房屋地址重复");
                }
            }
            return r1;
        }
        return r;
    }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructHouseUserDAO.java

@@ -16,6 +16,6 @@
 **/
@Mapper
public interface ComMngStructHouseUserDAO extends BaseMapper<ComMngStructHouseUserDO> {
    @Select("select u.name,u.phone from com_mng_struct_house_user h left join sys_user u on h.user_id=u.user_id")
    @Select("select u.name,u.phone from com_mng_struct_house_user h  join sys_user u on h.user_id=u.user_id and h.house_code=#{houseCode1}")
    List<LoginUserInfoVO> selectListHouseUser(String houseCode1);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructHouseServiceImpl.java

@@ -298,8 +298,8 @@
                if (type == 5) {
                    List<LoginUserInfoVO> loginUserInfoVOS = comMngStructHouseUserDAO.selectListHouseUser(houseCode1);
                    if (!ObjectUtils.isEmpty(loginUserInfoVOS)) {
                        String names = loginUserInfoVOS.stream().map(loginUserInfoVO -> loginUserInfoVO.getName()).collect(Collectors.joining());
                        String phones = loginUserInfoVOS.stream().map(loginUserInfoVO -> loginUserInfoVO.getPhone()).collect(Collectors.joining());
                        String names = loginUserInfoVOS.stream().map(loginUserInfoVO -> loginUserInfoVO.getName()).collect(Collectors.joining(","));
                        String phones = loginUserInfoVOS.stream().map(loginUserInfoVO -> loginUserInfoVO.getPhone()).collect(Collectors.joining(","));
                        comMngStructHouseVO.setNames(names);
                        comMngStructHouseVO.setPhones(phones);
                    }
@@ -320,6 +320,9 @@
     */
    @Override
    public R addHouse(BatchhouseVO batchhouseVO, ComMngStructAreaDO comMngStructAreaDO) {
        String roleConnector = comMngStructAreaDO.getRoleConnector();
        String roleDoor = comMngStructAreaDO.getRoleDoor();
        String roleFloor = comMngStructAreaDO.getRoleFloor();
        int type = batchhouseVO.getType().intValue();
        String parentCode1 = batchhouseVO.getParentCode();
        List<ComMngStructHouseDO> comMngStructHouseDOList = comMngStructHouseDAO.selectList(new QueryWrapper<ComMngStructHouseDO>().lambda().eq(ComMngStructHouseDO::getType, type).eq(ComMngStructHouseDO::getParentCode, parentCode1));
@@ -373,6 +376,9 @@
                }
            }
        }
        batchhouseVO.setRuleConnector(roleConnector);
        batchhouseVO.setRuleDoor(roleDoor);
        batchhouseVO.setRuleFloor(roleFloor);
        this.batchSaveHouse(batchhouseVO);
        return R.ok();
    }