diff --git a/src/main/java/com/zcloud/controller/dw/DwController.java b/src/main/java/com/zcloud/controller/dw/DwController.java index b520591d..9dfb6123 100644 --- a/src/main/java/com/zcloud/controller/dw/DwController.java +++ b/src/main/java/com/zcloud/controller/dw/DwController.java @@ -40,7 +40,7 @@ public class DwController extends BaseController { @RequestMapping(value = "saveOrUpdateMap") public Object saveOrUpdateMap() throws Exception { PageData pd = this.getPageData(); - MapInfo mapGet = JSONObject.parseObject(JSONObject.toJSONString(pd), MapInfo.class); + MapInfo mapGet = JSONObject.parseObject(pd.getString("data"), MapInfo.class); return dwService.saveOrUpdateMap(mapGet); } diff --git a/src/main/java/com/zcloud/service/dw/impl/DwServiceImpl.java b/src/main/java/com/zcloud/service/dw/impl/DwServiceImpl.java index 3f8589ae..287f843d 100644 --- a/src/main/java/com/zcloud/service/dw/impl/DwServiceImpl.java +++ b/src/main/java/com/zcloud/service/dw/impl/DwServiceImpl.java @@ -1,17 +1,25 @@ package com.zcloud.service.dw.impl; +import com.zcloud.entity.PageData; +import com.zcloud.service.bus.CorpInfoService; import com.zcloud.service.dw.DwService; import com.zcloud.service.dw.dto.*; import com.zcloud.util.HttpUtil; +import com.zcloud.util.Jurisdiction; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import javax.annotation.Resource; + @Service public class DwServiceImpl implements DwService { @Value("${dw.url}") private String url; + @Resource + private CorpInfoService corpInfoService; + @Override public Object getMapList(MapGet param) throws Exception { @@ -20,6 +28,14 @@ public class DwServiceImpl implements DwService { @Override public Object saveOrUpdateMap(MapInfo param) throws Exception { + param.getRequired().setCreatorId(Jurisdiction.getUSER_ID()); + param.getRequired().setCreatorName(Jurisdiction.getName()); + param.getRequired().setOperatorId(Jurisdiction.getUSER_ID()); + param.getRequired().setOperatorName(Jurisdiction.getName()); + param.getRequired().setCorpId(Jurisdiction.getCORPINFO_ID()); + PageData condition = new PageData(); + condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + param.getRequired().setCorpName(corpInfoService.findById(condition).getString("CORP_NAME")); return HttpUtil.post(url + "dw/saveOrUpdateMap", param); }