From 2d23c787ff001541f2f439d83dd8a628387509e6 Mon Sep 17 00:00:00 2001 From: zsvg <8680782@qq.com> Date: Fri, 17 Jun 2022 18:54:30 +0800 Subject: [PATCH] ~ --- .gitignore | 3 + .../de/supp/cate/DeSuppCateService.java | 5 - .../app/module/de/supp/main/DeSuppMain.java | 1 - .../vboot/core/common/init/SysPortalInit.java | 189 ------------------ .../module/bi/conn/main/BiConnMain.java | 21 -- .../module/bi/conn/main/BiConnMainApi.java | 48 ----- .../module/bi/conn/main/BiConnMainRepo.java | 8 - .../bi/conn/main/BiConnMainService.java | 20 -- .../extend/module/bi/demo/boy/BiDemoBoy.java | 15 -- .../module/bi/demo/boy/BiDemoBoyApi.java | 61 ------ .../module/bi/demo/boy/BiDemoBoyRepo.java | 8 - .../module/bi/demo/boy/BiDemoBoyService.java | 22 -- .../module/bi/demo/girl/BiDemoGirl.java | 15 -- .../module/bi/demo/girl/BiDemoGirlApi.java | 46 ----- .../module/bi/demo/girl/BiDemoGirlRepo.java | 8 - .../bi/demo/girl/BiDemoGirlService.java | 22 -- .../module/bi/demo/student/BiDemoStudent.java | 15 -- .../bi/demo/student/BiDemoStudentApi.java | 46 ----- .../bi/demo/student/BiDemoStudentRepo.java | 8 - .../bi/demo/student/BiDemoStudentService.java | 22 -- .../extend/module/bi/etl/log/BiEtlLog.java | 52 ----- .../extend/module/bi/etl/log/BiEtlLogApi.java | 45 ----- .../module/bi/etl/main/BiEtlJobListener.java | 41 ---- .../extend/module/bi/etl/main/BiEtlMain.java | 28 --- .../module/bi/etl/main/BiEtlMainApi.java | 89 --------- .../module/bi/etl/main/BiEtlMainHandler.java | 74 ------- .../module/bi/etl/main/BiEtlMainRepo.java | 9 - .../module/bi/etl/main/BiEtlMainService.java | 50 ----- .../module/bi/etl/main/KetJobFactory.java | 22 -- .../extend/module/bi/etl/main/KetUtil.java | 95 --------- .../module/bi/field/main/BiFieldMain.java | 23 --- .../module/bi/field/main/BiFieldMainApi.java | 45 ----- .../module/bi/field/main/BiFieldMainRepo.java | 8 - .../bi/field/main/BiFieldMainService.java | 22 -- .../module/bi/table/main/BiTableMain.java | 22 -- .../module/bi/table/main/BiTableMainApi.java | 45 ----- .../module/bi/table/main/BiTableMainRepo.java | 8 - .../bi/table/main/BiTableMainService.java | 22 -- .../module/sa/agent/cate/SaAgentCate.java | 19 -- .../module/sa/agent/cate/SaAgentCateApi.java | 50 ----- .../module/sa/agent/cate/SaAgentCateRepo.java | 9 - .../sa/agent/cate/SaAgentCateService.java | 21 -- .../module/sa/agent/main/SaAgentMain.java | 58 ------ .../module/sa/agent/main/SaAgentMainApi.java | 78 -------- .../module/sa/agent/main/SaAgentMainExp.java | 27 --- .../module/sa/agent/main/SaAgentMainRepo.java | 9 - .../sa/agent/main/SaAgentMainService.java | 22 -- .../module/sa/cust/cate/SaCustCate.java | 18 -- .../module/sa/cust/cate/SaCustCateApi.java | 49 ----- .../module/sa/cust/cate/SaCustCateRepo.java | 9 - .../sa/cust/cate/SaCustCateService.java | 20 -- .../module/sa/cust/main/SaCustMain.java | 55 ----- .../module/sa/cust/main/SaCustMainApi.java | 60 ------ .../module/sa/cust/main/SaCustMainRepo.java | 8 - .../sa/cust/main/SaCustMainService.java | 20 -- .../module/sa/prod/feat/SaProdFeat.java | 30 --- .../module/sa/prod/group/SaProdGroup.java | 44 ---- .../module/sa/prod/group/SaProdGroupApi.java | 57 ------ .../module/sa/prod/group/SaProdGroupRepo.java | 10 - .../sa/prod/group/SaProdGroupService.java | 29 --- .../module/sa/prod/main/SaProdMain.java | 33 --- .../module/sa/prod/temp/SaProdTemp.java | 25 --- .../module/sa/prod/temp/SaProdTempApi.java | 45 ----- .../module/sa/prod/temp/SaProdTempRepo.java | 9 - .../sa/prod/temp/SaProdTempService.java | 22 -- .../module/sa/proj/main/SaProjMain.java | 80 -------- .../module/sa/proj/main/SaProjMainApi.java | 74 ------- .../module/sa/proj/main/SaProjMainRepo.java | 8 - .../sa/proj/main/SaProjMainService.java | 33 --- .../module/te/allot/check/TeAllotCheck.java | 35 ---- .../te/allot/check/TeAllotCheckApi.java | 49 ----- .../te/allot/check/TeAllotCheckItem.java | 27 --- .../te/allot/check/TeAllotCheckRepo.java | 8 - .../te/allot/check/TeAllotCheckService.java | 33 --- .../extend/module/te/allot/check/Zcheck.java | 16 -- .../module/te/allot/drive/TeAllotDrive.java | 35 ---- .../te/allot/drive/TeAllotDriveApi.java | 50 ----- .../te/allot/drive/TeAllotDriveItem.java | 27 --- .../te/allot/drive/TeAllotDriveRepo.java | 8 - .../te/allot/drive/TeAllotDriveService.java | 32 --- .../extend/module/te/allot/drive/Zdrive.java | 16 -- .../module/te/allot/link/TeAllotLink.java | 35 ---- .../module/te/allot/link/TeAllotLinkApi.java | 48 ----- .../module/te/allot/link/TeAllotLinkItem.java | 27 --- .../module/te/allot/link/TeAllotLinkRepo.java | 8 - .../te/allot/link/TeAllotLinkService.java | 32 --- .../extend/module/te/allot/link/Zlink.java | 16 -- .../module/te/allot/param/TeAllotParam.java | 37 ---- .../te/allot/param/TeAllotParamApi.java | 48 ----- .../te/allot/param/TeAllotParamItem.java | 27 --- .../te/allot/param/TeAllotParamRepo.java | 8 - .../te/allot/param/TeAllotParamService.java | 56 ------ .../module/te/feat/check/TeFeatCheck.java | 23 --- .../module/te/feat/check/TeFeatCheckApi.java | 46 ----- .../module/te/feat/check/TeFeatCheckRepo.java | 8 - .../te/feat/check/TeFeatCheckService.java | 22 -- .../module/te/feat/comp/TeFeatComp.java | 59 ------ .../module/te/feat/comp/TeFeatCompApi.java | 55 ----- .../module/te/feat/comp/TeFeatCompRepo.java | 8 - .../te/feat/comp/TeFeatCompService.java | 45 ----- .../module/te/feat/drive/TeFeatDrive.java | 22 -- .../module/te/feat/drive/TeFeatDriveApi.java | 46 ----- .../module/te/feat/drive/TeFeatDriveRepo.java | 8 - .../te/feat/drive/TeFeatDriveService.java | 22 -- .../module/te/feat/link/TeFeatLink.java | 84 -------- .../module/te/feat/link/TeFeatLinkApi.java | 47 ----- .../module/te/feat/link/TeFeatLinkItem.java | 36 ---- .../module/te/feat/link/TeFeatLinkLeft.java | 31 --- .../module/te/feat/link/TeFeatLinkRepo.java | 8 - .../module/te/feat/link/TeFeatLinkRight.java | 37 ---- .../te/feat/link/TeFeatLinkService.java | 23 --- .../module/te/feat/param/TeFeatParam.java | 46 ----- .../module/te/feat/param/TeFeatParamApi.java | 75 ------- .../te/feat/param/TeFeatParamOption.java | 33 --- .../module/te/feat/param/TeFeatParamRepo.java | 8 - .../te/feat/param/TeFeatParamService.java | 41 ---- .../module/te/feat/screen/TeFeatScreen.java | 22 -- .../te/feat/screen/TeFeatScreenApi.java | 54 ----- .../te/feat/screen/TeFeatScreenRepo.java | 8 - .../te/feat/screen/TeFeatScreenService.java | 78 -------- .../module/te/prod/cate/TeProdCate.java | 18 -- .../module/te/prod/cate/TeProdCateApi.java | 55 ----- .../module/te/prod/cate/TeProdCateRepo.java | 8 - .../te/prod/cate/TeProdCateService.java | 22 -- .../module/te/prod/model/TeProdModel.java | 25 --- .../module/te/prod/model/TeProdModelApi.java | 81 -------- .../module/te/prod/model/TeProdModelRepo.java | 8 - .../te/prod/model/TeProdModelService.java | 127 ------------ .../extend/module/te/prod/model/Zmodel.java | 20 -- .../extend/module/te/prod/model/Zparam.java | 19 -- .../extend/module/te/prod/model/Zscreen.java | 19 -- .../module/te/prod/serie/TeProdSerie.java | 25 --- .../module/te/prod/serie/TeProdSerieApi.java | 51 ----- .../module/te/prod/serie/TeProdSerieRepo.java | 11 - .../te/prod/serie/TeProdSerieService.java | 26 --- .../module/te/prod/test/TeProdTest.java | 16 -- .../module/te/prod/test/TeProdTestApi.java | 56 ------ .../module/te/prod/test/TeProdTestRepo.java | 8 - .../te/prod/test/TeProdTestService.java | 25 --- .../module/te/prod/version/TeProdVersion.java | 76 ------- .../te/prod/version/TeProdVersionApi.java | 59 ------ .../te/prod/version/TeProdVersionRepo.java | 8 - .../te/prod/version/TeProdVersionService.java | 46 ----- .../module/te/tran/cate/TeTranCate.java | 18 -- .../module/te/tran/cate/TeTranCateApi.java | 55 ----- .../module/te/tran/cate/TeTranCateRepo.java | 8 - .../te/tran/cate/TeTranCateService.java | 22 -- .../module/te/tran/main/TeTranMain.java | 67 ------- .../module/te/tran/main/TeTranMainApi.java | 55 ----- .../module/te/tran/main/TeTranMainItem.java | 45 ----- .../module/te/tran/main/TeTranMainRepo.java | 8 - .../te/tran/main/TeTranMainService.java | 22 -- 152 files changed, 3 insertions(+), 5093 deletions(-) delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMain.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoy.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirl.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudent.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/etl/log/BiEtlLog.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/etl/log/BiEtlLogApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlJobListener.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMain.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainHandler.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/KetJobFactory.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/KetUtil.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMain.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMain.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCate.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCateApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCateRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCateService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMain.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainExp.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCate.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCateApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCateRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCateService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMain.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMainApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMainRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMainService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/prod/feat/SaProdFeat.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroup.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroupApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroupRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroupService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/prod/main/SaProdMain.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTemp.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTempApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTempRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTempService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMain.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMainApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMainRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMainService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheck.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckItem.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/allot/check/Zcheck.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDrive.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveItem.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/Zdrive.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLink.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkItem.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/allot/link/Zlink.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParam.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamItem.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheck.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheckApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheckRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheckService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatComp.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatCompApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatCompRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatCompService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDrive.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDriveApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDriveRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDriveService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLink.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkItem.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkLeft.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkRight.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParam.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamOption.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreen.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreenApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreenRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreenService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCate.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCateApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCateRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCateService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModel.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModelApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModelRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModelService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/prod/model/Zmodel.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/prod/model/Zparam.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/prod/model/Zscreen.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerie.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerieApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerieRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerieService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTest.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTestApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTestRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTestService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersion.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersionApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersionRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersionService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCate.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCateApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCateRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCateService.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMain.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainApi.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainItem.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainRepo.java delete mode 100644 vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainService.java diff --git a/.gitignore b/.gitignore index 36efa3f..af740f0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,6 @@ /.idea/ /vboot-web/src/main/resources/application.properties /vboot-web/src/main/resources/application.yml +/vboot-extend/src/main/java/vboot/extend/module/bi/ +/vboot-extend/src/main/java/vboot/extend/module/sa/ +/vboot-extend/src/main/java/vboot/extend/module/te/ diff --git a/vboot-application/src/main/java/vboot/app/module/de/supp/cate/DeSuppCateService.java b/vboot-application/src/main/java/vboot/app/module/de/supp/cate/DeSuppCateService.java index a0e85c1..48309cf 100644 --- a/vboot-application/src/main/java/vboot/app/module/de/supp/cate/DeSuppCateService.java +++ b/vboot-application/src/main/java/vboot/app/module/de/supp/cate/DeSuppCateService.java @@ -5,11 +5,6 @@ import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.stereotype.Service; import vboot.core.common.dao.Sqler; import vboot.core.common.service.BaseCateService; -import vboot.core.common.service.BaseMainService; -import vboot.core.common.service.BaseService; -import vboot.core.module.sys.portal.menu.SysPortalMenu; -import vboot.extend.module.sa.cust.cate.SaCustCate; -import vboot.extend.module.sa.cust.cate.SaCustCateRepo; import javax.annotation.PostConstruct; import java.util.List; diff --git a/vboot-application/src/main/java/vboot/app/module/de/supp/main/DeSuppMain.java b/vboot-application/src/main/java/vboot/app/module/de/supp/main/DeSuppMain.java index f049928..48fcfff 100644 --- a/vboot-application/src/main/java/vboot/app/module/de/supp/main/DeSuppMain.java +++ b/vboot-application/src/main/java/vboot/app/module/de/supp/main/DeSuppMain.java @@ -4,7 +4,6 @@ import lombok.Getter; import lombok.Setter; import vboot.core.common.entity.BaseMainEntity; import vboot.core.module.sys.org.root.SysOrg; -import vboot.extend.module.sa.prod.main.SaProdMain; import javax.persistence.*; import java.util.ArrayList; diff --git a/vboot-core/src/main/java/vboot/core/common/init/SysPortalInit.java b/vboot-core/src/main/java/vboot/core/common/init/SysPortalInit.java index 16271ed..bce255a 100644 --- a/vboot-core/src/main/java/vboot/core/common/init/SysPortalInit.java +++ b/vboot-core/src/main/java/vboot/core/common/init/SysPortalInit.java @@ -935,195 +935,6 @@ public class SysPortalInit { menu11.setPorid("sa"); menuService.insert(menu11); - SysPortalMenu menu2 = new SysPortalMenu(); - menu2.setId("Sa-SaProj"); - menu2.setName("项目管理"); - menu2.setCode("SaProj"); - menu2.setComp("LAYOUT"); - menu2.setPath("/sa/proj"); - menu2.setRedirect("/sa/proj/main"); - menu2.setOrnum(2); - menu2.setIcon("ele-Postcard"); - menu2.setAvtag(true); - menu2.setShtag(true); - menu2.setType("D"); - menu2.setPorid("sa"); - menuService.insert(menu2); - - SysPortalMenu menu21 = new SysPortalMenu(); - menu21.setId("Sa-SaProjMain"); - menu21.setName("项目清单"); - menu21.setCode("SaProjMain"); - menu21.setPath("/sa/proj/main"); - menu21.setComp("/sa/proj/main/index"); - menu21.setOrnum(21); - menu21.setIcon("ele-Tickets"); - menu21.setPid("Sa-SaProj"); - menu21.setCatag(true); - menu21.setAvtag(true); - menu21.setShtag(true); - menu21.setType("M"); - menu21.setPorid("sa"); - menuService.insert(menu21); - - SysPortalMenu menu22 = new SysPortalMenu(); - menu22.setId("Sa-SaProjMainEdit"); - menu22.setName("项目编辑"); - menu22.setCode("SaProjMainEdit"); - menu22.setPath("/sa/proj/main/edit"); - menu22.setComp("/sa/proj/main/edit"); - menu22.setOrnum(22); - menu22.setIcon("ele-Tickets"); - menu22.setPid("Sa-SaProj"); - menu22.setCatag(true); - menu22.setAvtag(true); - menu22.setShtag(false); - menu22.setType("M"); - menu22.setPorid("sa"); - menuService.insert(menu22); - - SysPortalMenu menu23 = new SysPortalMenu(); - menu23.setId("Sa-SaProjMainView"); - menu23.setName("项目编辑"); - menu23.setCode("SaProjMainView"); - menu23.setPath("/sa/proj/main/view"); - menu23.setComp("/sa/proj/main/view"); - menu23.setOrnum(23); - menu23.setIcon("ele-Tickets"); - menu23.setPid("Sa-SaProj"); - menu23.setCatag(true); - menu23.setAvtag(true); - menu23.setShtag(false); - menu23.setType("M"); - menu23.setPorid("sa"); - menuService.insert(menu23); - - SysPortalMenu menu3 = new SysPortalMenu(); - menu3.setId("Sa-SaAgent"); - menu3.setName("代理商管理"); - menu3.setCode("SaAgent"); - menu3.setComp("LAYOUT"); - menu3.setPath("/sa/agent"); - menu3.setRedirect("/sa/agent/main"); - menu3.setOrnum(3); - menu3.setIcon("ele-Postcard"); - menu3.setAvtag(true); - menu3.setShtag(true); - menu3.setType("D"); - menu3.setPorid("sa"); - menuService.insert(menu3); - - SysPortalMenu menu31 = new SysPortalMenu(); - menu31.setId("Sa-SaAgentCate"); - menu31.setName("代理商分类"); - menu31.setCode("SaAgentCate"); - menu31.setPath("/sa/agent/cate"); - menu31.setComp("/sa/agent/cate/index"); - menu31.setOrnum(31); - menu31.setIcon("ele-Tickets"); - menu31.setPid("Sa-SaAgent"); - menu31.setCatag(true); - menu31.setAvtag(true); - menu31.setShtag(true); - menu31.setType("M"); - menu31.setPorid("sa"); - menuService.insert(menu31); - - SysPortalMenu menu32 = new SysPortalMenu(); - menu32.setId("Sa-SaAgentMain"); - menu32.setName("代理商清单"); - menu32.setCode("SaAgentMain"); - menu32.setPath("/sa/agent/main"); - menu32.setComp("/sa/agent/main/index"); - menu32.setOrnum(32); - menu32.setIcon("ele-Tickets"); - menu32.setPid("Sa-SaAgent"); - menu32.setCatag(true); - menu32.setAvtag(true); - menu32.setShtag(true); - menu32.setType("M"); - menu32.setPorid("sa"); - menuService.insert(menu32); - - SysPortalMenu menu33 = new SysPortalMenu(); - menu33.setId("Sa-SaAgentMainEdit"); - menu33.setName("代理商编辑"); - menu33.setCode("SaAgentMainEdit"); - menu33.setPath("/sa/agent/main/edit"); - menu33.setComp("/sa/agent/main/edit"); - menu33.setOrnum(33); - menu33.setIcon("ele-Tickets"); - menu33.setPid("Sa-SaAgent"); - menu33.setCatag(true); - menu33.setAvtag(true); - menu33.setShtag(false); - menu33.setType("M"); - menu33.setPorid("sa"); - menuService.insert(menu33); - - SysPortalMenu menu4 = new SysPortalMenu(); - menu4.setId("Sa-SaCust"); - menu4.setName("客户管理"); - menu4.setCode("SaCust"); - menu4.setComp("LAYOUT"); - menu4.setPath("/sa/cust"); - menu4.setRedirect("/sa/cust/main"); - menu4.setOrnum(4); - menu4.setIcon("ele-Postcard"); - menu4.setAvtag(true); - menu4.setShtag(true); - menu4.setType("D"); - menu4.setPorid("sa"); - menuService.insert(menu4); - - SysPortalMenu menu41 = new SysPortalMenu(); - menu41.setId("Sa-SaCustCate"); - menu41.setName("客户分类"); - menu41.setCode("SaCustCate"); - menu41.setPath("/sa/cust/cate"); - menu41.setComp("/sa/cust/cate/index"); - menu41.setOrnum(41); - menu41.setIcon("ele-Tickets"); - menu41.setPid("Sa-SaCust"); - menu41.setCatag(true); - menu41.setAvtag(true); - menu41.setShtag(true); - menu41.setType("M"); - menu41.setPorid("sa"); - menuService.insert(menu41); - - SysPortalMenu menu42 = new SysPortalMenu(); - menu42.setId("Sa-SaCustMain"); - menu42.setName("客户分类"); - menu42.setCode("SaCustMain"); - menu42.setPath("/sa/cust/main"); - menu42.setComp("/sa/cust/main/index"); - menu42.setOrnum(42); - menu42.setIcon("ele-Tickets"); - menu42.setPid("Sa-SaCust"); - menu42.setCatag(true); - menu42.setAvtag(true); - menu42.setShtag(true); - menu42.setType("M"); - menu42.setPorid("sa"); - menuService.insert(menu42); - - SysPortalMenu menu43 = new SysPortalMenu(); - menu43.setId("Sa-SaCustMainEdit"); - menu43.setName("客户编辑"); - menu43.setCode("SaCustMainEdit"); - menu43.setPath("/sa/cust/main/edit"); - menu43.setComp("/sa/cust/main/edit"); - menu43.setOrnum(43); - menu43.setIcon("ele-Tickets"); - menu43.setPid("Sa-SaCust"); - menu43.setCatag(true); - menu43.setAvtag(true); - menu43.setShtag(false); - menu43.setType("M"); - menu43.setPorid("sa"); - menuService.insert(menu43); - } diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMain.java b/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMain.java deleted file mode 100644 index cc02ab7..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMain.java +++ /dev/null @@ -1,21 +0,0 @@ -package vboot.extend.module.bi.conn.main; - -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Column; -import javax.persistence.Entity; - -@Entity -@Getter -@Setter -public class BiConnMain extends BaseMainEntity { - - @Column(length = 64) - private String comet;//注释 - - @Column(length = 64) - private String notes;//备注 - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainApi.java deleted file mode 100644 index 4d885e0..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainApi.java +++ /dev/null @@ -1,48 +0,0 @@ -package vboot.extend.module.bi.conn.main; - -import vboot.extend.module.bi.table.main.BiTableMain; -import vboot.extend.module.bi.table.main.BiTableMainService; -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("bi/conn/main") -public class BiConnMainApi { - - private String table = "bi_conn_main"; - - @GetMapping - public R get(String name) { - Sqler sqler = new Sqler(table); - sqler.addLike("t.name", name); - sqler.addSelect("t.comet,t.notes"); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - BiTableMain main = service.findOne(id); - return R.ok(main); - } - - @PostMapping - public R post(@RequestBody BiTableMain main) { - return R.ok(service.insert(main)); - } - - @PutMapping - public R put(@RequestBody BiTableMain main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private BiTableMainService service; - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainRepo.java b/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainRepo.java deleted file mode 100644 index f03f406..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.bi.conn.main; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface BiConnMainRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainService.java b/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainService.java deleted file mode 100644 index 18de00e..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainService.java +++ /dev/null @@ -1,20 +0,0 @@ -package vboot.extend.module.bi.conn.main; - -import vboot.core.common.service.BaseMainService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; - -@Service -public class BiConnMainService extends BaseMainService { - - //----------bean注入------------ - @Autowired - private BiConnMainRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoy.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoy.java deleted file mode 100644 index d464e35..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoy.java +++ /dev/null @@ -1,15 +0,0 @@ -package vboot.extend.module.bi.demo.boy; - -import vboot.core.common.entity.BaseEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Entity; - -@Entity -@Getter -@Setter -public class BiDemoBoy extends BaseEntity -{ - private String notes; -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyApi.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyApi.java deleted file mode 100644 index bd4e5f7..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyApi.java +++ /dev/null @@ -1,61 +0,0 @@ -package vboot.extend.module.bi.demo.boy; - -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; -import vboot.core.xutil.lang.XstrUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; -import java.util.List; - - -@RestController -@RequestMapping("bi/demo/boy") -public class BiDemoBoyApi { - - private String table = "bi_demo_boy"; - - @GetMapping - public R get(String name) { - List boys = new ArrayList<>(); - for (int i = 1; i <= 100; i++) { - BiDemoBoy boy=new BiDemoBoy(); - boy.setId(XstrUtil.getUUID()); - boy.setName(XstrUtil.getRSID8()); - boys.add(boy); - } - repo.saveAll(boys); - Sqler sqler = new Sqler(table); - sqler.addLike("t.name", name); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - BiDemoBoy main = service.findOne(id); - return R.ok(main); - } - - @PostMapping - public R post(@RequestBody BiDemoBoy main) { - return R.ok(service.insert(main)); - } - - @PutMapping - public R put(@RequestBody BiDemoBoy main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private BiDemoBoyService service; - - @Autowired - private BiDemoBoyRepo repo; - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyRepo.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyRepo.java deleted file mode 100644 index b357b2d..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.bi.demo.boy; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface BiDemoBoyRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyService.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyService.java deleted file mode 100644 index 58730b5..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyService.java +++ /dev/null @@ -1,22 +0,0 @@ -package vboot.extend.module.bi.demo.boy; - -import vboot.core.common.service.BaseService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; - -@Service -@Slf4j -public class BiDemoBoyService extends BaseService { - - //----------bean注入------------ - @Autowired - private BiDemoBoyRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirl.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirl.java deleted file mode 100644 index 2b731e8..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirl.java +++ /dev/null @@ -1,15 +0,0 @@ -package vboot.extend.module.bi.demo.girl; - -import vboot.core.common.entity.BaseEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Entity; - -@Entity -@Getter -@Setter -public class BiDemoGirl extends BaseEntity -{ - private String notes; -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlApi.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlApi.java deleted file mode 100644 index 15e4fe3..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlApi.java +++ /dev/null @@ -1,46 +0,0 @@ -package vboot.extend.module.bi.demo.girl; - -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - - -@RestController -@RequestMapping("bi/demo/girl") -public class BiDemoGirlApi { - - private String table = "bi_demo_girl"; - - @GetMapping - public R get(String name) { - Sqler sqler = new Sqler(table); - sqler.addLike("t.name", name); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - BiDemoGirl main = service.findOne(id); - return R.ok(main); - } - - @PostMapping - public R post(@RequestBody BiDemoGirl main) { - return R.ok(service.insert(main)); - } - - @PutMapping - public R put(@RequestBody BiDemoGirl main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private BiDemoGirlService service; - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlRepo.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlRepo.java deleted file mode 100644 index 7059252..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.bi.demo.girl; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface BiDemoGirlRepo extends JpaRepository { - - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlService.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlService.java deleted file mode 100644 index 39db6b2..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlService.java +++ /dev/null @@ -1,22 +0,0 @@ -package vboot.extend.module.bi.demo.girl; - -import vboot.core.common.service.BaseService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; - -@Service -@Slf4j -public class BiDemoGirlService extends BaseService { - - //----------bean注入------------ - @Autowired - private BiDemoGirlRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudent.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudent.java deleted file mode 100644 index fa7dad4..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudent.java +++ /dev/null @@ -1,15 +0,0 @@ -package vboot.extend.module.bi.demo.student; - -import vboot.core.common.entity.BaseEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Entity; - -@Entity -@Getter -@Setter -public class BiDemoStudent extends BaseEntity -{ - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentApi.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentApi.java deleted file mode 100644 index 7950177..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentApi.java +++ /dev/null @@ -1,46 +0,0 @@ -package vboot.extend.module.bi.demo.student; - -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - - -@RestController -@RequestMapping("bi/demo/student") -public class BiDemoStudentApi { - - private String table = "bi_demo_student"; - - @GetMapping - public R get(String name) { - Sqler sqler = new Sqler(table); - sqler.addLike("t.name", name); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - BiDemoStudent main = service.findOne(id); - return R.ok(main); - } - - @PostMapping - public R post(@RequestBody BiDemoStudent main) { - return R.ok(service.insert(main)); - } - - @PutMapping - public R put(@RequestBody BiDemoStudent main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private BiDemoStudentService service; - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentRepo.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentRepo.java deleted file mode 100644 index 4343164..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.bi.demo.student; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface BiDemoStudentRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentService.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentService.java deleted file mode 100644 index 290cf3c..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentService.java +++ /dev/null @@ -1,22 +0,0 @@ -package vboot.extend.module.bi.demo.student; - -import vboot.core.common.service.BaseService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; - -@Service -@Slf4j -public class BiDemoStudentService extends BaseService { - - //----------bean注入------------ - @Autowired - private BiDemoStudentRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/etl/log/BiEtlLog.java b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/log/BiEtlLog.java deleted file mode 100644 index 97d23e4..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/etl/log/BiEtlLog.java +++ /dev/null @@ -1,52 +0,0 @@ -package vboot.extend.module.bi.etl.log; - -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import java.util.Date; - -@Entity -@Getter -@Setter -public class BiEtlLog { - - @Id - private Integer ID_BATCH; - - private String CHANNEL_ID; - - private String TRANSNAME; - - @Column(length = 15) - private String STATUS; - - private Long LINES_READ; - - private Long LINES_WRITTEN; - - private Long LINES_UPDATED; - - private Long LINES_INPUT; - - private Long LINES_OUTPUT; - - private Long LINES_REJECTED; - - private Long ERRORS; - - private Date STARTDATE; - - private Date ENDDATE; - - private Date LOGDATE; - - private Date DEPDATE; - - private Date REPLAYDATE; - - @Column(length = 5000) - private String LOG_FIELD; -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/etl/log/BiEtlLogApi.java b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/log/BiEtlLogApi.java deleted file mode 100644 index 180ff11..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/etl/log/BiEtlLogApi.java +++ /dev/null @@ -1,45 +0,0 @@ -package vboot.extend.module.bi.etl.log; - -import vboot.core.common.api.R; -import vboot.core.common.dao.JdbcDao; -import vboot.core.common.dao.Sqler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("bi/etl/log") -public class BiEtlLogApi { - private String table="bi_etl_log"; - - - @GetMapping - public R list(Integer panum, Integer pasiz, String name, String id) { - Sqler sqler = new Sqler("t.ID_BATCH as id,t.TRANSNAME as name,t.STARTDATE as sttim,t.ENDDATE as entim," + - "t.STATUS as state,t.LOGDATE as lotim,t.DEPDATE as detim,t.REPLAYDATE as retim", - table,panum,pasiz); - sqler.addLike("t.TRANSNAME", name); - sqler.addEqual("t.ID_BATCH", id); - sqler.addOrder("t.LOGDATE desc"); - return R.ok(jdbcDao.findPageData(sqler)); - } - - @GetMapping("one/{id}") - public R get(@PathVariable String id) { - String sql = "select t.ID_BATCH as id,t.STARTDATE sttim,t.ENDDATE entim,t.LOGDATE lotim,t.log_field msg,t.status state," + - "t.transname name from "+table+" t where t.ID_BATCH=?"; - return R.ok(jdbcDao.findMap(sql, id)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - String sql = "delete from "+table+" where ID_BATCH=?"; - for (String id : ids) { - jdbcDao.update(sql, id); - } - return R.ok(); - } - - @Autowired - private JdbcDao jdbcDao; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlJobListener.java b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlJobListener.java deleted file mode 100644 index 540997c..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlJobListener.java +++ /dev/null @@ -1,41 +0,0 @@ -package vboot.extend.module.bi.etl.main; - -import lombok.extern.slf4j.Slf4j; -import org.pentaho.di.core.KettleEnvironment; -import org.pentaho.di.core.exception.KettleException; -import org.quartz.SchedulerException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.event.ContextRefreshedEvent; - -import java.util.List; - -@Configuration -@Slf4j -public class BiEtlJobListener implements ApplicationListener { - @Autowired - private BiEtlMainHandler handler; - - @Autowired - private BiEtlMainService etlService; - - //初始启动quartz - @Override - public void onApplicationEvent(ContextRefreshedEvent event) { - List kettleList = etlService.findAll(); - try { - KettleEnvironment.init(); - } catch (KettleException e) { - e.printStackTrace(); - } - try { - handler.startAllEtlJobs(kettleList); - } catch (SchedulerException e) { - e.printStackTrace(); - } -// log.info("----ETL定时调度任务开启----"); - } - - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMain.java b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMain.java deleted file mode 100644 index 542e00d..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMain.java +++ /dev/null @@ -1,28 +0,0 @@ -package vboot.extend.module.bi.etl.main; - -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Column; -import javax.persistence.Entity; - -@Entity -@Getter -@Setter -public class BiEtlMain extends BaseMainEntity -{ - @Column(length = 32) - private String code; - - @Column(length = 32) - private String cron; - - private String notes; - - @Column(length = 128) - private String zpath; - - @Column(length = 128) - private String zname; -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainApi.java deleted file mode 100644 index 6beac93..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainApi.java +++ /dev/null @@ -1,89 +0,0 @@ -package vboot.extend.module.bi.etl.main; - -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; -import org.quartz.SchedulerException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("bi/etl/main") -public class BiEtlMainApi { - - @Value("${app.att.path}") - private String ATT_PATH; - - private String table = "bi_etl_main"; - - @GetMapping - public R get(String name) { - Sqler sqler = new Sqler("t.id,t.name,t.code,t.cron,t.avtag", table); - sqler.addLeftJoin("o.name as crman", "sys_org o", "o.id=t.crman"); - sqler.addLike("t.name", name); - sqler.addOrder("t.crtim desc"); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - return R.ok(service.findOne(id)); - } - - @PostMapping("once") - public R edit_startOnce(String id) throws Exception { - BiEtlMain kettle = service.findOne(id); - KetUtil.runTran(ATT_PATH + "/" + kettle.getZpath(), null, true); - return R.ok(); - } - - @PostMapping - public R post(@RequestBody BiEtlMain main) { - main.setAvtag(false); - return R.ok(service.insert(main)); - } - - @PutMapping - public R put(@RequestBody BiEtlMain main) throws SchedulerException { - if (main.getAvtag()) { - handler.startEtlJob(main); - } - return R.ok(service.update(main)); - } - - @PostMapping("start") - public R startJob(String ids) throws SchedulerException { - String[] idArr = ids.split(","); - for (int i = 0; i < idArr.length; i++) { - BiEtlMain kettle =service.findOne(idArr[i]); - handler.startEtlJob(kettle); - } - return R.ok(); - } - - @PostMapping("stop") - public R stopJob(String ids) throws SchedulerException { - String[] idArr = ids.split(","); - for (int i = 0; i < idArr.length; i++) { - BiEtlMain kettle = service.findOne(idArr[i]); - handler.stopEtlJob(kettle); - } - return R.ok(); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) throws SchedulerException { - for (int i = 0; i < ids.length; i++) { - BiEtlMain kettle = service.findOne(ids[i]); - handler.stopEtlJob(kettle); - } - return R.ok(service.delete(ids)); - } - - @Autowired - private BiEtlMainHandler handler; - - @Autowired - private BiEtlMainService service; - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainHandler.java b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainHandler.java deleted file mode 100644 index e026330..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainHandler.java +++ /dev/null @@ -1,74 +0,0 @@ -package vboot.extend.module.bi.etl.main; - -import org.quartz.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.List; - -@Component -public class BiEtlMainHandler { - - - - //开始执行所有任务 - public void startAllEtlJobs(List kettleList) throws SchedulerException { - for (int i = 0; i < kettleList.size(); i++) { - if(kettleList.get(i).getAvtag()){ - initEtlJob(scheduler,kettleList.get(i)); - } - } - //scheduler.start(); - } - - private void initEtlJob(Scheduler scheduler, BiEtlMain kettle) throws SchedulerException { - // 通过JobBuilder构建JobDetail实例，JobDetail规定只能是实现Job接口的实例 - // JobDetail 是具体Job实例 - JobDetail jobDetail = JobBuilder.newJob(KetJobFactory.class).withIdentity(kettle.getId(), "etl").build(); - // 基于表达式构建触发器 - jobDetail.getJobDataMap().put("etl", kettle.getId()); - CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(kettle.getCron()); - // CronTrigger表达式触发器 继承于Trigger - // TriggerBuilder 用于构建触发器实例 - CronTrigger cronTrigger = TriggerBuilder.newTrigger().withIdentity(kettle.getId(), "etl") - .withSchedule(cronScheduleBuilder).build(); - scheduler.scheduleJob(jobDetail, cronTrigger); - } - - //禁用任务 - public void stopEtlJob(BiEtlMain kettle) throws SchedulerException { - JobKey jobKey = JobKey.jobKey(kettle.getId(), "etl"); - scheduler.deleteJob(jobKey); - kettle.setAvtag(false); - biEtlMainRepo.save(kettle); - } - - //启用任务 - public void startEtlJob(BiEtlMain kettle) throws SchedulerException { - TriggerKey triggerKey = TriggerKey.triggerKey(kettle.getId(), "etl"); - CronTrigger trigger = (CronTrigger) scheduler.getTrigger(triggerKey); - if (null == trigger) { - JobDetail jobDetail = JobBuilder.newJob(KetJobFactory.class) - .withIdentity(kettle.getId(), "etl").build(); - jobDetail.getJobDataMap().put("etl", kettle.getId()); - CronScheduleBuilder scheduleBuilder = CronScheduleBuilder.cronSchedule(kettle.getCron()); - trigger = TriggerBuilder.newTrigger().withIdentity(kettle.getId(), "etl") - .withSchedule(scheduleBuilder).build(); - scheduler.scheduleJob(jobDetail, trigger); - } else { - CronScheduleBuilder scheduleBuilder = CronScheduleBuilder.cronSchedule(kettle.getCron()); - trigger = trigger.getTriggerBuilder().withIdentity(triggerKey).withSchedule(scheduleBuilder).build(); - scheduler.rescheduleJob(triggerKey, trigger); - } - kettle.setAvtag(true); - biEtlMainRepo.save(kettle); - } - - // 任务调度 - @Autowired - private Scheduler scheduler; - - @Autowired - private BiEtlMainRepo biEtlMainRepo; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainRepo.java b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainRepo.java deleted file mode 100644 index a0ec1a0..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainRepo.java +++ /dev/null @@ -1,9 +0,0 @@ -package vboot.extend.module.bi.etl.main; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface BiEtlMainRepo extends JpaRepository { - - BiEtlMain findByCode(String code); - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainService.java b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainService.java deleted file mode 100644 index 5793623..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainService.java +++ /dev/null @@ -1,50 +0,0 @@ -package vboot.extend.module.bi.etl.main; - -import vboot.core.common.service.BaseMainService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.Map; - -@Service -@Slf4j -public class BiEtlMainService extends BaseMainService { - - @Value("${app.att.path}") - private String ATT_PATH; - - public void runByNum(String kettleId,String num) throws Exception - { - BiEtlMain kettle=repo.findById(kettleId).get(); - try - { - KetUtil.runTran(ATT_PATH + "/" + kettle.getZpath(),null ,true); - } catch (Exception e) - { - StringWriter sw = new StringWriter(); - e.printStackTrace(new PrintWriter(sw, true)); - throw e; - } - } - - public long runById(String id, Map map) throws Exception { - BiEtlMain main=repo.findById(id).get(); - return KetUtil.runTran(ATT_PATH+"/"+main.getZpath(),map,false); - } - - - //bean注入------------------------------ - @Autowired - private BiEtlMainRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/KetJobFactory.java b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/KetJobFactory.java deleted file mode 100644 index c52881f..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/KetJobFactory.java +++ /dev/null @@ -1,22 +0,0 @@ -package vboot.extend.module.bi.etl.main; - -import vboot.core.xutil.web.XspringUtil; -import org.quartz.Job; -import org.quartz.JobExecutionContext; - -public class KetJobFactory implements Job { - - - @Override - public void execute(JobExecutionContext context) { - String kettleId = (String) context.getMergedJobDataMap().get("etl"); - try { - BiEtlMainService service= XspringUtil.getBean(BiEtlMainService.class); - service.runById(kettleId,null); - } catch (Exception e) { - e.printStackTrace(); - } - } - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/KetUtil.java b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/KetUtil.java deleted file mode 100644 index cb7b210..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/KetUtil.java +++ /dev/null @@ -1,95 +0,0 @@ -package vboot.extend.module.bi.etl.main; - -import org.pentaho.di.core.database.DatabaseMeta; -import org.pentaho.di.core.logging.KettleLogStore; -import org.pentaho.di.core.logging.TransLogTable; -import org.pentaho.di.core.variables.VariableSpace; -import org.pentaho.di.core.variables.Variables; -import org.pentaho.di.job.Job; -import org.pentaho.di.job.JobMeta; -import org.pentaho.di.trans.Trans; -import org.pentaho.di.trans.TransMeta; - -import java.util.Map; - -public class KetUtil { - public static void runJob(String jobPath) { - try { - JobMeta jobMeta = new JobMeta(jobPath, null); - Job job = new Job(null, jobMeta); - job.start(); - job.waitUntilFinished(); - if (job.getErrors() > 0) { - throw new Exception( - "There are errors during job exception!(执行job发生异常)"); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - public static long runTran(String ktrPath, Map map, Boolean waitFlag) throws Exception { - TransMeta transMeta = new TransMeta(ktrPath); - - DatabaseMeta databaseMeta = new DatabaseMeta(); - databaseMeta.setName("ket"); - databaseMeta.setDatabaseType("MYSQL"); - databaseMeta.setAccessType(DatabaseMeta.TYPE_ACCESS_NATIVE); - - - databaseMeta.setDBPort("3306"); - databaseMeta.setUsername("root"); - databaseMeta.setHostname("localhost"); - databaseMeta.setDBName("vboot-java"); - databaseMeta.setPassword("123456"); - - databaseMeta.getAttributes().setProperty("EXTRA_OPTION_MYSQL.useSSL", "false"); - transMeta.addDatabase(databaseMeta); - VariableSpace space = new Variables(); - TransLogTable transLogTable = TransLogTable.getDefault(space, transMeta, transMeta.getSteps()); - transLogTable.setConnectionName("ket"); - transLogTable.setTableName("bi_etl_log"); - transMeta.setTransLogTable(transLogTable); - - transMeta.setCapturingStepPerformanceSnapShots(true); - Trans trans = new Trans(transMeta); - -// trans.setLogLevel(LogLevel.DEBUG); - trans.setMonitored(true); - trans.setInitializing(true); - trans.setPreparing(true); - trans.setRunning(true); - trans.setSafeModeEnabled(true); - if (map != null) { - for (String s : map.keySet()) { - trans.setVariable(s, map.get(s)); - } - } - trans.execute(null); - if (waitFlag) { - trans.waitUntilFinished(); - } - -// if (trans.isFinished()) { -// Map> stepPerformanceSnapShots = trans.getStepPerformanceSnapShots(); -// stepPerformanceSnapShots.forEach((str, StepPerformanceSnapShotList) -> { -// for (StepPerformanceSnapShot stepPerformanceSnapShot : StepPerformanceSnapShotList) { -// System.out.println(JSONObject.fromObject(stepPerformanceSnapShot).toString()); -// } -// }); -// System.out.println("执行成功"); -// } else { -// Map> stepPerformanceSnapShots = trans.getStepPerformanceSnapShots(); -// stepPerformanceSnapShots.forEach((str, StepPerformanceSnapShotList) -> { -// for (StepPerformanceSnapShot stepPerformanceSnapShot : StepPerformanceSnapShotList) { -// System.err.println(JSONObject.fromObject(stepPerformanceSnapShot).toString()); -// } -// }); -// System.out.println("执行失败"); -// } - KettleLogStore.discardLines(trans.getLogChannelId(), true); - return trans.getBatchId(); - } - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMain.java b/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMain.java deleted file mode 100644 index ecb0faf..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMain.java +++ /dev/null @@ -1,23 +0,0 @@ -package vboot.extend.module.bi.field.main; - -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Column; -import javax.persistence.Entity; - -@Entity -@Getter -@Setter -public class BiFieldMain extends BaseMainEntity { - - @Column(length = 64) - private String comet; - - @Column(length = 64) - private String notes; - - @Column(length = 32) - private String tableid; -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainApi.java deleted file mode 100644 index c75dd3a..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainApi.java +++ /dev/null @@ -1,45 +0,0 @@ -package vboot.extend.module.bi.field.main; - -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("bi/field/main") -public class BiFieldMainApi { - - private String table = "bi_field_main"; - - @GetMapping - public R get(String name) { - Sqler sqler = new Sqler(table); - sqler.addLike("t.name" , name); - sqler.addSelect("t.notes"); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - return R.ok(service.findOne(id)); - } - - @PostMapping - public R post(@RequestBody BiFieldMain main) { - return R.ok(service.insert(main)); - } - - @PutMapping - public R put(@RequestBody BiFieldMain main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private BiFieldMainService service; - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainRepo.java b/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainRepo.java deleted file mode 100644 index 2ffd6de..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.bi.field.main; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface BiFieldMainRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainService.java b/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainService.java deleted file mode 100644 index b8b2e24..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainService.java +++ /dev/null @@ -1,22 +0,0 @@ -package vboot.extend.module.bi.field.main; - -import vboot.core.common.service.BaseMainService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; - -@Service -public class BiFieldMainService extends BaseMainService { - - //----------bean注入------------ - @Autowired - private BiFieldMainRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } -} - - diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMain.java b/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMain.java deleted file mode 100644 index 8556e41..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMain.java +++ /dev/null @@ -1,22 +0,0 @@ -package vboot.extend.module.bi.table.main; - -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Column; -import javax.persistence.Entity; - -@Entity -@Getter -@Setter -public class BiTableMain extends BaseMainEntity { - - @Column(length = 64) - private String comet;//注释 - - @Column(length = 64) - private String notes;//备注 - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainApi.java deleted file mode 100644 index 4b150dc..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainApi.java +++ /dev/null @@ -1,45 +0,0 @@ -package vboot.extend.module.bi.table.main; - -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("bi/table/main") -public class BiTableMainApi { - - private String table = "bi_table_main"; - - @GetMapping - public R get(String name) { - Sqler sqler = new Sqler(table); - sqler.addLike("t.name" , name); - sqler.addSelect("t.comet,t.notes"); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - return R.ok(service.findOne(id)); - } - - @PostMapping - public R post(@RequestBody BiTableMain main) { - return R.ok(service.insert(main)); - } - - @PutMapping - public R put(@RequestBody BiTableMain main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private BiTableMainService service; - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainRepo.java b/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainRepo.java deleted file mode 100644 index 0b6169c..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.bi.table.main; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface BiTableMainRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainService.java b/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainService.java deleted file mode 100644 index a389e91..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainService.java +++ /dev/null @@ -1,22 +0,0 @@ -package vboot.extend.module.bi.table.main; - -import vboot.core.common.service.BaseMainService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; - -@Service -public class BiTableMainService extends BaseMainService { - - //----------bean注入------------ - @Autowired - private BiTableMainRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } -} - - diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCate.java b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCate.java deleted file mode 100644 index 8c0b07f..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCate.java +++ /dev/null @@ -1,19 +0,0 @@ -package vboot.extend.module.sa.agent.cate; - -import lombok.Getter; -import lombok.Setter; -import vboot.core.common.entity.BaseMainEntity; - -import javax.persistence.Entity; - -@Entity -@Getter -@Setter -public class SaAgentCate extends BaseMainEntity { - - private Integer ornum;//排序号 - - private String notes; //备注 - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCateApi.java b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCateApi.java deleted file mode 100644 index 2514e35..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCateApi.java +++ /dev/null @@ -1,50 +0,0 @@ -package vboot.extend.module.sa.agent.cate; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; - -@RestController -@RequestMapping("sa/agent/cate") -public class SaAgentCateApi { - - @GetMapping("list") - public R getList() { - return R.ok(service.findAll()); - } - - @GetMapping - public R get(String name) { - Sqler sqler = new Sqler("sa_agent_cate"); - sqler.addLike("t.name", name); - sqler.addOrder("t.ornum").addSelect("t.notes"); - return R.ok(service.findPageData(sqler)); - } - - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - SaAgentCate main = service.findOne(id); - return R.ok(main); - } - - @PostMapping - public R post(@RequestBody SaAgentCate main) { return R.ok(service.insert(main)); } - - @PutMapping - public R put(@RequestBody SaAgentCate main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - - @Autowired - private SaAgentCateService service; - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCateRepo.java b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCateRepo.java deleted file mode 100644 index cfca483..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCateRepo.java +++ /dev/null @@ -1,9 +0,0 @@ -package vboot.extend.module.sa.agent.cate; - - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface SaAgentCateRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCateService.java b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCateService.java deleted file mode 100644 index b11b98f..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCateService.java +++ /dev/null @@ -1,21 +0,0 @@ -package vboot.extend.module.sa.agent.cate; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import vboot.core.common.service.BaseMainService; - -import javax.annotation.PostConstruct; - -@Service -public class SaAgentCateService extends BaseMainService { - - - @Autowired - private SaAgentCateRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMain.java b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMain.java deleted file mode 100644 index 6bde6fd..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMain.java +++ /dev/null @@ -1,58 +0,0 @@ -package vboot.extend.module.sa.agent.main; - -import lombok.Getter; -import lombok.Setter; -import vboot.core.common.entity.BaseMainEntity; -import vboot.core.module.sys.org.root.SysOrg; - -import javax.persistence.*; -import java.util.List; - -@Entity -@Getter -@Setter -public class SaAgentMain extends BaseMainEntity { - - //--------地址相关信息------<<< - private String addre;//完整地址 - - @Column(length = 64) - private String adreg;//省市区 - - @Column(length = 128) - private String addet;//省市区以外的详细信息 - - @Column(length = 32) - private String adcoo;//经纬度 - - @Column(length = 32) - private String adpro;//省 - - @Column(length = 32) - private String adcit;//市 - - @Column(length = 32) - private String addis;//区 - //--------地址相关信息------>>> - - @Column(length = 32) - private String level;//代理商资质 - - @Column(length = 32) - private String catid;//代理商分类 - - @Column(length = 32) - private String senum;//流水号 - - private String notes;//备注 - - @ManyToMany - @JoinTable(name = "sa_agent_viewer", joinColumns = {@JoinColumn(name = "mid")}, - inverseJoinColumns = {@JoinColumn(name = "oid")}) - private List viewers;//可查看者 - - @ManyToMany - @JoinTable(name = "sa_agent_editor", joinColumns = {@JoinColumn(name = "mid")}, - inverseJoinColumns = {@JoinColumn(name = "oid")}) - private List editors;//可编辑者 -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainApi.java deleted file mode 100644 index f542acf..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainApi.java +++ /dev/null @@ -1,78 +0,0 @@ -package vboot.extend.module.sa.agent.main; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.BeanPropertyRowMapper; -import org.springframework.web.bind.annotation.*; -import vboot.core.common.api.R; -import vboot.core.common.dao.JdbcDao; -import vboot.core.common.dao.Sqler; -import vboot.core.module.ass.num.main.AssNumMainService; -import vboot.core.module.mon.log.oper.Oplog; -import vboot.core.xutil.file.ExcelUtil; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -@RestController -@RequestMapping("sa/agent/main") -public class SaAgentMainApi { - - - @GetMapping("list") - public R getList() { - return R.ok(service.findAll()); - } - - @Oplog("查询代理商") - @GetMapping - public R get(String name) { - Sqler sqler = new Sqler("sa_agent_main"); - sqler.addLike("t.name", name); - sqler.addSelect("t.addre,t.senum"); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("exp") - public void getExp(HttpServletResponse response) throws Exception { - Sqler sqler=new Sqler("t.id,t.name,t.crtim,t.uptim","sa_agent_main"); - sqler.addLeftJoin("o1.name as crman","sys_org o1","o1.id=t.crman"); - sqler.addLeftJoin("o2.name as upman","sys_org o2","o2.id=t.upman"); - sqler.addSelect("t.addre,t.adcoo,t.notes,t.senum"); - List list = jdbcDao.getTp().query(sqler.getSql(), - sqler.getParams(), new BeanPropertyRowMapper<>(SaAgentMainExp.class)); - ExcelUtil.exportExcel(list, "代理商清单", SaAgentMainExp.class, response); - } - - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - SaAgentMain main = service.findOne(id); - return R.ok(main); - } - - @PostMapping - public R post(@RequestBody SaAgentMain main) { - main.setSenum(numService.getNum("AGENT")); - return R.ok(service.insert(main)); - } - - @PutMapping - public R put(@RequestBody SaAgentMain main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private AssNumMainService numService; - - @Autowired - private SaAgentMainService service; - - @Autowired - private JdbcDao jdbcDao; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainExp.java b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainExp.java deleted file mode 100644 index 0005c13..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainExp.java +++ /dev/null @@ -1,27 +0,0 @@ -package vboot.extend.module.sa.agent.main; - -import lombok.Data; - -@Data -public class SaAgentMainExp { - - private String id; - - private String senum; - - private String name; - - private String addre; - - private String adcoo; - - private String crman; - - private String crtim; - - private String upman; - - private String uptim; - - private String notes; -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainRepo.java b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainRepo.java deleted file mode 100644 index c75dc76..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainRepo.java +++ /dev/null @@ -1,9 +0,0 @@ -package vboot.extend.module.sa.agent.main; - - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface SaAgentMainRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainService.java b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainService.java deleted file mode 100644 index b167115..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainService.java +++ /dev/null @@ -1,22 +0,0 @@ -package vboot.extend.module.sa.agent.main; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import vboot.core.common.service.BaseMainService; - -import javax.annotation.PostConstruct; - -@Service -public class SaAgentMainService extends BaseMainService { - - - //----------bean注入------------ - @Autowired - private SaAgentMainRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCate.java b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCate.java deleted file mode 100644 index 8b51e4b..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCate.java +++ /dev/null @@ -1,18 +0,0 @@ -package vboot.extend.module.sa.cust.cate; - -import lombok.Getter; -import lombok.Setter; -import vboot.core.common.entity.BaseMainEntity; - -import javax.persistence.Entity; - -@Entity -@Getter -@Setter -public class SaCustCate extends BaseMainEntity { - - private Integer ornum;//排序号 - - private String notes; //备注 - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCateApi.java b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCateApi.java deleted file mode 100644 index 609a2f3..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCateApi.java +++ /dev/null @@ -1,49 +0,0 @@ -package vboot.extend.module.sa.cust.cate; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; - -@RestController -@RequestMapping("sa/cust/cate") -public class SaCustCateApi { - - @GetMapping("list") - public R getList() { - return R.ok(service.findAll()); - } - - @GetMapping - public R get(String name) { - Sqler sqler = new Sqler("sa_cust_cate"); - sqler.addLike("t.name", name); - sqler.addOrder("t.ornum").addSelect("t.notes"); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - SaCustCate main = service.findOne(id); - return R.ok(main); - } - - @PostMapping - public R post(@RequestBody SaCustCate main) { return R.ok(service.insert(main)); } - - @PutMapping - public R put(@RequestBody SaCustCate main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - - @Autowired - private SaCustCateService service; - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCateRepo.java b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCateRepo.java deleted file mode 100644 index 6a20b57..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCateRepo.java +++ /dev/null @@ -1,9 +0,0 @@ -package vboot.extend.module.sa.cust.cate; - - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface SaCustCateRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCateService.java b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCateService.java deleted file mode 100644 index 621ab25..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCateService.java +++ /dev/null @@ -1,20 +0,0 @@ -package vboot.extend.module.sa.cust.cate; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import vboot.core.common.service.BaseMainService; - -import javax.annotation.PostConstruct; - -@Service -public class SaCustCateService extends BaseMainService { - - @Autowired - private SaCustCateRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMain.java b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMain.java deleted file mode 100644 index bcb54e4..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMain.java +++ /dev/null @@ -1,55 +0,0 @@ -package vboot.extend.module.sa.cust.main; - -import lombok.Getter; -import lombok.Setter; -import vboot.core.common.entity.BaseMainEntity; -import vboot.core.module.sys.org.root.SysOrg; - -import javax.persistence.*; -import java.util.List; - -@Entity -@Getter -@Setter -public class SaCustMain extends BaseMainEntity { - - //--------地址相关信息------<<< - private String addre;//完整地址 - - @Column(length = 64) - private String adreg;//省市区 - - @Column(length = 128) - private String addet;//省市区以外的详细信息 - - @Column(length = 32) - private String adcoo;//经纬度 - - @Column(length = 32) - private String adpro;//省 - - @Column(length = 32) - private String adcit;//市 - - @Column(length = 32) - private String addis;//区 - //--------地址相关信息------>>> - - @Column(length = 32) - private String catid;//客户分类 - - @Column(length = 32) - private String senum;//流水号 - - private String notes;//备注 - - @ManyToMany - @JoinTable(name = "sa_cust_viewer", joinColumns = {@JoinColumn(name = "mid")}, - inverseJoinColumns = {@JoinColumn(name = "oid")}) - private List viewers;//可查看者 - - @ManyToMany - @JoinTable(name = "sa_cust_editor", joinColumns = {@JoinColumn(name = "mid")}, - inverseJoinColumns = {@JoinColumn(name = "oid")}) - private List editors;//可编辑者 -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMainApi.java deleted file mode 100644 index 3d1d9ef..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMainApi.java +++ /dev/null @@ -1,60 +0,0 @@ -package vboot.extend.module.sa.cust.main; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; -import vboot.core.module.ass.num.main.AssNumMainService; -import vboot.core.module.mon.log.oper.Oplog; - -@RestController -@RequestMapping("sa/cust/main") -public class SaCustMainApi { - - - @GetMapping("list") - public R getList() { - return R.ok(service.findAll()); - } - - @Oplog("查询客户") - @GetMapping - public R get(String name) { - Sqler sqler = new Sqler("sa_cust_main"); - sqler.addLike("t.name", name); - sqler.addSelect("t.addre,t.senum"); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - SaCustMain main = service.findOne(id); - return R.ok(main); - } - - @Oplog("新增客户") - @PostMapping - public R post(@RequestBody SaCustMain main) { - main.setSenum(numService.getNum("CUST")); - return R.ok(service.insert(main)); - } - - @Oplog("修改客户") - @PutMapping - public R put(@RequestBody SaCustMain main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private AssNumMainService numService; - - @Autowired - private SaCustMainService service; - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMainRepo.java b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMainRepo.java deleted file mode 100644 index 94a511e..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMainRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.sa.cust.main; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface SaCustMainRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMainService.java b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMainService.java deleted file mode 100644 index 3e00298..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMainService.java +++ /dev/null @@ -1,20 +0,0 @@ -package vboot.extend.module.sa.cust.main; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import vboot.core.common.service.BaseMainService; - -import javax.annotation.PostConstruct; - -@Service -public class SaCustMainService extends BaseMainService { - - @Autowired - private SaCustMainRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/prod/feat/SaProdFeat.java b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/feat/SaProdFeat.java deleted file mode 100644 index 7660d29..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/prod/feat/SaProdFeat.java +++ /dev/null @@ -1,30 +0,0 @@ -package vboot.extend.module.sa.prod.feat; - -import lombok.Getter; -import lombok.Setter; -import org.hibernate.annotations.GenericGenerator; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -@Entity -@Getter -@Setter -public class SaProdFeat { - - @Id - @Column(length = 32) - @GeneratedValue(generator = "jpa-uuid") - @GenericGenerator(name = "jpa-uuid", strategy = "uuid") - private String id;//ID - - @Column(length = 100) - private String name;//选项名称 - - private Integer ornum;//排序号 - - private String notes;//备注 - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroup.java b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroup.java deleted file mode 100644 index 5dd9531..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroup.java +++ /dev/null @@ -1,44 +0,0 @@ -package vboot.extend.module.sa.prod.group; - -import vboot.extend.module.sa.prod.main.SaProdMain; -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.List; - -@Entity -@Getter -@Setter -public class SaProdGroup extends BaseMainEntity { - - private Integer ornum; //排序 - - @Column(length = 32) - private String cate; //产品分类 - - @Column(length = 32) - private String layout; //布局方式 - - private Integer gramo; //组数 - - private Integer seamo; //台数 - - private String notes; //备注 - - @Column(length = 32) - private String prjid;//项目 - - @Transient - private Boolean edtag=false;//可编辑标记 - - @Transient - private Boolean chtag=false;//已变更标记 用户减少后台交互 - - @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true) - @JoinColumn(name = "groid") - @OrderBy("ornum ASC") - private List prods = new ArrayList<>(); -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroupApi.java b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroupApi.java deleted file mode 100644 index c8b6bc1..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroupApi.java +++ /dev/null @@ -1,57 +0,0 @@ -package vboot.extend.module.sa.prod.group; - -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("sa/prod/group") -public class SaProdGroupApi { - - //分页查询项目清单 - @GetMapping - public R get(String name) { - Sqler sqler = new Sqler("sa_prod_group"); - sqler.addLike("t.name", name); - sqler.addSelect("t.addre,t.notes"); - return R.ok(service.findPageData(sqler)); - } - - //查询单个项目 - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - SaProdGroup main = service.findOne(id); - return R.ok(main); - } - -// //查询单个项目 -// @GetMapping("proj/{id}") -// public R getOneByProj(@PathVariable String id) { -// List groups = service.findAllByPrjid(id); -// return R.ok(groups); -// } - - - //新增项目 - @PostMapping - public R post(@RequestBody SaProdGroup main) { - return R.ok(service.insert(main)); - } - - //修改项目 - @PutMapping - public R put(@RequestBody SaProdGroup main) { - return R.ok(service.update(main)); - } - - //删除项目 - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private SaProdGroupService service; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroupRepo.java b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroupRepo.java deleted file mode 100644 index 646c793..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroupRepo.java +++ /dev/null @@ -1,10 +0,0 @@ -package vboot.extend.module.sa.prod.group; - -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface SaProdGroupRepo extends JpaRepository { - - List findAllByPrjid(String prjid); -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroupService.java b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroupService.java deleted file mode 100644 index 501679f..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroupService.java +++ /dev/null @@ -1,29 +0,0 @@ -package vboot.extend.module.sa.prod.group; - -import vboot.core.common.service.BaseMainService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; -import java.util.List; - - -@Service -public class SaProdGroupService extends BaseMainService { - - public List findAllByPrjid(String prjid){ - return repo.findAllByPrjid(prjid); - } - - //----------bean注入------------ - @Autowired - private SaProdGroupRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - - -} - diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/prod/main/SaProdMain.java b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/main/SaProdMain.java deleted file mode 100644 index 2a15f62..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/prod/main/SaProdMain.java +++ /dev/null @@ -1,33 +0,0 @@ -package vboot.extend.module.sa.prod.main; - -import lombok.Getter; -import lombok.Setter; -import org.hibernate.annotations.GenericGenerator; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -@Entity -@Getter -@Setter -public class SaProdMain { - - @Id - @Column(length = 32) - @GeneratedValue(generator = "jpa-uuid") - @GenericGenerator(name = "jpa-uuid", strategy = "uuid") - private String id;//ID - - @Column(length = 100) - private String name;//选项名称 - - @Column(length = 64) - private String itnum;//梯号 - - private Integer ornum;//排序号 - - private String notes;//备注 - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTemp.java b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTemp.java deleted file mode 100644 index 2a57d67..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTemp.java +++ /dev/null @@ -1,25 +0,0 @@ -package vboot.extend.module.sa.prod.temp; - -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Column; -import javax.persistence.Entity; - -@Entity -@Getter -@Setter -public class SaProdTemp extends BaseMainEntity { - - private Integer ornum; - - private String notes; - - @Column(length = 32) - private String modid; - - - - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTempApi.java b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTempApi.java deleted file mode 100644 index a754986..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTempApi.java +++ /dev/null @@ -1,45 +0,0 @@ -package vboot.extend.module.sa.prod.temp; - -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("sa/prod/temp") -public class SaProdTempApi { - - @GetMapping - public R get(String name) { - Sqler sqler = new Sqler("sa_prod_temp"); - sqler.addLike("t.name", name); - sqler.addLeftJoin("m.name as modna", "te_prod_model m", "m.id=t.modid"); - sqler.addOrder("t.ornum"); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - SaProdTemp main = service.findOne(id); - return R.ok(main); - } - - @PostMapping - public R post(@RequestBody SaProdTemp main) { - return R.ok(service.insert(main)); - } - - @PutMapping - public R put(@RequestBody SaProdTemp main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private SaProdTempService service; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTempRepo.java b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTempRepo.java deleted file mode 100644 index 7a13799..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTempRepo.java +++ /dev/null @@ -1,9 +0,0 @@ -package vboot.extend.module.sa.prod.temp; - -import org.springframework.data.jpa.repository.JpaRepository; - - -public interface SaProdTempRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTempService.java b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTempService.java deleted file mode 100644 index ab8db91..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTempService.java +++ /dev/null @@ -1,22 +0,0 @@ -package vboot.extend.module.sa.prod.temp; - -import vboot.core.common.service.BaseMainService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; - -@Service -public class SaProdTempService extends BaseMainService { - - - //----------bean注入------------ - @Autowired - private SaProdTempRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMain.java b/vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMain.java deleted file mode 100644 index 2eaf8b8..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMain.java +++ /dev/null @@ -1,80 +0,0 @@ -package vboot.extend.module.sa.proj.main; - -import vboot.extend.module.sa.prod.group.SaProdGroup; -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; -import vboot.core.module.sys.org.root.SysOrg; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.List; - -@Entity -@Getter -@Setter -public class SaProjMain extends BaseMainEntity { - - //--------地址相关信息------<<< - private String addre;//完整地址 - - @Column(length = 64) - private String adreg;//省市区 - - @Column(length = 128) - private String addet;//省市区以外的详细信息 - - @Column(length = 32) - private String adcoo;//经纬度 - - @Column(length = 32) - private String adpro;//省 - - @Column(length = 32) - private String adcit;//市 - - @Column(length = 32) - private String addis;//区 - //--------地址相关信息------>>> - - @Column(length = 32) - private String senum;//流水号 - - - private String notes; //备注 - - @ManyToMany - @JoinTable(name = "sa_proj_viewer", joinColumns = {@JoinColumn(name = "mid")}, - inverseJoinColumns = {@JoinColumn(name = "oid")}) - private List viewers;//可查看者 - - @ManyToMany - @JoinTable(name = "sa_proj_editor", joinColumns = {@JoinColumn(name = "mid")}, - inverseJoinColumns = {@JoinColumn(name = "oid")}) - private List editors;//可编辑者 - - @ManyToOne - @JoinColumn(name = "opman") - private SysOrg opman;//经办人 - - private String type; //项目类型 - - @Column(length = 32) - private String ageid; //代理商ID - - @Transient - private String agena; //代理商名称 - - @Column(length = 32) - private String cusid; //客户ID - - @Transient - private String cusna; //客户名称 - - // @Transient - @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true) - @JoinColumn(name = "prjid") - @OrderBy("ornum ASC") - private List groups = new ArrayList<>(); //产品组 - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMainApi.java deleted file mode 100644 index c07ef7c..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMainApi.java +++ /dev/null @@ -1,74 +0,0 @@ -package vboot.extend.module.sa.proj.main; - -import vboot.extend.module.sa.prod.group.SaProdGroup; -import vboot.extend.module.sa.prod.group.SaProdGroupService; -import vboot.core.common.api.R; -import vboot.core.common.dao.JdbcDao; -import vboot.core.common.dao.Sqler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import vboot.core.module.ass.num.main.AssNumMainService; - -import java.util.List; - -@RestController -@RequestMapping("sa/proj/main") -public class SaProjMainApi { - - //分页查询项目清单 - @GetMapping - public R get(String name) { - Sqler sqler = new Sqler("sa_proj_main"); - sqler.addLike("t.name", name); - sqler.addSelect("t.addre,t.notes,t.senum"); - return R.ok(service.findPageData(sqler)); - } - - //查询单个项目 - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - SaProjMain main = service.findOne(id); - main.setAgena(jdbcDao.findOneName("sa_agent_main",main.getAgeid())); - main.setCusna(jdbcDao.findOneName("sa_cust_main",main.getCusna())); -// List groups = groupService.findAllByPrjid(id); -// main.setGroups(groups); - return R.ok(main); - } - - //新增项目 - @PostMapping - public R post(@RequestBody SaProjMain main) { - main.setSenum(numService.getNum("PROJ")); - return R.ok(service.insertx(main)); - } - - //修改项目 - @PutMapping - public R put(@RequestBody SaProjMain main) { - return R.ok(service.update(main)); - } - - //删除项目 - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - // @Autowired -// private SaAgentMainService agentService; -// -// @Autowired -// private SaCustMainService custService; - @Autowired - private JdbcDao jdbcDao; - - @Autowired - private AssNumMainService numService; - - @Autowired - private SaProjMainService service; - - @Autowired - private SaProdGroupService groupService; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMainRepo.java b/vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMainRepo.java deleted file mode 100644 index 6095f06..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMainRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.sa.proj.main; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface SaProjMainRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMainService.java b/vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMainService.java deleted file mode 100644 index f1f63b3..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMainService.java +++ /dev/null @@ -1,33 +0,0 @@ -package vboot.extend.module.sa.proj.main; - -import vboot.core.common.service.BaseMainService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; - - -@Service -public class SaProjMainService extends BaseMainService { - - public String insertx(SaProjMain main){ - - return super.insert(main); - } - - - - - - - - @Autowired - private SaProjMainRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -} - diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheck.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheck.java deleted file mode 100644 index 08bbc90..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheck.java +++ /dev/null @@ -1,35 +0,0 @@ -package vboot.extend.module.te.allot.check; - -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.List; - -@Entity -@Getter -@Setter -public class TeAllotCheck extends BaseMainEntity { - - private Integer ornum; - - private Integer venum;//版本号 - - private String notes; - - @Column(length = 32) - private String catid;//分类id - - @Column(length = 32) - private String serid;//系列id - - @Column(length = 32) - private String modid;//型号id - - @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true) - @JoinColumn(name = "allid") - private List items = new ArrayList<>(); - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckApi.java deleted file mode 100644 index 3bc1e80..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckApi.java +++ /dev/null @@ -1,49 +0,0 @@ -package vboot.extend.module.te.allot.check; - -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("te/allot/check") -public class TeAllotCheckApi { - - @GetMapping - public R get(String name,String modid) { - Sqler sqler = new Sqler("te_allot_check"); - sqler.addLike("t.name", name); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - TeAllotCheck main = service.findOne(id); - return R.ok(main); - } - - - @GetMapping("checks") - public R checks(String id) { - return R.ok(service.findData(id)); - } - - @PostMapping - public R post(@RequestBody TeAllotCheck main) { - return R.ok(service.insert(main)); - } - - @PutMapping - public R put(@RequestBody TeAllotCheck main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private TeAllotCheckService service; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckItem.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckItem.java deleted file mode 100644 index 1f157f8..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckItem.java +++ /dev/null @@ -1,27 +0,0 @@ -package vboot.extend.module.te.allot.check; - -import lombok.Getter; -import lombok.Setter; -import org.hibernate.annotations.GenericGenerator; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -@Entity -@Getter -@Setter -public class TeAllotCheckItem { - - @Id - @Column(length = 32) - @GeneratedValue(generator = "jpa-uuid") - @GenericGenerator(name = "jpa-uuid", strategy = "uuid") - private String id;//ID - - @Column(length = 32) - private String cheid; - - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckRepo.java deleted file mode 100644 index 589fdd3..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.te.allot.check; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface TeAllotCheckRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckService.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckService.java deleted file mode 100644 index e395702..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckService.java +++ /dev/null @@ -1,33 +0,0 @@ -package vboot.extend.module.te.allot.check; - -import vboot.core.common.dao.Sqler; -import vboot.core.common.service.BaseMainService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.BeanPropertyRowMapper; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; -import java.util.List; - -@Service -public class TeAllotCheckService extends BaseMainService { - - public List findData(String catid) { - Sqler sqler = new Sqler("te_feat_check"); - sqler.addEqual("t.catid", catid); - sqler.addOrder("t.ornum"); - List list = jdbcDao.getTp().query(sqler.getSql(), sqler.getParams(), new BeanPropertyRowMapper<>(Zcheck.class)); - return list; - } - - - //----------bean注入------------ - @Autowired - private TeAllotCheckRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/Zcheck.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/Zcheck.java deleted file mode 100644 index a6542fb..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/Zcheck.java +++ /dev/null @@ -1,16 +0,0 @@ -package vboot.extend.module.te.allot.check; - -import lombok.Data; - -@Data -public class Zcheck { - - private String id; - - private String code; - - private String name; - - private Integer ornum; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDrive.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDrive.java deleted file mode 100644 index 8d7647a..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDrive.java +++ /dev/null @@ -1,35 +0,0 @@ -package vboot.extend.module.te.allot.drive; - -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.List; - -@Entity -@Getter -@Setter -public class TeAllotDrive extends BaseMainEntity { - - private Integer ornum; - - private Integer venum;//版本号 - - private String notes; - - @Column(length = 32) - private String catid; - - @Column(length = 32) - private String serid;//系列id - - @Column(length = 32) - private String modid;//型号id - - @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true) - @JoinColumn(name = "allid") - private List items = new ArrayList<>(); - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveApi.java deleted file mode 100644 index 5cdd129..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveApi.java +++ /dev/null @@ -1,50 +0,0 @@ -package vboot.extend.module.te.allot.drive; - -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("te/allot/drive") -public class TeAllotDriveApi { - - @GetMapping - public R get(String name, String modid) { - Sqler sqler = new Sqler("te_allot_drive"); - sqler.addLike("t.name", name); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - TeAllotDrive main = service.findOne(id); - return R.ok(main); - } - - - @GetMapping("drives") - public R drives(String id) { - return R.ok(service.findData(id)); - } - - - @PostMapping - public R post(@RequestBody TeAllotDrive main) { - return R.ok(service.insert(main)); - } - - @PutMapping - public R put(@RequestBody TeAllotDrive main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private TeAllotDriveService service; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveItem.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveItem.java deleted file mode 100644 index 8b77deb..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveItem.java +++ /dev/null @@ -1,27 +0,0 @@ -package vboot.extend.module.te.allot.drive; - -import lombok.Getter; -import lombok.Setter; -import org.hibernate.annotations.GenericGenerator; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -@Entity -@Getter -@Setter -public class TeAllotDriveItem { - - @Id - @Column(length = 32) - @GeneratedValue(generator = "jpa-uuid") - @GenericGenerator(name = "jpa-uuid", strategy = "uuid") - private String id;//ID - - @Column(length = 32) - private String driid; - - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveRepo.java deleted file mode 100644 index c5dcd43..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.te.allot.drive; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface TeAllotDriveRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveService.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveService.java deleted file mode 100644 index 1fcda60..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveService.java +++ /dev/null @@ -1,32 +0,0 @@ -package vboot.extend.module.te.allot.drive; - -import vboot.core.common.dao.Sqler; -import vboot.core.common.service.BaseMainService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.BeanPropertyRowMapper; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; -import java.util.List; - -@Service -public class TeAllotDriveService extends BaseMainService { - - public List findData(String catid) { - Sqler sqler = new Sqler("te_feat_drive"); - sqler.addEqual("t.catid", catid); - sqler.addOrder("t.ornum"); - List list = jdbcDao.getTp().query(sqler.getSql(), sqler.getParams(), new BeanPropertyRowMapper<>(Zdrive.class)); - return list; - } - - //----------bean注入------------ - @Autowired - private TeAllotDriveRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/Zdrive.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/Zdrive.java deleted file mode 100644 index 9882991..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/Zdrive.java +++ /dev/null @@ -1,16 +0,0 @@ -package vboot.extend.module.te.allot.drive; - -import lombok.Data; - -@Data -public class Zdrive { - - private String id; - - private String code; - - private String name; - - private Integer ornum; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLink.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLink.java deleted file mode 100644 index 0dc7e75..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLink.java +++ /dev/null @@ -1,35 +0,0 @@ -package vboot.extend.module.te.allot.link; - -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.List; - -@Entity -@Getter -@Setter -public class TeAllotLink extends BaseMainEntity { - - private Integer ornum; - - private Integer venum;//版本号 - - private String notes; - - @Column(length = 32) - private String catid; - - @Column(length = 32) - private String serid;//系列id - - @Column(length = 32) - private String modid;//型号id - - @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true) - @JoinColumn(name = "allid") - private List items = new ArrayList<>(); - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkApi.java deleted file mode 100644 index 538c349..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkApi.java +++ /dev/null @@ -1,48 +0,0 @@ -package vboot.extend.module.te.allot.link; - -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("te/allot/link") -public class TeAllotLinkApi { - - @GetMapping - public R get(String name,String modid) { - Sqler sqler = new Sqler("te_allot_link"); - sqler.addLike("t.name", name); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - TeAllotLink main = service.findOne(id); - return R.ok(main); - } - - @GetMapping("links") - public R links(String id) { - return R.ok(service.findData(id)); - } - - @PostMapping - public R post(@RequestBody TeAllotLink main) { - return R.ok(service.insert(main)); - } - - @PutMapping - public R put(@RequestBody TeAllotLink main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private TeAllotLinkService service; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkItem.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkItem.java deleted file mode 100644 index e6f3051..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkItem.java +++ /dev/null @@ -1,27 +0,0 @@ -package vboot.extend.module.te.allot.link; - -import lombok.Getter; -import lombok.Setter; -import org.hibernate.annotations.GenericGenerator; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -@Entity -@Getter -@Setter -public class TeAllotLinkItem { - - @Id - @Column(length = 32) - @GeneratedValue(generator = "jpa-uuid") - @GenericGenerator(name = "jpa-uuid", strategy = "uuid") - private String id;//ID - - @Column(length = 32) - private String linid; - - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkRepo.java deleted file mode 100644 index 21ac014..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.te.allot.link; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface TeAllotLinkRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkService.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkService.java deleted file mode 100644 index 76a369c..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkService.java +++ /dev/null @@ -1,32 +0,0 @@ -package vboot.extend.module.te.allot.link; - -import vboot.core.common.dao.Sqler; -import vboot.core.common.service.BaseMainService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.BeanPropertyRowMapper; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; -import java.util.List; - -@Service -public class TeAllotLinkService extends BaseMainService { - - public List findData(String catid) { - Sqler sqler = new Sqler("te_feat_link"); - sqler.addEqual("t.catid", catid); - sqler.addOrder("t.ornum"); - List list = jdbcDao.getTp().query(sqler.getSql(), sqler.getParams(), new BeanPropertyRowMapper<>(Zlink.class)); - return list; - } - - //----------bean注入------------ - @Autowired - private TeAllotLinkRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/Zlink.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/Zlink.java deleted file mode 100644 index ba5c7cb..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/Zlink.java +++ /dev/null @@ -1,16 +0,0 @@ -package vboot.extend.module.te.allot.link; - -import lombok.Data; - -@Data -public class Zlink { - - private String id; - - private String code; - - private String name; - - private Integer ornum; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParam.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParam.java deleted file mode 100644 index 8c19d95..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParam.java +++ /dev/null @@ -1,37 +0,0 @@ -package vboot.extend.module.te.allot.param; - -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.List; - -@Entity -@Getter -@Setter -public class TeAllotParam extends BaseMainEntity { - - private Boolean ornum; - - private Boolean sptag;//专用标记 - - private Integer venum;//版本号 - - private String notes; - - @Column(length = 32) - private String catid; - - @Column(length = 32) - private String serid;//系列id - - @Column(length = 32) - private String modid;//型号id - - @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true) - @JoinColumn(name = "allid") - private List items = new ArrayList<>(); - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamApi.java deleted file mode 100644 index 98e9204..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamApi.java +++ /dev/null @@ -1,48 +0,0 @@ -package vboot.extend.module.te.allot.param; - -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("te/allot/param") -public class TeAllotParamApi { - - @GetMapping - public R get(String name, String modid) { - Sqler sqler = new Sqler("te_allot_param"); - sqler.addLike("t.name", name); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - TeAllotParam main = service.findOne(id); - return R.ok(main); - } - - @GetMapping("screens") - public R screens(String id) { - return R.ok(service.findData(id)); - } - - @PostMapping - public R post(@RequestBody TeAllotParam main) { - return R.ok(service.insert(main)); - } - - @PutMapping - public R put(@RequestBody TeAllotParam main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private TeAllotParamService service; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamItem.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamItem.java deleted file mode 100644 index c504c74..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamItem.java +++ /dev/null @@ -1,27 +0,0 @@ -package vboot.extend.module.te.allot.param; - -import lombok.Getter; -import lombok.Setter; -import org.hibernate.annotations.GenericGenerator; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -@Entity -@Getter -@Setter -public class TeAllotParamItem { - - @Id - @Column(length = 32) - @GeneratedValue(generator = "jpa-uuid") - @GenericGenerator(name = "jpa-uuid", strategy = "uuid") - private String id;//ID - - @Column(length = 32) - private String parid; - - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamRepo.java deleted file mode 100644 index e66a2a3..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.te.allot.param; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface TeAllotParamRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamService.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamService.java deleted file mode 100644 index b4948e4..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamService.java +++ /dev/null @@ -1,56 +0,0 @@ -package vboot.extend.module.te.allot.param; - -import vboot.extend.module.te.prod.model.Zparam; -import vboot.extend.module.te.prod.model.Zscreen; -import vboot.core.common.dao.Sqler; -import vboot.core.common.service.BaseMainService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.BeanPropertyRowMapper; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; -import java.util.ArrayList; -import java.util.List; - -@Service -public class TeAllotParamService extends BaseMainService { - - public List findData(String catid){ - Sqler sqler2=new Sqler("te_feat_screen"); - sqler2.addEqual("t.catid", catid); - sqler2.addOrder("t.ornum"); - List zscreens=jdbcDao.getTp().query(sqler2.getSql(),sqler2.getParams(), new BeanPropertyRowMapper<>(Zscreen.class)); - - List zparams = new ArrayList<>(); - String sql3 = "select id,name,code,scrid,ornum from te_feat_param where scrid in ("; - String ins = ""; - for (Zscreen zscreen : zscreens) { - ins += "'" + zscreen.getId() + "',"; - } - if (!"".equals(ins)) { - ins = ins.substring(0, ins.length() - 1); - sql3 += ins + ") order by scrid,ornum"; - zparams=jdbcDao.getTp().query(sql3, new BeanPropertyRowMapper<>(Zparam.class)); - } - - for (Zscreen zscreen : zscreens) { - for (Zparam zparam : zparams) { - if(zparam.getScrid().equals(zscreen.getId())){ - zscreen.getParams().add(zparam); - } - } - } - return zscreens; - } - - - //----------bean注入------------ - @Autowired - private TeAllotParamRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheck.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheck.java deleted file mode 100644 index 101961f..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheck.java +++ /dev/null @@ -1,23 +0,0 @@ -package vboot.extend.module.te.feat.check; - -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Column; -import javax.persistence.Entity; - -@Entity -@Getter -@Setter -public class TeFeatCheck extends BaseMainEntity { - - //te_feat_check - @Column(length = 32) - private String catid;//所属分类 - - private Integer ornum; - - private String notes; - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheckApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheckApi.java deleted file mode 100644 index 04ad7b9..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheckApi.java +++ /dev/null @@ -1,46 +0,0 @@ -package vboot.extend.module.te.feat.check; - -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - - -@RestController -@RequestMapping("te/feat/check") -public class TeFeatCheckApi { - - @GetMapping - public R get(String name, String catid) { - Sqler sqler = new Sqler("te_feat_check"); - sqler.addLike("t.name", name); - sqler.addEqual("t.catid", catid); - sqler.addLeftJoin("c.name as catna", "te_prod_cate c", "c.id=t.catid"); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - TeFeatCheck main = service.findOne(id); - return R.ok(main); - } - - @PostMapping - public R post(@RequestBody TeFeatCheck main) { - return R.ok(service.insert(main)); - } - - @PutMapping - public R put(@RequestBody TeFeatCheck main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private TeFeatCheckService service; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheckRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheckRepo.java deleted file mode 100644 index 39dd0ef..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheckRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.te.feat.check; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface TeFeatCheckRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheckService.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheckService.java deleted file mode 100644 index f9ac2b3..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheckService.java +++ /dev/null @@ -1,22 +0,0 @@ -package vboot.extend.module.te.feat.check; - -import vboot.core.common.service.BaseMainService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; - -@Service -public class TeFeatCheckService extends BaseMainService { - - - //----------bean注入------------ - @Autowired - private TeFeatCheckRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatComp.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatComp.java deleted file mode 100644 index c4369b9..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatComp.java +++ /dev/null @@ -1,59 +0,0 @@ -package vboot.extend.module.te.feat.comp; - -import vboot.extend.module.te.allot.check.TeAllotCheck; -import vboot.extend.module.te.allot.drive.TeAllotDrive; -import vboot.extend.module.te.allot.param.TeAllotParam; -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Transient; - -@Entity -@Getter -@Setter -public class TeFeatComp extends BaseMainEntity { - - private Integer ornum;//排序号 - - @Column(length = 32) - private String paway;//参数分配方式 - - @Column(length = 32) - private String patid;//参数分配模板id - - @Transient - private TeAllotParam patem;//参数分配模板引用 - - @Column(length = 32) - private String laway;//联动分配方式 - -// @Column(length = 32) -// private String latid;//联动分配模板id - -// @Transient -// private TeAllotParam latem;//联动分配模板引用 - - @Column(length = 32) - private String caway;//校验分配方式 - - @Column(length = 32) - private String catid;//校验分配模板id - - @Transient - private TeAllotCheck catem;//校验分配模板引用 - - @Column(length = 32) - private String daway;//驱动分配方式 - - @Column(length = 32) - private String datid;//驱动分配模板id - - @Transient - private TeAllotDrive datem;//驱动分配模板引用 - - private String notes; - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatCompApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatCompApi.java deleted file mode 100644 index 8f30910..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatCompApi.java +++ /dev/null @@ -1,55 +0,0 @@ -package vboot.extend.module.te.feat.comp; - -import vboot.extend.module.te.allot.param.TeAllotParamService; -import vboot.core.common.api.R; -import vboot.core.common.dao.JdbcDao; -import vboot.core.common.dao.Sqler; -import vboot.core.xutil.lang.XstrUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("te/feat/comp") -public class TeFeatCompApi { - - @GetMapping - public R get(String name) { - Sqler sqler = new Sqler("te_feat_comp"); - sqler.addLike("t.name", name); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - TeFeatComp main = service.findOne(id); - if (XstrUtil.isNotBlank(main.getPatid())) { - main.setPatem(apService.findOne(main.getPatid())); - } - return R.ok(main); - } - - @PostMapping - public R post(@RequestBody TeFeatComp main) { - return R.ok(service.insert(main)); - } - - @PutMapping - public R put(@RequestBody TeFeatComp main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private TeFeatCompService service; - - @Autowired - private TeAllotParamService apService; - - @Autowired - private JdbcDao jdbcDao; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatCompRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatCompRepo.java deleted file mode 100644 index 3cd43d2..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatCompRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.te.feat.comp; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface TeFeatCompRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatCompService.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatCompService.java deleted file mode 100644 index 4b40b28..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatCompService.java +++ /dev/null @@ -1,45 +0,0 @@ -package vboot.extend.module.te.feat.comp; - -import vboot.extend.module.te.allot.param.TeAllotParamRepo; -import vboot.core.common.service.BaseMainService; -import vboot.core.xutil.lang.XstrUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; - -@Service -public class TeFeatCompService extends BaseMainService { - - public String insert(TeFeatComp main){ - if(main.getPatem()!=null){ - String puuid = XstrUtil.getUUID(); - main.getPatem().setId(puuid); - main.getPatem().setName(main.getName()+"专用"); - main.getPatem().setSptag(true); - apRepo.save(main.getPatem()); - main.setPatid(puuid); - } - return super.insert(main); - } - - public String update(TeFeatComp main){ - if(main.getPatem()!=null){ - apRepo.save(main.getPatem()); - } - return super.update(main); - } - - //----------bean注入------------ - @Autowired - private TeAllotParamRepo apRepo; - - @Autowired - private TeFeatCompRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDrive.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDrive.java deleted file mode 100644 index 7f4bbb1..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDrive.java +++ /dev/null @@ -1,22 +0,0 @@ -package vboot.extend.module.te.feat.drive; - -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Column; -import javax.persistence.Entity; - -@Entity -@Getter -@Setter -public class TeFeatDrive extends BaseMainEntity { - - @Column(length = 32) - private String catid;//所属分类 - - private Integer ornum; - - private String notes; - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDriveApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDriveApi.java deleted file mode 100644 index 6a912d3..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDriveApi.java +++ /dev/null @@ -1,46 +0,0 @@ -package vboot.extend.module.te.feat.drive; - -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - - -@RestController -@RequestMapping("te/feat/drive") -public class TeFeatDriveApi { - - @GetMapping - public R get(String name,String catid) { - Sqler sqler = new Sqler("te_feat_drive"); - sqler.addLike("t.name", name); - sqler.addEqual("t.catid", catid); - sqler.addLeftJoin("c.name as catna", "te_prod_cate c", "c.id=t.catid"); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - TeFeatDrive main = service.findOne(id); - return R.ok(main); - } - - @PostMapping - public R post(@RequestBody TeFeatDrive main) { - return R.ok(service.insert(main)); - } - - @PutMapping - public R put(@RequestBody TeFeatDrive main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private TeFeatDriveService service; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDriveRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDriveRepo.java deleted file mode 100644 index 1caee3f..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDriveRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.te.feat.drive; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface TeFeatDriveRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDriveService.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDriveService.java deleted file mode 100644 index 0116768..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDriveService.java +++ /dev/null @@ -1,22 +0,0 @@ -package vboot.extend.module.te.feat.drive; - -import vboot.core.common.service.BaseMainService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; - -@Service -public class TeFeatDriveService extends BaseMainService { - - - //----------bean注入------------ - @Autowired - private TeFeatDriveRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLink.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLink.java deleted file mode 100644 index 6c79715..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLink.java +++ /dev/null @@ -1,84 +0,0 @@ -package vboot.extend.module.te.feat.link; - -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.List; - -@Entity -@Getter -@Setter -public class TeFeatLink extends BaseMainEntity { - - @Column(length = 32) - private String catid;//所属分类 - - @Column(length = 32) - private String modid;//所属型号 - - @Column(length = 32) - private String trpar;//触发参数 - - @Column(length = 32) - private String trway;//触发方式 - - private Integer trnum;//触发顺序 - - private Integer trcon;//触发条件 - - private Integer ornum;//排序号 - - @Column(length = 32) - private String liway;//联动方式 - - @Column(length = 2000) - private String lifun;//联动函数 - - private String notes; - - -// @Column(length = 64) -// private String pacod; -// -// @Column(length = 64) -// private String panam; -// -// @Column(length = 64) -// private String pbcod; -// -// @Column(length = 64) -// private String pbnam; -// -// @Column(length = 64) -// private String pccod; -// -// @Column(length = 64) -// private String pcnam; -// -// @Column(length = 64) -// private String pdcod; -// -// @Column(length = 64) -// private String pdnam; -// -// @Column(length = 64) -// private String pxcod; -// -// @Column(length = 64) -// private String pxnam; -// -// @Column(length = 64) -// private String pycod; -// -// @Column(length = 64) -// private String pynam; - - @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true) - @JoinColumn(name = "linid") - @OrderBy("ornum ASC") - private List items = new ArrayList<>(); - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkApi.java deleted file mode 100644 index efd0a33..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkApi.java +++ /dev/null @@ -1,47 +0,0 @@ -package vboot.extend.module.te.feat.link; - -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - - -@RestController -@RequestMapping("te/feat/link") -public class TeFeatLinkApi { - - @GetMapping - public R get(String name,String catid) { - Sqler sqler = new Sqler("te_feat_link"); - sqler.addLike("t.name", name); - sqler.addEqual("t.catid", catid); - sqler.addLeftJoin("c.name as catna", "te_prod_cate c", "c.id=t.catid"); - return R.ok(service.findPageData(sqler)); - } - - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - TeFeatLink main = service.findOne(id); - return R.ok(main); - } - - @PostMapping - public R post(@RequestBody TeFeatLink main) { - return R.ok(service.insert(main)); - } - - @PutMapping - public R put(@RequestBody TeFeatLink main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private TeFeatLinkService service; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkItem.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkItem.java deleted file mode 100644 index 94d9267..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkItem.java +++ /dev/null @@ -1,36 +0,0 @@ -package vboot.extend.module.te.feat.link; - -import lombok.Getter; -import lombok.Setter; -import org.hibernate.annotations.GenericGenerator; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.List; - -@Entity -@Getter -@Setter -public class TeFeatLinkItem { - - @Id - @Column(length = 32) - @GeneratedValue(generator = "jpa-uuid") - @GenericGenerator(name = "jpa-uuid", strategy = "uuid") - private String id;//ID - - private Integer ornum;//排序号 - - @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true) - @JoinColumn(name = "iteid") - @OrderBy("ornum ASC") - private List lefts = new ArrayList<>(); - - @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true) - @JoinColumn(name = "iteid") - @OrderBy("ornum ASC") - private List rights = new ArrayList<>(); - - private String notes;//备注 - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkLeft.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkLeft.java deleted file mode 100644 index 0c03f9f..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkLeft.java +++ /dev/null @@ -1,31 +0,0 @@ -package vboot.extend.module.te.feat.link; - -import lombok.Getter; -import lombok.Setter; -import org.hibernate.annotations.GenericGenerator; - -import javax.persistence.*; - -@Entity -@Getter -@Setter -public class TeFeatLinkLeft { - - @Id - @Column(length = 32) - @GeneratedValue(generator = "jpa-uuid") - @GenericGenerator(name = "jpa-uuid", strategy = "uuid") - private String id;//ID - - private Integer ornum;//排序号 - - @Column(length = 32) - private String copar; - - @Column(length = 32) - private String coway; - - @Column(length = 32) - private String coval; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkRepo.java deleted file mode 100644 index 619e949..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.te.feat.link; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface TeFeatLinkRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkRight.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkRight.java deleted file mode 100644 index d2f1aa7..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkRight.java +++ /dev/null @@ -1,37 +0,0 @@ -package vboot.extend.module.te.feat.link; - -import vboot.extend.module.te.feat.param.TeFeatParamOption; -import lombok.Getter; -import lombok.Setter; -import org.hibernate.annotations.GenericGenerator; - -import javax.persistence.*; -import java.util.List; - -@Entity -@Getter -@Setter -public class TeFeatLinkRight { - - @Id - @Column(length = 32) - @GeneratedValue(generator = "jpa-uuid") - @GenericGenerator(name = "jpa-uuid", strategy = "uuid") - private String id; - - private Integer ornum; - - @Column(length = 32) - private String efpar; - - @Column(length = 32) - private String efway; - - @Column(length = 32) - private String efval; - - @ManyToMany - @JoinTable(name = "te_feat_link_right_op", joinColumns = {@JoinColumn(name = "rid")}, - inverseJoinColumns = {@JoinColumn(name = "oid")}) - private List efops; -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkService.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkService.java deleted file mode 100644 index ae0e9de..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkService.java +++ /dev/null @@ -1,23 +0,0 @@ -package vboot.extend.module.te.feat.link; - -import vboot.core.common.service.BaseMainService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; - -@Service -public class TeFeatLinkService extends BaseMainService { - - - - //----------bean注入------------ - @Autowired - private TeFeatLinkRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParam.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParam.java deleted file mode 100644 index 21c0a07..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParam.java +++ /dev/null @@ -1,46 +0,0 @@ -package vboot.extend.module.te.feat.param; - -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.List; - -@Entity -@Getter -@Setter -public class TeFeatParam extends BaseMainEntity { - - private Boolean drtag;//土建参数标记 - - private Boolean qutag;//询价参数标记 - - @Column(length = 32) - private String shmod;//显示模式 - - @Column(length = 32) - private String code; - - private Integer ornum; - - private String notes; - - @Column(length = 32) - private String scrid; - - @Transient - private String scrna; - - @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true) - @JoinColumn(name = "parid") - @OrderBy("ornum ASC") - private List options = new ArrayList<>(); - - @Column(length = 2000) - private String asfun;//关联函数 - - - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamApi.java deleted file mode 100644 index b536247..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamApi.java +++ /dev/null @@ -1,75 +0,0 @@ -package vboot.extend.module.te.feat.param; - -import vboot.core.common.api.R; -import vboot.core.common.dao.JdbcDao; -import vboot.core.common.dao.Sqler; -import vboot.core.common.pojo.ZidName; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("te/feat/param") -public class TeFeatParamApi { - - @GetMapping - public R get(String name, String scrid) { - Sqler sqler = new Sqler("te_feat_param"); - sqler.addLike("t.name", name); - sqler.addEqual("t.scrid", scrid); - sqler.addLeftJoin("s.name as scrna", "te_feat_screen s", "s.id=t.scrid"); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - TeFeatParam main = service.findOne(id); - String sql = "select name from te_feat_screen where id=?"; - String scrna = jdbcDao.findOneString(sql, main.getScrid()); - main.setScrna(scrna); - return R.ok(main); - } - - @GetMapping("options") - public R getOptions(String id) { - String sql = "select id,name,code from te_feat_param_option where parid=?"; - List> mapList = jdbcDao.findMapList(sql, id); - return R.ok(mapList); - } - - @GetMapping("list") - public R getListByCate(String catid) { - String sql = "select t.id,t.name from te_feat_param t inner join te_feat_screen s on s.id=t.scrid " + - "inner join te_prod_cate c on c.id=s.catid where s.catid=?"; - List idNameList = jdbcDao.findIdNameList(sql, catid); - return R.ok(idNameList); - } - - @GetMapping("mallot") - public R mallot(String id) { - return R.ok(service.findData(id)); - } - - @PostMapping - public R post(@RequestBody TeFeatParam main) { - return R.ok(service.insert(main)); - } - - @PutMapping - public R put(@RequestBody TeFeatParam main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private TeFeatParamService service; - - @Autowired - private JdbcDao jdbcDao; -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamOption.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamOption.java deleted file mode 100644 index 7e9f7b5..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamOption.java +++ /dev/null @@ -1,33 +0,0 @@ -package vboot.extend.module.te.feat.param; - -import lombok.Getter; -import lombok.Setter; -import org.hibernate.annotations.GenericGenerator; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -@Entity -@Getter -@Setter -public class TeFeatParamOption { - - @Id - @Column(length = 32) - @GeneratedValue(generator = "jpa-uuid") - @GenericGenerator(name = "jpa-uuid", strategy = "uuid") - private String id;//ID - - @Column(length = 32) - private String code;//选项代码 - - @Column(length = 100) - private String name;//选项名称 - - private Integer ornum;//排序号 - - private String notes;//备注 - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamRepo.java deleted file mode 100644 index 018ed5a..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.te.feat.param; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface TeFeatParamRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamService.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamService.java deleted file mode 100644 index 76040b0..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamService.java +++ /dev/null @@ -1,41 +0,0 @@ -package vboot.extend.module.te.feat.param; - -import vboot.core.common.dao.Sqler; -import vboot.core.common.pojo.ZidName; -import vboot.core.common.service.BaseMainService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.BeanPropertyRowMapper; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; -import java.util.List; - -@Service -public class TeFeatParamService extends BaseMainService { - - public List findData(String paramid){ - Sqler sqler1 = new Sqler("t.catid","te_feat_screen"); - sqler1.addInnerJoin("", "te_feat_param p", "p.scrid=t.id"); - sqler1.addEqual("p.id", paramid); - String catid = jdbcDao.findOneString(sqler1); - - Sqler sqler2=new Sqler("te_prod_model"); - sqler2.addEqual("t.catid", catid); - sqler2.addOrder("t.ornum"); - List zmodels=jdbcDao.getTp().query(sqler2.getSql(),sqler2.getParams(), new BeanPropertyRowMapper<>(ZidName.class)); - return zmodels; - } - - - - - //----------bean注入------------ - @Autowired - private TeFeatParamRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreen.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreen.java deleted file mode 100644 index c37b58e..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreen.java +++ /dev/null @@ -1,22 +0,0 @@ -package vboot.extend.module.te.feat.screen; - -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Column; -import javax.persistence.Entity; - -@Entity -@Getter -@Setter -public class TeFeatScreen extends BaseMainEntity { - - @Column(length = 32) - private String catid;//所属分类 - - private Integer ornum; - - private String notes; - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreenApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreenApi.java deleted file mode 100644 index 4baa08c..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreenApi.java +++ /dev/null @@ -1,54 +0,0 @@ -package vboot.extend.module.te.feat.screen; - -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; -import vboot.core.common.pojo.Zinp; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("te/feat/screen") -public class TeFeatScreenApi { - - @GetMapping - public R get(String name,String catid) { - Sqler sqler = new Sqler("te_feat_screen"); - sqler.addLike("t.name", name); - sqler.addEqual("t.catid", catid); - sqler.addLeftJoin("c.name as catna", "te_prod_cate c", "c.id=t.catid"); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("tree") - public R getTree(String name) { - List list = service.findTreeList(name); - return R.ok(list); - } - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - TeFeatScreen main = service.findOne(id); - return R.ok(main); - } - - @PostMapping - public R post(@RequestBody TeFeatScreen main) { - return R.ok(service.insert(main)); - } - - @PutMapping - public R put(@RequestBody TeFeatScreen main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private TeFeatScreenService service; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreenRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreenRepo.java deleted file mode 100644 index 9b22b18..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreenRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.te.feat.screen; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface TeFeatScreenRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreenService.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreenService.java deleted file mode 100644 index 2c5b09d..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreenService.java +++ /dev/null @@ -1,78 +0,0 @@ -package vboot.extend.module.te.feat.screen; - -import vboot.core.common.dao.Sqler; -import vboot.core.common.pojo.Zinp; -import vboot.core.common.service.BaseMainService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; -import java.util.ArrayList; -import java.util.List; - -@Service -public class TeFeatScreenService extends BaseMainService { - - public List findTreeList(String name) { - Sqler cateSqler = new Sqler("te_prod_cate"); - cateSqler.addSelect("null as pid"); - cateSqler.addOrder("t.ornum"); - List list = jdbcDao.findInpList(cateSqler); - - Sqler mainSqler = new Sqler("te_feat_screen"); - mainSqler.addSelect("t.catid as pid"); - mainSqler.addLike("t.name", name); - mainSqler.addOrder("t.ornum"); - List list2 = jdbcDao.findInpList(mainSqler); - list.addAll(list2); - - return buildByRecursive(list); - } - - //使用递归方法建树 - private List buildByRecursive(List nodes) { - List list = new ArrayList<>(); - for (Zinp node : nodes) { - if (node.getPid() == null) { - list.add(findChildrenByTier(node, nodes)); - } else { - boolean flag = false; - for (Zinp node2 : nodes) { - if (node.getPid().equals(node2.getId())) { - flag = true; - break; - } - } - if (!flag) { - list.add(findChildrenByTier(node, nodes)); - } - } - } - return list; - } - - - //递归查找子节点 - private Zinp findChildrenByTier(Zinp node, List nodes) { - for (Zinp item : nodes) { - if (node.getId().equals(item.getPid())) { - if (node.getChildren() == null) { - node.setChildren(new ArrayList<>()); - } - node.getChildren().add(findChildrenByTier(item, nodes)); - } - } - return node; - } - - - //----------bean注入------------ - @Autowired - private TeFeatScreenRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCate.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCate.java deleted file mode 100644 index a5f6b82..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCate.java +++ /dev/null @@ -1,18 +0,0 @@ -package vboot.extend.module.te.prod.cate; - -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Entity; - -@Entity -@Getter -@Setter -public class TeProdCate extends BaseMainEntity { - - private Integer ornum; - - private String notes; - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCateApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCateApi.java deleted file mode 100644 index f527760..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCateApi.java +++ /dev/null @@ -1,55 +0,0 @@ -package vboot.extend.module.te.prod.cate; - -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("te/prod/cate") -public class TeProdCateApi { - - //分页特性分类 - @GetMapping - public R get(String name) { - Sqler sqler = new Sqler("te_prod_cate"); - sqler.addLike("t.name", name); - sqler.addSelect("t.notes"); - sqler.addOrder("t.ornum"); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("list") - public R getList() { - return R.ok(service.findAll()); - } - - //查询单个分类 - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - TeProdCate cate = service.findOne(id); - return R.ok(cate); - } - - //新增分类 - @PostMapping - public R post(@RequestBody TeProdCate cate) { - return R.ok(service.insert(cate)); - } - - //修改分类 - @PutMapping - public R put(@RequestBody TeProdCate cate) { - return R.ok(service.update(cate)); - } - - //删除分类 - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private TeProdCateService service; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCateRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCateRepo.java deleted file mode 100644 index ceeb7ef..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCateRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.te.prod.cate; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface TeProdCateRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCateService.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCateService.java deleted file mode 100644 index df568b5..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCateService.java +++ /dev/null @@ -1,22 +0,0 @@ -package vboot.extend.module.te.prod.cate; - -import vboot.core.common.service.BaseMainService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; - -@Service -public class TeProdCateService extends BaseMainService { - - - //----------bean注入------------ - @Autowired - private TeProdCateRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModel.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModel.java deleted file mode 100644 index f1b2723..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModel.java +++ /dev/null @@ -1,25 +0,0 @@ -package vboot.extend.module.te.prod.model; - -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.*; - -@Entity -@Getter -@Setter -public class TeProdModel extends BaseMainEntity { - - private Integer ornum; - - private String notes; - - @Column(length = 32) - private String catid; - - @Column(length = 32) - private String serid; - - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModelApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModelApi.java deleted file mode 100644 index 456c6e6..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModelApi.java +++ /dev/null @@ -1,81 +0,0 @@ -package vboot.extend.module.te.prod.model; - -import vboot.core.common.api.R; -import vboot.core.common.dao.JdbcDao; -import vboot.core.common.dao.Sqler; -import vboot.core.common.pojo.Zinp; -import vboot.core.xutil.lang.XstrUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("te/prod/model") -public class TeProdModelApi { - - @GetMapping - public R get(String name, String catid) { - Sqler sqler = new Sqler("te_prod_model"); - sqler.addLike("t.name", name); - sqler.addEqual("t.catid", catid); - sqler.addLeftJoin("c.name as catna", "te_prod_cate c", "c.id=t.catid"); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - TeProdModel main = service.findOne(id); - return R.ok(main); - } - - @GetMapping("list") - public R getList(String serid, String catid) { - if(XstrUtil.isNotBlank(catid)){ - String sql = "select m.id,m.name from te_prod_model m where m.catid=?"; - List> mapList = jdbcDao.findMapList(sql, catid); - return R.ok(mapList); - }else if(XstrUtil.isNotBlank(serid)){ - String sql = "select m.id,m.name from te_prod_model m where m.serid=?"; - List> mapList = jdbcDao.findMapList(sql, serid); - return R.ok(mapList); - }else{ - return null; - } - } - - @GetMapping("zmodel") - public R getFeat(String id) { - Zmodel zmodel = service.getZmodel(id); - return R.ok(zmodel); - } - - @GetMapping("tree") - public R getTree(String name) { - List list = service.findTreeList(name); - return R.ok(list); - } - - @PostMapping - public R post(@RequestBody TeProdModel main) { - return R.ok(service.insert(main)); - } - - @PutMapping - public R put(@RequestBody TeProdModel main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private TeProdModelService service; - - @Autowired - private JdbcDao jdbcDao; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModelRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModelRepo.java deleted file mode 100644 index f711874..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModelRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.te.prod.model; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface TeProdModelRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModelService.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModelService.java deleted file mode 100644 index 207a623..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModelService.java +++ /dev/null @@ -1,127 +0,0 @@ -package vboot.extend.module.te.prod.model; - -import vboot.core.common.dao.Sqler; -import vboot.core.common.pojo.Zinp; -import vboot.core.common.service.BaseMainService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.BeanPropertyRowMapper; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -@Service -public class TeProdModelService extends BaseMainService { - - public Zmodel getZmodel(String modid){ - String sql = "select m.catid,m.id,m.name,v.coway,v.paway,v.patid from te_prod_model m inner join te_prod_version v on v.modid=m.id" + - " and v.detag=1 where m.id=?"; - Map map = jdbcDao.findMap(sql, modid); - Zmodel zmodel = new Zmodel(); - zmodel.setId(modid); - zmodel.setName(""+map.get("name")); - zmodel.setCatid(""+map.get("catid")); - setScreens(zmodel); - - return zmodel; - } - - private void setScreens(Zmodel zmodel){ - Sqler sqler2=new Sqler("te_feat_screen"); - sqler2.addEqual("t.catid", zmodel.getCatid()); - sqler2.addOrder("t.ornum"); - List zscreens=jdbcDao.getTp().query(sqler2.getSql(),sqler2.getParams(), new BeanPropertyRowMapper<>(Zscreen.class)); - - List zparams = new ArrayList<>(); - String sql3 = "select id,name,shmod,code,scrid,ornum from te_feat_param where scrid in ("; - String ins = ""; - for (Zscreen zscreen : zscreens) { - ins += "'" + zscreen.getId() + "',"; - } - if (!"".equals(ins)) { - ins = ins.substring(0, ins.length() - 1); - sql3 += ins + ") order by scrid,ornum"; - zparams=jdbcDao.getTp().query(sql3, new BeanPropertyRowMapper<>(Zparam.class)); - } - - for (Zscreen zscreen : zscreens) { - for (Zparam zparam : zparams) { - if(zparam.getScrid().equals(zscreen.getId())){ - zscreen.getParams().add(zparam); - } - } - } - zmodel.setScreens(zscreens); - } - - - public List findTreeList(String name) { - Sqler cateSqler = new Sqler("te_prod_cate"); - cateSqler.addSelect("null as pid"); - cateSqler.addOrder("t.ornum"); - List list = jdbcDao.findInpList(cateSqler); - - Sqler serieSqler = new Sqler("te_prod_serie"); - serieSqler.addSelect("t.catid as pid"); - serieSqler.addOrder("t.ornum"); - List list2 = jdbcDao.findInpList(serieSqler); - list.addAll(list2); - - Sqler modelSqler = new Sqler("te_prod_model"); - modelSqler.addSelect("t.serid as pid"); - modelSqler.addOrder("t.ornum"); - List list3 = jdbcDao.findInpList(modelSqler); - list.addAll(list3); - - return buildByRecursive(list); - } - - //使用递归方法建树 - private List buildByRecursive(List nodes) { - List list = new ArrayList<>(); - for (Zinp node : nodes) { - if (node.getPid() == null) { - list.add(findChildrenByTier(node, nodes)); - } else { - boolean flag = false; - for (Zinp node2 : nodes) { - if (node.getPid().equals(node2.getId())) { - flag = true; - break; - } - } - if (!flag) { - list.add(findChildrenByTier(node, nodes)); - } - } - } - return list; - } - - - //递归查找子节点 - private Zinp findChildrenByTier(Zinp node, List nodes) { - for (Zinp item : nodes) { - if (node.getId().equals(item.getPid())) { - if (node.getChildren() == null) { - node.setChildren(new ArrayList<>()); - } - node.getChildren().add(findChildrenByTier(item, nodes)); - } - } - return node; - } - - - //----------bean注入------------ - @Autowired - private TeProdModelRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/Zmodel.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/Zmodel.java deleted file mode 100644 index 370a35f..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/Zmodel.java +++ /dev/null @@ -1,20 +0,0 @@ -package vboot.extend.module.te.prod.model; - -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; - - -@Data -public class Zmodel { - - private String id; - - private String name; - - private String catid; - - List screens = new ArrayList<>(); - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/Zparam.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/Zparam.java deleted file mode 100644 index a4cf8fc..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/Zparam.java +++ /dev/null @@ -1,19 +0,0 @@ -package vboot.extend.module.te.prod.model; - -import lombok.Data; - -@Data -public class Zparam { - - private String id; - - private String code; - - private String name; - - private Integer ornum; - - private String scrid; - - private String shmod; -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/Zscreen.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/Zscreen.java deleted file mode 100644 index 9dc93a9..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/Zscreen.java +++ /dev/null @@ -1,19 +0,0 @@ -package vboot.extend.module.te.prod.model; - -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; - -@Data -public class Zscreen { - - private String id; - - private String name; - - private Integer ornum; - - List params = new ArrayList<>(); - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerie.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerie.java deleted file mode 100644 index 1ad2893..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerie.java +++ /dev/null @@ -1,25 +0,0 @@ -package vboot.extend.module.te.prod.serie; - -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Column; -import javax.persistence.Entity; - -@Entity -@Getter -@Setter -public class TeProdSerie extends BaseMainEntity { - - private Integer ornum; - - private String notes; - - @Column(length = 32) - private String catid; - - - - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerieApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerieApi.java deleted file mode 100644 index daac6a5..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerieApi.java +++ /dev/null @@ -1,51 +0,0 @@ -package vboot.extend.module.te.prod.serie; - -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("te/prod/serie") -public class TeProdSerieApi { - - @GetMapping - public R get(String name,String catid) { - Sqler sqler = new Sqler("te_prod_serie"); - sqler.addLike("t.name", name); - sqler.addEqual("t.catid", catid); - sqler.addLeftJoin("c.name as catna", "te_prod_cate c", "c.id=t.catid"); - sqler.addOrder("t.ornum"); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("list") - public R getList(String catid) { - return R.ok(service.findAllByCatid(catid)); - } - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - TeProdSerie main = service.findOne(id); - return R.ok(main); - } - - @PostMapping - public R post(@RequestBody TeProdSerie main) { - return R.ok(service.insert(main)); - } - - @PutMapping - public R put(@RequestBody TeProdSerie main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private TeProdSerieService service; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerieRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerieRepo.java deleted file mode 100644 index e96430c..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerieRepo.java +++ /dev/null @@ -1,11 +0,0 @@ -package vboot.extend.module.te.prod.serie; - -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface TeProdSerieRepo extends JpaRepository { - - List findAllByCatid(String catid); - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerieService.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerieService.java deleted file mode 100644 index 96c32b3..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerieService.java +++ /dev/null @@ -1,26 +0,0 @@ -package vboot.extend.module.te.prod.serie; - -import vboot.core.common.service.BaseMainService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; -import java.util.List; - -@Service -public class TeProdSerieService extends BaseMainService { - - public List findAllByCatid(String catid){ - return repo.findAllByCatid(catid); - } - - //----------bean注入------------ - @Autowired - private TeProdSerieRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTest.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTest.java deleted file mode 100644 index ce572b2..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package vboot.extend.module.te.prod.test; - -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Entity; - -@Entity -@Getter -@Setter -public class TeProdTest extends BaseMainEntity { - - private String notes; - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTestApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTestApi.java deleted file mode 100644 index 9cf6b22..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTestApi.java +++ /dev/null @@ -1,56 +0,0 @@ -package vboot.extend.module.te.prod.test; - -import vboot.extend.module.te.prod.cate.TeProdCate; -import vboot.extend.module.te.prod.cate.TeProdCateService; -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("te/prod/test") -public class TeProdTestApi { - - //分页特性分类 - @GetMapping - public R get(String name) { - Sqler sqler = new Sqler("te_prod_test"); - sqler.addLike("t.name", name); - sqler.addSelect("t.notes"); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("list") - public R getList() { - return R.ok(service.findAll()); - } - - //查询单个分类 - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - TeProdCate cate = service.findOne(id); - return R.ok(cate); - } - - //新增分类 - @PostMapping - public R post(@RequestBody TeProdCate cate) { - return R.ok(service.insert(cate)); - } - - //修改分类 - @PutMapping - public R put(@RequestBody TeProdCate cate) { - return R.ok(service.update(cate)); - } - - //删除分类 - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private TeProdCateService service; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTestRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTestRepo.java deleted file mode 100644 index 1a7a88a..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTestRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.te.prod.test; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface TeProdTestRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTestService.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTestService.java deleted file mode 100644 index 927a603..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTestService.java +++ /dev/null @@ -1,25 +0,0 @@ -package vboot.extend.module.te.prod.test; - -import vboot.core.common.service.BaseMainService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; - -@Service -public class TeProdTestService extends BaseMainService { - - - - - - //----------bean注入------------ - @Autowired - private TeProdTestRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersion.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersion.java deleted file mode 100644 index 7c790b5..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersion.java +++ /dev/null @@ -1,76 +0,0 @@ -package vboot.extend.module.te.prod.version; - -import vboot.extend.module.te.allot.check.TeAllotCheck; -import vboot.extend.module.te.allot.drive.TeAllotDrive; -import vboot.extend.module.te.allot.param.TeAllotParam; -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.*; - -@Entity -@Getter -@Setter -public class TeProdVersion extends BaseMainEntity { - - private Integer ornum;//排序号 - - private Integer venum;//版本号 - - private Boolean detag;//默认版本标记 - - @Column(length = 32) - private String stdat;//生效开始时间 - - @Column(length = 32) - private String endat;//生效结束时间 - - @Column(length = 32) - private String coway;//配置方式 - - @Column(length = 32) - private String paway;//参数分配方式 - - @Column(length = 32) - private String patid;//参数分配模板id - - @Transient - private TeAllotParam patem;//参数分配模板引用 - - @Column(length = 32) - private String laway;//联动分配方式 - -// @Column(length = 32) -// private String latid;//联动分配模板id - -// @Transient -// private TeAllotParam latem;//联动分配模板引用 - - @Column(length = 32) - private String caway;//校验分配方式 - - @Column(length = 32) - private String catid;//校验分配模板id - - @Transient - private TeAllotCheck catem;//校验分配模板引用 - - @Column(length = 32) - private String daway;//驱动分配方式 - - @Column(length = 32) - private String datid;//驱动分配模板id - - @Transient - private TeAllotDrive datem;//驱动分配模板引用 - - private String notes; - - @Column(length = 32) - private String modid;//型号ID - - @Transient - private String modna;//型号名称 - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersionApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersionApi.java deleted file mode 100644 index de3723c..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersionApi.java +++ /dev/null @@ -1,59 +0,0 @@ -package vboot.extend.module.te.prod.version; - -import vboot.extend.module.te.allot.param.TeAllotParamService; -import vboot.core.common.api.R; -import vboot.core.common.dao.JdbcDao; -import vboot.core.common.dao.Sqler; -import vboot.core.xutil.lang.XstrUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("te/prod/version") -public class TeProdVersionApi { - - @GetMapping - public R get(String name, String modid) { - Sqler sqler = new Sqler("te_prod_version"); - sqler.addLike("t.name" , name); - sqler.addEqual("t.modid" , modid); - sqler.addSelect("t.detag"); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - TeProdVersion main = service.findOne(id); - String modna = jdbcDao.findOneString("select name from te_prod_model where id=?" , main.getModid()); - main.setModna(modna); - if (XstrUtil.isNotBlank(main.getPatid())) { - main.setPatem(apService.findOne(main.getPatid())); - } - return R.ok(main); - } - - @PostMapping - public R post(@RequestBody TeProdVersion main) { - return R.ok(service.insert(main)); - } - - @PutMapping - public R put(@RequestBody TeProdVersion main) { - return R.ok(service.update(main)); - } - - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private TeProdVersionService service; - - @Autowired - private TeAllotParamService apService; - - @Autowired - private JdbcDao jdbcDao; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersionRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersionRepo.java deleted file mode 100644 index 0f1684d..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersionRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.te.prod.version; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface TeProdVersionRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersionService.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersionService.java deleted file mode 100644 index e4760c4..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersionService.java +++ /dev/null @@ -1,46 +0,0 @@ -package vboot.extend.module.te.prod.version; - -import vboot.extend.module.te.allot.param.TeAllotParamRepo; -import vboot.core.common.service.BaseMainService; -import vboot.core.xutil.lang.XstrUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; - -@Service -public class TeProdVersionService extends BaseMainService { - - public String insert(TeProdVersion main){ - if(main.getPatem()!=null){ - String puuid = XstrUtil.getUUID(); - main.getPatem().setId(puuid); - main.getPatem().setName(main.getName()+"专用"); - main.getPatem().setSptag(true); - apRepo.save(main.getPatem()); - main.setPatid(puuid); - } - return super.insert(main); - } - - public String update(TeProdVersion main){ - if(main.getPatem()!=null){ - apRepo.save(main.getPatem()); - } - return super.update(main); - } - - //----------bean注入------------ - @Autowired - private TeAllotParamRepo apRepo; - - - @Autowired - private TeProdVersionRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCate.java b/vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCate.java deleted file mode 100644 index 24bdc61..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCate.java +++ /dev/null @@ -1,18 +0,0 @@ -package vboot.extend.module.te.tran.cate; - -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Entity; - -@Entity -@Getter -@Setter -public class TeTranCate extends BaseMainEntity { - - private Integer ornum; - - private String notes; - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCateApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCateApi.java deleted file mode 100644 index bbdfc4d..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCateApi.java +++ /dev/null @@ -1,55 +0,0 @@ -package vboot.extend.module.te.tran.cate; - -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("te/tran/cate") -public class TeTranCateApi { - - //分页特性分类 - @GetMapping - public R get(String name) { - Sqler sqler = new Sqler("te_tran_cate"); - sqler.addLike("t.name", name); - sqler.addSelect("t.notes"); - sqler.addOrder("t.ornum"); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("list") - public R getList() { - return R.ok(service.findAll()); - } - - //查询单个分类 - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - TeTranCate cate = service.findOne(id); - return R.ok(cate); - } - - //新增分类 - @PostMapping - public R post(@RequestBody TeTranCate cate) { - return R.ok(service.insert(cate)); - } - - //修改分类 - @PutMapping - public R put(@RequestBody TeTranCate cate) { - return R.ok(service.update(cate)); - } - - //删除分类 - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private TeTranCateService service; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCateRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCateRepo.java deleted file mode 100644 index d69c376..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCateRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.te.tran.cate; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface TeTranCateRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCateService.java b/vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCateService.java deleted file mode 100644 index 66d21a7..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCateService.java +++ /dev/null @@ -1,22 +0,0 @@ -package vboot.extend.module.te.tran.cate; - -import vboot.core.common.service.BaseMainService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; - -@Service -public class TeTranCateService extends BaseMainService { - - - //----------bean注入------------ - @Autowired - private TeTranCateRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMain.java b/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMain.java deleted file mode 100644 index afc0606..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMain.java +++ /dev/null @@ -1,67 +0,0 @@ -package vboot.extend.module.te.tran.main; - -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.List; - -@Entity -@Getter -@Setter -public class TeTranMain extends BaseMainEntity { - - @Column(length = 64) - private String catid; - - private Integer ornum; - - private String notes; - - @Column(length = 64) - private String pacod; - - @Column(length = 64) - private String panam; - - @Column(length = 64) - private String pbcod; - - @Column(length = 64) - private String pbnam; - - @Column(length = 64) - private String pccod; - - @Column(length = 64) - private String pcnam; - - @Column(length = 64) - private String pdcod; - - @Column(length = 64) - private String pdnam; - - @Column(length = 64) - private String pxcod; - - @Column(length = 64) - private String pxnam; - - @Column(length = 64) - private String pycod; - - @Column(length = 64) - private String pynam; - - @Column(length = 32) - private String trway; - - @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true) - @JoinColumn(name = "mainid") - @OrderBy("ornum ASC") - private List items = new ArrayList<>(); - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainApi.java deleted file mode 100644 index cfacfca..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainApi.java +++ /dev/null @@ -1,55 +0,0 @@ -package vboot.extend.module.te.tran.main; - -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("te/tran/main") -public class TeTranMainApi { - - //分页特性分类 - @GetMapping - public R get(String name) { - Sqler sqler = new Sqler("te_tran_main"); - sqler.addLike("t.name", name); - sqler.addSelect("t.notes"); - sqler.addOrder("t.ornum"); - return R.ok(service.findPageData(sqler)); - } - - @GetMapping("list") - public R getList() { - return R.ok(service.findAll()); - } - - //查询单个分类 - @GetMapping("one/{id}") - public R getOne(@PathVariable String id) { - TeTranMain cate = service.findOne(id); - return R.ok(cate); - } - - //新增分类 - @PostMapping - public R post(@RequestBody TeTranMain cate) { - return R.ok(service.insert(cate)); - } - - //修改分类 - @PutMapping - public R put(@RequestBody TeTranMain cate) { - return R.ok(service.update(cate)); - } - - //删除分类 - @DeleteMapping("{ids}") - public R delete(@PathVariable String[] ids) { - return R.ok(service.delete(ids)); - } - - @Autowired - private TeTranMainService service; - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainItem.java b/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainItem.java deleted file mode 100644 index da43259..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainItem.java +++ /dev/null @@ -1,45 +0,0 @@ -package vboot.extend.module.te.tran.main; - -import lombok.Getter; -import lombok.Setter; -import org.hibernate.annotations.GenericGenerator; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -@Entity -@Getter -@Setter -public class TeTranMainItem { - - @Id - @Column(length = 32) - @GeneratedValue(generator = "jpa-uuid") - @GenericGenerator(name = "jpa-uuid", strategy = "uuid") - private String id;//ID - - private Integer ornum;//排序号 - - @Column(length = 100) - private String paval; - - @Column(length = 100) - private String pbval; - - @Column(length = 100) - private String pcval; - - @Column(length = 100) - private String pdval; - - @Column(length = 100) - private String pxval; - - @Column(length = 100) - private String pyval; - - private String notes;//备注 - -} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainRepo.java deleted file mode 100644 index cf35d3d..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package vboot.extend.module.te.tran.main; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface TeTranMainRepo extends JpaRepository { - - -} diff --git a/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainService.java b/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainService.java deleted file mode 100644 index 7dd00d5..0000000 --- a/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainService.java +++ /dev/null @@ -1,22 +0,0 @@ -package vboot.extend.module.te.tran.main; - -import vboot.core.common.service.BaseMainService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; - -@Service -public class TeTranMainService extends BaseMainService { - - - //----------bean注入------------ - @Autowired - private TeTranMainRepo repo; - - @PostConstruct - public void initDao() { - super.setRepo(repo); - } - -}