|
|
|
@ -15,22 +15,27 @@ import jnpf.model.recycledeviceconfig.*;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
|
|
import javax.validation.Valid;
|
|
|
|
|
import java.util.*;
|
|
|
|
|
|
|
|
|
|
import jnpf.annotation.JnpfField;
|
|
|
|
|
import jnpf.base.vo.PageListVO;
|
|
|
|
|
import jnpf.base.vo.PaginationVO;
|
|
|
|
|
import jnpf.base.vo.DownloadVO;
|
|
|
|
|
import jnpf.config.ConfigValueUtil;
|
|
|
|
|
import jnpf.base.entity.ProvinceEntity;
|
|
|
|
|
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
import jnpf.engine.entity.FlowTaskEntity;
|
|
|
|
|
import jnpf.exception.WorkFlowException;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 投递柜配置
|
|
|
|
|
*
|
|
|
|
|
* @版本: V3.5
|
|
|
|
|
* @版权: 引迈信息技术有限公司(https://www.jnpfsoft.com)
|
|
|
|
|
* @作者: JNPF开发平台组
|
|
|
|
@ -38,7 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
*/
|
|
|
|
|
@Slf4j
|
|
|
|
|
@RestController
|
|
|
|
|
@Tag(name = "投递柜配置" , description = "scm")
|
|
|
|
|
@Tag(name = "投递柜配置", description = "scm")
|
|
|
|
|
@RequestMapping("/api/scm/RecycleDeviceConfig")
|
|
|
|
|
public class RecycleDeviceConfigController {
|
|
|
|
|
|
|
|
|
@ -52,7 +57,6 @@ public class RecycleDeviceConfigController {
|
|
|
|
|
private RecycleDeviceConfigService recycleDeviceConfigService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 列表
|
|
|
|
|
*
|
|
|
|
@ -61,18 +65,18 @@ public class RecycleDeviceConfigController {
|
|
|
|
|
*/
|
|
|
|
|
@Operation(summary = "获取列表")
|
|
|
|
|
@PostMapping("/getList")
|
|
|
|
|
public ActionResult list(@RequestBody RecycleDeviceConfigPagination recycleDeviceConfigPagination)throws IOException{
|
|
|
|
|
List<RecycleDeviceConfigEntity> list= recycleDeviceConfigService.getList(recycleDeviceConfigPagination);
|
|
|
|
|
List<Map<String, Object>> realList=new ArrayList<>();
|
|
|
|
|
public ActionResult list(@RequestBody RecycleDeviceConfigPagination recycleDeviceConfigPagination) throws IOException {
|
|
|
|
|
List<RecycleDeviceConfigEntity> list = recycleDeviceConfigService.getList(recycleDeviceConfigPagination);
|
|
|
|
|
List<Map<String, Object>> realList = new ArrayList<>();
|
|
|
|
|
for (RecycleDeviceConfigEntity entity : list) {
|
|
|
|
|
Map<String, Object> recycleDeviceConfigMap=JsonUtil.entityToMap(entity);
|
|
|
|
|
Map<String, Object> recycleDeviceConfigMap = JsonUtil.entityToMap(entity);
|
|
|
|
|
recycleDeviceConfigMap.put("id", recycleDeviceConfigMap.get("id"));
|
|
|
|
|
//副表数据
|
|
|
|
|
//子表数据
|
|
|
|
|
realList.add(recycleDeviceConfigMap);
|
|
|
|
|
}
|
|
|
|
|
//数据转换
|
|
|
|
|
realList = generaterSwapUtil.swapDataList(realList, RecycleDeviceConfigConstant.getFormData(), RecycleDeviceConfigConstant.getColumnData(), recycleDeviceConfigPagination.getModuleId(),false);
|
|
|
|
|
realList = generaterSwapUtil.swapDataList(realList, RecycleDeviceConfigConstant.getFormData(), RecycleDeviceConfigConstant.getColumnData(), recycleDeviceConfigPagination.getModuleId(), false);
|
|
|
|
|
|
|
|
|
|
//返回对象
|
|
|
|
|
PageListVO vo = new PageListVO();
|
|
|
|
@ -81,6 +85,7 @@ public class RecycleDeviceConfigController {
|
|
|
|
|
vo.setPagination(page);
|
|
|
|
|
return ActionResult.success(vo);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 创建
|
|
|
|
|
*
|
|
|
|
@ -90,100 +95,104 @@ public class RecycleDeviceConfigController {
|
|
|
|
|
@PostMapping()
|
|
|
|
|
@Operation(summary = "创建")
|
|
|
|
|
public ActionResult create(@RequestBody @Valid RecycleDeviceConfigForm recycleDeviceConfigForm) {
|
|
|
|
|
String b = recycleDeviceConfigService.checkForm(recycleDeviceConfigForm,0);
|
|
|
|
|
if (StringUtil.isNotEmpty(b)){
|
|
|
|
|
return ActionResult.fail(b );
|
|
|
|
|
}
|
|
|
|
|
try{
|
|
|
|
|
recycleDeviceConfigService.saveOrUpdate(recycleDeviceConfigForm, null ,true);
|
|
|
|
|
}catch(Exception e){
|
|
|
|
|
return ActionResult.fail("新增数据失败");
|
|
|
|
|
String b = recycleDeviceConfigService.checkForm(recycleDeviceConfigForm, 0);
|
|
|
|
|
if (StringUtil.isNotEmpty(b)) {
|
|
|
|
|
return ActionResult.fail(b);
|
|
|
|
|
}
|
|
|
|
|
return ActionResult.success("创建成功");
|
|
|
|
|
String result = recycleDeviceConfigService.saveOrUpdate(recycleDeviceConfigForm, null, true);
|
|
|
|
|
return ActionResult.success(result);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 编辑
|
|
|
|
|
*
|
|
|
|
|
* @param id
|
|
|
|
|
* @param recycleDeviceConfigForm
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@PutMapping("/{id}")
|
|
|
|
|
@Operation(summary = "更新")
|
|
|
|
|
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid RecycleDeviceConfigForm recycleDeviceConfigForm,
|
|
|
|
|
@RequestParam(value = "isImport", required = false) boolean isImport){
|
|
|
|
|
public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid RecycleDeviceConfigForm recycleDeviceConfigForm,
|
|
|
|
|
@RequestParam(value = "isImport", required = false) boolean isImport) {
|
|
|
|
|
recycleDeviceConfigForm.setId(id);
|
|
|
|
|
if (!isImport) {
|
|
|
|
|
String b = recycleDeviceConfigService.checkForm(recycleDeviceConfigForm,1);
|
|
|
|
|
if (StringUtil.isNotEmpty(b)){
|
|
|
|
|
return ActionResult.fail(b );
|
|
|
|
|
String b = recycleDeviceConfigService.checkForm(recycleDeviceConfigForm, 1);
|
|
|
|
|
if (StringUtil.isNotEmpty(b)) {
|
|
|
|
|
return ActionResult.fail(b);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
RecycleDeviceConfigEntity entity= recycleDeviceConfigService.getInfo(id);
|
|
|
|
|
if(entity!=null){
|
|
|
|
|
try{
|
|
|
|
|
recycleDeviceConfigService.saveOrUpdate(recycleDeviceConfigForm,id,false);
|
|
|
|
|
}catch(Exception e){
|
|
|
|
|
RecycleDeviceConfigEntity entity = recycleDeviceConfigService.getInfo(id);
|
|
|
|
|
if (entity != null) {
|
|
|
|
|
try {
|
|
|
|
|
recycleDeviceConfigService.saveOrUpdate(recycleDeviceConfigForm, id, false);
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
return ActionResult.fail("修改数据失败");
|
|
|
|
|
}
|
|
|
|
|
return ActionResult.success("更新成功");
|
|
|
|
|
}else{
|
|
|
|
|
} else {
|
|
|
|
|
return ActionResult.fail("更新失败,数据不存在");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 删除
|
|
|
|
|
*
|
|
|
|
|
* @param id
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@Operation(summary = "删除")
|
|
|
|
|
@DeleteMapping("/{id}")
|
|
|
|
|
@Transactional
|
|
|
|
|
public ActionResult delete(@PathVariable("id") String id){
|
|
|
|
|
RecycleDeviceConfigEntity entity= recycleDeviceConfigService.getInfo(id);
|
|
|
|
|
if(entity!=null){
|
|
|
|
|
public ActionResult delete(@PathVariable("id") String id) {
|
|
|
|
|
RecycleDeviceConfigEntity entity = recycleDeviceConfigService.getInfo(id);
|
|
|
|
|
if (entity != null) {
|
|
|
|
|
//主表数据删除
|
|
|
|
|
recycleDeviceConfigService.delete(entity);
|
|
|
|
|
}
|
|
|
|
|
return ActionResult.success("删除成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 表单信息(详情页)
|
|
|
|
|
* 详情页面使用-转换数据
|
|
|
|
|
*
|
|
|
|
|
* @param id
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@Operation(summary = "表单信息(详情页)")
|
|
|
|
|
@GetMapping("/detail/{id}")
|
|
|
|
|
public ActionResult detailInfo(@PathVariable("id") String id){
|
|
|
|
|
RecycleDeviceConfigEntity entity= recycleDeviceConfigService.getInfo(id);
|
|
|
|
|
if(entity==null){
|
|
|
|
|
public ActionResult detailInfo(@PathVariable("id") String id) {
|
|
|
|
|
RecycleDeviceConfigEntity entity = recycleDeviceConfigService.getInfo(id);
|
|
|
|
|
if (entity == null) {
|
|
|
|
|
return ActionResult.fail("表单数据不存在!");
|
|
|
|
|
}
|
|
|
|
|
Map<String, Object> recycleDeviceConfigMap=JsonUtil.entityToMap(entity);
|
|
|
|
|
Map<String, Object> recycleDeviceConfigMap = JsonUtil.entityToMap(entity);
|
|
|
|
|
recycleDeviceConfigMap.put("id", recycleDeviceConfigMap.get("id"));
|
|
|
|
|
//副表数据
|
|
|
|
|
//子表数据
|
|
|
|
|
recycleDeviceConfigMap = generaterSwapUtil.swapDataDetail(recycleDeviceConfigMap,RecycleDeviceConfigConstant.getFormData(),"565858748388610501",false);
|
|
|
|
|
recycleDeviceConfigMap = generaterSwapUtil.swapDataDetail(recycleDeviceConfigMap, RecycleDeviceConfigConstant.getFormData(), "565858748388610501", false);
|
|
|
|
|
return ActionResult.success(recycleDeviceConfigMap);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 获取详情(编辑页)
|
|
|
|
|
* 编辑页面使用-不转换数据
|
|
|
|
|
*
|
|
|
|
|
* @param id
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@Operation(summary = "信息")
|
|
|
|
|
@GetMapping("/{id}")
|
|
|
|
|
public ActionResult info(@PathVariable("id") String id){
|
|
|
|
|
RecycleDeviceConfigEntity entity= recycleDeviceConfigService.getInfo(id);
|
|
|
|
|
if(entity==null){
|
|
|
|
|
public ActionResult info(@PathVariable("id") String id) {
|
|
|
|
|
RecycleDeviceConfigEntity entity = recycleDeviceConfigService.getInfo(id);
|
|
|
|
|
if (entity == null) {
|
|
|
|
|
return ActionResult.fail("表单数据不存在!");
|
|
|
|
|
}
|
|
|
|
|
Map<String, Object> recycleDeviceConfigMap=JsonUtil.entityToMap(entity);
|
|
|
|
|
Map<String, Object> recycleDeviceConfigMap = JsonUtil.entityToMap(entity);
|
|
|
|
|
recycleDeviceConfigMap.put("id", recycleDeviceConfigMap.get("id"));
|
|
|
|
|
//副表数据
|
|
|
|
|
//子表数据
|
|
|
|
|
recycleDeviceConfigMap = generaterSwapUtil.swapDataForm(recycleDeviceConfigMap,RecycleDeviceConfigConstant.getFormData(),RecycleDeviceConfigConstant.TABLEFIELDKEY,RecycleDeviceConfigConstant.TABLERENAMES);
|
|
|
|
|
recycleDeviceConfigMap = generaterSwapUtil.swapDataForm(recycleDeviceConfigMap, RecycleDeviceConfigConstant.getFormData(), RecycleDeviceConfigConstant.TABLEFIELDKEY, RecycleDeviceConfigConstant.TABLERENAMES);
|
|
|
|
|
return ActionResult.success(recycleDeviceConfigMap);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|