Merge remote-tracking branch 'origin/dev_dingV1' into dev_dingV1

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueApplicationDTO.java

@@ -130,4 +130,16 @@ public class IssueApplicationDTO implements Serializable {
      */
     private Long latestTime;
 
+    private String address;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueApplicationEntity.java

@@ -85,4 +85,16 @@ public class IssueApplicationEntity extends BaseEpmetEntity {
 	 */
 	private String approveStaffId;
 
+	private String address;
+
+	/**
+	 * 经度
+	 */
+	private String longitude;
+
+	/**
+	 * 纬度
+	 */
+	private String latitude;
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -1,9 +1,9 @@
 package com.epmet.service.impl;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.nacos.client.utils.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.rocketmq.messages.GroupAchievementMQMsg;
 import com.epmet.commons.tools.constant.AppClientConstant;
@@ -21,6 +21,8 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
+import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
+import com.epmet.commons.tools.scan.param.ImgTaskDTO;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
 import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
@@ -46,6 +48,7 @@ import com.epmet.entity.*;
 import com.epmet.feign.*;
 import com.epmet.redis.GovIssueRedis;
 import com.epmet.redis.IssueVoteDetailRedis;
+import com.epmet.resi.group.constant.TopicConstant;
 import com.epmet.resi.group.dto.group.form.AllIssueFormDTO;
 import com.epmet.resi.group.dto.group.form.GroupInfoFormDTO;
 import com.epmet.resi.group.dto.group.result.GroupClosedListResultDTO;
@@ -1778,7 +1781,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     @Override
     public void createIssue(IssueDTO issueDTO) {
         // 先审核
-        /*if (org.apache.commons.lang3.StringUtils.isNotBlank(issueDTO.getIssueTitle()) || org.apache.commons.lang3.StringUtils.isNotBlank(issueDTO.getSuggestion())) {
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(issueDTO.getIssueTitle()) || org.apache.commons.lang3.StringUtils.isNotBlank(issueDTO.getSuggestion())) {
             TextScanParamDTO textScan = new TextScanParamDTO();
             //标题
             TextTaskDTO taskTitle = new TextTaskDTO();
@@ -1816,7 +1819,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                     throw new EpmetException(EpmetErrorCode.IMG_SCAN_FAILED.getCode());
                 }
             }
-        }*/
+        }
 
         // 是否开启
         String openStatus = configurationParameterService.checkIssueAuditSwitchIfOpen(issueDTO.getCustomerId());
@@ -1836,8 +1839,28 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             if(null == gridInfo){
                 throw new EpmetException("查询网格信息失败"+issueDTO.getGridId());
             }
+            Result<List<UserBaseInfoResultDTO>> userResult = userOpenFeignClient.queryUserBaseInfo(Arrays.asList(issueDTO.getUserId()));
+            if (!userResult.success() || CollectionUtils.isEmpty(userResult.getData())){
+                throw new EpmetException("查询居民信息失败");
+            }
             issueDTO.setOrgId(gridInfo.getPid());
             issueDTO.setOrgIdPath(gridInfo.getPids());
+            IssueEntity e = ConvertUtils.sourceToTarget(issueDTO, IssueEntity.class);
+            e.setIssueStatus(ModuleConstants.ISSUE_STATUS_VOTING);
+            e.setSourceType(ModuleConstants.ISSUE);
+            e.setDecidedTime(new Date());
+            baseDao.insert(e);
+            IssueProcessEntity issueProcessEntity = new IssueProcessEntity();
+            issueProcessEntity.setIssueId(e.getId());
+            issueProcessEntity.setIssueStatus(ModuleConstants.ISSUE_STATUS_VOTING);
+            issueProcessEntity.setOrgType(ModuleConstants.ISSUE_PROCESS_ORG_TYPE_GRID);
+            issueProcessEntity.setOrgId(issueDTO.getGridId());
+            UserBaseInfoResultDTO user = userResult.getData().get(NumConstant.ZERO);
+            issueProcessEntity.setOperationExplain(user.getShowName() + "发表议题【"+issueDTO.getSuggestion()+"】");
+            issueProcessEntity.setOrgName(gridInfo.getGridNamePath());
+            issueProcessEntity.setCustomerId(issueDTO.getCustomerId());
+            issueProcessService.insert(issueProcessEntity);
+            insertAtt(issueDTO.getAttachmentList(),e.getId(),ModuleConstants.ISSUE,issueDTO.getCustomerId());
         }
 
     }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/utils/ModuleConstants.java

@@ -182,4 +182,6 @@ public interface ModuleConstants {
     String UNDER_AUDITING = "under_auditing";
 
     String ISSUE_APPLICATION = "issue_application";
+
+    String ISSUE = "issue";
 }

epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.18__alter_issue_type.sql

@@ -9,6 +9,10 @@ alter table issue add column ADDRESS VARCHAR(255) DEFAULT '' COMMENT '地址' AF
 alter table issue add COLUMN LONGITUDE VARCHAR(64) DEFAULT'' COMMENT '经度' AFTER ADDRESS;
 alter table issue add COLUMN LATITUDE VARCHAR(64) DEFAULT'' COMMENT '纬度' AFTER LONGITUDE;
 
+alter table issue_application add column ADDRESS VARCHAR(255) DEFAULT '' COMMENT '地址' AFTER `SUGGESTION`;
+alter table issue_application add COLUMN LONGITUDE VARCHAR(64) DEFAULT'' COMMENT '经度' AFTER ADDRESS;
+alter table issue_application add COLUMN LATITUDE VARCHAR(64) DEFAULT'' COMMENT '纬度' AFTER LONGITUDE;
+
 CREATE TABLE `issue_attachment` (
                                     `ID` varchar(64) NOT NULL COMMENT '主键',
                                     `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',