all

huanghongfa

2021-02-20 80b3e624bfdf32fa8c45ea157739b1f63aada76d

all

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -24,7 +24,8 @@
  <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$/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructAreaDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructAreaDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaServiceImpl.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -432,7 +433,7 @@
      <workItem from="1613609849178" duration="13230000" />
      <workItem from="1613633203630" duration="14394000" />
      <workItem from="1613714097966" duration="14584000" />
      <workItem from="1613782093187" duration="11591000" />
      <workItem from="1613782093187" duration="13110000" />
    </task>
    <servers />
  </component>
@@ -492,54 +493,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="1612426172959" />
    <state width="1031" height="196" key="GridCell.Tab.0.bottom" timestamp="1613798144902">
    <state width="1031" height="436" key="GridCell.Tab.0.bottom" timestamp="1613802354143">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="196" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1613798144902" />
    <state width="1031" height="196" key="GridCell.Tab.0.center" timestamp="1613798144902">
    <state width="1031" height="436" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1613802354143" />
    <state width="1031" height="436" key="GridCell.Tab.0.center" timestamp="1613802354142">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="196" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1613798144902" />
    <state width="1031" height="196" key="GridCell.Tab.0.left" timestamp="1613798144902">
    <state width="1031" height="436" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1613802354142" />
    <state width="1031" height="436" key="GridCell.Tab.0.left" timestamp="1613802354142">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="196" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1613798144902" />
    <state width="1031" height="196" key="GridCell.Tab.0.right" timestamp="1613798144902">
    <state width="1031" height="436" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1613802354142" />
    <state width="1031" height="436" key="GridCell.Tab.0.right" timestamp="1613802354142">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="196" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1613798144902" />
    <state width="1031" height="196" key="GridCell.Tab.1.bottom" timestamp="1613798144903">
    <state width="1031" height="436" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1613802354142" />
    <state width="1031" height="436" key="GridCell.Tab.1.bottom" timestamp="1613802354143">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="196" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1613798144903" />
    <state width="1031" height="196" key="GridCell.Tab.1.center" timestamp="1613798144902">
    <state width="1031" height="436" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1613802354143" />
    <state width="1031" height="436" key="GridCell.Tab.1.center" timestamp="1613802354143">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="196" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1613798144902" />
    <state width="1031" height="196" key="GridCell.Tab.1.left" timestamp="1613798144902">
    <state width="1031" height="436" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1613802354143" />
    <state width="1031" height="436" key="GridCell.Tab.1.left" timestamp="1613802354143">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="196" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1613798144902" />
    <state width="1031" height="196" key="GridCell.Tab.1.right" timestamp="1613798144902">
    <state width="1031" height="436" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1613802354143" />
    <state width="1031" height="436" key="GridCell.Tab.1.right" timestamp="1613802354143">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="196" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1613798144902" />
    <state width="1031" height="196" key="GridCell.Tab.2.bottom" timestamp="1613798144903">
    <state width="1031" height="436" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1613802354143" />
    <state width="1031" height="436" key="GridCell.Tab.2.bottom" timestamp="1613802354143">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="196" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1613798144903" />
    <state width="1031" height="196" key="GridCell.Tab.2.center" timestamp="1613798144903">
    <state width="1031" height="436" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1613802354143" />
    <state width="1031" height="436" key="GridCell.Tab.2.center" timestamp="1613802354143">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="196" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1613798144903" />
    <state width="1031" height="196" key="GridCell.Tab.2.left" timestamp="1613798144903">
    <state width="1031" height="436" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1613802354143" />
    <state width="1031" height="436" key="GridCell.Tab.2.left" timestamp="1613802354143">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="196" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1613798144903" />
    <state width="1031" height="196" key="GridCell.Tab.2.right" timestamp="1613798144903">
    <state width="1031" height="436" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1613802354143" />
    <state width="1031" height="436" key="GridCell.Tab.2.right" timestamp="1613802354143">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="196" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1613798144903" />
    <state width="1031" height="436" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1613802354143" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1612603382513">
      <screen x="0" y="0" width="1536" height="824" />
    </state>

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java

@@ -472,13 +472,13 @@
        if (ok) {
            Object data = r.getData();
            if (!ObjectUtils.isEmpty(data)) {
                LoginUserInfoVO loginUserInfoVO= JSONObject.parseObject(JSONObject.toJSONString(data),LoginUserInfoVO.class);
                CommunityUserInfoVO communityUserInfoVO= JSONObject.parseObject(JSONObject.toJSONString(data),CommunityUserInfoVO.class);
                R r1=communityService.detailHouse(userId);
                if (R.isOk(r1)) {
                    Object data1 = r1.getData();
                    if (!ObjectUtils.isEmpty(data1)) {
                        loginUserInfoVO.setComMngStructHouseVOS((List<ComMngStructHouseVO>)data1);
                        r.setData(loginUserInfoVO);
                        communityUserInfoVO.setComMngStructHouseVOS((List<ComMngStructHouseVO>)data1);
                        r.setData(communityUserInfoVO);
                    }
                }
            }

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

@@ -60,4 +60,6 @@
            "\ta.area_name LIKE CONCAT( '%', #{areaName}, '%' ) \n" +
            "\tAND a.community_id =#{communityId}")
    List<ComMngStructAreaVO> listAreas(@Param("areaName")String areaName, @Param("communityId")Long communityId);
    @Select("select count(id) from com_mng_struct_house where parent_code=#{areaCode}")
    Integer selectCountHouseByParentHouseCode(String areaCode);
}

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

@@ -221,9 +221,14 @@
        }
        String roleFloor = comMngStructAreaDO.getRoleFloor();
        String roleDoor = comMngStructAreaDO.getRoleDoor();
        String areaCode = comMngStructAreaDO.getAreaCode();
        if (ObjectUtils.isEmpty(roleDoor)||ObjectUtils.isEmpty(roleFloor)) {
            return R.fail("小区未批量设置房屋，请先去社区后台配置");
        }
        Integer num=comMngStructAreaDAO.selectCountHouseByParentHouseCode(areaCode);
        if (num.intValue()==0) {
            return R.fail("小区未批量设置房屋，请先去社区后台配置");
        }
        ComMngStructAreaVO comMngStructAreaVO=new ComMngStructAreaVO();
        BeanUtils.copyProperties(comMngStructAreaDO,comMngStructAreaVO);
        return R.ok(comMngStructAreaVO);