Commit c46a2cce authored by chenzhao's avatar chenzhao

参数改为JSONObject

parent 803cab11
package com.yeejoin.amos.boot.module.jg.api.service; package com.yeejoin.amos.boot.module.jg.api.service;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
...@@ -19,9 +20,9 @@ import java.util.Map; ...@@ -19,9 +20,9 @@ import java.util.Map;
*/ */
public interface IJgChangeRegistrationTransferService extends IService<JgChangeRegistrationTransfer> { public interface IJgChangeRegistrationTransferService extends IService<JgChangeRegistrationTransfer> {
boolean updateTransfer(String submitType, Map<String, Object> map, ReginParams reginParams); boolean updateTransfer(String submitType, JSONObject map, ReginParams reginParams);
boolean createTransfer(String submitType, Map<String, Object> map, ReginParams reginParams); boolean createTransfer(String submitType, JSONObject map, ReginParams reginParams);
boolean deleteBatchBySequenceNbrs(Long[] sequenceNbrs); boolean deleteBatchBySequenceNbrs(Long[] sequenceNbrs);
......
package com.yeejoin.amos.boot.module.jg.api.service; package com.yeejoin.amos.boot.module.jg.api.service;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto; import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
...@@ -57,6 +58,6 @@ public interface IJgChangeRegistrationUnitService { ...@@ -57,6 +58,6 @@ public interface IJgChangeRegistrationUnitService {
* @param model 数据 * @param model 数据
* @param submitType 保存类型 * @param submitType 保存类型
*/ */
void saveNotice(String submitType, Map<String,Object> model, ReginParams reginParams); void saveNotice(String submitType, JSONObject model, ReginParams reginParams);
} }
...@@ -56,7 +56,7 @@ public class JgChangeRegistrationTransferController extends BaseController { ...@@ -56,7 +56,7 @@ public class JgChangeRegistrationTransferController extends BaseController {
@PostMapping(value = "/save") @PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增移装变更登记登记", notes = "新增移装变更登记登记") @ApiOperation(httpMethod = "POST", value = "新增移装变更登记登记", notes = "新增移装变更登记登记")
public ResponseModel<Boolean> save(@RequestParam(value = "submitType", required = false) String submitType, public ResponseModel<Boolean> save(@RequestParam(value = "submitType", required = false) String submitType,
@RequestBody Map<String, Object> map) { @RequestBody JSONObject map) {
Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID); Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
if(ValidationUtil.isEmpty(tableData)){ if(ValidationUtil.isEmpty(tableData)){
throw new BadRequest("参数校验失败."); throw new BadRequest("参数校验失败.");
...@@ -79,7 +79,7 @@ public class JgChangeRegistrationTransferController extends BaseController { ...@@ -79,7 +79,7 @@ public class JgChangeRegistrationTransferController extends BaseController {
@PutMapping(value = "/update") @PutMapping(value = "/update")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新移装变更登记登记", notes = "根据sequenceNbr更新移装变更登记登记") @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新移装变更登记登记", notes = "根据sequenceNbr更新移装变更登记登记")
public ResponseModel<Boolean> updateBySequenceNbr(@RequestParam(value = "submitType", required = false) String submitType, public ResponseModel<Boolean> updateBySequenceNbr(@RequestParam(value = "submitType", required = false) String submitType,
@RequestBody Map<String, Object> map) { @RequestBody JSONObject map) {
Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID); Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
if(ValidationUtil.isEmpty(tableData)){ if(ValidationUtil.isEmpty(tableData)){
throw new BadRequest("参数校验失败."); throw new BadRequest("参数校验失败.");
......
...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.controller; ...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil; import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto; import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
...@@ -59,7 +60,7 @@ public class JgChangeRegistrationUnitController extends BaseController { ...@@ -59,7 +60,7 @@ public class JgChangeRegistrationUnitController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save") @PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增单位变更", notes = "新增单位变更") @ApiOperation(httpMethod = "POST", value = "新增单位变更", notes = "新增单位变更")
public ResponseModel<String> save(@RequestParam String submitType, @RequestBody Map<String, Object> model) { public ResponseModel<String> save(@RequestParam String submitType, @RequestBody JSONObject model) {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
jgChangeRegistrationUnitServiceImpl.saveNotice(submitType, model, reginParams); jgChangeRegistrationUnitServiceImpl.saveNotice(submitType, model, reginParams);
......
...@@ -143,7 +143,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang ...@@ -143,7 +143,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
* @param map * @param map
* @return * @return
*/ */
public boolean createTransfer(String submitType, Map<String, Object> map, ReginParams reginParams) { public boolean createTransfer(String submitType, JSONObject map, ReginParams reginParams) {
Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID); Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
if(ValidationUtil.isEmpty(tableData)){ if(ValidationUtil.isEmpty(tableData)){
...@@ -324,7 +324,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang ...@@ -324,7 +324,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
* @param map * @param map
* @return * @return
*/ */
public boolean updateTransfer(String submitType, Map<String, Object> map, ReginParams reginParams) { public boolean updateTransfer(String submitType, JSONObject map, ReginParams reginParams) {
return this.createTransfer(submitType, map, reginParams); return this.createTransfer(submitType, map, reginParams);
} }
......
...@@ -316,7 +316,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg ...@@ -316,7 +316,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
@Override @Override
@SuppressWarnings({"Duplicates", "rawtypes"}) @SuppressWarnings({"Duplicates", "rawtypes"})
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void saveNotice(String submitType, Map<String,Object> map, ReginParams reginParams) { public void saveNotice(String submitType, JSONObject map, ReginParams reginParams) {
JgChangeRegistrationUnitDto model = BeanUtil.mapToBean(((LinkedHashMap) map.get("changeRegisInfo")), JgChangeRegistrationUnitDto.class, true); JgChangeRegistrationUnitDto model = BeanUtil.mapToBean(((LinkedHashMap) map.get("changeRegisInfo")), JgChangeRegistrationUnitDto.class, true);
......
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