Merge branch 'master' of http://124.70.58.209:3000/buzhanyi/ankaibeiProjectManagement

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/controller/ApplyForCostController.java

@@ -64,6 +64,7 @@ public class ApplyForCostController {
     @RequestMapping("/addCommunication")
     public ResMsg addCommunication(@RequestBody CommunicationInfoVo communicationInfoVo) {
         communicationInfoVo.setCreateUser(TokenData.takeFromRequest().getUserId());
+        communicationInfoVo.setTotalMoney(communicationInfoVo.getApplicationFee());
         return applyForCostService.addCommunication(communicationInfoVo);
     }
 

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/controller/SubmitUserTaskController.java

@@ -303,14 +303,11 @@ public class SubmitUserTaskController {
         } else {
             flowApiService.completeTask(task, flowTaskComment, subVo.getTaskVariableData());
         }
-        int flowTaskStatus = flowWorkOrderService.getFlowWorkOrderByProcessInstanceId(subVo.getProcessInstanceId()).getFlowStatus();
-        log.info("-------------->subVo.getCostType()" + subVo.getCostType());
-        log.info("-------------->CostEnum.getEnumByCode(subVo.getCostType()" + CostEnum.getEnumByCode(subVo.getCostType()));
+        flowStatus = flowWorkOrderService.getFlowWorkOrderByProcessInstanceId(subVo.getProcessInstanceId()).getFlowStatus();
         switch (CostEnum.getEnumByCode(subVo.getCostType())) {
             case PROJECTADD:
                 projectInfoMapper.updateProjectFlowStatus(flowStatus + "", subVo.getApplyDataId());
             case MANHOUR:
-                log.info("-------------->flowStatus------subVo.getApplyDataId()>" + flowStatus+"------"+subVo.getApplyDataId());
                 manHourMapper.updateManHourFlowStatus(flowStatus + "", subVo.getApplyDataId());
             case PROJECTTASKADD:
                 taskInfoMapper.updateTaskFlowStatus(flowStatus + "", subVo.getApplyDataId());

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/service/impl/TaskInfoServiceImpl.java

@@ -242,7 +242,6 @@ public class TaskInfoServiceImpl implements TaskInfoService {
         }
         //任务发起人
         byId.get().setTaskCreator(userInfoMapper.getById(byId.get().getTaskCreator()).getShowName());
-        //byId.get().setTaskPriority(TaskPriority.getEnumByCode(byId.get().getTaskPriority()).getReason());
 
         return new ResMsg(CodeEnum.OK, byId.orElse(null));
     }

common/common-dict/src/main/java/com/ankaibei/workFlow/common/dict/service/GlobalDictItemService.java

@@ -12,7 +12,7 @@ import java.util.List;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface GlobalDictItemService extends IBaseService<GlobalDictItem, Long> {
+public interface GlobalDictItemService extends IBaseService<GlobalDictItem, String> {
 
     /**
      * 保存新增的全局字典项目。

common/common-dict/src/main/java/com/ankaibei/workFlow/common/dict/service/GlobalDictService.java

@@ -15,7 +15,7 @@ import java.util.Set;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface GlobalDictService extends IBaseService<GlobalDict, Long> {
+public interface GlobalDictService extends IBaseService<GlobalDict, String> {
 
     /**
      * 保存全局字典对象。

common/common-dict/src/main/java/com/ankaibei/workFlow/common/dict/service/TenantGlobalDictItemService.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface TenantGlobalDictItemService extends IBaseService<TenantGlobalDictItem, Long> {
+public interface TenantGlobalDictItemService extends IBaseService<TenantGlobalDictItem, String> {
 
     /**
      * 保存新增的租户字典项目。

common/common-dict/src/main/java/com/ankaibei/workFlow/common/dict/service/impl/GlobalDictItemServiceImpl.java

@@ -29,8 +29,7 @@ import java.util.List;
  */
 @Slf4j
 @Service("globalDictItemService")
-public class GlobalDictItemServiceImpl
-        extends BaseService<GlobalDictItem, Long> implements GlobalDictItemService {
+public class GlobalDictItemServiceImpl extends BaseService<GlobalDictItem, String> implements GlobalDictItemService {
 
     @Autowired
     private GlobalDictItemMapper globalDictItemMapper;

common/common-dict/src/main/java/com/ankaibei/workFlow/common/dict/service/impl/GlobalDictServiceImpl.java

@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service("globalDictService")
-public class GlobalDictServiceImpl extends BaseService<GlobalDict, Long> implements GlobalDictService {
+public class GlobalDictServiceImpl extends BaseService<GlobalDict, String> implements GlobalDictService {
 
     @Autowired
     private GlobalDictMapper globalDictMapper;

common/common-dict/src/main/java/com/ankaibei/workFlow/common/dict/service/impl/TenantGlobalDictItemServiceImpl.java

@@ -33,8 +33,7 @@ import java.util.List;
 @MyDataSource(ApplicationConstant.TENANT_GLOBAL_DICT_DATASOURCE_TYPE)
 @Slf4j
 @Service("tenantGlobalDictItemService")
-public class TenantGlobalDictItemServiceImpl
-        extends BaseService<TenantGlobalDictItem, Long> implements TenantGlobalDictItemService {
+public class TenantGlobalDictItemServiceImpl extends BaseService<TenantGlobalDictItem, String> implements TenantGlobalDictItemService {
 
     @Autowired
     private TenantGlobalDictItemMapper tenantGlobalDictItemMapper;

common/common-flow/src/main/java/com/ankaibei/workFlow/common/flow/controller/FlowEntryController.java

@@ -292,10 +292,10 @@ public class FlowEntryController {
     @OperationLog(type = SysOperationLogType.UPDATE)
     @PostMapping("/updateMainVersion")
     public ResponseResult<Void> updateMainVersion(
-            @MyRequestBody(required = true) Long entryId,
-            @MyRequestBody(required = true) Long newEntryPublishId) {
+            @MyRequestBody(required = true) String entryId,
+            @MyRequestBody(required = true) String newEntryPublishId) {
         String errorMessage;
-        FlowEntryPublish flowEntryPublish = flowEntryService.getFlowEntryPublishFromCache(newEntryPublishId + "");
+        FlowEntryPublish flowEntryPublish = flowEntryService.getFlowEntryPublishFromCache(newEntryPublishId);
         if (flowEntryPublish == null) {
             errorMessage = "数据验证失败，当前流程发布版本并不存在，请刷新后重试！";
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);

common/common-log/src/main/java/com/ankaibei/workFlow/common/log/service/SysOperationLogService.java

@@ -11,7 +11,7 @@ import java.util.List;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface SysOperationLogService extends IBaseService<SysOperationLog, Long> {
+public interface SysOperationLogService extends IBaseService<SysOperationLog, String> {
 
     /**
      * 异步的插入一条新操作日志。

common/common-log/src/main/java/com/ankaibei/workFlow/common/log/service/impl/SysOperationLogServiceImpl.java

@@ -26,7 +26,7 @@ import java.util.List;
  */
 @MyDataSource(ApplicationConstant.OPERATION_LOG_DATASOURCE_TYPE)
 @Service
-public class SysOperationLogServiceImpl extends BaseService<SysOperationLog, Long> implements SysOperationLogService {
+public class SysOperationLogServiceImpl extends BaseService<SysOperationLog, String> implements SysOperationLogService {
 
     @Autowired
     private SysOperationLogMapper sysOperationLogMapper;

common/common-online-api/src/main/java/com/ankaibei/workFlow/common/online/api/controller/OnlineDatasourceRelationController.java

@@ -221,7 +221,7 @@ public class OnlineDatasourceRelationController {
      * @return 应答结果对象，包含对象详情。
      */
     @GetMapping("/view")
-    public ResponseResult<OnlineDatasourceRelationVo> view(@RequestParam Long relationId) {
+    public ResponseResult<OnlineDatasourceRelationVo> view(@RequestParam String relationId) {
         if (MyCommonUtil.existBlankArgument(relationId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }

common/common-online-api/src/main/java/com/ankaibei/workFlow/common/online/api/controller/OnlineDictController.java

@@ -151,7 +151,7 @@ public class OnlineDictController {
      * @return 应答结果对象，包含对象详情。
      */
     @GetMapping("/view")
-    public ResponseResult<OnlineDictVo> view(@RequestParam Long dictId) {
+    public ResponseResult<OnlineDictVo> view(@RequestParam String dictId) {
         if (MyCommonUtil.existBlankArgument(dictId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }

common/common-online-api/src/main/java/com/ankaibei/workFlow/common/online/api/controller/OnlineFormController.java

@@ -212,7 +212,7 @@ public class OnlineFormController {
      * @return 应答结果对象，包含对象详情。
      */
     @GetMapping("/view")
-    public ResponseResult<OnlineFormVo> view(@RequestParam Long formId) {
+    public ResponseResult<OnlineFormVo> view(@RequestParam String formId) {
         if (MyCommonUtil.existBlankArgument(formId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }

common/common-online-api/src/main/java/com/ankaibei/workFlow/common/online/api/controller/OnlinePageController.java

@@ -196,7 +196,7 @@ public class OnlinePageController {
      * @return 应答结果对象，包含对象详情。
      */
     @GetMapping("/view")
-    public ResponseResult<OnlinePageVo> view(@RequestParam Long pageId) {
+    public ResponseResult<OnlinePageVo> view(@RequestParam String pageId) {
         if (MyCommonUtil.existBlankArgument(pageId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -219,7 +219,7 @@ public class OnlinePageController {
      */
     @PostMapping("/listNotInOnlinePageDatasource")
     public ResponseResult<MyPageData<OnlineDatasourceVo>> listNotInOnlinePageDatasource(
-            @MyRequestBody Long pageId,
+            @MyRequestBody String pageId,
             @MyRequestBody OnlineDatasourceDto onlineDatasourceDtoFilter,
             @MyRequestBody MyOrderParam orderParam,
             @MyRequestBody MyPageParam pageParam) {
@@ -248,7 +248,7 @@ public class OnlinePageController {
      */
     @PostMapping("/listOnlinePageDatasource")
     public ResponseResult<MyPageData<OnlineDatasourceVo>> listOnlinePageDatasource(
-            @MyRequestBody Long pageId,
+            @MyRequestBody String pageId,
             @MyRequestBody OnlineDatasourceDto onlineDatasourceDtoFilter,
             @MyRequestBody MyOrderParam orderParam,
             @MyRequestBody MyPageParam pageParam) {
@@ -276,7 +276,7 @@ public class OnlinePageController {
     @OperationLog(type = SysOperationLogType.ADD_M2M)
     @PostMapping("/addOnlinePageDatasource")
     public ResponseResult<Void> addOnlinePageDatasource(
-            @MyRequestBody Long pageId,
+            @MyRequestBody String pageId,
             @MyRequestBody(value = "onlinePageDatasourceList") List<OnlinePageDatasourceDto> onlinePageDatasourceDtoList) {
         if (MyCommonUtil.existBlankArgument(pageId, onlinePageDatasourceDtoList)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
@@ -330,17 +330,17 @@ public class OnlinePageController {
     @OperationLog(type = SysOperationLogType.DELETE_M2M)
     @PostMapping("/deleteOnlinePageDatasource")
     public ResponseResult<Void> deleteOnlinePageDatasource(
-            @MyRequestBody Long pageId, @MyRequestBody Long datasourceId) {
+            @MyRequestBody String pageId, @MyRequestBody String datasourceId) {
         if (MyCommonUtil.existBlankArgument(pageId, datasourceId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
-        if (!onlinePageService.removeOnlinePageDatasource(pageId + "", datasourceId + "")) {
+        if (!onlinePageService.removeOnlinePageDatasource(pageId, datasourceId)) {
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
         }
         return ResponseResult.success();
     }
 
-    private ResponseResult<Void> doOnlinePageDatasourceVerify(Long pageId) {
+    private ResponseResult<Void> doOnlinePageDatasourceVerify(String pageId) {
         if (MyCommonUtil.existBlankArgument(pageId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }

common/common-online-api/src/main/java/com/ankaibei/workFlow/common/online/api/controller/OnlineRuleController.java

@@ -139,7 +139,7 @@ public class OnlineRuleController {
      * @return 应答结果对象，包含对象详情。
      */
     @GetMapping("/view")
-    public ResponseResult<OnlineRuleVo> view(@RequestParam Long ruleId) {
+    public ResponseResult<OnlineRuleVo> view(@RequestParam String ruleId) {
         if (MyCommonUtil.existBlankArgument(ruleId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }

common/common-online-api/src/main/java/com/ankaibei/workFlow/common/online/api/controller/OnlineVirtualColumnController.java

@@ -152,7 +152,7 @@ public class OnlineVirtualColumnController {
      * @return 应答结果对象，包含对象详情。
      */
     @GetMapping("/view")
-    public ResponseResult<OnlineVirtualColumnVo> view(@RequestParam Long virtualColumnId) {
+    public ResponseResult<OnlineVirtualColumnVo> view(@RequestParam String virtualColumnId) {
         if (MyCommonUtil.existBlankArgument(virtualColumnId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/dao/OnlineDatasourceMapper.java

@@ -34,7 +34,7 @@ public interface OnlineDatasourceMapper extends BaseDaoMapper<OnlineDatasource>
      * @return 从表数据列表。
      */
     List<OnlineDatasource> getOnlineDatasourceListByPageId(
-            @Param("pageId") Long pageId,
+            @Param("pageId") String pageId,
             @Param("onlineDatasourceFilter") OnlineDatasource onlineDatasourceFilter,
             @Param("orderBy") String orderBy);
 
@@ -47,7 +47,7 @@ public interface OnlineDatasourceMapper extends BaseDaoMapper<OnlineDatasource>
      * @return 与主表没有建立关联的从表数据列表。
      */
     List<OnlineDatasource> getNotInOnlineDatasourceListByPageId(
-            @Param("pageId") Long pageId,
+            @Param("pageId") String pageId,
             @Param("onlineDatasourceFilter") OnlineDatasource onlineDatasourceFilter,
             @Param("orderBy") String orderBy);
 

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/OnlineDatasourceRelationService.java

@@ -14,7 +14,7 @@ import java.util.Set;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface OnlineDatasourceRelationService extends IBaseService<OnlineDatasourceRelation, Long> {
+public interface OnlineDatasourceRelationService extends IBaseService<OnlineDatasourceRelation, String> {
 
     /**
      * 保存新增对象。

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/OnlineDatasourceService.java

@@ -98,7 +98,7 @@ public interface OnlineDatasourceService extends IBaseService<OnlineDatasource,
      * @param orderBy 排序参数。
      * @return 查询结果集。
      */
-    List<OnlineDatasource> getNotInOnlineDatasourceListByPageId(Long pageId, OnlineDatasource filter, String orderBy);
+    List<OnlineDatasource> getNotInOnlineDatasourceListByPageId(String pageId, OnlineDatasource filter, String orderBy);
 
     /**
      * 在多对多关系中，当前Service的数据表为从表，返回与指定主表主键Id存在对多对关系的列表。
@@ -108,7 +108,7 @@ public interface OnlineDatasourceService extends IBaseService<OnlineDatasource,
      * @param orderBy 排序参数。
      * @return 查询结果集。
      */
-    List<OnlineDatasource> getOnlineDatasourceListByPageId(Long pageId, OnlineDatasource filter, String orderBy);
+    List<OnlineDatasource> getOnlineDatasourceListByPageId(String pageId, OnlineDatasource filter, String orderBy);
 
     /**
      * 获取指定数据源Id集合所关联的在线表关联数据。

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/OnlineDblinkService.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface OnlineDblinkService extends IBaseService<OnlineDblink, Long> {
+public interface OnlineDblinkService extends IBaseService<OnlineDblink, String> {
 
     /**
      * 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/OnlineDictService.java

@@ -12,7 +12,7 @@ import java.util.Set;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface OnlineDictService extends IBaseService<OnlineDict, Long> {
+public interface OnlineDictService extends IBaseService<OnlineDict, String> {
 
     /**
      * 保存新增对象。

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/OnlineFormService.java

@@ -13,7 +13,7 @@ import java.util.Set;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface OnlineFormService extends IBaseService<OnlineForm, Long> {
+public interface OnlineFormService extends IBaseService<OnlineForm, String> {
 
     /**
      * 保存新增对象。

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/OnlinePageService.java

@@ -12,7 +12,7 @@ import java.util.List;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface OnlinePageService extends IBaseService<OnlinePage, Long> {
+public interface OnlinePageService extends IBaseService<OnlinePage, String> {
 
     /**
      * 保存新增对象。

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/OnlineRuleService.java

@@ -13,7 +13,7 @@ import java.util.Set;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface OnlineRuleService extends IBaseService<OnlineRule, Long> {
+public interface OnlineRuleService extends IBaseService<OnlineRule, String> {
 
     /**
      * 保存新增对象。

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/OnlineVirtualColumnService.java

@@ -11,7 +11,7 @@ import java.util.*;
  * @author Buzhanyi
  * @date 2022-09-25
  */
-public interface OnlineVirtualColumnService extends IBaseService<OnlineVirtualColumn, Long> {
+public interface OnlineVirtualColumnService extends IBaseService<OnlineVirtualColumn, String> {
 
     /**
      * 保存新增对象。

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/impl/OnlineDatasourceRelationServiceImpl.java

@@ -42,7 +42,7 @@ import java.util.*;
 @Slf4j
 @Service("onlineDatasourceRelationService")
 public class OnlineDatasourceRelationServiceImpl
-        extends BaseService<OnlineDatasourceRelation, Long> implements OnlineDatasourceRelationService {
+        extends BaseService<OnlineDatasourceRelation, String> implements OnlineDatasourceRelationService {
 
     @Autowired
     private OnlineDatasourceRelationMapper onlineDatasourceRelationMapper;
@@ -139,7 +139,7 @@ public class OnlineDatasourceRelationServiceImpl
         relation.setCreateTime(originalRelation.getCreateTime());
         // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
         UpdateWrapper<OnlineDatasourceRelation> uw =
-                this.createUpdateQueryForNullValue(relation, Long.valueOf(relation.getRelationId()));
+                this.createUpdateQueryForNullValue(relation, relation.getRelationId());
         return onlineDatasourceRelationMapper.update(relation, uw) == 1;
     }
 

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/impl/OnlineDatasourceServiceImpl.java

@@ -211,7 +211,7 @@ public class OnlineDatasourceServiceImpl extends BaseService<OnlineDatasource, L
      * @return 查询结果集。
      */
     @Override
-    public List<OnlineDatasource> getNotInOnlineDatasourceListByPageId(Long pageId, OnlineDatasource filter, String orderBy) {
+    public List<OnlineDatasource> getNotInOnlineDatasourceListByPageId(String pageId, OnlineDatasource filter, String orderBy) {
         List<OnlineDatasource> resultList =
                 onlineDatasourceMapper.getNotInOnlineDatasourceListByPageId(pageId, filter, orderBy);
         this.buildRelationForDataList(resultList, MyRelationParam.dictOnly());
@@ -227,7 +227,7 @@ public class OnlineDatasourceServiceImpl extends BaseService<OnlineDatasource, L
      * @return 查询结果集。
      */
     @Override
-    public List<OnlineDatasource> getOnlineDatasourceListByPageId(Long pageId, OnlineDatasource filter, String orderBy) {
+    public List<OnlineDatasource> getOnlineDatasourceListByPageId(String pageId, OnlineDatasource filter, String orderBy) {
         List<OnlineDatasource> resultList =
                 onlineDatasourceMapper.getOnlineDatasourceListByPageId(pageId, filter, orderBy);
         this.buildRelationForDataList(resultList, MyRelationParam.dictOnly());

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/impl/OnlineDblinkServiceImpl.java

@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service("onlineDblinkService")
-public class OnlineDblinkServiceImpl extends BaseService<OnlineDblink, Long> implements OnlineDblinkService {
+public class OnlineDblinkServiceImpl extends BaseService<OnlineDblink, String> implements OnlineDblinkService {
 
     @Autowired
     private OnlineDblinkMapper onlineDblinkMapper;

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/impl/OnlineDictServiceImpl.java

@@ -31,7 +31,7 @@ import java.util.Set;
  */
 @Slf4j
 @Service("onlineDictService")
-public class OnlineDictServiceImpl extends BaseService<OnlineDict, Long> implements OnlineDictService {
+public class OnlineDictServiceImpl extends BaseService<OnlineDict, String> implements OnlineDictService {
 
     @Autowired
     private OnlineDictMapper onlineDictMapper;
@@ -83,7 +83,7 @@ public class OnlineDictServiceImpl extends BaseService<OnlineDict, Long> impleme
         onlineDict.setUpdateTime(new Date());
         onlineDict.setCreateTime(originalOnlineDict.getCreateTime());
         // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
-        UpdateWrapper<OnlineDict> uw = this.createUpdateQueryForNullValue(onlineDict, Long.valueOf(onlineDict.getDictId()));
+        UpdateWrapper<OnlineDict> uw = this.createUpdateQueryForNullValue(onlineDict, onlineDict.getDictId());
         return onlineDictMapper.update(onlineDict, uw) == 1;
     }
 
@@ -168,7 +168,7 @@ public class OnlineDictServiceImpl extends BaseService<OnlineDict, Long> impleme
         String errorMessageFormat = "数据验证失败，关联的%s并不存在，请刷新后重试！";
         //这里是基于字典的验证。
         if (this.needToVerify(onlineDict, originalOnlineDict, OnlineDict::getDblinkId)
-                && !dblinkService.existId(Long.valueOf(onlineDict.getDblinkId()))) {
+                && !dblinkService.existId(onlineDict.getDblinkId())) {
             return CallResult.error(String.format(errorMessageFormat, "数据库链接主键id"));
         }
         return CallResult.ok();

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/impl/OnlineFormServiceImpl.java

@@ -38,7 +38,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service("onlineFormService")
-public class OnlineFormServiceImpl extends BaseService<OnlineForm, Long> implements OnlineFormService {
+public class OnlineFormServiceImpl extends BaseService<OnlineForm, String> implements OnlineFormService {
 
     @Autowired
     private OnlineFormMapper onlineFormMapper;
@@ -108,7 +108,7 @@ public class OnlineFormServiceImpl extends BaseService<OnlineForm, Long> impleme
         onlineForm.setUpdateTime(new Date());
         onlineForm.setCreateTime(originalOnlineForm.getCreateTime());
         // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
-        UpdateWrapper<OnlineForm> uw = this.createUpdateQueryForNullValue(onlineForm, Long.valueOf(onlineForm.getFormId()));
+        UpdateWrapper<OnlineForm> uw = this.createUpdateQueryForNullValue(onlineForm, onlineForm.getFormId());
         if (onlineFormMapper.update(onlineForm, uw) != 1) {
             return false;
         }
@@ -279,7 +279,7 @@ public class OnlineFormServiceImpl extends BaseService<OnlineForm, Long> impleme
         }
         //这里是一对多的验证
         if (this.needToVerify(onlineForm, originalOnlineForm, OnlineForm::getPageId)
-                && !onlinePageService.existId(Long.valueOf(onlineForm.getPageId()))) {
+                && !onlinePageService.existId(onlineForm.getPageId())) {
             return CallResult.error(String.format(errorMessageFormat, "页面id"));
         }
         return CallResult.ok();

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/impl/OnlinePageServiceImpl.java

@@ -33,7 +33,7 @@ import java.util.List;
  */
 @Slf4j
 @Service("onlinePageService")
-public class OnlinePageServiceImpl extends BaseService<OnlinePage, Long> implements OnlinePageService {
+public class OnlinePageServiceImpl extends BaseService<OnlinePage, String> implements OnlinePageService {
 
     @Autowired
     private OnlinePageMapper onlinePageMapper;
@@ -89,7 +89,7 @@ public class OnlinePageServiceImpl extends BaseService<OnlinePage, Long> impleme
         onlinePage.setCreateTime(originalOnlinePage.getCreateTime());
         onlinePage.setPublished(originalOnlinePage.getPublished());
         // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
-        UpdateWrapper<OnlinePage> uw = this.createUpdateQueryForNullValue(onlinePage, Long.valueOf(onlinePage.getPageId()));
+        UpdateWrapper<OnlinePage> uw = this.createUpdateQueryForNullValue(onlinePage, onlinePage.getPageId());
         return onlinePageMapper.update(onlinePage, uw) == 1;
     }
 

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/impl/OnlineRuleServiceImpl.java

@@ -39,7 +39,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service("onlineRuleService")
-public class OnlineRuleServiceImpl extends BaseService<OnlineRule, Long> implements OnlineRuleService {
+public class OnlineRuleServiceImpl extends BaseService<OnlineRule, String> implements OnlineRuleService {
 
     @Autowired
     private OnlineRuleMapper onlineRuleMapper;
@@ -100,7 +100,7 @@ public class OnlineRuleServiceImpl extends BaseService<OnlineRule, Long> impleme
         commonRedisUtil.evictFormCache(ONLINE_RULE_CACHE_KEY);
         onlineRule.setUpdateTime(new Date());
         onlineRule.setCreateTime(originalOnlineRule.getCreateTime());
-        UpdateWrapper<OnlineRule> uw = this.createUpdateQueryForNullValue(onlineRule, Long.valueOf(onlineRule.getRuleId()));
+        UpdateWrapper<OnlineRule> uw = this.createUpdateQueryForNullValue(onlineRule, onlineRule.getRuleId());
         return onlineRuleMapper.update(onlineRule, uw) == 1;
     }
 

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/impl/OnlineVirtualColumnServiceImpl.java

@@ -31,8 +31,7 @@ import java.util.*;
  */
 @Slf4j
 @Service("onlineVirtualColumnService")
-public class OnlineVirtualColumnServiceImpl
-        extends BaseService<OnlineVirtualColumn, Long> implements OnlineVirtualColumnService {
+public class OnlineVirtualColumnServiceImpl extends BaseService<OnlineVirtualColumn, String> implements OnlineVirtualColumnService {
 
     @Autowired
     private OnlineVirtualColumnMapper onlineVirtualColumnMapper;
@@ -89,8 +88,7 @@ public class OnlineVirtualColumnServiceImpl
                 virtualColumn.setTableId(datasource.getMasterTableId());
             }
         }
-        UpdateWrapper<OnlineVirtualColumn> uw =
-                this.createUpdateQueryForNullValue(virtualColumn, Long.valueOf(virtualColumn.getVirtualColumnId()));
+        UpdateWrapper<OnlineVirtualColumn> uw = this.createUpdateQueryForNullValue(virtualColumn, virtualColumn.getVirtualColumnId());
         return onlineVirtualColumnMapper.update(virtualColumn, uw) == 1;
     }
 
@@ -164,7 +162,7 @@ public class OnlineVirtualColumnServiceImpl
             return CallResult.error(String.format(errorMessageFormat, "数据源Id"));
         }
         if (this.needToVerify(virtualColumn, originalVirtualColumn, OnlineVirtualColumn::getRelationId)
-                && !onlineDatasourceRelationService.existId(Long.valueOf(virtualColumn.getRelationId()))) {
+                && !onlineDatasourceRelationService.existId(virtualColumn.getRelationId())) {
             return CallResult.error(String.format(errorMessageFormat, "数据源关联Id"));
         }
         if (this.needToVerify(virtualColumn, originalVirtualColumn, OnlineVirtualColumn::getAggregationColumnId)