项目上报网格化平台功能v4

esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/api/ShiBeiCityGridApi.java → esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/api/ShiBeiCityGridApi.java

@@ -1,10 +1,11 @@
-package com.elink.esua.gird.shibei.api;
+package com.elink.esua.epdc.gird.shibei.api;
 
-import com.elink.esua.gird.shibei.dto.GetZSBInputInfoDto;
-import com.elink.esua.gird.shibei.dto.GridDto;
-import com.elink.esua.gird.shibei.dto.SearchCaseProcessByTaskIdDto;
-import com.elink.esua.gird.shibei.dto.form.SendInputInfoFormDto;
-import com.elink.esua.gird.shibei.dto.form.SendWenXinEvaluateInfoFormDto;
+
+import com.elink.esua.epdc.gird.shibei.dto.GetZSBInputInfoDto;
+import com.elink.esua.epdc.gird.shibei.dto.GridDto;
+import com.elink.esua.epdc.gird.shibei.dto.SearchCaseProcessByTaskIdDto;
+import com.elink.esua.epdc.gird.shibei.dto.form.SendInputInfoFormDto;
+import com.elink.esua.epdc.gird.shibei.dto.form.SendWenXinEvaluateInfoFormDto;
 
 /**
  * 市北城市网格化平台API接口

esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/api/impl/ShiBeiCityGridApiImpl.java → esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/api/impl/ShiBeiCityGridApiImpl.java

@@ -1,13 +1,13 @@
-package com.elink.esua.gird.shibei.api.impl;
+package com.elink.esua.epdc.gird.shibei.api.impl;
 
-import com.elink.esua.gird.shibei.api.ShiBeiCityGridApi;
-import com.elink.esua.gird.shibei.contants.ApiConstants;
-import com.elink.esua.gird.shibei.dto.GetZSBInputInfoDto;
-import com.elink.esua.gird.shibei.dto.GridDto;
-import com.elink.esua.gird.shibei.dto.SearchCaseProcessByTaskIdDto;
-import com.elink.esua.gird.shibei.dto.form.SendInputInfoFormDto;
-import com.elink.esua.gird.shibei.dto.form.SendWenXinEvaluateInfoFormDto;
-import com.elink.esua.gird.shibei.util.XstreamUtil;
+import com.elink.esua.epdc.gird.shibei.api.ShiBeiCityGridApi;
+import com.elink.esua.epdc.gird.shibei.contants.ApiConstants;
+import com.elink.esua.epdc.gird.shibei.dto.GetZSBInputInfoDto;
+import com.elink.esua.epdc.gird.shibei.dto.GridDto;
+import com.elink.esua.epdc.gird.shibei.dto.SearchCaseProcessByTaskIdDto;
+import com.elink.esua.epdc.gird.shibei.dto.form.SendInputInfoFormDto;
+import com.elink.esua.epdc.gird.shibei.dto.form.SendWenXinEvaluateInfoFormDto;
+import com.elink.esua.epdc.gird.shibei.util.XstreamUtil;
 import com.elink.esua.httpclient.HttpClientUtils;
 import com.elink.esua.httpclient.ResultDto;
 import com.google.common.collect.Maps;

esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/constant/CommonConstants.java → esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/constant/CommonConstants.java

@@ -1,4 +1,4 @@
-package com.elink.esua.gird.shibei.constant;
+package com.elink.esua.epdc.gird.shibei.constant;
 
 /**
  * 定义公用常量

esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/contants/ApiConstants.java → esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/contants/ApiConstants.java

@@ -1,4 +1,4 @@
-package com.elink.esua.gird.shibei.contants;
+package com.elink.esua.epdc.gird.shibei.contants;
 
 /**
  * webservice API接口地址常量

esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/contants/ResponseConstants.java → esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/contants/ResponseConstants.java

@@ -1,4 +1,4 @@
-package com.elink.esua.gird.shibei.contants;
+package com.elink.esua.epdc.gird.shibei.contants;
 
 /**
  * 响应常量

esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/GetZSBInputInfoDto.java → esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/GetZSBInputInfoDto.java

@@ -1,4 +1,4 @@
-package com.elink.esua.gird.shibei.dto;
+package com.elink.esua.epdc.gird.shibei.dto;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 
@@ -14,13 +14,13 @@ import java.util.List;
 public class GetZSBInputInfoDto {
 
     @XStreamAlias("request")
-    private List<GetZSBInputInfoItemDto> request;
+    private List<com.elink.esua.epdc.gird.shibei.dto.GetZSBInputInfoItemDto> request;
 
-    public List<GetZSBInputInfoItemDto> getRequest() {
+    public List<com.elink.esua.epdc.gird.shibei.dto.GetZSBInputInfoItemDto> getRequest() {
         return request;
     }
 
-    public void setRequest(List<GetZSBInputInfoItemDto> request) {
+    public void setRequest(List<com.elink.esua.epdc.gird.shibei.dto.GetZSBInputInfoItemDto> request) {
         this.request = request;
     }
 }

esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/GetZSBInputInfoItemDto.java → esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/GetZSBInputInfoItemDto.java

@@ -1,4 +1,4 @@
-package com.elink.esua.gird.shibei.dto;
+package com.elink.esua.epdc.gird.shibei.dto;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 

esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/GridDto.java → esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/GridDto.java

@@ -1,4 +1,4 @@
-package com.elink.esua.gird.shibei.dto;
+package com.elink.esua.epdc.gird.shibei.dto;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 

esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/SearchCaseProcessByTaskIdDto.java → esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/SearchCaseProcessByTaskIdDto.java

@@ -1,4 +1,4 @@
-package com.elink.esua.gird.shibei.dto;
+package com.elink.esua.epdc.gird.shibei.dto;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamImplicit;
@@ -15,13 +15,13 @@ import java.util.List;
 public class SearchCaseProcessByTaskIdDto {
 
     @XStreamImplicit(itemFieldName = "request")
-    List<SearchCaseProcessByTaskIdItemDto> request;
+    List<com.elink.esua.epdc.gird.shibei.dto.SearchCaseProcessByTaskIdItemDto> request;
 
-    public List<SearchCaseProcessByTaskIdItemDto> getRequest() {
+    public List<com.elink.esua.epdc.gird.shibei.dto.SearchCaseProcessByTaskIdItemDto> getRequest() {
         return request;
     }
 
-    public void setRequest(List<SearchCaseProcessByTaskIdItemDto> request) {
+    public void setRequest(List<com.elink.esua.epdc.gird.shibei.dto.SearchCaseProcessByTaskIdItemDto> request) {
         this.request = request;
     }
 }

esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/SearchCaseProcessByTaskIdItemDto.java → esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/SearchCaseProcessByTaskIdItemDto.java

@@ -1,4 +1,4 @@
-package com.elink.esua.gird.shibei.dto;
+package com.elink.esua.epdc.gird.shibei.dto;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 

esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/form/ImageFile.java → esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/ImageFile.java

@@ -1,4 +1,4 @@
-package com.elink.esua.gird.shibei.dto.form;
+package com.elink.esua.epdc.gird.shibei.dto.form;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamImplicit;
@@ -16,13 +16,13 @@ import java.util.List;
 public class ImageFile {
 
     @XStreamImplicit(itemFieldName = "File")
-    private List<ReportFile> reportFileList;
+    private List<com.elink.esua.epdc.gird.shibei.dto.form.ReportFile> reportFileList;
 
-    public List<ReportFile> getReportFileList() {
+    public List<com.elink.esua.epdc.gird.shibei.dto.form.ReportFile> getReportFileList() {
         return reportFileList;
     }
 
-    public void setReportFileList(List<ReportFile> reportFileList) {
+    public void setReportFileList(List<com.elink.esua.epdc.gird.shibei.dto.form.ReportFile> reportFileList) {
         this.reportFileList = reportFileList;
     }
 }

esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/form/ReportFile.java → esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/ReportFile.java

@@ -1,4 +1,4 @@
-package com.elink.esua.gird.shibei.dto.form;
+package com.elink.esua.epdc.gird.shibei.dto.form;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;

esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/form/SendInputInfoFormDto.java → esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/SendInputInfoFormDto.java

@@ -1,4 +1,4 @@
-package com.elink.esua.gird.shibei.dto.form;
+package com.elink.esua.epdc.gird.shibei.dto.form;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 
@@ -148,7 +148,7 @@ public class SendInputInfoFormDto implements Serializable {
      * 多媒体声音
      */
     @XStreamAlias("WaveFile")
