commit

inspur-admin/src/main/resources/application-druid.yml

@@ -56,4 +56,4 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true

inspur-admin/src/main/resources/application.yml

@@ -22,7 +22,7 @@ inspur:
     # tomcat部署 项目根路径
     tomcat-path: /party-admin
     # 服务部署Ip
-    ip: 117.73.13.40
+    ip: party.guoziyu.cn
 
 # 开发环境配置
 server:
@@ -54,7 +54,7 @@ spring:
   messages:
     # 国际化资源文件路径
     basename: i18n/messages
-  profiles: 
+  profiles:
     active: druid
   # 文件上传
   servlet:
@@ -75,7 +75,7 @@ spring:
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 9
+    database: 10
     # 密码
     password: Hycpb@123
     # 连接超时时间
@@ -116,7 +116,7 @@ token:
     # App令牌有效期（默认7天）
     app:
       expireTime: 10080
-  
+
 # MyBatis配置
 mybatis:
     # 搜索指定包别名
@@ -127,10 +127,10 @@ mybatis:
     configLocation: classpath:mybatis/mybatis-config.xml
 
 # PageHelper分页插件
-pagehelper: 
+pagehelper:
   helperDialect: mysql
   supportMethodsArguments: true
-  params: count=countSql 
+  params: count=countSql
 
 # Swagger配置
 swagger:
@@ -140,7 +140,7 @@ swagger:
   pathMapping: /dev-api
 
 # 防止XSS攻击
-xss: 
+xss:
   # 过滤开关
   enabled: true
   # 排除链接（多个用逗号分隔）
@@ -176,4 +176,4 @@ SM2:
   # 公钥X
   publicKeyPointXHex: 0C2872EE56C4E85B102D164F24C1DB718097C969EDC707FD65FFD07D628CD454
   # 公钥Y
-  publicKeyPointYHex: C3AE1BB7CD0787E316F4A4876B273BA680CB601EDA75EB984A154939C6B5C3CE
+  publicKeyPointYHex: C3AE1BB7CD0787E316F4A4876B273BA680CB601EDA75EB984A154939C6B5C3CE

inspur-ai/src/main/java/com/inspur/rabbitmq/MsgTestController.java

@@ -1,3 +1,4 @@
+/*
 package com.inspur.rabbitmq;
 
 import com.alibaba.fastjson2.JSON;
@@ -11,11 +12,13 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+*/
 /**
  * 消息发生 test
  *
  * @author lihao16
- */
+ *//*
+
 @RestController
 @RequestMapping("/mq/test")
 public class MsgTestController {
@@ -38,3 +41,4 @@ public class MsgTestController {
     }
 
 }
+*/

inspur-ai/src/main/java/com/inspur/rabbitmq/config/RabbitMQConfiguration.java

@@ -16,8 +16,8 @@ import org.springframework.context.annotation.Scope;
  *
  * @author lihao16
  */
