Merge remote-tracking branch 'remotes/origin/dev_grid_platform' into dev_add_closedCount_category

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java

@@ -132,4 +132,8 @@ public class ScreenProjectDataInfoFormDTO implements Serializable {
      * 满意度得分
      */
     private BigDecimal satisfactionScore;
+    /**
+     * 项目创建人
+     */
+    private String projectCreator;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java

@@ -14,6 +14,7 @@ import com.epmet.constant.SystemMessageType;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginExtractService;
 import com.epmet.service.evaluationindex.extract.toscreen.ScreenExtractService;
+import com.epmet.service.evaluationindex.screen.ScreenProjectDataService;
 import com.epmet.util.DimIdGenerator;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -160,7 +161,7 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
                 type = SystemMessageType.PROJECT_EDIT;
             }
             DisputeProcessMQMsg msg = new DisputeProcessMQMsg(customerId, msgObj.getProjectId(), type);
-            //SpringContextUtils.getBean(ScreenProjectDataService.class).sendProjectChangeMq(msg);
+            SpringContextUtils.getBean(ScreenProjectDataService.class).sendProjectChangeMq(msg);
         } catch (RenException e) {
             // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
             logger.error("【RocketMQ】消费项目变动消息失败:",e);

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/BaseConflictsResolveDTO.java

@@ -0,0 +1,77 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.opendata.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 事件中间表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-22
+ */
+@Data
+public class BaseConflictsResolveDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 事件ID
+     */
+	private String id;
+
+    /**
+     * 事件信息
+     */
+	private String eventInfo;
+
+    /**
+     * 事件所属网格ID
+     */
+	private String gridId;
+
+    /**
+     * 
+     */
+	private String delFlag;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ExUserDTO.java

@@ -0,0 +1,76 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.opendata.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 系统用户中间表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-22
+ */
+@Data
+public class ExUserDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 市平台 用户ID
+     */
+	private String userId;
+
+    /**
+     * 市平台 用户名
+     */
+	private String userName;
+
+    /**
+     * 市平台 用户身份证号
+     */
+	private String idCard;
+
+    /**
+     * 市平台 用户手机号
+     */
+	private String mobile;
+
+    /**
+     * 区县平台 用户ID
+     */
+	private String userIdQx;
+
+    /**
+     * 区县平台 用户名
+     */
+	private String userNameQx;
+
+    /**
+     * 区县平台 用户账号
+     */
+	private String userAccount;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BaseGridInfoController.java

@@ -44,7 +44,7 @@ public class BaseGridInfoController {
 
     /**
      * @Author sun
-     * @Description 组织基础信息中介库同步
+     * @Description 组织基础信息中间库同步
      **/
     @PostMapping("agencybaseinfo")
     public Result getAgencyBaseInfo(@RequestBody(required = false) GridBaseInfoFormDTO formDTO) {
@@ -55,7 +55,7 @@ public class BaseGridInfoController {
 
     /**
      * @Author sun
-     * @Description 网格基础信息中介库同步
+     * @Description 网格基础信息中间库同步
      **/
     @PostMapping("gridbaseinfo")
     public Result getGridBaseInfo(@RequestBody(required = false) GridBaseInfoFormDTO formDTO) {

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BaseConflictsResolveDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.opendata.entity.BaseConflictsResolveEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 事件中间表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-22
+ */
+@Mapper
+public interface BaseConflictsResolveDao extends BaseDao<BaseConflictsResolveEntity> {
+	
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/ExUserDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.opendata.entity.ExUserEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 系统用户中间表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-22
+ */
+@Mapper
+public interface ExUserDao extends BaseDao<ExUserEntity> {
+	
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseConflictsResolveEntity.java

@@ -0,0 +1,48 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.opendata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 事件中间表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-22
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("base_conflicts_resolve")
+public class BaseConflictsResolveEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 事件信息
+     */
+	private String eventInfo;
+
+    /**
+     * 事件所属网格ID
+     */
+	private String gridId;
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExUserEntity.java

@@ -0,0 +1,72 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.opendata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 系统用户中间表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-22
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ex_user")
+public class ExUserEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 市平台 用户ID
+     */
+	private String userId;
+
+    /**
+     * 市平台 用户名
+     */
+	private String userName;
+
+    /**
+     * 市平台 用户身份证号
+     */
+	private String idCard;
+
+    /**
+     * 市平台 用户手机号
+     */
+	private String mobile;
+
+    /**
+     * 区县平台 用户ID
+     */
+	private String userIdQx;
+
+    /**
+     * 区县平台 用户名
+     */
+	private String userNameQx;
+
+    /**
+     * 区县平台 用户账号
+     */
+	private String userAccount;
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BaseConflictsResolveService.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.opendata.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.opendata.entity.BaseConflictsResolveEntity;
+
+/**
+ * 事件中间表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-22
+ */
+public interface BaseConflictsResolveService extends BaseService<BaseConflictsResolveEntity> {
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/ExUserService.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.opendata.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.opendata.entity.ExUserEntity;
+
+/**
+ * 系统用户中间表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-22
+ */
+public interface ExUserService extends BaseService<ExUserEntity> {
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseConflictsResolveServiceImpl.java

@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.opendata.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.opendata.dao.BaseConflictsResolveDao;
+import com.epmet.opendata.entity.BaseConflictsResolveEntity;
+import com.epmet.opendata.service.BaseConflictsResolveService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 事件中间表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-22
+ */
+@Service
+public class BaseConflictsResolveServiceImpl extends BaseServiceImpl<BaseConflictsResolveDao, BaseConflictsResolveEntity> implements BaseConflictsResolveService {
+
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java

@@ -20,6 +20,7 @@ package com.epmet.opendata.service.impl;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.org.result.CustomerAgencyDTO;
 import com.epmet.dto.org.result.CustomerGridDTO;
@@ -58,7 +59,8 @@ public class BaseGridInfoServiceImpl extends BaseServiceImpl<BaseGridInfoDao, Ba
     @Transactional(rollbackFor = Exception.class)
     public void getAgencyBaseInfo(GridBaseInfoFormDTO formDTO) {
         //1.查询组织基础信息
-        Result<List<CustomerAgencyDTO>> result = dataStatisticalOpenFeignClient.getAgencyBaseInfo(formDTO);
+        com.epmet.dto.org.form.GridBaseInfoFormDTO formDTO1 = ConvertUtils.sourceToTarget(formDTO, com.epmet.dto.org.form.GridBaseInfoFormDTO.class);
+        Result<List<CustomerAgencyDTO>> result = dataStatisticalOpenFeignClient.getAgencyBaseInfo(formDTO1);
         if (!result.success()) {
             throw new RenException(result.getInternalMsg());
         }
@@ -110,7 +112,8 @@ public class BaseGridInfoServiceImpl extends BaseServiceImpl<BaseGridInfoDao, Ba
     @Transactional(rollbackFor = Exception.class)
     public void getGridBaseInfo(GridBaseInfoFormDTO formDTO) {
         //1.查询网格基础信息
-        Result<List<CustomerGridDTO>> result = dataStatisticalOpenFeignClient.getGridBaseInfo(formDTO);
+        com.epmet.dto.org.form.GridBaseInfoFormDTO formDTO1 = ConvertUtils.sourceToTarget(formDTO, com.epmet.dto.org.form.GridBaseInfoFormDTO.class);
+        Result<List<CustomerGridDTO>> result = dataStatisticalOpenFeignClient.getGridBaseInfo(formDTO1);
         if (!result.success()) {
             throw new RenException(result.getInternalMsg());
         }
@@ -141,7 +144,8 @@ public class BaseGridInfoServiceImpl extends BaseServiceImpl<BaseGridInfoDao, Ba
             ExList.add(entity);
         });
         if (null != formDTO.getType() && "all".equals(formDTO.getType())) {
-            exDeptDao.updateBatchGrid(ExList);
+            exDeptDao.updateBatch(ExList);
+            //exDeptDao.updateBatchGrid(ExList);
         } else {
             exDeptDao.insertBatch(ExList);
         }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridUserServiceImpl.java

@@ -56,7 +56,8 @@ public class BaseGridUserServiceImpl extends BaseServiceImpl<BaseGridUserDao, Ba
     @Transactional(rollbackFor = Exception.class)
     public void getStaffBaseInfo(StaffBaseInfoFormDTO formDTO) {
         //1.查询网格基础信息
-        Result<List<GridUserInfoDTO>> result = dataStatisticalOpenFeignClient.getStaffBaseInfo(formDTO);
+        com.epmet.dto.user.form.StaffBaseInfoFormDTO formDTO1 = ConvertUtils.sourceToTarget(formDTO,  com.epmet.dto.user.form.StaffBaseInfoFormDTO.class);
+        Result<List<GridUserInfoDTO>> result = dataStatisticalOpenFeignClient.getStaffBaseInfo(formDTO1);
         if (!result.success()) {
             throw new RenException(result.getInternalMsg());
         }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExUserServiceImpl.java

@@ -0,0 +1,48 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.opendata.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.opendata.dao.ExUserDao;
+import com.epmet.opendata.dto.ExUserDTO;
+import com.epmet.opendata.entity.ExUserEntity;
+import com.epmet.opendata.service.ExUserService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 系统用户中间表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-22
+ */
+@Service
+public class ExUserServiceImpl extends BaseServiceImpl<ExUserDao, ExUserEntity> implements ExUserService {
+
+
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml

@@ -21,7 +21,8 @@
             <trim prefix="dept_id_qx =(case" suffix="end),">
                 <foreach collection="list" item="item">
                     <if test='null != item.deptIdQx'>
-                        when grid_code = #{item.gridCode} then #{item.deptIdQx}
+                       <!--  when grid_code = #{item.gridCode} then #{item.deptIdQx} -->
+                        when dept_name_qx = #{item.deptNameQx} then #{item.deptIdQx}
                     </if>
                 </foreach>
             </trim>
@@ -29,7 +30,8 @@
             <trim prefix="dept_name_qx =(case" suffix="end),">
                 <foreach collection="list" item="item">
                     <if test='null != item.deptNameQx'>
-                        when grid_code = #{item.gridCode} then #{item.deptNameQx}
+                        when dept_name_qx = #{item.deptNameQx} then #{item.deptIdQx}
+                       <!--  when grid_code = #{item.gridCode} then #{item.deptNameQx} -->
                     </if>
                 </foreach>
             </trim>
@@ -38,7 +40,8 @@
         WHERE
         1=1
         <foreach collection="list" item="item" open="AND(  " separator=" OR " index="index" close=")">
-            grid_code = #{item.gridCode}
+            <!-- grid_code = #{item.gridCode} -->
+            dept_name_qx = #{item.deptNameQx}
         </foreach>
     </update>