瀏覽代碼

OBJ_工程表都关联完成

Lin Qilong 1 周之前
父節點
當前提交
0d7b10cdf1
共有 36 個文件被更改,包括 740 次插入115 次删除
  1. 6 0
      gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjAd.java
  2. 6 0
      gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjCws.java
  3. 6 0
      gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjDike.java
  4. 7 7
      gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjEng.java
  5. 6 0
      gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjHyst.java
  6. 6 0
      gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjIrr.java
  7. 6 0
      gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjLk.java
  8. 14 0
      gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjOthe.java
  9. 6 0
      gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjProj.java
  10. 6 0
      gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjPust.java
  11. 14 0
      gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjRes.java
  12. 6 0
      gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjRv.java
  13. 6 0
      gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjSd.java
  14. 6 0
      gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjWadi.java
  15. 6 0
      gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjWaga.java
  16. 85 0
      gw-common/src/main/java/com/goldenwater/common/core/mapper/ObjSyncMapper.java
  17. 31 9
      gw-slaj/src/main/java/com/goldenwater/slaj/eng/service/impl/AttEngCwsServiceImpl.java
  18. 33 9
      gw-slaj/src/main/java/com/goldenwater/slaj/eng/service/impl/AttEngDikeServiceImpl.java
  19. 23 4
      gw-slaj/src/main/java/com/goldenwater/slaj/eng/service/impl/AttEngHystServiceImpl.java
  20. 23 4
      gw-slaj/src/main/java/com/goldenwater/slaj/eng/service/impl/AttEngIrrServiceImpl.java
  21. 31 9
      gw-slaj/src/main/java/com/goldenwater/slaj/eng/service/impl/AttEngOtheServiceImpl.java
  22. 23 4
      gw-slaj/src/main/java/com/goldenwater/slaj/eng/service/impl/AttEngPustServiceImpl.java
  23. 23 4
      gw-slaj/src/main/java/com/goldenwater/slaj/eng/service/impl/AttEngSdServiceImpl.java
  24. 23 4
      gw-slaj/src/main/java/com/goldenwater/slaj/eng/service/impl/AttEngWadiServiceImpl.java
  25. 25 4
      gw-slaj/src/main/java/com/goldenwater/slaj/eng/service/impl/AttEngWagaServiceImpl.java
  26. 2 1
      gw-slaj/src/main/java/com/goldenwater/slaj/hidd/controller/ObjEngController.java
  27. 6 2
      gw-slaj/src/main/java/com/goldenwater/slaj/hidd/domain/AttEngBase.java
  28. 2 1
      gw-slaj/src/main/java/com/goldenwater/slaj/hidd/mapper/ObjEngMapper.java
  29. 2 1
      gw-slaj/src/main/java/com/goldenwater/slaj/hidd/service/IObjEngService.java
  30. 48 20
      gw-slaj/src/main/java/com/goldenwater/slaj/hidd/service/impl/AttEngBaseServiceImpl.java
  31. 2 1
      gw-slaj/src/main/java/com/goldenwater/slaj/hidd/service/impl/ObjEngServiceImpl.java
  32. 32 10
      gw-slaj/src/main/java/com/goldenwater/slaj/sins/service/impl/AttEngResServiceImpl.java
  33. 5 5
      gw-slaj/src/main/resources/mapper/slaj/hidd/ObjEngMapper.xml
  34. 24 6
      gw-system/src/main/java/com/goldenwater/system/service/impl/AttAdBaseServiceImpl.java
  35. 29 10
      gw-system/src/main/java/com/goldenwater/system/service/impl/AttProjBaseServiceImpl.java
  36. 161 0
      gw-system/src/main/resources/mapper/system/ObjSyncMapper.xml

+ 6 - 0
gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjAd.java

@@ -0,0 +1,6 @@
+package com.goldenwater.common.core.domain.obj;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+public class ObjAd { private String guid; private String adCode; private String adName; private Date fromDate; private Date toDate; }

+ 6 - 0
gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjCws.java

@@ -0,0 +1,6 @@
+package com.goldenwater.common.core.domain.obj;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+public class ObjCws { private String guid; private String cwsCode; private String cwsName; private Date fromDate; private Date toDate; }

+ 6 - 0
gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjDike.java

@@ -0,0 +1,6 @@
+package com.goldenwater.common.core.domain.obj;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+public class ObjDike { private String guid; private String dikeCode; private String dikeName; private Date fromDate; private Date toDate; }

+ 7 - 7
gw-slaj/src/main/java/com/goldenwater/slaj/hidd/domain/ObjEng.java → gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjEng.java

@@ -1,10 +1,8 @@
-package com.goldenwater.slaj.hidd.domain;
-
+package com.goldenwater.common.core.domain.obj;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import java.util.Date;
 
