项目上报bug修改

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

@@ -51,6 +51,7 @@ public class ShiBeiCityGridApiImpl implements ShiBeiCityGridApi {
     public GridDto newSendInputInfo(SendInputInfoFormDto caseReportFormDto) {
         Map<String, Object> map = Maps.newHashMap();
         map.put("srtXml", XstreamUtil.objectToXml(caseReportFormDto));
+        LOGGER.info("strXml" + map.get("srtXml"));
         GridDto girdDto = this.requestGird(ApiConstants.newSendInputInfo, map, GridDto.class);
         if (girdDto == null) {
             LOGGER.error("案件上报失败，案件内部编号:{}", caseReportFormDto.getHotLinesn());

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

@@ -23,12 +23,12 @@ public class CommonConstants {
     /**
      * 案件属性
      */
-    public static String INFO_TYPE_ID="1";
+    public static String INFO_TYPE_ID = "18";
 
     /**
      * 案件大类
      */
-    public static String INFO_BC="99";
+    public static String INFO_BC = "01";
 
     /**
      * 案件小类

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

@@ -1,10 +1,13 @@
 package com.elink.esua.epdc.gird.shibei.util;
 
 import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.basic.DateConverter;
 import com.thoughtworks.xstream.io.xml.DomDriver;
 import com.thoughtworks.xstream.io.xml.XmlFriendlyNameCoder;
 import com.thoughtworks.xstream.io.xml.XppDriver;
 
+import java.util.TimeZone;
+
 /**
  * @author rongchao
  * @Date 18-12-4
@@ -37,6 +40,7 @@ public class XstreamUtil {
     public static String objectToXml(Object obj) {
         //解决下划线问题
         XStream xStream = new XStream(new XppDriver(new XmlFriendlyNameCoder("_-", "_")));
+        xStream.registerConverter(new DateConverter("yyyy-MM-dd HH:mm:ss", null, TimeZone.getTimeZone("GMT+8")));
         XStream.setupDefaultSecurity(xStream);
         xStream.allowTypes(new Class[]{obj.getClass()});
         //xstream使用注解转换

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

@@ -17,8 +17,8 @@
 
 package com.elink.esua.epdc.modules.item.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -78,60 +78,70 @@ public class GridPlatformHandleLogEntity extends BaseEpdcEntity {
 	 * 必填
 	 * 派遣时间（格式：yyyy-MM-dd HH24:mm:ss）
 	 */
+	@TableField(value = "DispatchTime")
 	private String dispatchTime;
 
 	/**
 	 * 必填
 	 * 派遣部门编号
 	 */
+	@TableField(value = "DeptCode")
 	private String deptCode;
 
 	/**
 	 * 必填
 	 * 派遣部门名称
 	 */
+	@TableField(value = "DeptName")
 	private String deptName;
 
 	/**
 	 * 必填
 	 * 主责部门编号
 	 */
+	@TableField(value = "ExecDeptCode")
 	private String execDeptCode;
 
 	/**
 	 * 必填
 	 * 主责部门名称
 	 */
+	@TableField(value = "ExecDeptName")
 	private String execDeptName;
 
 	/**
 	 * 必填
 	 * 到场时间要求（分钟数）
 	 */
+	@TableField(value = "CArriveTime")
 	private int carriveTime;
 
 	/**
 	 * 必填
 	 * 处置时间要求（分钟数）
 	 */
+	@TableField(value = "CSolvingTime")
 	private int csolvingTime;
 
 	/**
 	 * 必填
 	 * 到场截止时间（格式：yyyy-MM-dd HH24:mm:ss）
 	 */
+	@TableField(value = "ArriveTime")
 	private String arriveTime;
 
 	/**
 	 * 必填
 	 * 处置截止时间（格式：yyyy-MM-dd HH24:mm:ss）
 	 */
+	@TableField(value = "SolvingTime")
 	private String solvingTime;
 
 	/**
 	 * 必填
 	 * 派遣意见
 	 */
+	@TableField(value = "SolvingNote")
 	private String solvingNote;
 
 	//结案新增
@@ -140,24 +150,28 @@ public class GridPlatformHandleLogEntity extends BaseEpdcEntity {
 	 * 必填
 	 * 结案时间（格式：yyyy-MM-dd HH24:mm:ss）
 	 */
+	@TableField(value = "EndTime")
 	private String endTime;
 
 	/**
 	 * 必填
 	 * 最终处理时间（格式：yyyy-MM-dd HH24:mm:ss）
 	 */
+	@TableField(value = "LastSolvingTime")
 	private String lastSolvingTime;
 
 	/**
 	 * 必填
 	 * 结案意见
 	 */
+	@TableField(value = "EndNote")
 	private String endNote;
 
 	/**
 	 * 必填
 	 * 结案评判（实际解决、解释说明等）
 	 */
+	@TableField(value = "BanliResult")
 	private String banliResult;
 
 }

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

@@ -970,9 +970,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 		formDto.setContactMode(itemEntity.getMobile());
         double[] gps= GPSUtils.gcj02_To_Gps84(itemEntity.getIssueLatitude(),itemEntity.getIssueLongitude());
 		// 坐标X
-		formDto.setCoordX(new BigDecimal(gps[0]));
+        formDto.setCoordX(new BigDecimal(gps[1]));
 		// 坐标Y
-		formDto.setCoordY(new BigDecimal(gps[1]));
+        formDto.setCoordY(new BigDecimal(gps[0]));
 		// 监督员编号
 		formDto.setKeepersn("");
 		// 操作时间