Commit 520b3807 authored by suhuiguang's avatar suhuiguang

refactor(大编辑):代码重构

1.日志查询增加分页参数
parent 64dd0758
......@@ -13,5 +13,5 @@ import java.util.Set;
*/
public interface IJgBizChangeLogService {
IPage<?> queryPageListByChangeIds(Set<String> changeIds);
IPage<?> queryPageListByChangeIds(Set<String> changeIds, int current, int size);
}
......@@ -26,8 +26,7 @@ import java.util.Map;
public class BizDataChangeController extends BaseController {
public enum DetailType {
equip,
project
equip, project
}
......@@ -38,8 +37,7 @@ public class BizDataChangeController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/v1/singleManageEquipEdit/save")
@ApiOperation(value = "业务数据变更保存--西安专用", httpMethod = "POST")
public ResponseModel<String> save(@RequestParam String applyNo,
@RequestBody RequestChangeData changeData) {
public ResponseModel<String> save(@RequestParam String applyNo, @RequestBody RequestChangeData changeData) {
singleManageEquipEditHandle.doSave(applyNo, changeData);
return ResponseHelper.buildResponse("success");
}
......@@ -48,8 +46,7 @@ public class BizDataChangeController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/v1/singleManageEquipEdit/detail")
@ApiOperation(value = "查询可业务变更的字段及默认值--西安专用", httpMethod = "GET")
public ResponseModel<Map<String, ?>> getDetailV1(@RequestParam(required = false) String applyNo,
@RequestParam(required = false) String bizId) {
public ResponseModel<Map<String, ?>> getDetailV1(@RequestParam(required = false) String applyNo, @RequestParam(required = false) String bizId) {
return ResponseHelper.buildResponse(singleManageEquipEditHandle.getDetail(applyNo, bizId));
}
......@@ -67,23 +64,21 @@ public class BizDataChangeController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/v2/{bizType}/sub-detail")
@ApiOperation(value = "编辑二级页面详情查询--通用", httpMethod = "GET")
public ResponseModel<Map<String, ?>> getSubDetailV2(@ApiParam(value = "设备或者装置唯一标识") @RequestParam String bizId,
@ApiParam(value = "单据编号") @RequestParam(required = false) String applyNo,
@ApiParam(value = "详情类型:设备、装置") @RequestParam DetailType type,
@ApiParam(value = "业务类型") @PathVariable String bizType) {
public ResponseModel<Map<String, ?>> getSubDetailV2(@ApiParam(value = "设备或者装置唯一标识") @RequestParam String bizId, @ApiParam(value = "单据编号,装置时需要") @RequestParam(required = false) String applyNo, @ApiParam(value = "详情类型:设备、装置") @RequestParam DetailType type, @ApiParam(value = "业务类型") @PathVariable String bizType) {
return ResponseHelper.buildResponse(bizDataChangeService.querySubDetail(applyNo, bizId, bizType, type));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/v2/{bizType}/save")
@ApiOperation(value = "编辑保存--通用", httpMethod = "POST")
public ResponseModel<String> saveV2(@ApiParam(required = true, value = "单据编号或者record") @RequestParam String applyNo,
public ResponseModel<String> saveV2(@ApiParam(value = "设备或者装置唯一标识") @RequestParam String bizId,
@ApiParam(required = true, value = "单据编号或者record") @RequestParam String applyNo,
@ApiParam(required = true, value = "业务类型") @PathVariable String bizType,
@ApiParam(required = true, value = "设备处理器类型") @RequestParam IBizDataChangeHandleStrategy.ModelType modelType,
@RequestBody RequestChangeData changeData) {
// 基础数据校验
changeData.validated();
bizDataChangeService.save(applyNo, bizType, modelType, changeData, getSelectedOrgInfo());
bizDataChangeService.save(bizId, applyNo, bizType, modelType, changeData, getSelectedOrgInfo());
return ResponseHelper.buildResponse("success");
}
......@@ -91,7 +86,9 @@ public class BizDataChangeController extends BaseController {
@GetMapping(value = "/v2/{bizType}/change-logs")
@ApiOperation(value = "编辑二级页面详情查询--通用", httpMethod = "GET")
public ResponseModel<IPage<?>> getChangeLogPage(@ApiParam(value = "设备或者装置唯一标识") @RequestParam String bizId,
@ApiParam(required = true, value = "业务类型") @PathVariable String bizType) {
return ResponseHelper.buildResponse(bizDataChangeService.getChangeLogPage(bizId, bizType));
@ApiParam(required = true, value = "业务类型") @PathVariable String bizType,
@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size) {
return ResponseHelper.buildResponse(bizDataChangeService.getChangeLogPage(bizId, bizType, current, size));
}
}
......@@ -26,11 +26,12 @@ public class BizDataChangeServiceImpl {
* @param selectedOrgInfo
*/
@Transactional(rollbackFor = Exception.class)
public void save(String applyNo,
public void save(String bizId,
String applyNo,
String bizType,
IBizDataChangeHandleStrategy.ModelType modelType, RequestChangeData changeData, ReginParams selectedOrgInfo) {
IBizDataChangeHandleStrategy handleStrategy = BizDataHandleStrategyContext.getStrategy(bizType);
handleStrategy.doSave(applyNo, modelType, changeData, selectedOrgInfo);
handleStrategy.doSave(bizId, applyNo, modelType, changeData, selectedOrgInfo);
}
public IPage<?> queryDetail(String applyNo, String bizType, BizDataChangeController.DetailType type, JSONObject searchParams) {
......@@ -43,8 +44,8 @@ public class BizDataChangeServiceImpl {
return handleStrategy.getSubDetail(applyNo, bizId, type);
}
public IPage<?> getChangeLogPage(String bizId, String bizType) {
public IPage<?> getChangeLogPage(String bizId, String bizType, int current, int size) {
IBizDataChangeHandleStrategy handleStrategy = BizDataHandleStrategyContext.getStrategy(bizType);
return handleStrategy.getChangeLogs(bizId);
return handleStrategy.getChangeLogs(bizId, current, size);
}
}
......@@ -34,18 +34,18 @@ public abstract class DefaultBizDataChangeHandler<U extends BaseBizDataChangeEve
@Override
public final void doSave(String applyNo, ModelType model, Map<String, Object> changeData, ReginParams selectedOrgInfo) {
if (beforeCheck(applyNo, model, changeData)) {
public final void doSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData, ReginParams selectedOrgInfo) {
if (beforeCheck(bizId, applyNo, model, changeData)) {
JSONObject oData = new JSONObject(changeData);
// 删除原始提交的变更说明及附件放置后续存放到json
changeData.remove("changeReason");
changeData.remove("changeAttachment");
IEquipChangeDataProcessStrategy dataProcessor = EquipDataProcessStrategyContext.getStrategy(model);
List<FieldChangeMeta> allChangeColumns = dataProcessor.handle(changeData, applyNo);
List<FieldChangeMeta> bizEditColumns = updBizData(applyNo, model, changeData);
List<FieldChangeMeta> allChangeColumns = dataProcessor.handle(changeData, bizId);
List<FieldChangeMeta> bizEditColumns = updBizData(bizId, applyNo, model, changeData);
allChangeColumns.addAll(bizEditColumns);
if (bizIsFinished(applyNo, model, changeData)) {
List<FieldChangeMeta> equipColumns = updCertDataIfBizFin(applyNo, model, changeData);
List<FieldChangeMeta> equipColumns = updCertDataIfBizFin(bizId, applyNo, model, changeData);
allChangeColumns.addAll(equipColumns);
}
// 发送数据变更消息
......@@ -96,11 +96,11 @@ public abstract class DefaultBizDataChangeHandler<U extends BaseBizDataChangeEve
}
@Override
public IPage<?> getChangeLogs(String bizId) {
public IPage<?> getChangeLogs(String bizId, int current, int size) {
Set<String> changeIds = new HashSet<>();
changeIds.addAll(getEqs(bizId));
changeIds.addAll(getProjectContraptionIds(bizId));
JgBizChangeLogServiceImpl service = applicationContext.getBean(JgBizChangeLogServiceImpl.class);
return service.queryPageListByChangeIds(changeIds);
return service.queryPageListByChangeIds(changeIds, current, size);
}
}
......@@ -25,12 +25,12 @@ public class InstallNoticeDataChangeHandler extends DefaultBizDataChangeHandler<
}
@Override
public List<FieldChangeMeta> updBizData(String applyNo, ModelType model, Map<String, Object> changeData) {
public List<FieldChangeMeta> updBizData(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
return Collections.emptyList();
}
@Override
public Boolean beforeCheck(String applyNo, ModelType model, Map<String, Object> changeData) {
public Boolean beforeCheck(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
return null;
}
......@@ -40,7 +40,7 @@ public class InstallNoticeDataChangeHandler extends DefaultBizDataChangeHandler<
}
@Override
public List<FieldChangeMeta> updCertDataIfBizFin(String applyNo, ModelType model, Map<String, Object> changeData) {
public List<FieldChangeMeta> updCertDataIfBizFin(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
return Collections.emptyList();
}
......
......@@ -40,23 +40,23 @@ public interface IBizDataChangeHandleStrategy {
/**
* 保存
*
* @param bizId 设备record或者装置id
* @param applyNo 单据编号
* @param model @see ModelType
* @param changeData 变更数据
*/
List<FieldChangeMeta> updBizData(String applyNo, ModelType model, Map<String, Object> changeData);
List<FieldChangeMeta> updBizData(String bizId, String applyNo, ModelType model, Map<String, Object> changeData);
/**
* 前置校验 如业务字段的重复性检验
*
* @param bizId 设备record或者装置id
* @param applyNo 单据编号
* @param model 类型
* @param changeData 数据
* @return 是否通过前置校验
*/
Boolean beforeCheck(String applyNo, ModelType model, Map<String, Object> changeData);
Boolean beforeCheck(String bizId, String applyNo, ModelType model, Map<String, Object> changeData);
/**
* 单据方式:单个处理、批量处理
......@@ -66,7 +66,7 @@ public interface IBizDataChangeHandleStrategy {
singleEquip
}
void doSave(String applyNo, ModelType model, Map<String, Object> changeData, ReginParams selectedOrgInfo);
void doSave(String bizId, String applyNo, ModelType model, Map<String, Object> changeData, ReginParams selectedOrgInfo);
/**
* 获取子表的设备或者使用登记证
......@@ -78,13 +78,13 @@ public interface IBizDataChangeHandleStrategy {
/**
* 在业务单位状态为已完成时进行证表的更新
*
* @param bizId 设备record或者装置id
* @param applyNo 单据编号
* @param model 类型
* @param changeData 数据
* @return 更新的字段
*/
List<FieldChangeMeta> updCertDataIfBizFin(String applyNo, ModelType model, Map<String, Object> changeData);
List<FieldChangeMeta> updCertDataIfBizFin(String bizId, String applyNo, ModelType model, Map<String, Object> changeData);
/**
* 单据是否已经审核完成
......@@ -110,5 +110,5 @@ public interface IBizDataChangeHandleStrategy {
* @param bizId 业务id
* @return 分页数据
*/
IPage<?> getChangeLogs(String bizId);
IPage<?> getChangeLogs(String bizId , int current, int size);
}
......@@ -44,7 +44,7 @@ public class UseRegisterDataChangeHandler extends DefaultBizDataChangeHandler<Ba
* @param changeData 前端不支持分组-目前为平铺数据结构
*/
@Override
public List<FieldChangeMeta> updBizData(String applyNo, ModelType model, Map<String, Object> changeData) {
public List<FieldChangeMeta> updBizData(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
List<FieldChangeMeta> bizEditColumns = new ArrayList<>();
// 1.流程中时-更新单据-业务冗余的字段
this.updateBizInfo(changeData);
......@@ -56,7 +56,7 @@ public class UseRegisterDataChangeHandler extends DefaultBizDataChangeHandler<Ba
}
@Override
public Boolean beforeCheck(String applyNo, ModelType model, Map<String, Object> changeData) {
public Boolean beforeCheck(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
return true;
}
......@@ -68,7 +68,7 @@ public class UseRegisterDataChangeHandler extends DefaultBizDataChangeHandler<Ba
}
@Override
public List<FieldChangeMeta> updCertDataIfBizFin(String applyNo, ModelType model, Map<String, Object> changeData) {
public List<FieldChangeMeta> updCertDataIfBizFin(String bizId, String applyNo, ModelType model, Map<String, Object> changeData) {
// 更新设备/装置的使用信息
return useRegisterUpdateService.updCertDataIfBizFin(applyNo, new JSONObject(changeData));
}
......
......@@ -730,7 +730,7 @@ public class CommonEquipDataProcessService {
if (map.containsKey("flag") && !map.containsKey("USE_UNIT_CREDIT_CODE")) {
return new Page<>();
}
int pageNumber = ObjectUtils.isEmpty(map.getInteger("number")) ? 1 : map.getInteger("number");
int pageNumber = ObjectUtils.isEmpty(map.getInteger("current")) ? 1 : map.getInteger("current");
int size = ObjectUtils.isEmpty(map.getInteger("size")) ? 20 : map.getInteger("size");
Page<JSONObject> result = new Page<>(pageNumber, size);
SearchRequest request = new SearchRequest();
......
......@@ -38,7 +38,7 @@ public class JgBizChangeLogServiceImpl extends BaseService<JgBizChangeLogDto, Jg
}
@Override
public IPage<?> queryPageListByChangeIds(Set<String> changeIds) {
public IPage<?> queryPageListByChangeIds(Set<String> changeIds, int current, int size) {
return null;
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment