Browse Source

grouping关键字处理

yucheng 3 years ago
parent
commit
a19b0bf0f2

+ 2 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/entity/ObjectDigital.java

@@ -37,7 +37,8 @@ public class ObjectDigital extends AuditableEntity {
     private String classCode;
     /** 集团编码 */
     private String groupCode;
-    /** 组标识 */
+    /** 组标识 mysql8中grouping是关键字,必须标识 */
+    @TableField(value = "`grouping`")
     private Integer grouping;
     /** 边类型编码 */
     @TableField(typeHandler = JacksonTypeHandler.class)

+ 4 - 2
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/digital/service/impl/ObjectDigitalServiceImpl.java

@@ -115,7 +115,7 @@ public class ObjectDigitalServiceImpl implements IObjectDigitalService {
         fillClassCodeForUpdate(voList,dbMap);
         //信息点校验
         Map<String, Map<String, ObjectInfoDefine>> allInfoMap = validateOnSave(voList, true);
-
+        List<ObjectDigital> resultList = new ArrayList<>();
         voList.forEach(vo -> {
             ObjectDigital dbVO = MapUtil.get(dbMap, vo.getId(), ObjectDigital.class);
             // 容错处理
@@ -134,10 +134,11 @@ public class ObjectDigitalServiceImpl implements IObjectDigitalService {
 
             // 修改
             dao.updateById(newDbVO);
+            resultList.add(newDbVO);
             // 修改后消息
             messageSender.sendMessage(DigitalMessageConstant.OPERATE_AFTER_UPDATE, dbVO, newDbVO, false);
         });
-        return voList;
+        return resultList;
     }
 
     @Override
@@ -374,6 +375,7 @@ public class ObjectDigitalServiceImpl implements IObjectDigitalService {
      * @param ids
      * @return
      */
+    @Override
     public Map<String, List<String>> queryVirtualCodeMap(String projectId,String groupCode,List<String> ids) {
         LambdaQueryWrapper<ObjectDigital> wrapper = new LambdaQueryWrapper<>();
         wrapper.select(ObjectDigital::getId, ObjectDigital::getVirtualCodes);