-    private WaveFile waveFile;
+    private com.elink.esua.epdc.gird.shibei.dto.form.WaveFile waveFile;
 
     /**
      * 必填
@@ -345,11 +345,11 @@ public class SendInputInfoFormDto implements Serializable {
         this.imageFile = imageFile;
     }
 
-    public WaveFile getWaveFile() {
+    public com.elink.esua.epdc.gird.shibei.dto.form.WaveFile getWaveFile() {
         return waveFile;
     }
 
-    public void setWaveFile(WaveFile waveFile) {
+    public void setWaveFile(com.elink.esua.epdc.gird.shibei.dto.form.WaveFile waveFile) {
         this.waveFile = waveFile;
     }
 }

esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/form/SendWenXinEvaluateInfoFormDto.java → esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/SendWenXinEvaluateInfoFormDto.java

@@ -1,4 +1,4 @@
-package com.elink.esua.gird.shibei.dto.form;
+package com.elink.esua.epdc.gird.shibei.dto.form;
 
 import java.io.Serializable;
 

esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/dto/form/WaveFile.java → esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/form/WaveFile.java

@@ -1,4 +1,4 @@
-package com.elink.esua.gird.shibei.dto.form;
+package com.elink.esua.epdc.gird.shibei.dto.form;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamImplicit;

esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/gird/shibei/util/XstreamUtil.java → esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/util/XstreamUtil.java

@@ -1,4 +1,4 @@
-package com.elink.esua.gird.shibei.util;
+package com.elink.esua.epdc.gird.shibei.util;
 
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.xml.DomDriver;

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemGridPlatformDTO.java

@@ -51,7 +51,7 @@ public class ItemGridPlatformDTO implements Serializable {
     /**
      * 上报人部门ID
      */