-@Configuration
-@Slf4j
+// @Configuration
+// @Slf4j
 public class RabbitMQConfiguration {
 
     @Value("${spring.rabbitmq.host}")
@@ -38,7 +38,7 @@ public class RabbitMQConfiguration {
 
     public static final String PARTY_MQ_ROUTINGKEY = "party-mq-routingKey";
 
-    @Bean
+    // @Bean
     public ConnectionFactory connectionFactory() {
         CachingConnectionFactory connectionFactory = new CachingConnectionFactory(host, port);
         connectionFactory.setUsername(username);
@@ -48,14 +48,14 @@ public class RabbitMQConfiguration {
         return connectionFactory;
     }
 
-    @Bean
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+    // @Bean
+    // @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
     public RabbitTemplate rabbitTemplate() {
         RabbitTemplate template = new RabbitTemplate(connectionFactory());
         return template;
     }
 
-    @Bean
+    // @Bean
     public DirectExchange defaultExchange() {
         return new DirectExchange(PARTY_MQ_EXCHANGE);
     }
@@ -65,7 +65,7 @@ public class RabbitMQConfiguration {
      *
      * @return
      */
-    @Bean
+    // @Bean
     public Queue queueA() {
         // 队列持久
         return new Queue(PARTY_MQ_QUEUE, true);
@@ -76,7 +76,7 @@ public class RabbitMQConfiguration {
      *
      * @return
      */
-    @Bean
+    // @Bean
     public Binding binding() {
         return BindingBuilder.bind(queueA()).to(defaultExchange()).with(RabbitMQConfiguration.PARTY_MQ_ROUTINGKEY);
     }

inspur-ai/src/main/java/com/inspur/rabbitmq/producer/PartyMessageProducer.java

@@ -1,3 +1,4 @@
+/*
 package com.inspur.rabbitmq.producer;
 
 import com.inspur.common.utils.uuid.UUID;
@@ -9,29 +10,37 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 
+*/
 /**
  * MQ消息生成者
  *
  * @author lihao16
- */
+ *//*
+
 @Slf4j
-@Component
+// @Component
 public class PartyMessageProducer implements RabbitTemplate.ConfirmCallback{
 
 
-    /**
+    */
+/**
      * 由于rabbitTemplate的scope属性设置为ConfigurableBeanFactory.SCOPE_PROTOTYPE，所以不能自动注入
-     */
+     *//*
+
     private RabbitTemplate rabbitTemplate;
 
-    /**
+    */
+/**
      * 构造方法注入rabbitTemplate
-     */
-    @Autowired
+     *//*
+
+    */
+/*@Autowired
     public PartyMessageProducer(RabbitTemplate rabbitTemplate) {
         this.rabbitTemplate = rabbitTemplate;
         rabbitTemplate.setConfirmCallback(this);
-    }
+    }*//*
+
 
     public void sendMsg(String content) {
         CorrelationData correlationId = new CorrelationData(UUID.randomUUID().toString());
@@ -41,9 +50,11 @@ public class PartyMessageProducer implements RabbitTemplate.ConfirmCallback{
         rabbitTemplate.convertAndSend(RabbitMQConfiguration.PARTY_MQ_EXCHANGE, RabbitMQConfiguration.PARTY_MQ_ROUTINGKEY, content, correlationId);
     }
 
-    /**
+    */
+/**
      * 回调
-     */
+     *//*
+
     @Override
     public void confirm(CorrelationData correlationData, boolean ack, String cause) {
         log.info(" 回调id:" + correlationData);
@@ -55,3 +66,4 @@ public class PartyMessageProducer implements RabbitTemplate.ConfirmCallback{
     }
 
 }
+*/

inspur-party/src/main/java/com/inspur/dt/service/impl/DengTaSyncServiceImpl.java

@@ -33,6 +33,7 @@ import java.text.ParseException;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * @author lihao16
@@ -114,7 +115,6 @@ public class DengTaSyncServiceImpl implements DengTaSyncService {
         PartyOrgManage orgManage = new PartyOrgManage();
         BeanUtils.copyProperties(pullRsp,orgManage);
         orgManage.setDtId(pullRsp.getId());
-        orgManage.setId(orgId);
         orgManage.setUserTableId(userTableId);
         orgManage.setCreateTime(DateUtils.parseDate(pullRsp.getCreateTime(), DateUtils.YYYY_MM_DD_HH_MM_SS));
         orgManage.setEstablishTime(DateUtils.parseDate(pullRsp.getEstablishTime(), DateUtils.YYYY_MM_DD));
@@ -128,8 +128,9 @@ public class DengTaSyncServiceImpl implements DengTaSyncService {
             orgManage.setPid("0");
         }
         //查询数据库中是否存在
-        PartyOrgManage dbOrg = partyOrgManageMapper.selectPartyOrgManageByDtId(orgId);
+        PartyOrgManage dbOrg = partyOrgManageMapper.selectPartyOrgManageByDtIdAndUid(orgId,userTableId);
         if (null == dbOrg) {
+            orgManage.setId(UUID.randomUUID().toString().replace("-",""));
             partyOrgManageMapper.insertPartyOrgManage(orgManage);
         } else {
             partyOrgManageMapper.updatePartyOrgManage(orgManage);
@@ -210,7 +211,7 @@ public class DengTaSyncServiceImpl implements DengTaSyncService {
             memberManage.setIsExcellent("1");
             memberManage.setIsRetire("1");
             //查询数据库中是否存在
-            PartyMemberManage dbMember = partyMemberManageMapper.selectPartyMemberManageByDtId(dtId);
+            PartyMemberManage dbMember = partyMemberManageMapper.selectPartyMemberManageByDtIdAndUid(dtId,userTableId);
             if (null == dbMember) {
                 partyMemberManageMapper.insertPartyMemberManage(memberManage);
             }else {
@@ -287,7 +288,7 @@ public class DengTaSyncServiceImpl implements DengTaSyncService {
             partyOrgPost.setCreateTime(createTime);
             partyOrgPost.setStatus(0);
             //查询数据库中是否存在
-            PartyOrgPost dbPost = partyOrgPostMapper.selectPartyOrgPostByDtId(partyOrgPost.getDtId());
+            PartyOrgPost dbPost = partyOrgPostMapper.selectPartyOrgPostByDtIdAndUid(partyOrgPost.getDtId(), userTableId);
             if (null == dbPost) {
                 partyOrgPostMapper.insertPartyOrgPost(partyOrgPost);
             }else {
@@ -403,7 +404,7 @@ public class DengTaSyncServiceImpl implements DengTaSyncService {
                 meetingInfo.setPicsPath(null);
             }
             //查询数据库中是否存在
-            PartyMeetingInfo dbMeeting = partyMeetingInfoMapper.selectPartyOrgPostByDtId(meetingInfo.getDtId());
+            PartyMeetingInfo dbMeeting = partyMeetingInfoMapper.selectPartyMeetingByDtIdAndUid(meetingInfo.getDtId(),meetingInfo.getUserTableId());
             if (null == dbMeeting) {
                 meetingInfo.setIsMobile(0);
                 meetingInfo.setAttendanceStatus(0);

inspur-party/src/main/java/com/inspur/dt/task/DengTaPullSchedule.java

@@ -76,11 +76,12 @@ public class DengTaPullSchedule {
                 continue;
             }
             Long memberUTId = getUserTableId(DengTaSyncConstant.MEMBER_MANAGE_TABLE_NAME,sysUser.getUserId(),0);
-            PartyOrgManage partyOrgManage =  partyOrgManageMapper.selectPartyOrgManageByDtId(dtOrgId);
+            Long orgUTId = getUserTableId(DengTaSyncConstant.ORG_MANAGE_TABLE_NAME,sysUser.getUserId(),0);
+            PartyOrgManage partyOrgManage =  partyOrgManageMapper.selectPartyOrgManageByDtIdAndUid(dtOrgId,orgUTId);
             String orgId = partyOrgManage.getId();
             dengTaSyncService.memberPull(orgId,dtOrgId,memberUTId);
             // 根据当前组织查询所有子组织
-            List<PartyOrgManage> subOrgs = partyOrgManageMapper.selectChildrenOrgByDtId(dtOrgId);
+            List<PartyOrgManage> subOrgs = partyOrgManageMapper.selectChildrenOrgByDtIdAndUid(dtOrgId,orgUTId);
             if (CollectionUtils.isEmpty(subOrgs)) {
                 continue;
             }
@@ -110,11 +111,12 @@ public class DengTaPullSchedule {
             if (StringUtils.isEmpty(dtOrgId)) {
                 continue;
             }
-            PartyOrgManage partyOrgManage =  partyOrgManageMapper.selectPartyOrgManageByDtId(dtOrgId);
+            Long orgUTId = getUserTableId(DengTaSyncConstant.ORG_MANAGE_TABLE_NAME,sysUser.getUserId(),0);
+            PartyOrgManage partyOrgManage =  partyOrgManageMapper.selectPartyOrgManageByDtIdAndUid(dtOrgId,orgUTId);
             String orgId = partyOrgManage.getId();
             dengTaSyncService.meetingPull(orgId,dtOrgId,sysUser.getUserId());
             // 根据当前组织查询所有子组织
-            List<PartyOrgManage> subOrgs = partyOrgManageMapper.selectChildrenOrgByDtId(dtOrgId);
+            List<PartyOrgManage> subOrgs = partyOrgManageMapper.selectChildrenOrgByDtIdAndUid(dtOrgId,orgUTId);
             if (CollectionUtils.isEmpty(subOrgs)) {
                 continue;
             }
@@ -145,11 +147,12 @@ public class DengTaPullSchedule {
                 continue;
             }
             Long postUTId = getUserTableId(DengTaSyncConstant.ORG_POST_TABLE_NAME,sysUser.getUserId(),0);
-            PartyOrgManage partyOrgManage =  partyOrgManageMapper.selectPartyOrgManageByDtId(dtOrgId);
+            Long orgUTId = getUserTableId(DengTaSyncConstant.ORG_MANAGE_TABLE_NAME,sysUser.getUserId(),0);
+            PartyOrgManage partyOrgManage =  partyOrgManageMapper.selectPartyOrgManageByDtIdAndUid(dtOrgId,orgUTId);
             String orgId = partyOrgManage.getId();
             dengTaSyncService.postPull(orgId,dtOrgId,postUTId);
             // 根据当前组织查询所有子组织
-            List<PartyOrgManage> subOrgs = partyOrgManageMapper.selectChildrenOrgByDtId(dtOrgId);
+            List<PartyOrgManage> subOrgs = partyOrgManageMapper.selectChildrenOrgByDtIdAndUid(dtOrgId,orgUTId);
             if (CollectionUtils.isEmpty(subOrgs)) {
                 continue;
             }

inspur-party/src/main/java/com/inspur/mapper/PartyMeetingInfoMapper.java

@@ -180,4 +180,12 @@ public interface PartyMeetingInfoMapper
      * @return 党员会议
      */
     public PartyMeetingInfo selectPartyOrgPostByDtId(@Param("dtId") String dtId);
+
+    /**
+     * 查询党员会议
+     * @param dtId
+     * @param uid
+     * @return
+     */
+    public PartyMeetingInfo selectPartyMeetingByDtIdAndUid(@Param("dtId") String dtId, @Param("uid") Long uid);
 }

inspur-party/src/main/java/com/inspur/mapper/PartyMemberManageMapper.java

@@ -173,4 +173,12 @@ public interface PartyMemberManageMapper
      * @return 党员基础信息
      */
     public PartyMemberManage selectPartyMemberManageByDtId(@Param("dtId") String dtId);
+
+    /**
+     * 查询党员基础信息
+     * @param dtId
+     * @param uid
+     * @return
+     */
+    public PartyMemberManage selectPartyMemberManageByDtIdAndUid(@Param("dtId") String dtId, @Param("uid") Long uid);
 }

inspur-party/src/main/java/com/inspur/mapper/PartyOrgManageMapper.java

@@ -31,6 +31,14 @@ public interface PartyOrgManageMapper
      */
     public PartyOrgManage selectPartyOrgManageByDtId(String dtId);
 
+    /**
+     * 查询党组织管理
+     * @param dtId
+     * @param userTableId
+     * @return
+     */
+    public PartyOrgManage selectPartyOrgManageByDtIdAndUid(@Param("dtId") String dtId, @Param("userTableId") Long userTableId);
+
     /**
      * 查询党组织管理列表
      *
@@ -172,4 +180,6 @@ public interface PartyOrgManageMapper
      * @return
      */
     public List<PartyOrgManage> selectChildrenOrgByDtId(@Param("dtId") String dtId);
+
+    public List<PartyOrgManage> selectChildrenOrgByDtIdAndUid(@Param("dtId") String dtId,@Param("uid") Long userTableId);
 }

inspur-party/src/main/java/com/inspur/mapper/PartyOrgPostMapper.java

@@ -2,6 +2,7 @@ package com.inspur.mapper;
 
 import com.inspur.domain.partywork.PartyMemberManage;
 import com.inspur.domain.partywork.PartyOrgPost;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -92,4 +93,12 @@ public interface PartyOrgPostMapper
      * @return 党组织职位
      */
     public PartyOrgPost selectPartyOrgPostByDtId(String dtId);
+
+    /**
+     * 根据党组织ID和党员ID查询党组织职位
+     * @param dtId
+     * @param uid
+     * @return
+     */
+    public PartyOrgPost selectPartyOrgPostByDtIdAndUid(@Param("dtId") String dtId, @Param("uid") Long uid);
 }

inspur-party/src/main/resources/mapper/PartyMeetingInfoMapper.xml

@@ -253,6 +253,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where dt_id = #{dtId}
     </select>
 
+    <select id="selectPartyMeetingByDtIdAndUid" resultMap="PartyMeetingInfoResult">
+        <include refid="selectPartyMeetingInfoVo"/>
+        where dt_id = #{dtId} and user_table_id = #{uid}
+    </select>
+
     <select id="selectPartyMeetingLeaveInfoById" parameterType="com.inspur.domain.partywork.PartyMeetingMsgRef" resultMap="PartyMeetingMsgRefResult">
         select id, meeting_id, type, msg_id, status, create_time, update_time
         from party_meeting_msg_ref

inspur-party/src/main/resources/mapper/PartyMemberManageMapper.xml

@@ -99,6 +99,11 @@
         where dt_id = #{dtId}
     </select>
 
+    <select id="selectPartyMemberManageByDtIdAndUid" resultMap="PartyMemberManageResult">
+        <include refid="selectPartyMemberManageVo"/>
+        where dt_id = #{dtId} and user_table_id = #{uid}
+    </select>
+
     <insert id="insertPartyMemberManage" parameterType="com.inspur.domain.partywork.PartyMemberManage" useGeneratedKeys="true" keyProperty="id">
         insert into party_member_manage
         <trim prefix="(" suffix=")" suffixOverrides=",">

inspur-party/src/main/resources/mapper/PartyOrgManageMapper.xml

@@ -71,11 +71,21 @@
         where dt_id = #{id}
     </select>
 
+    <select id="selectPartyOrgManageByDtIdAndUid" resultMap="PartyOrgManageResult">
+        <include refid="selectPartyOrgManageVo"/>
+        where dt_id = #{dtId} and user_table_id = #{userTableId}
+    </select>
+
     <select id="selectChildrenOrgByDtId" parameterType="String" resultMap="PartyOrgManageResult">
         <include refid="selectPartyOrgManageVo"/>
         WHERE pid = (SELECT id FROM party_org_manage WHERE dt_id = #{dtId})
     </select>
 
+    <select id="selectChildrenOrgByDtIdAndUid" resultMap="PartyOrgManageResult">
+        <include refid="selectPartyOrgManageVo"/>
+        WHERE pid = (SELECT id FROM party_org_manage WHERE dt_id = #{dtId} and user_table_id = #{uid})
+    </select>
+
     <select id="selectPartyOrgByPid" parameterType="String" resultMap="PartyOrgManageResult">
         <include refid="selectPartyOrgManageVo"/>
         where pid = #{pid}

inspur-party/src/main/resources/mapper/PartyOrgPostMapper.xml

@@ -75,6 +75,11 @@
         where dt_id = #{dtId}
     </select>
 
+    <select id="selectPartyOrgPostByDtIdAndUid" resultMap="PartyOrgPostResult">
+        <include refid="selectPartyOrgPostVo"/>
+        where dt_id = #{dtId} and user_table_id = #{uid}
+    </select>
+
     <insert id="insertPartyOrgPost" parameterType="com.inspur.domain.partywork.PartyOrgPost" useGeneratedKeys="true" keyProperty="id">
         insert into party_org_post
         <trim prefix="(" suffix=")" suffixOverrides=",">