huanghongfa
2021-01-19 6c41a1f9c2e12888c4c19da4c654452a8ddcfe3b
社区后台人脸采集
3个文件已修改
85 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -24,32 +24,6 @@
  <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/IndexApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/UserApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructBuildTypeVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructBuildTypeVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/MenuRoleVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/MenuRoleVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/user/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/user/UserService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActMicroWishVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActMicroWishVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComMngStructBuildTypeVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComMngStructBuildTypeVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/MenuRoleVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/MenuRoleVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/user/UserService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/user/UserService.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.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$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/SystemManagementApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/SystemManagementApi.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/ComActMicroWishDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComMngStructOtherBuildService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComMngStructOtherBuildService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/RoleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/RoleService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
@@ -430,7 +404,7 @@
      <workItem from="1610934956567" duration="1325000" />
      <workItem from="1610939265133" duration="8588000" />
      <workItem from="1610956684718" duration="7037000" />
      <workItem from="1611019208339" duration="9905000" />
      <workItem from="1611019208339" duration="10917000" />
    </task>
    <servers />
  </component>
@@ -482,54 +456,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="416" key="GridCell.Tab.0.bottom" timestamp="1611029941982">
    <state width="1031" height="416" key="GridCell.Tab.0.bottom" timestamp="1611031008988">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611029941982" />
    <state width="1031" height="416" key="GridCell.Tab.0.center" timestamp="1611029941981">
    <state width="1031" height="416" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state width="1031" height="416" key="GridCell.Tab.0.center" timestamp="1611031008988">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611029941981" />
    <state width="1031" height="416" key="GridCell.Tab.0.left" timestamp="1611029941980">
    <state width="1031" height="416" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state width="1031" height="416" key="GridCell.Tab.0.left" timestamp="1611031008988">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611029941980" />
    <state width="1031" height="416" key="GridCell.Tab.0.right" timestamp="1611029941982">
    <state width="1031" height="416" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state width="1031" height="416" key="GridCell.Tab.0.right" timestamp="1611031008988">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611029941982" />
    <state width="1031" height="416" key="GridCell.Tab.1.bottom" timestamp="1611029941982">
    <state width="1031" height="416" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state width="1031" height="416" key="GridCell.Tab.1.bottom" timestamp="1611031008988">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611029941982" />
    <state width="1031" height="416" key="GridCell.Tab.1.center" timestamp="1611029941982">
    <state width="1031" height="416" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state width="1031" height="416" key="GridCell.Tab.1.center" timestamp="1611031008988">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611029941982" />
    <state width="1031" height="416" key="GridCell.Tab.1.left" timestamp="1611029941982">
    <state width="1031" height="416" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state width="1031" height="416" key="GridCell.Tab.1.left" timestamp="1611031008988">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611029941982" />
    <state width="1031" height="416" key="GridCell.Tab.1.right" timestamp="1611029941982">
    <state width="1031" height="416" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state width="1031" height="416" key="GridCell.Tab.1.right" timestamp="1611031008988">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611029941982" />
    <state width="1031" height="416" key="GridCell.Tab.2.bottom" timestamp="1611029941982">
    <state width="1031" height="416" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state width="1031" height="416" key="GridCell.Tab.2.bottom" timestamp="1611031008988">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611029941982" />
    <state width="1031" height="416" key="GridCell.Tab.2.center" timestamp="1611029941982">
    <state width="1031" height="416" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state width="1031" height="416" key="GridCell.Tab.2.center" timestamp="1611031008988">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611029941982" />
    <state width="1031" height="416" key="GridCell.Tab.2.left" timestamp="1611029941982">
    <state width="1031" height="416" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state width="1031" height="416" key="GridCell.Tab.2.left" timestamp="1611031008988">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611029941982" />
    <state width="1031" height="416" key="GridCell.Tab.2.right" timestamp="1611029941982">
    <state width="1031" height="416" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state width="1031" height="416" key="GridCell.Tab.2.right" timestamp="1611031008988">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611029941982" />
    <state width="1031" height="416" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -550,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="1611023689827" />
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1611029216462">
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1611031083011">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611029216462" />
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611031083011" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -58,14 +58,13 @@
            "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != &quot;&quot;'>" +
            "AND c.`name` = #{loginUserInfoVO.name} \n" +
            " </if> " +
            " <where>" +
            " where u.face_state is not null and u.type=1" +
            "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
            "and u.`name` = #{loginUserInfoVO.communityName} \n" +
            " </if> " +
            "<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != &quot;&quot;'>" +
            "AND u.phone = #{loginUserInfoVO.phone}" +
            " </if> " +
            " </where>" +
            " order by u.face_state asc,u.create_at asc " +
            "</script>")
    IPage<LoginUserInfoVO> pageUserFace(Page page, @Param("loginUserInfoVO") LoginUserInfoVO loginUserInfoVO);
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -329,7 +329,7 @@
                sysUserDO.setFaceState(1);
                break;
            case 2:
                sysUserDO.setFaceState(3);
                sysUserDO.setFaceState(2);
                break;
            case 3:
                break;