-/**
- * 工程信息表 obj_eng
- */
 @Data
 public class ObjEng {
     /** 主键 */
@@ -16,9 +14,11 @@ public class ObjEng {
     /** 工程类型 */
     private String engType;
     /** 属性建立时间 */
-    private String fromDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date fromDate;
     /** 属性终止时间 */
-    private String toDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date toDate;
     /** 无效字段 */
     private String pubGuid;
     /** 迁转指定单位 */

+ 6 - 0
gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjHyst.java

@@ -0,0 +1,6 @@
+package com.goldenwater.common.core.domain.obj;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+public class ObjHyst { private String guid; private String hystCode; private String hystName; private Date fromDate; private Date toDate; }

+ 6 - 0
gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjIrr.java

@@ -0,0 +1,6 @@
+package com.goldenwater.common.core.domain.obj;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+public class ObjIrr { private String guid; private String irrCode; private String irrName; private Date fromDate; private Date toDate; }

+ 6 - 0
gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjLk.java

@@ -0,0 +1,6 @@
+package com.goldenwater.common.core.domain.obj;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+public class ObjLk { private String guid; private String lkCode; private String lkName; private Date fromDate; private Date toDate; }

+ 14 - 0
gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjOthe.java

@@ -0,0 +1,14 @@
+package com.goldenwater.common.core.domain.obj;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ObjOthe {
+    private String guid;
+    private String objCode;
+    private String objName;
+    private Date fromDate;
+    private Date toDate;
+}

+ 6 - 0
gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjProj.java

@@ -0,0 +1,6 @@
+package com.goldenwater.common.core.domain.obj;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+public class ObjProj { private String guid; private String projCode; private String projName; private Date fromDate; private Date toDate; }

+ 6 - 0
gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjPust.java

@@ -0,0 +1,6 @@
+package com.goldenwater.common.core.domain.obj;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+public class ObjPust { private String guid; private String pustCode; private String pustName; private Date fromDate; private Date toDate; }

+ 14 - 0
gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjRes.java

@@ -0,0 +1,14 @@
+package com.goldenwater.common.core.domain.obj;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ObjRes {
+    private String guid;
+    private String resCode;
+    private String resName;
+    private Date fromDate;
+    private Date toDate;
+}

+ 6 - 0
gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjRv.java

@@ -0,0 +1,6 @@
+package com.goldenwater.common.core.domain.obj;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+public class ObjRv { private String guid; private String rvCode; private String rvName; private Date fromDate; private Date toDate; }

+ 6 - 0
gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjSd.java

@@ -0,0 +1,6 @@
+package com.goldenwater.common.core.domain.obj;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+public class ObjSd { private String guid; private String sdCode; private String sdName; private Date fromDate; private Date toDate; }

+ 6 - 0
gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjWadi.java

@@ -0,0 +1,6 @@
+package com.goldenwater.common.core.domain.obj;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+public class ObjWadi { private String guid; private String wadiCode; private String wadiName; private Date fromDate; private Date toDate; }

+ 6 - 0
gw-common/src/main/java/com/goldenwater/common/core/domain/obj/ObjWaga.java

@@ -0,0 +1,6 @@
+package com.goldenwater.common.core.domain.obj;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+public class ObjWaga { private String guid; private String wagaCode; private String wagaName; private Date fromDate; private Date toDate; }

+ 85 - 0
gw-common/src/main/java/com/goldenwater/common/core/mapper/ObjSyncMapper.java

@@ -0,0 +1,85 @@
+package com.goldenwater.common.core.mapper;
+
+import com.goldenwater.common.core.domain.obj.*;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ObjSyncMapper {
+    int insertObjEng(ObjEng obj);
+
+    int updateObjEng(ObjEng obj);
+
+    int deleteObjEng(String guid);
+
+    int insertObjRes(ObjRes obj);
+
+    int updateObjRes(ObjRes obj);
+
+    int deleteObjRes(String guid);
+
+    int insertObjWaga(ObjWaga obj);
+
+    int updateObjWaga(ObjWaga obj);
+
+    int deleteObjWaga(String guid);
+
+    int insertObjPust(ObjPust obj);
+
+    int updateObjPust(ObjPust obj);
+
+    int deleteObjPust(String guid);
+
+    int insertObjHyst(ObjHyst obj);
+
+    int updateObjHyst(ObjHyst obj);
+
+    int deleteObjHyst(String guid);
+
+    int insertObjDike(ObjDike obj);
+
+    int updateObjDike(ObjDike obj);
+
+    int deleteObjDike(String guid);
+
+    int insertObjIrr(ObjIrr obj);
+
+    int updateObjIrr(ObjIrr obj);
+
+    int deleteObjIrr(String guid);
+
+    int insertObjWadi(ObjWadi obj);
+
+    int updateObjWadi(ObjWadi obj);
+
+    int deleteObjWadi(String guid);
+
+    int insertObjSd(ObjSd obj);
+
+    int updateObjSd(ObjSd obj);
+
+    int deleteObjSd(String guid);
+
+    int insertObjCws(ObjCws obj);
+
+    int updateObjCws(ObjCws obj);
+
+    int deleteObjCws(String guid);
+
+    int insertObjOthe(ObjOthe obj);
+
+    int updateObjOthe(ObjOthe obj);
+
+    int deleteObjOthe(String guid);
+
+    int insertObjProj(ObjProj obj);
+
+    int updateObjProj(ObjProj obj);
+
+    int deleteObjProj(String guid);
+
+    int insertObjAd(ObjAd obj);
+
+    int updateObjAd(ObjAd obj);
+
+    int deleteObjAd(String guid);
+}

+ 31 - 9
gw-slaj/src/main/java/com/goldenwater/slaj/eng/service/impl/AttEngCwsServiceImpl.java

@@ -1,21 +1,25 @@
 package com.goldenwater.slaj.eng.service.impl;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
+import com.goldenwater.common.core.domain.obj.ObjCws;
+import com.goldenwater.common.core.mapper.ObjSyncMapper;
 import com.goldenwater.common.utils.uuid.IdUtils;
 import com.goldenwater.slaj.common.utils.EntityUtils;
 import com.goldenwater.slaj.eng.domain.AttEngCws;
 import com.goldenwater.slaj.eng.mapper.AttEngCwsMapper;
 import com.goldenwater.slaj.eng.service.IEngAttrService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
 
 @Service("cwsEngAttrService")
 public class AttEngCwsServiceImpl implements IEngAttrService<AttEngCws> {
 
     @Autowired
     private AttEngCwsMapper attEngCwsMapper;
+    @Autowired
+    private ObjSyncMapper objSyncMapper;
 
     @Override
     public AttEngCws selectByGuid(String guid) {
@@ -32,23 +36,41 @@ public class AttEngCwsServiceImpl implements IEngAttrService<AttEngCws> {
         String guid = IdUtils.fastSimpleUUID();
         entity.setGuid(guid);
         entity.setEngGuid(guid);
+        entity.setCollTime(new Date());
         EntityUtils.emptyStringToNull(entity);
-        return attEngCwsMapper.insert(entity);
+        int rows = attEngCwsMapper.insert(entity);
+        if (rows > 0) syncObj(entity);
+        return rows;
     }
 
     @Override
     public int update(AttEngCws entity) {
         EntityUtils.emptyStringToNull(entity);
-        return attEngCwsMapper.update(entity);
+        int rows = attEngCwsMapper.update(entity);
+        if (rows > 0) syncObj(entity);
+        return rows;
     }
 
     @Override
     public int deleteByGuid(String guid) {
-        return attEngCwsMapper.deleteByGuid(guid);
+        int rows = attEngCwsMapper.deleteByGuid(guid);
+        if (rows > 0) objSyncMapper.deleteObjCws(guid);
+        return rows;
     }
 
     @Override
     public int deleteByGuids(String[] guids) {
-        return attEngCwsMapper.deleteByGuids(guids);
+        int rows = attEngCwsMapper.deleteByGuids(guids);
+        if (rows > 0) { for (String guid : guids) objSyncMapper.deleteObjCws(guid); }
+        return rows;
+    }
+
+    private void syncObj(AttEngCws e) {
+        ObjCws o = new ObjCws();
+        o.setGuid(e.getGuid());
+        o.setCwsCode(e.getCwsCode());
+        o.setCwsName(e.getEngName());
+        o.setFromDate(e.getCollTime());
+        objSyncMapper.insertObjCws(o);  // upsert via ON CONFLICT
     }
 }

+ 33 - 9
gw-slaj/src/main/java/com/goldenwater/slaj/eng/service/impl/AttEngDikeServiceImpl.java

@@ -1,21 +1,25 @@
 package com.goldenwater.slaj.eng.service.impl;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
+import com.goldenwater.common.core.domain.obj.ObjDike;
+import com.goldenwater.common.core.mapper.ObjSyncMapper;
 import com.goldenwater.common.utils.uuid.IdUtils;
 import com.goldenwater.slaj.common.utils.EntityUtils;
 import com.goldenwater.slaj.eng.domain.AttEngDike;
 import com.goldenwater.slaj.eng.mapper.AttEngDikeMapper;
 import com.goldenwater.slaj.eng.service.IEngAttrService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
 
 @Service("dikeEngAttrService")
 public class AttEngDikeServiceImpl implements IEngAttrService<AttEngDike> {
 
     @Autowired
     private AttEngDikeMapper attEngDikeMapper;
+    @Autowired
+    private ObjSyncMapper objSyncMapper;
 
     @Override
     public AttEngDike selectByGuid(String guid) {
@@ -32,23 +36,43 @@ public class AttEngDikeServiceImpl implements IEngAttrService<AttEngDike> {
         String guid = IdUtils.fastSimpleUUID();
         entity.setGuid(guid);
         entity.setEngGuid(guid);
+        entity.setCollTime(new Date());
         EntityUtils.emptyStringToNull(entity);
-        return attEngDikeMapper.insert(entity);
+        int rows = attEngDikeMapper.insert(entity);
+        if (rows > 0) syncObj(entity);
+        return rows;
     }
 
     @Override
     public int update(AttEngDike entity) {
         EntityUtils.emptyStringToNull(entity);
-        return attEngDikeMapper.update(entity);
+        int rows = attEngDikeMapper.update(entity);
+        if (rows > 0) syncObj(entity);
+        return rows;
     }
 
     @Override
     public int deleteByGuid(String guid) {
-        return attEngDikeMapper.deleteByGuid(guid);
+        int rows = attEngDikeMapper.deleteByGuid(guid);
+        if (rows > 0) objSyncMapper.deleteObjDike(guid);
+        return rows;
     }
 
     @Override
     public int deleteByGuids(String[] guids) {
-        return attEngDikeMapper.deleteByGuids(guids);
+        int rows = attEngDikeMapper.deleteByGuids(guids);
+        if (rows > 0) {
+            for (String guid : guids) objSyncMapper.deleteObjDike(guid);
+        }
+        return rows;
+    }
+
+    private void syncObj(AttEngDike e) {
+        ObjDike o = new ObjDike();
+        o.setGuid(e.getGuid());
+        o.setDikeCode(e.getDikeCode());
+        o.setDikeName(e.getEngName());
+        o.setFromDate(e.getCollTime());
+        objSyncMapper.insertObjDike(o);  // upsert via ON CONFLICT
     }
 }

+ 23 - 4
gw-slaj/src/main/java/com/goldenwater/slaj/eng/service/impl/AttEngHystServiceImpl.java

@@ -1,5 +1,6 @@
 package com.goldenwater.slaj.eng.service.impl;
 
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +10,8 @@ import com.goldenwater.common.utils.uuid.IdUtils;
 import com.goldenwater.slaj.common.utils.EntityUtils;
 import com.goldenwater.slaj.eng.domain.AttEngHyst;
 import com.goldenwater.slaj.eng.mapper.AttEngHystMapper;
+import com.goldenwater.common.core.mapper.ObjSyncMapper;
+import com.goldenwater.common.core.domain.obj.ObjHyst;
 import com.goldenwater.slaj.eng.service.IEngAttrService;
 
 @Service("hystEngAttrService")
@@ -16,6 +19,8 @@ public class AttEngHystServiceImpl implements IEngAttrService<AttEngHyst> {
 
     @Autowired
     private AttEngHystMapper attEngHystMapper;
+    @Autowired
+    private ObjSyncMapper objSyncMapper;
 
     @Override
     public AttEngHyst selectByGuid(String guid) {
@@ -32,23 +37,37 @@ public class AttEngHystServiceImpl implements IEngAttrService<AttEngHyst> {
         String guid = IdUtils.fastSimpleUUID();
         entity.setGuid(guid);
         entity.setEngGuid(guid);
+        entity.setCollTime(new Date());
         EntityUtils.emptyStringToNull(entity);
-        return attEngHystMapper.insert(entity);
+        int rows = attEngHystMapper.insert(entity);
+        if (rows > 0) syncObj(entity);
+        return rows;
     }
 
     @Override
     public int update(AttEngHyst entity) {
         EntityUtils.emptyStringToNull(entity);
-        return attEngHystMapper.update(entity);
+        int rows = attEngHystMapper.update(entity);
+        if (rows > 0) syncObj(entity);
+        return rows;
     }
 
     @Override
     public int deleteByGuid(String guid) {
-        return attEngHystMapper.deleteByGuid(guid);
+        int rows = attEngHystMapper.deleteByGuid(guid);
+        if (rows > 0) objSyncMapper.deleteObjHyst(guid);
+        return rows;
     }
 
     @Override
     public int deleteByGuids(String[] guids) {
-        return attEngHystMapper.deleteByGuids(guids);
+        int rows = attEngHystMapper.deleteByGuids(guids);
+        if (rows > 0) { for (String guid : guids) objSyncMapper.deleteObjHyst(guid); }
+        return rows;
+    }
+    private void syncObj(AttEngHyst e) {
+        ObjHyst o = new ObjHyst(); o.setGuid(e.getGuid()); o.setHystCode(e.getHystCode());
+        o.setHystName(e.getEngName()); o.setFromDate(e.getCollTime());
+        objSyncMapper.insertObjHyst(o);  // upsert via ON CONFLICT
     }
 }

+ 23 - 4
gw-slaj/src/main/java/com/goldenwater/slaj/eng/service/impl/AttEngIrrServiceImpl.java

@@ -1,5 +1,6 @@
 package com.goldenwater.slaj.eng.service.impl;
 
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +10,8 @@ import com.goldenwater.common.utils.uuid.IdUtils;
 import com.goldenwater.slaj.common.utils.EntityUtils;
 import com.goldenwater.slaj.eng.domain.AttEngIrr;
 import com.goldenwater.slaj.eng.mapper.AttEngIrrMapper;
+import com.goldenwater.common.core.mapper.ObjSyncMapper;
+import com.goldenwater.common.core.domain.obj.ObjIrr;
 import com.goldenwater.slaj.eng.service.IEngAttrService;
 
 @Service("irrEngAttrService")
@@ -16,6 +19,8 @@ public class AttEngIrrServiceImpl implements IEngAttrService<AttEngIrr> {
 
     @Autowired
     private AttEngIrrMapper attEngIrrMapper;
+    @Autowired
+    private ObjSyncMapper objSyncMapper;
 
     @Override
     public AttEngIrr selectByGuid(String guid) {
@@ -32,23 +37,37 @@ public class AttEngIrrServiceImpl implements IEngAttrService<AttEngIrr> {
         String guid = IdUtils.fastSimpleUUID();
         entity.setGuid(guid);
         entity.setEngGuid(guid);
+        entity.setCollTime(new Date());
         EntityUtils.emptyStringToNull(entity);
-        return attEngIrrMapper.insert(entity);
+        int rows = attEngIrrMapper.insert(entity);
+        if (rows > 0) syncObj(entity);
+        return rows;
     }
 
     @Override
     public int update(AttEngIrr entity) {
         EntityUtils.emptyStringToNull(entity);
-        return attEngIrrMapper.update(entity);
+        int rows = attEngIrrMapper.update(entity);
+        if (rows > 0) syncObj(entity);
+        return rows;
     }
 
     @Override
     public int deleteByGuid(String guid) {
-        return attEngIrrMapper.deleteByGuid(guid);
+        int rows = attEngIrrMapper.deleteByGuid(guid);
+        if (rows > 0) objSyncMapper.deleteObjIrr(guid);
+        return rows;
     }
 
     @Override
     public int deleteByGuids(String[] guids) {
-        return attEngIrrMapper.deleteByGuids(guids);
+        int rows = attEngIrrMapper.deleteByGuids(guids);
+        if (rows > 0) { for (String guid : guids) objSyncMapper.deleteObjIrr(guid); }
+        return rows;
+    }
+    private void syncObj(AttEngIrr e) {
+        ObjIrr o = new ObjIrr(); o.setGuid(e.getGuid()); o.setIrrCode(e.getIrrCode());
+        o.setIrrName(e.getEngName()); o.setFromDate(e.getCollTime());
+        objSyncMapper.insertObjIrr(o);  // upsert via ON CONFLICT
     }
 }

+ 31 - 9
gw-slaj/src/main/java/com/goldenwater/slaj/eng/service/impl/AttEngOtheServiceImpl.java

@@ -1,21 +1,25 @@
 package com.goldenwater.slaj.eng.service.impl;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
+import com.goldenwater.common.core.domain.obj.ObjOthe;
+import com.goldenwater.common.core.mapper.ObjSyncMapper;
 import com.goldenwater.common.utils.uuid.IdUtils;
 import com.goldenwater.slaj.common.utils.EntityUtils;
 import com.goldenwater.slaj.eng.domain.AttEngOthe;
 import com.goldenwater.slaj.eng.mapper.AttEngOtheMapper;
 import com.goldenwater.slaj.eng.service.IEngAttrService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
 
 @Service("otheEngAttrService")
 public class AttEngOtheServiceImpl implements IEngAttrService<AttEngOthe> {
 
     @Autowired
     private AttEngOtheMapper attEngOtheMapper;
+    @Autowired
+    private ObjSyncMapper objSyncMapper;
 
     @Override
     public AttEngOthe selectByGuid(String guid) {
@@ -32,23 +36,41 @@ public class AttEngOtheServiceImpl implements IEngAttrService<AttEngOthe> {
         String guid = IdUtils.fastSimpleUUID();
         entity.setGuid(guid);
         entity.setEngGuid(guid);
+        entity.setCollTime(new Date());
         EntityUtils.emptyStringToNull(entity);
-        return attEngOtheMapper.insert(entity);
+        int rows = attEngOtheMapper.insert(entity);
+        if (rows > 0) syncObj(entity);
+        return rows;
     }
 
     @Override
     public int update(AttEngOthe entity) {
         EntityUtils.emptyStringToNull(entity);
-        return attEngOtheMapper.update(entity);
+        int rows = attEngOtheMapper.update(entity);
+        if (rows > 0) syncObj(entity);
+        return rows;
     }
 
     @Override
     public int deleteByGuid(String guid) {
-        return attEngOtheMapper.deleteByGuid(guid);
+        int rows = attEngOtheMapper.deleteByGuid(guid);
+        if (rows > 0) objSyncMapper.deleteObjOthe(guid);
+        return rows;
     }
 
     @Override
     public int deleteByGuids(String[] guids) {
-        return attEngOtheMapper.deleteByGuids(guids);
+        int rows = attEngOtheMapper.deleteByGuids(guids);
+        if (rows > 0) { for (String guid : guids) objSyncMapper.deleteObjOthe(guid); }
+        return rows;
+    }
+
+    private void syncObj(AttEngOthe e) {
+        ObjOthe o = new ObjOthe();
+        o.setGuid(e.getGuid());
+        o.setObjCode(e.getObjCode());
+        o.setObjName(e.getEngName());
+        o.setFromDate(e.getCollTime());
+        objSyncMapper.insertObjOthe(o);  // upsert via ON CONFLICT
     }
 }

+ 23 - 4
gw-slaj/src/main/java/com/goldenwater/slaj/eng/service/impl/AttEngPustServiceImpl.java

@@ -1,5 +1,6 @@
 package com.goldenwater.slaj.eng.service.impl;
 
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +10,8 @@ import com.goldenwater.common.utils.uuid.IdUtils;
 import com.goldenwater.slaj.common.utils.EntityUtils;
 import com.goldenwater.slaj.eng.domain.AttEngPust;
 import com.goldenwater.slaj.eng.mapper.AttEngPustMapper;
+import com.goldenwater.common.core.mapper.ObjSyncMapper;
+import com.goldenwater.common.core.domain.obj.ObjPust;
 import com.goldenwater.slaj.eng.service.IEngAttrService;
 
 @Service("pustEngAttrService")
@@ -16,6 +19,8 @@ public class AttEngPustServiceImpl implements IEngAttrService<AttEngPust> {
 
     @Autowired
     private AttEngPustMapper attEngPustMapper;
+    @Autowired
+    private ObjSyncMapper objSyncMapper;
 
     @Override
     public AttEngPust selectByGuid(String guid) {
@@ -32,23 +37,37 @@ public class AttEngPustServiceImpl implements IEngAttrService<AttEngPust> {
         String guid = IdUtils.fastSimpleUUID();
         entity.setGuid(guid);
         entity.setEngGuid(guid);
+        entity.setCollTime(new Date());
         EntityUtils.emptyStringToNull(entity);
-        return attEngPustMapper.insert(entity);
+        int rows = attEngPustMapper.insert(entity);
+        if (rows > 0) syncObj(entity);
+        return rows;
     }
 
     @Override
     public int update(AttEngPust entity) {
         EntityUtils.emptyStringToNull(entity);
-        return attEngPustMapper.update(entity);
+        int rows = attEngPustMapper.update(entity);
+        if (rows > 0) syncObj(entity);
+        return rows;
     }
 
     @Override
     public int deleteByGuid(String guid) {
-        return attEngPustMapper.deleteByGuid(guid);
+        int rows = attEngPustMapper.deleteByGuid(guid);
+        if (rows > 0) objSyncMapper.deleteObjPust(guid);
+        return rows;
     }
 
     @Override
     public int deleteByGuids(String[] guids) {
-        return attEngPustMapper.deleteByGuids(guids);
+        int rows = attEngPustMapper.deleteByGuids(guids);
+        if (rows > 0) { for (String guid : guids) objSyncMapper.deleteObjPust(guid); }
+        return rows;
+    }
+    private void syncObj(AttEngPust e) {
+        ObjPust o = new ObjPust(); o.setGuid(e.getGuid()); o.setPustCode(e.getPustCode());
+        o.setPustName(e.getEngName()); o.setFromDate(e.getCollTime());
+        objSyncMapper.insertObjPust(o);  // upsert via ON CONFLICT
     }
 }

+ 23 - 4
gw-slaj/src/main/java/com/goldenwater/slaj/eng/service/impl/AttEngSdServiceImpl.java

@@ -1,5 +1,6 @@
 package com.goldenwater.slaj.eng.service.impl;
 
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +10,8 @@ import com.goldenwater.common.utils.uuid.IdUtils;
 import com.goldenwater.slaj.common.utils.EntityUtils;
 import com.goldenwater.slaj.eng.domain.AttEngSd;
 import com.goldenwater.slaj.eng.mapper.AttEngSdMapper;
+import com.goldenwater.common.core.mapper.ObjSyncMapper;
+import com.goldenwater.common.core.domain.obj.ObjSd;
 import com.goldenwater.slaj.eng.service.IEngAttrService;
 
 @Service("sdEngAttrService")
@@ -16,6 +19,8 @@ public class AttEngSdServiceImpl implements IEngAttrService<AttEngSd> {
 
     @Autowired
     private AttEngSdMapper attEngSdMapper;
+    @Autowired
+    private ObjSyncMapper objSyncMapper;
 
     @Override
     public AttEngSd selectByGuid(String guid) {
@@ -32,23 +37,37 @@ public class AttEngSdServiceImpl implements IEngAttrService<AttEngSd> {
         String guid = IdUtils.fastSimpleUUID();
         entity.setGuid(guid);
         entity.setEngGuid(guid);
+        entity.setCollTime(new Date());
         EntityUtils.emptyStringToNull(entity);
-        return attEngSdMapper.insert(entity);
+        int rows = attEngSdMapper.insert(entity);
+        if (rows > 0) syncObj(entity);
+        return rows;
     }
 
     @Override
     public int update(AttEngSd entity) {
         EntityUtils.emptyStringToNull(entity);
-        return attEngSdMapper.update(entity);
+        int rows = attEngSdMapper.update(entity);
+        if (rows > 0) syncObj(entity);
+        return rows;
     }
 
     @Override
     public int deleteByGuid(String guid) {
-        return attEngSdMapper.deleteByGuid(guid);
+        int rows = attEngSdMapper.deleteByGuid(guid);
+        if (rows > 0) objSyncMapper.deleteObjSd(guid);
+        return rows;
     }
 
     @Override
     public int deleteByGuids(String[] guids) {
-        return attEngSdMapper.deleteByGuids(guids);
+        int rows = attEngSdMapper.deleteByGuids(guids);
+        if (rows > 0) { for (String guid : guids) objSyncMapper.deleteObjSd(guid); }
+        return rows;
+    }
+    private void syncObj(AttEngSd e) {
+        ObjSd o = new ObjSd(); o.setGuid(e.getGuid()); o.setSdCode(e.getSdCode());
+        o.setSdName(e.getEngName()); o.setFromDate(e.getCollTime());
+        objSyncMapper.insertObjSd(o);  // upsert via ON CONFLICT
     }
 }

+ 23 - 4
gw-slaj/src/main/java/com/goldenwater/slaj/eng/service/impl/AttEngWadiServiceImpl.java

@@ -1,5 +1,6 @@
 package com.goldenwater.slaj.eng.service.impl;
 
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +10,8 @@ import com.goldenwater.common.utils.uuid.IdUtils;
 import com.goldenwater.slaj.common.utils.EntityUtils;
 import com.goldenwater.slaj.eng.domain.AttEngWadi;
 import com.goldenwater.slaj.eng.mapper.AttEngWadiMapper;
+import com.goldenwater.common.core.mapper.ObjSyncMapper;
+import com.goldenwater.common.core.domain.obj.ObjWadi;
 import com.goldenwater.slaj.eng.service.IEngAttrService;
 
 @Service("wadiEngAttrService")
@@ -16,6 +19,8 @@ public class AttEngWadiServiceImpl implements IEngAttrService<AttEngWadi> {
 
     @Autowired
     private AttEngWadiMapper attEngWadiMapper;
+    @Autowired
+    private ObjSyncMapper objSyncMapper;
 
     @Override
     public AttEngWadi selectByGuid(String guid) {
@@ -32,23 +37,37 @@ public class AttEngWadiServiceImpl implements IEngAttrService<AttEngWadi> {
         String guid = IdUtils.fastSimpleUUID();
         entity.setGuid(guid);
         entity.setEngGuid(guid);
+        entity.setCollTime(new Date());
         EntityUtils.emptyStringToNull(entity);
-        return attEngWadiMapper.insert(entity);
+        int rows = attEngWadiMapper.insert(entity);
+        if (rows > 0) syncObj(entity);
+        return rows;
     }
 
     @Override
     public int update(AttEngWadi entity) {
         EntityUtils.emptyStringToNull(entity);
-        return attEngWadiMapper.update(entity);
+        int rows = attEngWadiMapper.update(entity);
+        if (rows > 0) syncObj(entity);
+        return rows;
     }
 
     @Override
     public int deleteByGuid(String guid) {
-        return attEngWadiMapper.deleteByGuid(guid);
+        int rows = attEngWadiMapper.deleteByGuid(guid);
+        if (rows > 0) objSyncMapper.deleteObjWadi(guid);
+        return rows;
     }
 
     @Override
     public int deleteByGuids(String[] guids) {
-        return attEngWadiMapper.deleteByGuids(guids);
+        int rows = attEngWadiMapper.deleteByGuids(guids);
+        if (rows > 0) { for (String guid : guids) objSyncMapper.deleteObjWadi(guid); }
+        return rows;
+    }
+    private void syncObj(AttEngWadi e) {
+        ObjWadi o = new ObjWadi(); o.setGuid(e.getGuid()); o.setWadiCode(e.getWadiCode());
+        o.setWadiName(e.getEngName()); o.setFromDate(e.getCollTime());
+        objSyncMapper.insertObjWadi(o);  // upsert via ON CONFLICT
     }
 }

+ 25 - 4
gw-slaj/src/main/java/com/goldenwater/slaj/eng/service/impl/AttEngWagaServiceImpl.java

@@ -1,5 +1,6 @@
 package com.goldenwater.slaj.eng.service.impl;
 
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -7,6 +8,8 @@ import org.springframework.stereotype.Service;
 
 import com.goldenwater.common.utils.uuid.IdUtils;
 import com.goldenwater.slaj.common.utils.EntityUtils;
+import com.goldenwater.common.core.mapper.ObjSyncMapper;
+import com.goldenwater.common.core.domain.obj.ObjWaga;
 import com.goldenwater.slaj.eng.domain.AttEngWaga;
 import com.goldenwater.slaj.eng.mapper.AttEngWagaMapper;
 import com.goldenwater.slaj.eng.service.IEngAttrService;
@@ -17,6 +20,9 @@ public class AttEngWagaServiceImpl implements IEngAttrService<AttEngWaga> {
     @Autowired
     private AttEngWagaMapper attEngWagaMapper;
 
+    @Autowired
+    private ObjSyncMapper objSyncMapper;
+
     @Override
     public AttEngWaga selectByGuid(String guid) {
         return attEngWagaMapper.selectByGuid(guid);
@@ -32,23 +38,38 @@ public class AttEngWagaServiceImpl implements IEngAttrService<AttEngWaga> {
         String guid = IdUtils.fastSimpleUUID();
         entity.setGuid(guid);
         entity.setEngGuid(guid);
+        entity.setCollTime(new Date());
         EntityUtils.emptyStringToNull(entity);
-        return attEngWagaMapper.insert(entity);
+        int rows = attEngWagaMapper.insert(entity);
+        if (rows > 0) syncObj(entity);
+        return rows;
     }
 
     @Override
     public int update(AttEngWaga entity) {
         EntityUtils.emptyStringToNull(entity);
-        return attEngWagaMapper.update(entity);
+        int rows = attEngWagaMapper.update(entity);
+        if (rows > 0) syncObj(entity);
+        return rows;
     }
 
     @Override
     public int deleteByGuid(String guid) {
-        return attEngWagaMapper.deleteByGuid(guid);
+        int rows = attEngWagaMapper.deleteByGuid(guid);
+        if (rows > 0) objSyncMapper.deleteObjWaga(guid);
+        return rows;
+    }
+
+    private void syncObj(AttEngWaga e) {
+        ObjWaga o = new ObjWaga(); o.setGuid(e.getGuid()); o.setWagaCode(e.getWagaCode());
+        o.setWagaName(e.getEngName()); o.setFromDate(e.getCollTime());
+        objSyncMapper.insertObjWaga(o);  // upsert via ON CONFLICT
     }
 
     @Override
     public int deleteByGuids(String[] guids) {
-        return attEngWagaMapper.deleteByGuids(guids);
+        int rows = attEngWagaMapper.deleteByGuids(guids);
+        if (rows > 0) { for (String guid : guids) objSyncMapper.deleteObjWaga(guid); }
+        return rows;
     }
 }

+ 2 - 1
gw-slaj/src/main/java/com/goldenwater/slaj/hidd/controller/ObjEngController.java

@@ -1,12 +1,13 @@
 package com.goldenwater.slaj.hidd.controller;
 
 import java.util.List;
+
+import com.goldenwater.common.core.domain.obj.ObjEng;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.goldenwater.common.core.controller.BaseController;
 import com.goldenwater.common.core.domain.AjaxResult;
 import com.goldenwater.common.core.page.TableDataInfo;
-import com.goldenwater.slaj.hidd.domain.ObjEng;
 import com.goldenwater.slaj.hidd.service.IObjEngService;
 
 /**

+ 6 - 2
gw-slaj/src/main/java/com/goldenwater/slaj/hidd/domain/AttEngBase.java

@@ -1,7 +1,9 @@
 package com.goldenwater.slaj.hidd.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 工程基础信息表 att_eng_base
@@ -89,9 +91,11 @@ public class AttEngBase {
     /** 更新时间 */
     private String updTime;
     /** 开始时间 */
-    private String fromDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date fromDate;
     /** 结束时间 */
-    private String toDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date toDate;
     /** 记录人 */
     private String recPers;
     /** 工程编码 */

+ 2 - 1
gw-slaj/src/main/java/com/goldenwater/slaj/hidd/mapper/ObjEngMapper.java

@@ -1,8 +1,9 @@
 package com.goldenwater.slaj.hidd.mapper;
 
 import java.util.List;
+
+import com.goldenwater.common.core.domain.obj.ObjEng;
 import org.apache.ibatis.annotations.Mapper;
-import com.goldenwater.slaj.hidd.domain.ObjEng;
 
 /**
  * 工程信息 数据层

+ 2 - 1
gw-slaj/src/main/java/com/goldenwater/slaj/hidd/service/IObjEngService.java

@@ -1,7 +1,8 @@
 package com.goldenwater.slaj.hidd.service;
 
+import com.goldenwater.common.core.domain.obj.ObjEng;
+
 import java.util.List;
-import com.goldenwater.slaj.hidd.domain.ObjEng;
 
 /**
  * 工程信息 服务层

+ 48 - 20
gw-slaj/src/main/java/com/goldenwater/slaj/hidd/service/impl/AttEngBaseServiceImpl.java

@@ -1,11 +1,14 @@
 package com.goldenwater.slaj.hidd.service.impl;
 
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.goldenwater.slaj.hidd.mapper.AttEngBaseMapper;
+import com.goldenwater.common.core.domain.obj.ObjEng;
+import com.goldenwater.common.core.mapper.ObjSyncMapper;
 import com.goldenwater.slaj.hidd.domain.AttEngBase;
+import com.goldenwater.slaj.hidd.mapper.AttEngBaseMapper;
 import com.goldenwater.slaj.hidd.service.IAttEngBaseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 工程基础信息 服务层实现
@@ -16,8 +19,12 @@ public class AttEngBaseServiceImpl implements IAttEngBaseService {
     @Autowired
     private AttEngBaseMapper attEngBaseMapper;
 
+    @Autowired
+    private ObjSyncMapper objSyncMapper;
+
     /**
      * 查询工程基础信息信息
+     *
      * @param guid 查询条件
      * @return 工程基础信息信息
      */
@@ -28,6 +35,7 @@ public class AttEngBaseServiceImpl implements IAttEngBaseService {
 
     /**
      * 查询工程基础信息列表
+     *
      * @param attEngBase 工程基础信息查询条件
      * @return 工程基础信息集合
      */
@@ -38,41 +46,61 @@ public class AttEngBaseServiceImpl implements IAttEngBaseService {
 
     /**
      * 新增工程基础信息
+     *
      * @param attEngBase 工程基础信息信息
      * @return 影响行数
      */
     @Override
-    public int insertAttEngBase(AttEngBase attEngBase) {
-        return attEngBaseMapper.insertAttEngBase(attEngBase);
+    public int insertAttEngBase(AttEngBase e) {
+        int rows = attEngBaseMapper.insertAttEngBase(e);
+        if (rows > 0) syncObjEng(e);
+        return rows;
     }
 
-    /**
-     * 修改工程基础信息
-     * @param attEngBase 工程基础信息信息
-     * @return 影响行数
-     */
     @Override
-    public int updateAttEngBase(AttEngBase attEngBase) {
-        return attEngBaseMapper.updateAttEngBase(attEngBase);
+    public int updateAttEngBase(AttEngBase e) {
+        int rows = attEngBaseMapper.updateAttEngBase(e);
+        if (rows > 0) syncObjEng(e);
+        return rows;
     }
 
-    /**
-     * 删除工程基础信息
-     * @param guid 工程基础信息主键
-     * @return 影响行数
-     */
     @Override
     public int deleteAttEngBaseByGuid(String guid) {
-        return attEngBaseMapper.deleteAttEngBaseByGuid(guid);
+        int rows = attEngBaseMapper.deleteAttEngBaseByGuid(guid);
+        if (rows > 0) objSyncMapper.deleteObjEng(guid);
+        return rows;
+    }
+
+    private void syncObjEng(AttEngBase e) {
+        ObjEng o = new ObjEng();
+        o.setGuid(e.getGuid());
+        o.setEngCode(e.getEngCode());
+        o.setEngName(e.getEngName());
+        o.setEngType(e.getEngType());
+        o.setFromDate(e.getFromDate());
+        o.setToDate(e.getToDate());
+        objSyncMapper.insertObjEng(o);
+    }
+
+    private java.util.Date parseDate(String s) {
+        if (s == null || s.isEmpty()) return null;
+        try {
+            return new java.text.SimpleDateFormat("yyyy-MM-dd").parse(s);
+        } catch (Exception ex) {
+            return null;
+        }
     }
 
     /**
      * 批量删除工程基础信息
+     *
      * @param guids 工程基础信息主键数组
      * @return 影响行数
      */
     @Override
     public int deleteAttEngBaseByGuids(String[] guids) {
-        return attEngBaseMapper.deleteAttEngBaseByGuids(guids);
+        int rows = attEngBaseMapper.deleteAttEngBaseByGuids(guids);
+        if (rows > 0) { for (String guid : guids) objSyncMapper.deleteObjEng(guid); }
+        return rows;
     }
 }

+ 2 - 1
gw-slaj/src/main/java/com/goldenwater/slaj/hidd/service/impl/ObjEngServiceImpl.java

@@ -1,10 +1,11 @@
 package com.goldenwater.slaj.hidd.service.impl;
 
 import java.util.List;
+
+import com.goldenwater.common.core.domain.obj.ObjEng;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.goldenwater.slaj.hidd.mapper.ObjEngMapper;
-import com.goldenwater.slaj.hidd.domain.ObjEng;
 import com.goldenwater.slaj.hidd.service.IObjEngService;
 
 /**

+ 32 - 10
gw-slaj/src/main/java/com/goldenwater/slaj/sins/service/impl/AttEngResServiceImpl.java

@@ -1,5 +1,7 @@
 package com.goldenwater.slaj.sins.service.impl;
 
+import com.goldenwater.common.core.domain.obj.ObjRes;
+import com.goldenwater.common.core.mapper.ObjSyncMapper;
 import com.goldenwater.common.utils.uuid.IdUtils;
 import com.goldenwater.slaj.common.utils.EntityUtils;
 import com.goldenwater.slaj.sins.domain.AttEngRes;
@@ -17,6 +19,9 @@ public class AttEngResServiceImpl implements IAttEngResService {
     @Autowired
     private AttEngResMapper attEngResMapper;
 
+    @Autowired
+    private ObjSyncMapper objSyncMapper;
+
     @Override
     public AttEngRes selectAttEngResByGuid(String guid) {
         return attEngResMapper.selectAttEngResByGuid(guid);
@@ -28,27 +33,44 @@ public class AttEngResServiceImpl implements IAttEngResService {
     }
 
     @Override
-    public int insertAttEngRes(AttEngRes attEngRes) {
+    public int insertAttEngRes(AttEngRes e) {
         String guid = IdUtils.fastSimpleUUID();
-        attEngRes.setGuid(guid);
-        attEngRes.setEngGuid(guid);
-        attEngRes.setCollTime(new Date());
-        EntityUtils.emptyStringToNull(attEngRes);
-        return attEngResMapper.insertAttEngRes(attEngRes);
+        e.setGuid(guid);
+        e.setEngGuid(guid);
+        e.setCollTime(new Date());
+        EntityUtils.emptyStringToNull(e);
+        int rows = attEngResMapper.insertAttEngRes(e);
+        if (rows > 0) syncObj(e);
+        return rows;
     }
 
     @Override
-    public int updateAttEngRes(AttEngRes attEngRes) {
-        return attEngResMapper.updateAttEngRes(attEngRes);
+    public int updateAttEngRes(AttEngRes e) {
+        int rows = attEngResMapper.updateAttEngRes(e);
+        if (rows > 0) syncObj(e);
+        return rows;
     }
 
     @Override
     public int deleteAttEngResByGuid(String guid) {
-        return attEngResMapper.deleteAttEngResByGuid(guid);
+        int rows = attEngResMapper.deleteAttEngResByGuid(guid);
+        if (rows > 0) objSyncMapper.deleteObjRes(guid);
+        return rows;
+    }
+
+    private void syncObj(AttEngRes e) {
+        ObjRes o = new ObjRes();
+        o.setGuid(e.getGuid());
+        o.setResCode(e.getResCode());
+        o.setResName(e.getEngName());
+        o.setFromDate(e.getCollTime());
+        objSyncMapper.insertObjRes(o);
     }
 
     @Override
     public int deleteAttEngResByGuids(String[] guids) {
-        return attEngResMapper.deleteAttEngResByGuids(guids);
+        int rows = attEngResMapper.deleteAttEngResByGuids(guids);
+        if (rows > 0) { for (String guid : guids) objSyncMapper.deleteObjRes(guid); }
+        return rows;
     }
 }

+ 5 - 5
gw-slaj/src/main/resources/mapper/slaj/hidd/ObjEngMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goldenwater.slaj.hidd.mapper.ObjEngMapper">
-    <resultMap type="com.goldenwater.slaj.hidd.domain.ObjEng" id="ObjEngResult">
+    <resultMap type="com.goldenwater.common.core.domain.obj.ObjEng" id="ObjEngResult">
         <result property="guid" column="guid"/>
         <result property="engCode" column="eng_code"/>
         <result property="engName" column="eng_name"/>
@@ -23,18 +23,18 @@
         <include refid="selectObjEngVo"/>
         where guid = #{guid}
     </select>
-    <select id="selectObjEngList" parameterType="com.goldenwater.slaj.hidd.domain.ObjEng" resultMap="ObjEngResult">
+    <select id="selectObjEngList" parameterType="com.goldenwater.common.core.domain.obj.ObjEng" resultMap="ObjEngResult">
         <include refid="selectObjEngVo"/>
         <where>
             <if test="engName != null and engName != ''">AND eng_name like '%' || #{engName} || '%'</if>
             <if test="engType != null and engType != ''">AND eng_type = #{engType}</if>
         </where>
     </select>
-    <insert id="insertObjEng" parameterType="com.goldenwater.slaj.hidd.domain.ObjEng">
+    <insert id="insertObjEng" parameterType="com.goldenwater.common.core.domain.obj.ObjEng">
         insert into obj_eng (guid, eng_code, eng_name, eng_type, from_date, to_date, pub_guid, org_jurd, org_rest, old_code, manage_mode)
         values (#{guid}, #{engCode}, #{engName}, #{engType}, #{fromDate}, #{toDate}, #{pubGuid}, #{orgJurd}, #{orgRest}, #{oldCode}, #{manageMode})
     </insert>
-    <update id="updateObjEng" parameterType="com.goldenwater.slaj.hidd.domain.ObjEng">
+    <update id="updateObjEng" parameterType="com.goldenwater.common.core.domain.obj.ObjEng">
         update obj_eng
         <set>
             <if test="engCode != null">eng_code = #{engCode},</if>
@@ -55,7 +55,7 @@
     </delete>
     <delete id="deleteObjEngByGuids" parameterType="String">
         delete from obj_eng where guid in
-        <foreach item="guid" collection="array" open="(" separator="," close=")">
+        <foreach item="guid" collection="guids" open="(" separator="," close=")">
             #{guid}
         </foreach>
     </delete>

+ 24 - 6
gw-system/src/main/java/com/goldenwater/system/service/impl/AttAdBaseServiceImpl.java

@@ -4,6 +4,8 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.goldenwater.common.core.domain.entity.AttAdBase;
+import com.goldenwater.common.core.mapper.ObjSyncMapper;
+import com.goldenwater.common.core.domain.obj.ObjAd;
 import com.goldenwater.system.mapper.AttAdBaseMapper;
 import com.goldenwater.system.service.IAttAdBaseService;
 
@@ -18,6 +20,9 @@ public class AttAdBaseServiceImpl implements IAttAdBaseService
     @Autowired
     private AttAdBaseMapper attAdBaseMapper;
 
+    @Autowired
+    private ObjSyncMapper objSyncMapper;
+
     @Override
     public List<AttAdBase> selectAttAdBaseList(AttAdBase attAdBase) {
         return attAdBaseMapper.selectAttAdBaseList(attAdBase);
@@ -29,22 +34,35 @@ public class AttAdBaseServiceImpl implements IAttAdBaseService
     }
 
     @Override
-    public int insertAttAdBase(AttAdBase attAdBase) {
-        return attAdBaseMapper.insertAttAdBase(attAdBase);
+    public int insertAttAdBase(AttAdBase e) {
+        int rows = attAdBaseMapper.insertAttAdBase(e);
+        if (rows > 0) syncObj(e);
+        return rows;
     }
 
     @Override
-    public int updateAttAdBase(AttAdBase attAdBase) {
-        return attAdBaseMapper.updateAttAdBase(attAdBase);
+    public int updateAttAdBase(AttAdBase e) {
+        int rows = attAdBaseMapper.updateAttAdBase(e);
+        if (rows > 0) syncObj(e);
+        return rows;
     }
 
     @Override
     public int deleteAttAdBaseById(String guid) {
-        return attAdBaseMapper.deleteAttAdBaseById(guid);
+        int rows = attAdBaseMapper.deleteAttAdBaseById(guid);
+        if (rows > 0) objSyncMapper.deleteObjAd(guid);
+        return rows;
+    }
+
+    private void syncObj(AttAdBase e) {
+        ObjAd o = new ObjAd(); o.setGuid(e.getGuid()); o.setAdCode(e.getAdCode());
+        o.setAdName(e.getAdName()); objSyncMapper.insertObjAd(o);
     }
 
     @Override
     public int deleteAttAdBaseByIds(String[] guids) {
-        return attAdBaseMapper.deleteAttAdBaseByIds(guids);
+        int rows = attAdBaseMapper.deleteAttAdBaseByIds(guids);
+        if (rows > 0) { for (String guid : guids) objSyncMapper.deleteObjAd(guid); }
+        return rows;
     }
 }

+ 29 - 10
gw-system/src/main/java/com/goldenwater/system/service/impl/AttProjBaseServiceImpl.java

@@ -1,6 +1,8 @@
 package com.goldenwater.system.service.impl;
 
 import com.goldenwater.common.core.domain.entity.AttProjBase;
+import com.goldenwater.common.core.mapper.ObjSyncMapper;
+import com.goldenwater.common.core.domain.obj.ObjProj;
 import com.goldenwater.common.utils.SecurityUtils;
 import com.goldenwater.common.utils.uuid.IdUtils;
 import com.goldenwater.system.mapper.AttProjBaseMapper;
@@ -21,6 +23,9 @@ public class AttProjBaseServiceImpl implements IAttProjBaseService {
     @Autowired
     private AttProjBaseMapper attProjBaseMapper;
 
+    @Autowired
+    private ObjSyncMapper objSyncMapper;
+
     @Override
     public List<AttProjBase> selectAttProjBaseList(AttProjBase attProjBase) {
         return attProjBaseMapper.selectAttProjBaseList(attProjBase);
@@ -32,26 +37,40 @@ public class AttProjBaseServiceImpl implements IAttProjBaseService {
     }
 
     @Override
-    public int insertAttProjBase(AttProjBase attProjBase) {
-        attProjBase.setGuid(IdUtils.fastSimpleUUID());
-        attProjBase.setCollTime(new Date());
-        attProjBase.setRecPers(SecurityUtils.getUserId());
-        return attProjBaseMapper.insertAttProjBase(attProjBase);
+    public int insertAttProjBase(AttProjBase e) {
+        e.setGuid(IdUtils.fastSimpleUUID());
+        e.setCollTime(new Date());
+        e.setRecPers(SecurityUtils.getUserId());
+        int rows = attProjBaseMapper.insertAttProjBase(e);
+        if (rows > 0) syncObj(e);
+        return rows;
     }
 
     @Override
-    public int updateAttProjBase(AttProjBase attProjBase) {
-        attProjBase.setUpdTime(new Date());
-        return attProjBaseMapper.updateAttProjBase(attProjBase);
+    public int updateAttProjBase(AttProjBase e) {
+        e.setUpdTime(new Date());
+        int rows = attProjBaseMapper.updateAttProjBase(e);
+        if (rows > 0) syncObj(e);
+        return rows;
     }
 
     @Override
     public int deleteAttProjBaseById(String guid) {
-        return attProjBaseMapper.deleteAttProjBaseById(guid);
+        int rows = attProjBaseMapper.deleteAttProjBaseById(guid);
+        if (rows > 0) objSyncMapper.deleteObjProj(guid);
+        return rows;
+    }
+
+    private void syncObj(AttProjBase e) {
+        ObjProj o = new ObjProj(); o.setGuid(e.getGuid()); o.setProjCode(e.getProjCode());
+        o.setProjName(e.getProjName()); o.setFromDate(e.getProjBegDate());
+        objSyncMapper.insertObjProj(o);
     }
 
     @Override
     public int deleteAttProjBaseByIds(String[] guids) {
-        return attProjBaseMapper.deleteAttProjBaseByIds(guids);
+        int rows = attProjBaseMapper.deleteAttProjBaseByIds(guids);
+        if (rows > 0) { for (String guid : guids) objSyncMapper.deleteObjProj(guid); }
+        return rows;
     }
 }

+ 161 - 0
gw-system/src/main/resources/mapper/system/ObjSyncMapper.xml

@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goldenwater.common.core.mapper.ObjSyncMapper">
+
+    <insert id="insertObjEng" parameterType="com.goldenwater.common.core.domain.obj.ObjEng">
+        insert into OBJ_ENG (GUID, ENG_CODE, ENG_NAME, ENG_TYPE, FROM_DATE, TO_DATE)
+        values (#{guid}, #{engCode}, #{engName}, #{engType}, #{fromDate}, #{toDate})
+        on conflict (GUID) do update set ENG_CODE=EXCLUDED.ENG_CODE, ENG_NAME=EXCLUDED.ENG_NAME,
+        ENG_TYPE=EXCLUDED.ENG_TYPE, FROM_DATE=EXCLUDED.FROM_DATE, TO_DATE=EXCLUDED.TO_DATE
+    </insert>
+    <update id="updateObjEng" parameterType="com.goldenwater.common.core.domain.obj.ObjEng">
+        update OBJ_ENG set ENG_CODE=#{engCode}, ENG_NAME=#{engName}, ENG_TYPE=#{engType},
+        FROM_DATE=#{fromDate}, TO_DATE=#{toDate} where GUID=#{guid}
+    </update>
+    <delete id="deleteObjEng" parameterType="String">delete from OBJ_ENG where GUID=#{guid}</delete>
+
+    <insert id="insertObjRes" parameterType="com.goldenwater.common.core.domain.obj.ObjRes">
+        insert into OBJ_RES (GUID, RES_CODE, RES_NAME, FROM_DATE, TO_DATE)
+        values (#{guid}, #{resCode}, #{resName}, #{fromDate}, #{toDate})
+        on conflict (GUID) do update set RES_CODE=EXCLUDED.RES_CODE, RES_NAME=EXCLUDED.RES_NAME,
+        FROM_DATE=EXCLUDED.FROM_DATE, TO_DATE=EXCLUDED.TO_DATE
+    </insert>
+    <update id="updateObjRes" parameterType="com.goldenwater.common.core.domain.obj.ObjRes">
+        update OBJ_RES set RES_CODE=#{resCode}, RES_NAME=#{resName},
+        FROM_DATE=#{fromDate}, TO_DATE=#{toDate} where GUID=#{guid}
+    </update>
+    <delete id="deleteObjRes" parameterType="String">delete from OBJ_RES where GUID=#{guid}</delete>
+
+    <insert id="insertObjWaga" parameterType="com.goldenwater.common.core.domain.obj.ObjWaga">
+        insert into OBJ_WAGA (GUID, WAGA_CODE, WAGA_NAME, FROM_DATE, TO_DATE)
+        values (#{guid}, #{wagaCode}, #{wagaName}, #{fromDate}, #{toDate})
+        on conflict (GUID) do update set WAGA_CODE=EXCLUDED.WAGA_CODE, WAGA_NAME=EXCLUDED.WAGA_NAME,
+        FROM_DATE=EXCLUDED.FROM_DATE, TO_DATE=EXCLUDED.TO_DATE
+    </insert>
+    <update id="updateObjWaga" parameterType="com.goldenwater.common.core.domain.obj.ObjWaga">
+        update OBJ_WAGA set WAGA_CODE=#{wagaCode}, WAGA_NAME=#{wagaName},
+        FROM_DATE=#{fromDate}, TO_DATE=#{toDate} where GUID=#{guid}
+    </update>
+    <delete id="deleteObjWaga" parameterType="String">delete from OBJ_WAGA where GUID=#{guid}</delete>
+
+    <insert id="insertObjPust" parameterType="com.goldenwater.common.core.domain.obj.ObjPust">
+        insert into OBJ_PUST (GUID, PUST_CODE, PUST_NAME, FROM_DATE, TO_DATE)
+        values (#{guid}, #{pustCode}, #{pustName}, #{fromDate}, #{toDate})
+        on conflict (GUID) do update set PUST_CODE=EXCLUDED.PUST_CODE, PUST_NAME=EXCLUDED.PUST_NAME,
+        FROM_DATE=EXCLUDED.FROM_DATE, TO_DATE=EXCLUDED.TO_DATE
+    </insert>
+    <update id="updateObjPust" parameterType="com.goldenwater.common.core.domain.obj.ObjPust">
+        update OBJ_PUST set PUST_CODE=#{pustCode}, PUST_NAME=#{pustName},
+        FROM_DATE=#{fromDate}, TO_DATE=#{toDate} where GUID=#{guid}
+    </update>
+    <delete id="deleteObjPust" parameterType="String">delete from OBJ_PUST where GUID=#{guid}</delete>
+
+    <insert id="insertObjHyst" parameterType="com.goldenwater.common.core.domain.obj.ObjHyst">
+        insert into OBJ_HYST (GUID, HYST_CODE, HYST_NAME, FROM_DATE, TO_DATE)
+        values (#{guid}, #{hystCode}, #{hystName}, #{fromDate}, #{toDate})
+        on conflict (GUID) do update set HYST_CODE=EXCLUDED.HYST_CODE, HYST_NAME=EXCLUDED.HYST_NAME,
+        FROM_DATE=EXCLUDED.FROM_DATE, TO_DATE=EXCLUDED.TO_DATE
+    </insert>
+    <update id="updateObjHyst" parameterType="com.goldenwater.common.core.domain.obj.ObjHyst">
+        update OBJ_HYST set HYST_CODE=#{hystCode}, HYST_NAME=#{hystName},
+        FROM_DATE=#{fromDate}, TO_DATE=#{toDate} where GUID=#{guid}
+    </update>
+    <delete id="deleteObjHyst" parameterType="String">delete from OBJ_HYST where GUID=#{guid}</delete>
+
+    <insert id="insertObjDike" parameterType="com.goldenwater.common.core.domain.obj.ObjDike">
+        insert into OBJ_DIKE (GUID, DIKE_CODE, DIKE_NAME, FROM_DATE, TO_DATE)
+        values (#{guid}, #{dikeCode}, #{dikeName}, #{fromDate}, #{toDate})
+        on conflict (GUID) do update set DIKE_CODE=EXCLUDED.DIKE_CODE, DIKE_NAME=EXCLUDED.DIKE_NAME,
+        FROM_DATE=EXCLUDED.FROM_DATE, TO_DATE=EXCLUDED.TO_DATE
+    </insert>
+    <update id="updateObjDike" parameterType="com.goldenwater.common.core.domain.obj.ObjDike">
+        update OBJ_DIKE set DIKE_CODE=#{dikeCode}, DIKE_NAME=#{dikeName},
+        FROM_DATE=#{fromDate}, TO_DATE=#{toDate} where GUID=#{guid}
+    </update>
+    <delete id="deleteObjDike" parameterType="String">delete from OBJ_DIKE where GUID=#{guid}</delete>
+
+    <insert id="insertObjIrr" parameterType="com.goldenwater.common.core.domain.obj.ObjIrr">
+        insert into OBJ_IRR (GUID, IRR_CODE, IRR_NAME, FROM_DATE, TO_DATE)
+        values (#{guid}, #{irrCode}, #{irrName}, #{fromDate}, #{toDate})
+        on conflict (GUID) do update set IRR_CODE=EXCLUDED.IRR_CODE, IRR_NAME=EXCLUDED.IRR_NAME,
+        FROM_DATE=EXCLUDED.FROM_DATE, TO_DATE=EXCLUDED.TO_DATE
+    </insert>
+    <update id="updateObjIrr" parameterType="com.goldenwater.common.core.domain.obj.ObjIrr">
+        update OBJ_IRR set IRR_CODE=#{irrCode}, IRR_NAME=#{irrName},
+        FROM_DATE=#{fromDate}, TO_DATE=#{toDate} where GUID=#{guid}
+    </update>
+    <delete id="deleteObjIrr" parameterType="String">delete from OBJ_IRR where GUID=#{guid}</delete>
+
+    <insert id="insertObjWadi" parameterType="com.goldenwater.common.core.domain.obj.ObjWadi">
+        insert into OBJ_WADI (GUID, WADI_CODE, WADI_NAME, FROM_DATE, TO_DATE)
+        values (#{guid}, #{wadiCode}, #{wadiName}, #{fromDate}, #{toDate})
+        on conflict (GUID) do update set WADI_CODE=EXCLUDED.WADI_CODE, WADI_NAME=EXCLUDED.WADI_NAME,
+        FROM_DATE=EXCLUDED.FROM_DATE, TO_DATE=EXCLUDED.TO_DATE
+    </insert>
+    <update id="updateObjWadi" parameterType="com.goldenwater.common.core.domain.obj.ObjWadi">
+        update OBJ_WADI set WADI_CODE=#{wadiCode}, WADI_NAME=#{wadiName},
+        FROM_DATE=#{fromDate}, TO_DATE=#{toDate} where GUID=#{guid}
+    </update>
+    <delete id="deleteObjWadi" parameterType="String">delete from OBJ_WADI where GUID=#{guid}</delete>
+
+    <insert id="insertObjSd" parameterType="com.goldenwater.common.core.domain.obj.ObjSd">
+        insert into OBJ_SD (GUID, SD_CODE, SD_NAME, FROM_DATE, TO_DATE)
+        values (#{guid}, #{sdCode}, #{sdName}, #{fromDate}, #{toDate})
+        on conflict (GUID) do update set SD_CODE=EXCLUDED.SD_CODE, SD_NAME=EXCLUDED.SD_NAME,
+        FROM_DATE=EXCLUDED.FROM_DATE, TO_DATE=EXCLUDED.TO_DATE
+    </insert>
+    <update id="updateObjSd" parameterType="com.goldenwater.common.core.domain.obj.ObjSd">
+        update OBJ_SD set SD_CODE=#{sdCode}, SD_NAME=#{sdName},
+        FROM_DATE=#{fromDate}, TO_DATE=#{toDate} where GUID=#{guid}
+    </update>
+    <delete id="deleteObjSd" parameterType="String">delete from OBJ_SD where GUID=#{guid}</delete>
+
+    <insert id="insertObjCws" parameterType="com.goldenwater.common.core.domain.obj.ObjCws">
+        insert into OBJ_CWS (GUID, CWS_CODE, CWS_NAME, FROM_DATE, TO_DATE)
+        values (#{guid}, #{cwsCode}, #{cwsName}, #{fromDate}, #{toDate})
+        on conflict (GUID) do update set CWS_CODE=EXCLUDED.CWS_CODE, CWS_NAME=EXCLUDED.CWS_NAME,
+        FROM_DATE=EXCLUDED.FROM_DATE, TO_DATE=EXCLUDED.TO_DATE
+    </insert>
+    <update id="updateObjCws" parameterType="com.goldenwater.common.core.domain.obj.ObjCws">
+        update OBJ_CWS set CWS_CODE=#{cwsCode}, CWS_NAME=#{cwsName},
+        FROM_DATE=#{fromDate}, TO_DATE=#{toDate} where GUID=#{guid}
+    </update>
+    <delete id="deleteObjCws" parameterType="String">delete from OBJ_CWS where GUID=#{guid}</delete>
+
+    <insert id="insertObjOthe" parameterType="com.goldenwater.common.core.domain.obj.ObjOthe">
+        insert into OBJ_OTHE (GUID, OBJ_CODE, OBJ_NAME, FROM_DATE, TO_DATE)
+        values (#{guid}, #{objCode}, #{objName}, #{fromDate}, #{toDate})
+        on conflict (GUID) do update set OBJ_CODE=EXCLUDED.OBJ_CODE, OBJ_NAME=EXCLUDED.OBJ_NAME,
+        FROM_DATE=EXCLUDED.FROM_DATE, TO_DATE=EXCLUDED.TO_DATE
+    </insert>
+    <update id="updateObjOthe" parameterType="com.goldenwater.common.core.domain.obj.ObjOthe">
+        update OBJ_OTHE set OBJ_CODE=#{objCode}, OBJ_NAME=#{objName},
+        FROM_DATE=#{fromDate}, TO_DATE=#{toDate} where GUID=#{guid}
+    </update>
+    <delete id="deleteObjOthe" parameterType="String">delete from OBJ_OTHE where GUID=#{guid}</delete>
+
+    <insert id="insertObjProj" parameterType="com.goldenwater.common.core.domain.obj.ObjProj">
+        insert into OBJ_PROJ (GUID, PROJ_CODE, PROJ_NAME, FROM_DATE, TO_DATE)
+        values (#{guid}, #{projCode}, #{projName}, #{fromDate}, #{toDate})
+        on conflict (GUID) do update set PROJ_CODE=EXCLUDED.PROJ_CODE, PROJ_NAME=EXCLUDED.PROJ_NAME,
+        FROM_DATE=EXCLUDED.FROM_DATE, TO_DATE=EXCLUDED.TO_DATE
+    </insert>
+    <update id="updateObjProj" parameterType="com.goldenwater.common.core.domain.obj.ObjProj">
+        update OBJ_PROJ set PROJ_CODE=#{projCode}, PROJ_NAME=#{projName},
+        FROM_DATE=#{fromDate}, TO_DATE=#{toDate} where GUID=#{guid}
+    </update>
+    <delete id="deleteObjProj" parameterType="String">delete from OBJ_PROJ where GUID=#{guid}</delete>
+
+    <insert id="insertObjAd" parameterType="com.goldenwater.common.core.domain.obj.ObjAd">
+        insert into OBJ_AD (GUID, AD_CODE, AD_NAME, FROM_DATE, TO_DATE)
+        values (#{guid}, #{adCode}, #{adName}, #{fromDate}, #{toDate})
+        on conflict (GUID) do update set AD_CODE=EXCLUDED.AD_CODE, AD_NAME=EXCLUDED.AD_NAME,
+        FROM_DATE=EXCLUDED.FROM_DATE, TO_DATE=EXCLUDED.TO_DATE
+    </insert>
+    <update id="updateObjAd" parameterType="com.goldenwater.common.core.domain.obj.ObjAd">
+        update OBJ_AD set AD_CODE=#{adCode}, AD_NAME=#{adName},
+        FROM_DATE=#{fromDate}, TO_DATE=#{toDate} where GUID=#{guid}
+    </update>
+    <delete id="deleteObjAd" parameterType="String">delete from OBJ_AD where GUID=#{guid}</delete>
+
+</mapper>