diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/EquipmentinspectionrecordsController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/EquipmentInspectionRecordsController.java similarity index 58% rename from jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/EquipmentinspectionrecordsController.java rename to jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/EquipmentInspectionRecordsController.java index 33f1013..8962c77 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/EquipmentinspectionrecordsController.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/EquipmentInspectionRecordsController.java @@ -30,17 +30,17 @@ import jnpf.exception.WorkFlowException; import org.springframework.transaction.annotation.Transactional; /** - * equipmentinspectionrecords + * EquipmentInspectionRecords * @版本: V3.5 * @版权: 引迈信息技术有限公司(https://www.jnpfsoft.com) * @作者: JNPF开发平台组 - * @日期: 2024-07-18 + * @日期: 2024-07-19 */ @Slf4j @RestController -@Tag(name = "equipmentinspectionrecords" , description = "example") -@RequestMapping("/api/example/Equipmentinspectionrecords") -public class EquipmentinspectionrecordsController { +@Tag(name = "EquipmentInspectionRecords" , description = "example") +@RequestMapping("/api/example/EquipmentInspectionRecords") +public class EquipmentInspectionRecordsController { @Autowired private GeneraterSwapUtil generaterSwapUtil; @@ -49,53 +49,53 @@ public class EquipmentinspectionrecordsController { private UserProvider userProvider; @Autowired - private EquipmentinspectionrecordsService equipmentinspectionrecordsService; + private EquipmentInspectionRecordsService equipmentInspectionRecordsService; /** * 列表 * - * @param equipmentinspectionrecordsPagination + * @param equipmentInspectionRecordsPagination * @return */ @Operation(summary = "获取列表") @PostMapping("/getList") - public ActionResult list(@RequestBody EquipmentinspectionrecordsPagination equipmentinspectionrecordsPagination)throws IOException{ - List list= equipmentinspectionrecordsService.getList(equipmentinspectionrecordsPagination); + public ActionResult list(@RequestBody EquipmentInspectionRecordsPagination equipmentInspectionRecordsPagination)throws IOException{ + List list= equipmentInspectionRecordsService.getList(equipmentInspectionRecordsPagination); List> realList=new ArrayList<>(); - for (EquipmentinspectionrecordsEntity entity : list) { - Map equipmentinspectionrecordsMap=JsonUtil.entityToMap(entity); - equipmentinspectionrecordsMap.put("id", equipmentinspectionrecordsMap.get("id")); + for (EquipmentInspectionRecordsEntity entity : list) { + Map equipmentInspectionRecordsMap=JsonUtil.entityToMap(entity); + equipmentInspectionRecordsMap.put("id", equipmentInspectionRecordsMap.get("id")); //副表数据 //子表数据 - realList.add(equipmentinspectionrecordsMap); + realList.add(equipmentInspectionRecordsMap); } //数据转换 - realList = generaterSwapUtil.swapDataList(realList, EquipmentinspectionrecordsConstant.getFormData(), EquipmentinspectionrecordsConstant.getColumnData(), equipmentinspectionrecordsPagination.getModuleId(),false); + realList = generaterSwapUtil.swapDataList(realList, EquipmentInspectionRecordsConstant.getFormData(), EquipmentInspectionRecordsConstant.getColumnData(), equipmentInspectionRecordsPagination.getModuleId(),false); //返回对象 PageListVO vo = new PageListVO(); vo.setList(realList); - PaginationVO page = JsonUtil.getJsonToBean(equipmentinspectionrecordsPagination, PaginationVO.class); + PaginationVO page = JsonUtil.getJsonToBean(equipmentInspectionRecordsPagination, PaginationVO.class); vo.setPagination(page); return ActionResult.success(vo); } /** * 创建 * - * @param equipmentinspectionrecordsForm + * @param equipmentInspectionRecordsForm * @return */ @PostMapping() @Operation(summary = "创建") - public ActionResult create(@RequestBody @Valid EquipmentinspectionrecordsForm equipmentinspectionrecordsForm) { - String b = equipmentinspectionrecordsService.checkForm(equipmentinspectionrecordsForm,0); + public ActionResult create(@RequestBody @Valid EquipmentInspectionRecordsForm equipmentInspectionRecordsForm) { + String b = equipmentInspectionRecordsService.checkForm(equipmentInspectionRecordsForm,0); if (StringUtil.isNotEmpty(b)){ return ActionResult.fail(b ); } try{ - equipmentinspectionrecordsService.saveOrUpdate(equipmentinspectionrecordsForm, null ,true); + equipmentInspectionRecordsService.saveOrUpdate(equipmentInspectionRecordsForm, null ,true); }catch(Exception e){ return ActionResult.fail("新增数据失败"); } @@ -104,24 +104,24 @@ public class EquipmentinspectionrecordsController { /** * 编辑 * @param id - * @param equipmentinspectionrecordsForm + * @param equipmentInspectionRecordsForm * @return */ @PutMapping("/{id}") @Operation(summary = "更新") - public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid EquipmentinspectionrecordsForm equipmentinspectionrecordsForm, + public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid EquipmentInspectionRecordsForm equipmentInspectionRecordsForm, @RequestParam(value = "isImport", required = false) boolean isImport){ - equipmentinspectionrecordsForm.setId(id); + equipmentInspectionRecordsForm.setId(id); if (!isImport) { - String b = equipmentinspectionrecordsService.checkForm(equipmentinspectionrecordsForm,1); + String b = equipmentInspectionRecordsService.checkForm(equipmentInspectionRecordsForm,1); if (StringUtil.isNotEmpty(b)){ return ActionResult.fail(b ); } } - EquipmentinspectionrecordsEntity entity= equipmentinspectionrecordsService.getInfo(id); + EquipmentInspectionRecordsEntity entity= equipmentInspectionRecordsService.getInfo(id); if(entity!=null){ try{ - equipmentinspectionrecordsService.saveOrUpdate(equipmentinspectionrecordsForm,id,false); + equipmentInspectionRecordsService.saveOrUpdate(equipmentInspectionRecordsForm,id,false); }catch(Exception e){ return ActionResult.fail("修改数据失败"); } @@ -139,11 +139,11 @@ public class EquipmentinspectionrecordsController { @DeleteMapping("/{id}") @Transactional public ActionResult delete(@PathVariable("id") String id){ - EquipmentinspectionrecordsEntity entity= equipmentinspectionrecordsService.getInfo(id); + EquipmentInspectionRecordsEntity entity= equipmentInspectionRecordsService.getInfo(id); if(entity!=null){ //假删除 entity.setDeleteMark(1); - equipmentinspectionrecordsService.update(id,entity); + equipmentInspectionRecordsService.update(id,entity); } return ActionResult.success("删除成功"); } @@ -156,16 +156,16 @@ public class EquipmentinspectionrecordsController { @Operation(summary = "表单信息(详情页)") @GetMapping("/detail/{id}") public ActionResult detailInfo(@PathVariable("id") String id){ - EquipmentinspectionrecordsEntity entity= equipmentinspectionrecordsService.getInfo(id); + EquipmentInspectionRecordsEntity entity= equipmentInspectionRecordsService.getInfo(id); if(entity==null){ return ActionResult.fail("表单数据不存在!"); } - Map equipmentinspectionrecordsMap=JsonUtil.entityToMap(entity); - equipmentinspectionrecordsMap.put("id", equipmentinspectionrecordsMap.get("id")); + Map equipmentInspectionRecordsMap=JsonUtil.entityToMap(entity); + equipmentInspectionRecordsMap.put("id", equipmentInspectionRecordsMap.get("id")); //副表数据 //子表数据 - equipmentinspectionrecordsMap = generaterSwapUtil.swapDataDetail(equipmentinspectionrecordsMap,EquipmentinspectionrecordsConstant.getFormData(),"583294095649145157",false); - return ActionResult.success(equipmentinspectionrecordsMap); + equipmentInspectionRecordsMap = generaterSwapUtil.swapDataDetail(equipmentInspectionRecordsMap,EquipmentInspectionRecordsConstant.getFormData(),"583294095649145157",false); + return ActionResult.success(equipmentInspectionRecordsMap); } /** * 获取详情(编辑页) @@ -176,16 +176,16 @@ public class EquipmentinspectionrecordsController { @Operation(summary = "信息") @GetMapping("/{id}") public ActionResult info(@PathVariable("id") String id){ - EquipmentinspectionrecordsEntity entity= equipmentinspectionrecordsService.getInfo(id); + EquipmentInspectionRecordsEntity entity= equipmentInspectionRecordsService.getInfo(id); if(entity==null){ return ActionResult.fail("表单数据不存在!"); } - Map equipmentinspectionrecordsMap=JsonUtil.entityToMap(entity); - equipmentinspectionrecordsMap.put("id", equipmentinspectionrecordsMap.get("id")); + Map equipmentInspectionRecordsMap=JsonUtil.entityToMap(entity); + equipmentInspectionRecordsMap.put("id", equipmentInspectionRecordsMap.get("id")); //副表数据 //子表数据 - equipmentinspectionrecordsMap = generaterSwapUtil.swapDataForm(equipmentinspectionrecordsMap,EquipmentinspectionrecordsConstant.getFormData(),EquipmentinspectionrecordsConstant.TABLEFIELDKEY,EquipmentinspectionrecordsConstant.TABLERENAMES); - return ActionResult.success(equipmentinspectionrecordsMap); + equipmentInspectionRecordsMap = generaterSwapUtil.swapDataForm(equipmentInspectionRecordsMap,EquipmentInspectionRecordsConstant.getFormData(),EquipmentInspectionRecordsConstant.TABLEFIELDKEY,EquipmentInspectionRecordsConstant.TABLERENAMES); + return ActionResult.success(equipmentInspectionRecordsMap); } }