diff --git a/fill-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceCallbackController.java b/fill-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceCallbackController.java index 6b9fa95d3d406f6d39b52a0d19ecc91a1754b4c5..f2505f3c7c52a0d490f511556f4dc7e4d1fb0bdc 100644 --- a/fill-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceCallbackController.java +++ b/fill-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceCallbackController.java @@ -56,24 +56,16 @@ public class DeviceCallbackController { matterEntity.setId(null); matterEntity.setSiteId(copySiteId); - matterService.save(matterEntity); + matterService.getMatterDao().insert(matterEntity); matterDatumEntity.setMatterId(matterEntity.getId()); matterDatumEntity.setId(null); matterDatumEntity.setSiteId(copySiteId); - matterDatumService.save(matterDatumEntity); + matterDatumService.getMatterDatumDao().insert(matterDatumEntity); } - - - - } - - - - } diff --git a/fill-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterDatumService.java b/fill-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterDatumService.java index 3262714bf57ab23c71eab54000d594c5b5fb87c3..c921e98ed4dc01ba1e97bb6254f3cdc436d76eab 100644 --- a/fill-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterDatumService.java +++ b/fill-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterDatumService.java @@ -2,6 +2,8 @@ package com.mortals.xhx.module.matter.service; import com.mortals.framework.common.Rest; import com.mortals.framework.model.Context; 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; /** * MatterDatumService @@ -13,6 +15,9 @@ import com.mortals.xhx.module.matter.model.MatterDatumEntity; */ public interface MatterDatumService extends ICRUDService<MatterDatumEntity,Long>{ + + MatterDatumDao getMatterDatumDao(); + /** * 鍚堟垚doc鏁版嵁妯℃澘 * @param context diff --git a/fill-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterService.java b/fill-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterService.java index a35945ec7b9f8d60bea8ef5334d2c1e97596fc0b..1aea49823ad0025663e5b9937fe76fda46624c9b 100644 --- a/fill-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterService.java +++ b/fill-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterService.java @@ -5,6 +5,7 @@ import com.mortals.framework.model.Context; import com.mortals.framework.model.PageInfo; import com.mortals.framework.model.Result; import com.mortals.framework.service.ICRUDService; +import com.mortals.xhx.module.matter.dao.MatterDao; import com.mortals.xhx.module.matter.model.MatterEntity; /** * MatterService @@ -16,6 +17,9 @@ import com.mortals.xhx.module.matter.model.MatterEntity; */ public interface MatterService extends ICRUDService<MatterEntity,Long>{ + MatterDao getMatterDao(); + + /** * 绔欑偣浜嬮」杞郴缁熶簨椤� * @param sheetMatterIds diff --git a/fill-manager/src/test/java/com/mortals/httpclient/system.http b/fill-manager/src/test/java/com/mortals/httpclient/system.http index 2521c83db3ba1d9f2c12db11f95c18506ae73b73..a9ea0bc4da92582eda9fb13c862815f251dfc1e1 100644 --- a/fill-manager/src/test/java/com/mortals/httpclient/system.http +++ b/fill-manager/src/test/java/com/mortals/httpclient/system.http @@ -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 {}