-	private Integer reportPersonDeptId;
+	private Long reportPersonDeptId;
 
     /**
      * 状态 15-网格化平台-上报，20-网格化平台-受理，25-网格化平台-立案，30-网格化平台-派遣，35-网格化平台-中间再派，40-网格化平台-接单，45-网格化平台-处理，50-网格化平台-中间督办，55-网格化平台-催办，55-网格化平台-结案

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemGridPlatformEntity.java

@@ -51,7 +51,7 @@ public class ItemGridPlatformEntity extends BaseEpdcEntity {
     /**
      * 上报人部门ID
      */
-	private Integer reportPersonDeptId;
+	private Long reportPersonDeptId;
 
     /**
      * 状态 15-网格化平台-上报，20-网格化平台-受理，25-网格化平台-立案，30-网格化平台-派遣，35-网格化平台-中间再派，40-网格化平台-接单，45-网格化平台-处理，50-网格化平台-中间督办，55-网格化平台-催办，55-网格化平台-结案

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -49,6 +49,14 @@ import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.enums.ItemGridPlatformHandleStatusEnum;
 import com.elink.esua.epdc.enums.ItemHandleCategoryEnum;
+import com.elink.esua.epdc.gird.shibei.api.ShiBeiCityGridApi;
+import com.elink.esua.epdc.gird.shibei.constant.CommonConstants;
+import com.elink.esua.epdc.gird.shibei.contants.ApiConstants;
+import com.elink.esua.epdc.gird.shibei.dto.GridDto;
+import com.elink.esua.epdc.gird.shibei.dto.form.ImageFile;
+import com.elink.esua.epdc.gird.shibei.dto.form.ReportFile;
+import com.elink.esua.epdc.gird.shibei.dto.form.SendInputInfoFormDto;
+import com.elink.esua.epdc.gird.shibei.util.XstreamUtil;
 import com.elink.esua.epdc.modules.async.NewsTask;
 import com.elink.esua.epdc.modules.events.dao.ImgDao;
 import com.elink.esua.epdc.modules.events.entity.ImgEntity;
@@ -61,13 +69,6 @@ import com.elink.esua.epdc.modules.issue.service.IssueService;
 import com.elink.esua.epdc.modules.item.dao.ItemDao;
 import com.elink.esua.epdc.modules.item.entity.*;
 import com.elink.esua.epdc.modules.item.service.*;
-import com.elink.esua.gird.shibei.api.ShiBeiCityGridApi;
-import com.elink.esua.gird.shibei.constant.CommonConstants;
-import com.elink.esua.gird.shibei.contants.ApiConstants;
-import com.elink.esua.gird.shibei.dto.GridDto;
-import com.elink.esua.gird.shibei.dto.form.ImageFile;
-import com.elink.esua.gird.shibei.dto.form.SendInputInfoFormDto;
-import com.elink.esua.gird.shibei.util.XstreamUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -908,9 +909,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 		// 发生地址
 		formDto.setStandardAddress(itemEntity.getIssueAddress());
 		// 问题描述
-		formDto.setDescription("测试999勿删谢谢");// itemEntity.getItemContent()
+		formDto.setDescription(itemEntity.getItemContent());// 测试999勿删谢谢
 		// 反映人
-		formDto.setReportPerson("测试人员");// itemEntity.getNickName()
+		formDto.setReportPerson(itemEntity.getNickName());// itemEntity.getNickName()测试人员
 		// 联系方式
 		formDto.setContactMode(itemEntity.getMobile());
 		// 坐标X
@@ -922,7 +923,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 		// 操作时间
 		formDto.setInsertTime(new Date());
 		// 操作人
-		formDto.setInsertUser("尹作梅");// user.getRealName()
+		formDto.setInsertUser(user.getRealName());//
 		// 外系统编号
 		formDto.setHotLinesn(itemEntity.getId());
 		// 先查询网格对应街道id
@@ -949,13 +950,13 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 		if (null != imageList && !imageList.isEmpty()) {
 			String url = null;
 			String filename = null;
-			com.elink.esua.gird.shibei.dto.form.ReportFile reportFile = null;
-			List<com.elink.esua.gird.shibei.dto.form.ReportFile> reportFiles = new ArrayList<>();
+			ReportFile reportFile = null;
+			List<ReportFile> reportFiles = new ArrayList<>();
 			for (ImgEntity image : imageList) {
 				url = image.getImgUrl();
 				if (org.apache.commons.lang.StringUtils.isNotBlank(url)) {
 					filename = url.substring(url.lastIndexOf(CommonConstants.CHAR_ASCII_47) + CommonConstants.NUMBER_ONE);
-					reportFile = new com.elink.esua.gird.shibei.dto.form.ReportFile();
+					reportFile = new ReportFile();
 					reportFile.setName(filename);
 					reportFile.setUrl(url);
 					reportFile.setBase64string("");
@@ -982,7 +983,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         ItemGridPlatformEntity itemGridPlatformEntity = new ItemGridPlatformEntity();
         itemGridPlatformEntity.setReferenceId(handleProcessEntity.getItemId());
         itemGridPlatformEntity.setTaskid(gridDto.getTaskId());
-		itemGridPlatformEntity.setReportPersonDeptId(Integer.valueOf(String.valueOf(user.getDeptId())));
+        itemGridPlatformEntity.setReportPersonDeptId(user.getDeptId());
         itemGridPlatformEntity.setStatus(ItemGridPlatformHandleStatusEnum.HANDLE_SB.getValue());
         itemGridPlatformService.insert(itemGridPlatformEntity);