首页展示

huanghongfa

2021-01-29 d49f6b9103cece847377bb63121639ff941a87c0

首页展示

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -28,9 +28,11 @@
      <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" 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/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" 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_user/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/timejob/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/timejob/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" afterDir="false" />
@@ -420,7 +422,7 @@
      <workItem from="1611536010905" duration="21843000" />
      <workItem from="1611622682269" duration="58745000" />
      <workItem from="1611834131869" duration="1431000" />
      <workItem from="1611883117467" duration="1486000" />
      <workItem from="1611883117467" duration="4744000" />
    </task>
    <servers />
  </component>
@@ -480,54 +482,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="515" key="GridCell.Tab.0.bottom" timestamp="1611883664802">
    <state width="1031" height="366" key="GridCell.Tab.0.bottom" timestamp="1611888573657">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state width="1031" height="515" key="GridCell.Tab.0.center" timestamp="1611883664802">
    <state width="1031" height="366" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
    <state width="1031" height="366" key="GridCell.Tab.0.center" timestamp="1611888573657">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state width="1031" height="515" key="GridCell.Tab.0.left" timestamp="1611883664802">
    <state width="1031" height="366" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
    <state width="1031" height="366" key="GridCell.Tab.0.left" timestamp="1611888573657">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state width="1031" height="515" key="GridCell.Tab.0.right" timestamp="1611883664802">
    <state width="1031" height="366" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
    <state width="1031" height="366" key="GridCell.Tab.0.right" timestamp="1611888573657">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state width="1031" height="515" key="GridCell.Tab.1.bottom" timestamp="1611883664802">
    <state width="1031" height="366" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
    <state width="1031" height="366" key="GridCell.Tab.1.bottom" timestamp="1611888573657">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state width="1031" height="515" key="GridCell.Tab.1.center" timestamp="1611883664802">
    <state width="1031" height="366" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
    <state width="1031" height="366" key="GridCell.Tab.1.center" timestamp="1611888573657">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state width="1031" height="515" key="GridCell.Tab.1.left" timestamp="1611883664802">
    <state width="1031" height="366" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
    <state width="1031" height="366" key="GridCell.Tab.1.left" timestamp="1611888573657">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state width="1031" height="515" key="GridCell.Tab.1.right" timestamp="1611883664802">
    <state width="1031" height="366" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
    <state width="1031" height="366" key="GridCell.Tab.1.right" timestamp="1611888573657">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state width="1031" height="515" key="GridCell.Tab.2.bottom" timestamp="1611883664802">
    <state width="1031" height="366" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
    <state width="1031" height="366" key="GridCell.Tab.2.bottom" timestamp="1611888573657">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state width="1031" height="515" key="GridCell.Tab.2.center" timestamp="1611883664802">
    <state width="1031" height="366" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
    <state width="1031" height="366" key="GridCell.Tab.2.center" timestamp="1611888573657">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state width="1031" height="515" key="GridCell.Tab.2.left" timestamp="1611883664802">
    <state width="1031" height="366" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
    <state width="1031" height="366" key="GridCell.Tab.2.left" timestamp="1611888573657">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state width="1031" height="515" key="GridCell.Tab.2.right" timestamp="1611883664802">
    <state width="1031" height="366" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
    <state width="1031" height="366" key="GridCell.Tab.2.right" timestamp="1611888573657">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="515" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611883664802" />
    <state width="1031" height="366" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611888573657" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -556,10 +558,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.SelectionHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1611623127978" />
    <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611883185831">
    <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611888603087">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611883185831" />
    <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611888603087" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <screen x="0" y="0" width="1536" height="824" />
    </state>

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: dev  # 指定配置文件的环境
      profile: test  # 指定配置文件的环境
  profiles:
    active: dev
    active: test
  servlet:
    multipart:
      max-file-size: 10MB

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: dev  # 指定配置文件的环境
      profile: test  # 指定配置文件的环境
  profiles:
    active: dev
    active: test
  servlet:
    multipart:
      max-file-size: 10MB

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: dev  # 指定配置文件的环境
      profile: test  # 指定配置文件的环境
  profiles:
    active: dev
    active: test

eureka:
  client:

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: dev  # 指定配置文件的环境
      profile: test  # 指定配置文件的环境
  profiles:
    active: dev
    active: test
  servlet:
    multipart:
      max-file-size: 10MB

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: dev  # 指定配置文件的环境
      profile: test  # 指定配置文件的环境
  profiles:
    active: dev
    active: test
  servlet:
    multipart:
      max-file-size: 10MB

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java

@@ -9,6 +9,7 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;

import java.util.List;

@@ -84,4 +85,6 @@
    List<ComPbMemberDO> selectListRegister(Long communityId);
    @Select("select name from sys_user where user_id=#{createBy}")
    String selectNameByUserId(Long createBy);
    @Update("update sys_user u set u.is_partymember=0 where u.id_card=#{idCard}")
    void updateUserIsPartymember(String idCard);
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -428,9 +428,16 @@
     * @return 删除结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R deleteDynUser(Integer id) {
        ComPbMemberDO comPbMemberDO = comPbMemberDAO.selectById(id);
        if (ObjectUtils.isEmpty(comPbMemberDO)) {
            return R.fail("党员不存在");
        }
        int delete = comPbMemberDAO.deleteById(id);
        if (delete>0) {
//            维护用户表党员状态
            comPbMemberDAO.updateUserIsPartymember(comPbMemberDO.getIdCard());
            return R.ok();
        }
        return R.fail();

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: dev  # 指定配置文件的环境
      profile: test  # 指定配置文件的环境
  profiles:
    active: dev
    active: test

eureka:
  client:

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -92,7 +92,7 @@
            "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
            "AND c.`area_name` like concat(#{loginUserInfoVO.communityName},'%')  \n" +
            " </if> " +
            " where u.community_id=#{loginUserInfoVO.communityId} " +
            " where u.community_id=#{loginUserInfoVO.communityId} and u.type=1 " +
            "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != &quot;&quot;'>" +
            " and u.`name` like concat(#{loginUserInfoVO.name},'%')  \n" +
            " </if> " +
@@ -220,8 +220,8 @@
            "GROUP BY u.community_id)t ORDER BY t.num desc limit 10")
    List<DataKanbanDTO> selectCommunityActiveUserOrder();
    @Select("SELECT \n" +
            "COUNT(u.user_id)allUser,\n" +
            "COUNT(case when u.is_volunteer=1 then u.user_id else null end )volunteerUser,\n" +
            "COUNT(DISTINCT u.user_id)allUser,\n" +
            "(select COUNT(m.id) from com_mng_volunteer_mng m where m.community_id=#{communityId} and m.`state`=2)volunteerUser,\n" +
            "COUNT(case when u.is_partymember=1 then u.user_id else null end )partymemberUser,\n" +
            "COUNT(h.id)house\n" +
            "FROM\n" +

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: dev  # 指定配置文件的环境
      profile: test  # 指定配置文件的环境
  profiles:
    active: dev
    active: test

eureka:
  client:

 springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: dev  # 指定配置文件的环境
      profile: test  # 指定配置文件的环境
  profiles:
    active: dev
    active: test

eureka:
  client:

 springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: dev  # 指定配置文件的环境
      profile: test  # 指定配置文件的环境
  profiles:
    active: dev
    active: test
  servlet:
    multipart:
      max-file-size: 10MB