Commit 34b592eb authored by 赵啸非's avatar 赵啸非

修改同步业务逻辑

parent af74f424
Pipeline #2871 canceled with stages
...@@ -56,24 +56,16 @@ public class DeviceCallbackController { ...@@ -56,24 +56,16 @@ public class DeviceCallbackController {
matterEntity.setId(null); matterEntity.setId(null);
matterEntity.setSiteId(copySiteId); matterEntity.setSiteId(copySiteId);
matterService.save(matterEntity); matterService.getMatterDao().insert(matterEntity);
matterDatumEntity.setMatterId(matterEntity.getId()); matterDatumEntity.setMatterId(matterEntity.getId());
matterDatumEntity.setId(null); matterDatumEntity.setId(null);
matterDatumEntity.setSiteId(copySiteId); matterDatumEntity.setSiteId(copySiteId);
matterDatumService.save(matterDatumEntity); matterDatumService.getMatterDatumDao().insert(matterDatumEntity);
} }
} }
} }
......
...@@ -2,6 +2,8 @@ package com.mortals.xhx.module.matter.service; ...@@ -2,6 +2,8 @@ package com.mortals.xhx.module.matter.service;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.service.ICRUDService; import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.matter.dao.MatterDao;
import com.mortals.xhx.module.matter.dao.MatterDatumDao;
import com.mortals.xhx.module.matter.model.MatterDatumEntity; import com.mortals.xhx.module.matter.model.MatterDatumEntity;
/** /**
* MatterDatumService * MatterDatumService
...@@ -13,6 +15,9 @@ import com.mortals.xhx.module.matter.model.MatterDatumEntity; ...@@ -13,6 +15,9 @@ import com.mortals.xhx.module.matter.model.MatterDatumEntity;
*/ */
public interface MatterDatumService extends ICRUDService<MatterDatumEntity,Long>{ public interface MatterDatumService extends ICRUDService<MatterDatumEntity,Long>{
MatterDatumDao getMatterDatumDao();
/** /**
* 合成doc数据模板 * 合成doc数据模板
* @param context * @param context
......
...@@ -5,6 +5,7 @@ import com.mortals.framework.model.Context; ...@@ -5,6 +5,7 @@ import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo; import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result; import com.mortals.framework.model.Result;
import com.mortals.framework.service.ICRUDService; import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.matter.dao.MatterDao;
import com.mortals.xhx.module.matter.model.MatterEntity; import com.mortals.xhx.module.matter.model.MatterEntity;
/** /**
* MatterService * MatterService
...@@ -16,6 +17,9 @@ import com.mortals.xhx.module.matter.model.MatterEntity; ...@@ -16,6 +17,9 @@ import com.mortals.xhx.module.matter.model.MatterEntity;
*/ */
public interface MatterService extends ICRUDService<MatterEntity,Long>{ public interface MatterService extends ICRUDService<MatterEntity,Long>{
MatterDao getMatterDao();
/** /**
* 站点事项转系统事项 * 站点事项转系统事项
* @param sheetMatterIds * @param sheetMatterIds
......
...@@ -75,7 +75,7 @@ Content-Type: application/json ...@@ -75,7 +75,7 @@ Content-Type: application/json
###站点树 ###站点树
GET {{baseUrl}}//api/device/copy GET http://192.168.0.250:17215/fm/api/device/copy
Content-Type: application/json Content-Type: application/json
{} {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment