From 34dcaf3d979c81da68162c9aed3d51dfac176b55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Wed, 15 Feb 2017 23:03:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BB=A3=E7=A0=81=E7=BB=93?= =?UTF-8?q?=E6=9E=84=EF=BC=8C=E9=87=87=E7=94=A8Maven=E6=9D=A5=E7=AE=A1?= =?UTF-8?q?=E7=90=86jar=E5=8C=85(15)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/jsh/action/asset/AssetAction.java | 517 ------------ src/com/jsh/action/asset/ReportAction.java | 120 --- src/com/jsh/action/basic/AccountAction.java | 446 ----------- src/com/jsh/action/basic/AppAction.java | 541 ------------- src/com/jsh/action/basic/AssetNameAction.java | 286 ------- src/com/jsh/action/basic/CategoryAction.java | 272 ------- src/com/jsh/action/basic/DepotAction.java | 376 --------- src/com/jsh/action/basic/FunctionsAction.java | 588 -------------- src/com/jsh/action/basic/InOutItemAction.java | 331 -------- src/com/jsh/action/basic/LogAction.java | 193 ----- src/com/jsh/action/basic/RoleAction.java | 347 -------- src/com/jsh/action/basic/SupplierAction.java | 406 ---------- src/com/jsh/action/basic/UserAction.java | 481 ----------- .../jsh/action/basic/UserBusinessAction.java | 229 ------ .../action/materials/AccountHeadAction.java | 308 -------- .../action/materials/AccountItemAction.java | 192 ----- .../jsh/action/materials/DepotHeadAction.java | 374 --------- .../jsh/action/materials/DepotItemAction.java | 542 ------------- .../jsh/action/materials/MaterialAction.java | 402 ---------- .../materials/MaterialCategoryAction.java | 275 ------- .../jsh/action/materials/PersonAction.java | 287 ------- src/com/jsh/base/BaseAction.java | 116 --- src/com/jsh/base/BaseDAO.java | 140 ---- src/com/jsh/base/BaseIDAO.java | 124 --- src/com/jsh/base/BaseIService.java | 109 --- src/com/jsh/base/BaseService.java | 141 ---- src/com/jsh/base/Log.java | 174 ---- src/com/jsh/dao/asset/AssetDAO.java | 17 - src/com/jsh/dao/asset/AssetIDAO.java | 9 - src/com/jsh/dao/asset/ReportDAO.java | 21 - src/com/jsh/dao/asset/ReportIDAO.java | 16 - src/com/jsh/dao/basic/AccountDAO.java | 17 - src/com/jsh/dao/basic/AccountIDAO.java | 9 - src/com/jsh/dao/basic/AppDAO.java | 17 - src/com/jsh/dao/basic/AppIDAO.java | 9 - src/com/jsh/dao/basic/AssetNameDAO.java | 17 - src/com/jsh/dao/basic/AssetNameIDAO.java | 9 - src/com/jsh/dao/basic/CategoryDAO.java | 17 - src/com/jsh/dao/basic/CategoryIDAO.java | 9 - src/com/jsh/dao/basic/DepotDAO.java | 17 - src/com/jsh/dao/basic/DepotIDAO.java | 9 - src/com/jsh/dao/basic/FunctionsDAO.java | 17 - src/com/jsh/dao/basic/FunctionsIDAO.java | 9 - src/com/jsh/dao/basic/InOutItemDAO.java | 17 - src/com/jsh/dao/basic/InOutItemIDAO.java | 9 - src/com/jsh/dao/basic/LogDAO.java | 18 - src/com/jsh/dao/basic/LogIDAO.java | 13 - src/com/jsh/dao/basic/RoleDAO.java | 17 - src/com/jsh/dao/basic/RoleIDAO.java | 9 - src/com/jsh/dao/basic/SupplierDAO.java | 19 - src/com/jsh/dao/basic/SupplierIDAO.java | 9 - src/com/jsh/dao/basic/UserBusinessDAO.java | 32 - src/com/jsh/dao/basic/UserBusinessIDAO.java | 14 - src/com/jsh/dao/basic/UserDAO.java | 19 - src/com/jsh/dao/basic/UserIDAO.java | 9 - src/com/jsh/dao/materials/AccountHeadDAO.java | 32 - .../jsh/dao/materials/AccountHeadIDAO.java | 15 - src/com/jsh/dao/materials/AccountItemDAO.java | 22 - .../jsh/dao/materials/AccountItemIDAO.java | 12 - src/com/jsh/dao/materials/DepotHeadDAO.java | 32 - src/com/jsh/dao/materials/DepotHeadIDAO.java | 15 - src/com/jsh/dao/materials/DepotItemDAO.java | 58 -- src/com/jsh/dao/materials/DepotItemIDAO.java | 14 - .../dao/materials/MaterialCategoryDAO.java | 17 - .../dao/materials/MaterialCategoryIDAO.java | 9 - src/com/jsh/dao/materials/MaterialDAO.java | 17 - src/com/jsh/dao/materials/MaterialIDAO.java | 9 - src/com/jsh/dao/materials/PersonDAO.java | 17 - src/com/jsh/dao/materials/PersonIDAO.java | 9 - src/com/jsh/model/po/Account.hbm.xml | 36 - src/com/jsh/model/po/Account.java | 90 --- src/com/jsh/model/po/AccountHead.hbm.xml | 56 -- src/com/jsh/model/po/AccountHead.java | 143 ---- src/com/jsh/model/po/AccountItem.hbm.xml | 36 - src/com/jsh/model/po/AccountItem.java | 94 --- src/com/jsh/model/po/App.hbm.xml | 81 -- src/com/jsh/model/po/App.java | 174 ---- src/com/jsh/model/po/Asset.hbm.xml | 96 --- src/com/jsh/model/po/Asset.java | 379 --------- src/com/jsh/model/po/Assetcategory.hbm.xml | 26 - src/com/jsh/model/po/Assetcategory.java | 67 -- src/com/jsh/model/po/Assetname.hbm.xml | 34 - src/com/jsh/model/po/Assetname.java | 93 --- src/com/jsh/model/po/Basicuser.hbm.xml | 69 -- src/com/jsh/model/po/Basicuser.java | 177 ----- src/com/jsh/model/po/Category.hbm.xml | 26 - src/com/jsh/model/po/Category.java | 67 -- src/com/jsh/model/po/Depot.hbm.xml | 26 - src/com/jsh/model/po/Depot.java | 60 -- src/com/jsh/model/po/DepotHead.hbm.xml | 81 -- src/com/jsh/model/po/DepotHead.java | 174 ---- src/com/jsh/model/po/DepotItem.hbm.xml | 46 -- src/com/jsh/model/po/DepotItem.java | 103 --- src/com/jsh/model/po/Functions.hbm.xml | 54 -- src/com/jsh/model/po/Functions.java | 93 --- src/com/jsh/model/po/InOutItem.hbm.xml | 26 - src/com/jsh/model/po/InOutItem.java | 66 -- src/com/jsh/model/po/Logdetails.hbm.xml | 44 -- src/com/jsh/model/po/Logdetails.java | 119 --- src/com/jsh/model/po/Material.hbm.xml | 59 -- src/com/jsh/model/po/Material.java | 155 ---- src/com/jsh/model/po/MaterialCategory.hbm.xml | 24 - src/com/jsh/model/po/MaterialCategory.java | 61 -- src/com/jsh/model/po/Person.hbm.xml | 21 - src/com/jsh/model/po/Person.java | 49 -- src/com/jsh/model/po/Role.hbm.xml | 16 - src/com/jsh/model/po/Role.java | 31 - src/com/jsh/model/po/Supplier.hbm.xml | 69 -- src/com/jsh/model/po/Supplier.java | 163 ---- src/com/jsh/model/po/UserBusiness.hbm.xml | 26 - src/com/jsh/model/po/UserBusiness.java | 49 -- src/com/jsh/model/vo/asset/AssetModel.java | 429 ---------- .../jsh/model/vo/asset/AssetShowModel.java | 43 - src/com/jsh/model/vo/asset/ReportModel.java | 321 -------- .../jsh/model/vo/asset/ReportShowModel.java | 34 - src/com/jsh/model/vo/basic/AccountModel.java | 170 ---- .../jsh/model/vo/basic/AccountShowModel.java | 43 - src/com/jsh/model/vo/basic/AppModel.java | 294 ------- src/com/jsh/model/vo/basic/AppShowModel.java | 22 - .../jsh/model/vo/basic/AssetNameModel.java | 154 ---- .../model/vo/basic/AssetNameShowModel.java | 22 - src/com/jsh/model/vo/basic/CategoryModel.java | 125 --- .../jsh/model/vo/basic/CategoryShowModel.java | 22 - src/com/jsh/model/vo/basic/DepotModel.java | 150 ---- .../jsh/model/vo/basic/DepotShowModel.java | 43 - .../jsh/model/vo/basic/FunctionsModel.java | 219 ----- .../model/vo/basic/FunctionsShowModel.java | 22 - .../jsh/model/vo/basic/InOutItemModel.java | 140 ---- .../model/vo/basic/InOutItemShowModel.java | 43 - src/com/jsh/model/vo/basic/LogModel.java | 200 ----- src/com/jsh/model/vo/basic/LogShowModel.java | 43 - src/com/jsh/model/vo/basic/RoleModel.java | 123 --- src/com/jsh/model/vo/basic/RoleShowModel.java | 22 - src/com/jsh/model/vo/basic/SupplierModel.java | 237 ------ .../jsh/model/vo/basic/SupplierShowModel.java | 42 - .../jsh/model/vo/basic/UserBusinessModel.java | 123 --- .../model/vo/basic/UserBusinessShowModel.java | 43 - src/com/jsh/model/vo/basic/UserModel.java | 255 ------ src/com/jsh/model/vo/basic/UserShowModel.java | 22 - .../model/vo/materials/AccountHeadModel.java | 225 ------ .../vo/materials/AccountHeadShowModel.java | 42 - .../model/vo/materials/AccountItemModel.java | 251 ------ .../vo/materials/AccountItemShowModel.java | 22 - .../model/vo/materials/DepotHeadModel.java | 229 ------ .../vo/materials/DepotHeadShowModel.java | 42 - .../model/vo/materials/DepotItemModel.java | 238 ------ .../vo/materials/DepotItemShowModel.java | 22 - .../vo/materials/MaterialCategoryModel.java | 123 --- .../materials/MaterialCategoryShowModel.java | 43 - .../jsh/model/vo/materials/MaterialModel.java | 235 ------ .../model/vo/materials/MaterialShowModel.java | 43 - .../jsh/model/vo/materials/PersonModel.java | 109 --- .../model/vo/materials/PersonShowModel.java | 42 - src/com/jsh/service/asset/AssetIService.java | 30 - src/com/jsh/service/asset/AssetService.java | 746 ------------------ src/com/jsh/service/asset/ReportIService.java | 15 - src/com/jsh/service/asset/ReportService.java | 23 - .../jsh/service/basic/AccountIService.java | 9 - src/com/jsh/service/basic/AccountService.java | 22 - src/com/jsh/service/basic/AppIService.java | 9 - src/com/jsh/service/basic/AppService.java | 31 - .../jsh/service/basic/AssetNameIService.java | 9 - .../jsh/service/basic/AssetNameService.java | 22 - .../jsh/service/basic/CategoryIService.java | 9 - .../jsh/service/basic/CategoryService.java | 23 - src/com/jsh/service/basic/DepotIService.java | 9 - src/com/jsh/service/basic/DepotService.java | 32 - .../jsh/service/basic/FunctionsIService.java | 9 - .../jsh/service/basic/FunctionsService.java | 31 - .../jsh/service/basic/InOutItemIService.java | 9 - .../jsh/service/basic/InOutItemService.java | 23 - src/com/jsh/service/basic/LogIService.java | 16 - src/com/jsh/service/basic/LogService.java | 36 - src/com/jsh/service/basic/RoleIService.java | 9 - src/com/jsh/service/basic/RoleService.java | 30 - .../jsh/service/basic/SupplierIService.java | 9 - .../jsh/service/basic/SupplierService.java | 25 - .../service/basic/UserBusinessIService.java | 15 - .../service/basic/UserBusinessService.java | 32 - src/com/jsh/service/basic/UserIService.java | 33 - src/com/jsh/service/basic/UserService.java | 114 --- .../materials/AccountHeadIService.java | 15 - .../service/materials/AccountHeadService.java | 32 - .../materials/AccountItemIService.java | 18 - .../service/materials/AccountItemService.java | 38 - .../service/materials/DepotHeadIService.java | 15 - .../service/materials/DepotHeadService.java | 32 - .../service/materials/DepotItemIService.java | 26 - .../service/materials/DepotItemService.java | 124 --- .../materials/MaterialCategoryIService.java | 9 - .../materials/MaterialCategoryService.java | 24 - .../service/materials/MaterialIService.java | 9 - .../service/materials/MaterialService.java | 24 - .../jsh/service/materials/PersonIService.java | 9 - .../jsh/service/materials/PersonService.java | 24 - src/com/jsh/util/AssetConstants.java | 119 --- src/com/jsh/util/BeanFactoryUtil.java | 127 --- src/com/jsh/util/ExceptionCodeConstants.java | 35 - src/com/jsh/util/JshConstants.java | 36 - src/com/jsh/util/JshException.java | 74 -- .../util/OpenSessionInViewFilterExtend.java | 24 - src/com/jsh/util/PageUtil.java | 199 ----- src/com/jsh/util/PathTool.java | 85 -- src/com/jsh/util/SearchConditionUtil.java | 127 --- src/com/jsh/util/SessionFilter.java | 70 -- src/com/jsh/util/Tools.java | 561 ------------- 206 files changed, 20666 deletions(-) delete mode 100644 src/com/jsh/action/asset/AssetAction.java delete mode 100644 src/com/jsh/action/asset/ReportAction.java delete mode 100644 src/com/jsh/action/basic/AccountAction.java delete mode 100644 src/com/jsh/action/basic/AppAction.java delete mode 100644 src/com/jsh/action/basic/AssetNameAction.java delete mode 100644 src/com/jsh/action/basic/CategoryAction.java delete mode 100644 src/com/jsh/action/basic/DepotAction.java delete mode 100644 src/com/jsh/action/basic/FunctionsAction.java delete mode 100644 src/com/jsh/action/basic/InOutItemAction.java delete mode 100644 src/com/jsh/action/basic/LogAction.java delete mode 100644 src/com/jsh/action/basic/RoleAction.java delete mode 100644 src/com/jsh/action/basic/SupplierAction.java delete mode 100644 src/com/jsh/action/basic/UserAction.java delete mode 100644 src/com/jsh/action/basic/UserBusinessAction.java delete mode 100644 src/com/jsh/action/materials/AccountHeadAction.java delete mode 100644 src/com/jsh/action/materials/AccountItemAction.java delete mode 100644 src/com/jsh/action/materials/DepotHeadAction.java delete mode 100644 src/com/jsh/action/materials/DepotItemAction.java delete mode 100644 src/com/jsh/action/materials/MaterialAction.java delete mode 100644 src/com/jsh/action/materials/MaterialCategoryAction.java delete mode 100644 src/com/jsh/action/materials/PersonAction.java delete mode 100644 src/com/jsh/base/BaseAction.java delete mode 100644 src/com/jsh/base/BaseDAO.java delete mode 100644 src/com/jsh/base/BaseIDAO.java delete mode 100644 src/com/jsh/base/BaseIService.java delete mode 100644 src/com/jsh/base/BaseService.java delete mode 100644 src/com/jsh/base/Log.java delete mode 100644 src/com/jsh/dao/asset/AssetDAO.java delete mode 100644 src/com/jsh/dao/asset/AssetIDAO.java delete mode 100644 src/com/jsh/dao/asset/ReportDAO.java delete mode 100644 src/com/jsh/dao/asset/ReportIDAO.java delete mode 100644 src/com/jsh/dao/basic/AccountDAO.java delete mode 100644 src/com/jsh/dao/basic/AccountIDAO.java delete mode 100644 src/com/jsh/dao/basic/AppDAO.java delete mode 100644 src/com/jsh/dao/basic/AppIDAO.java delete mode 100644 src/com/jsh/dao/basic/AssetNameDAO.java delete mode 100644 src/com/jsh/dao/basic/AssetNameIDAO.java delete mode 100644 src/com/jsh/dao/basic/CategoryDAO.java delete mode 100644 src/com/jsh/dao/basic/CategoryIDAO.java delete mode 100644 src/com/jsh/dao/basic/DepotDAO.java delete mode 100644 src/com/jsh/dao/basic/DepotIDAO.java delete mode 100644 src/com/jsh/dao/basic/FunctionsDAO.java delete mode 100644 src/com/jsh/dao/basic/FunctionsIDAO.java delete mode 100644 src/com/jsh/dao/basic/InOutItemDAO.java delete mode 100644 src/com/jsh/dao/basic/InOutItemIDAO.java delete mode 100644 src/com/jsh/dao/basic/LogDAO.java delete mode 100644 src/com/jsh/dao/basic/LogIDAO.java delete mode 100644 src/com/jsh/dao/basic/RoleDAO.java delete mode 100644 src/com/jsh/dao/basic/RoleIDAO.java delete mode 100644 src/com/jsh/dao/basic/SupplierDAO.java delete mode 100644 src/com/jsh/dao/basic/SupplierIDAO.java delete mode 100644 src/com/jsh/dao/basic/UserBusinessDAO.java delete mode 100644 src/com/jsh/dao/basic/UserBusinessIDAO.java delete mode 100644 src/com/jsh/dao/basic/UserDAO.java delete mode 100644 src/com/jsh/dao/basic/UserIDAO.java delete mode 100644 src/com/jsh/dao/materials/AccountHeadDAO.java delete mode 100644 src/com/jsh/dao/materials/AccountHeadIDAO.java delete mode 100644 src/com/jsh/dao/materials/AccountItemDAO.java delete mode 100644 src/com/jsh/dao/materials/AccountItemIDAO.java delete mode 100644 src/com/jsh/dao/materials/DepotHeadDAO.java delete mode 100644 src/com/jsh/dao/materials/DepotHeadIDAO.java delete mode 100644 src/com/jsh/dao/materials/DepotItemDAO.java delete mode 100644 src/com/jsh/dao/materials/DepotItemIDAO.java delete mode 100644 src/com/jsh/dao/materials/MaterialCategoryDAO.java delete mode 100644 src/com/jsh/dao/materials/MaterialCategoryIDAO.java delete mode 100644 src/com/jsh/dao/materials/MaterialDAO.java delete mode 100644 src/com/jsh/dao/materials/MaterialIDAO.java delete mode 100644 src/com/jsh/dao/materials/PersonDAO.java delete mode 100644 src/com/jsh/dao/materials/PersonIDAO.java delete mode 100644 src/com/jsh/model/po/Account.hbm.xml delete mode 100644 src/com/jsh/model/po/Account.java delete mode 100644 src/com/jsh/model/po/AccountHead.hbm.xml delete mode 100644 src/com/jsh/model/po/AccountHead.java delete mode 100644 src/com/jsh/model/po/AccountItem.hbm.xml delete mode 100644 src/com/jsh/model/po/AccountItem.java delete mode 100644 src/com/jsh/model/po/App.hbm.xml delete mode 100644 src/com/jsh/model/po/App.java delete mode 100644 src/com/jsh/model/po/Asset.hbm.xml delete mode 100644 src/com/jsh/model/po/Asset.java delete mode 100644 src/com/jsh/model/po/Assetcategory.hbm.xml delete mode 100644 src/com/jsh/model/po/Assetcategory.java delete mode 100644 src/com/jsh/model/po/Assetname.hbm.xml delete mode 100644 src/com/jsh/model/po/Assetname.java delete mode 100644 src/com/jsh/model/po/Basicuser.hbm.xml delete mode 100644 src/com/jsh/model/po/Basicuser.java delete mode 100644 src/com/jsh/model/po/Category.hbm.xml delete mode 100644 src/com/jsh/model/po/Category.java delete mode 100644 src/com/jsh/model/po/Depot.hbm.xml delete mode 100644 src/com/jsh/model/po/Depot.java delete mode 100644 src/com/jsh/model/po/DepotHead.hbm.xml delete mode 100644 src/com/jsh/model/po/DepotHead.java delete mode 100644 src/com/jsh/model/po/DepotItem.hbm.xml delete mode 100644 src/com/jsh/model/po/DepotItem.java delete mode 100644 src/com/jsh/model/po/Functions.hbm.xml delete mode 100644 src/com/jsh/model/po/Functions.java delete mode 100644 src/com/jsh/model/po/InOutItem.hbm.xml delete mode 100644 src/com/jsh/model/po/InOutItem.java delete mode 100644 src/com/jsh/model/po/Logdetails.hbm.xml delete mode 100644 src/com/jsh/model/po/Logdetails.java delete mode 100644 src/com/jsh/model/po/Material.hbm.xml delete mode 100644 src/com/jsh/model/po/Material.java delete mode 100644 src/com/jsh/model/po/MaterialCategory.hbm.xml delete mode 100644 src/com/jsh/model/po/MaterialCategory.java delete mode 100644 src/com/jsh/model/po/Person.hbm.xml delete mode 100644 src/com/jsh/model/po/Person.java delete mode 100644 src/com/jsh/model/po/Role.hbm.xml delete mode 100644 src/com/jsh/model/po/Role.java delete mode 100644 src/com/jsh/model/po/Supplier.hbm.xml delete mode 100644 src/com/jsh/model/po/Supplier.java delete mode 100644 src/com/jsh/model/po/UserBusiness.hbm.xml delete mode 100644 src/com/jsh/model/po/UserBusiness.java delete mode 100644 src/com/jsh/model/vo/asset/AssetModel.java delete mode 100644 src/com/jsh/model/vo/asset/AssetShowModel.java delete mode 100644 src/com/jsh/model/vo/asset/ReportModel.java delete mode 100644 src/com/jsh/model/vo/asset/ReportShowModel.java delete mode 100644 src/com/jsh/model/vo/basic/AccountModel.java delete mode 100644 src/com/jsh/model/vo/basic/AccountShowModel.java delete mode 100644 src/com/jsh/model/vo/basic/AppModel.java delete mode 100644 src/com/jsh/model/vo/basic/AppShowModel.java delete mode 100644 src/com/jsh/model/vo/basic/AssetNameModel.java delete mode 100644 src/com/jsh/model/vo/basic/AssetNameShowModel.java delete mode 100644 src/com/jsh/model/vo/basic/CategoryModel.java delete mode 100644 src/com/jsh/model/vo/basic/CategoryShowModel.java delete mode 100644 src/com/jsh/model/vo/basic/DepotModel.java delete mode 100644 src/com/jsh/model/vo/basic/DepotShowModel.java delete mode 100644 src/com/jsh/model/vo/basic/FunctionsModel.java delete mode 100644 src/com/jsh/model/vo/basic/FunctionsShowModel.java delete mode 100644 src/com/jsh/model/vo/basic/InOutItemModel.java delete mode 100644 src/com/jsh/model/vo/basic/InOutItemShowModel.java delete mode 100644 src/com/jsh/model/vo/basic/LogModel.java delete mode 100644 src/com/jsh/model/vo/basic/LogShowModel.java delete mode 100644 src/com/jsh/model/vo/basic/RoleModel.java delete mode 100644 src/com/jsh/model/vo/basic/RoleShowModel.java delete mode 100644 src/com/jsh/model/vo/basic/SupplierModel.java delete mode 100644 src/com/jsh/model/vo/basic/SupplierShowModel.java delete mode 100644 src/com/jsh/model/vo/basic/UserBusinessModel.java delete mode 100644 src/com/jsh/model/vo/basic/UserBusinessShowModel.java delete mode 100644 src/com/jsh/model/vo/basic/UserModel.java delete mode 100644 src/com/jsh/model/vo/basic/UserShowModel.java delete mode 100644 src/com/jsh/model/vo/materials/AccountHeadModel.java delete mode 100644 src/com/jsh/model/vo/materials/AccountHeadShowModel.java delete mode 100644 src/com/jsh/model/vo/materials/AccountItemModel.java delete mode 100644 src/com/jsh/model/vo/materials/AccountItemShowModel.java delete mode 100644 src/com/jsh/model/vo/materials/DepotHeadModel.java delete mode 100644 src/com/jsh/model/vo/materials/DepotHeadShowModel.java delete mode 100644 src/com/jsh/model/vo/materials/DepotItemModel.java delete mode 100644 src/com/jsh/model/vo/materials/DepotItemShowModel.java delete mode 100644 src/com/jsh/model/vo/materials/MaterialCategoryModel.java delete mode 100644 src/com/jsh/model/vo/materials/MaterialCategoryShowModel.java delete mode 100644 src/com/jsh/model/vo/materials/MaterialModel.java delete mode 100644 src/com/jsh/model/vo/materials/MaterialShowModel.java delete mode 100644 src/com/jsh/model/vo/materials/PersonModel.java delete mode 100644 src/com/jsh/model/vo/materials/PersonShowModel.java delete mode 100644 src/com/jsh/service/asset/AssetIService.java delete mode 100644 src/com/jsh/service/asset/AssetService.java delete mode 100644 src/com/jsh/service/asset/ReportIService.java delete mode 100644 src/com/jsh/service/asset/ReportService.java delete mode 100644 src/com/jsh/service/basic/AccountIService.java delete mode 100644 src/com/jsh/service/basic/AccountService.java delete mode 100644 src/com/jsh/service/basic/AppIService.java delete mode 100644 src/com/jsh/service/basic/AppService.java delete mode 100644 src/com/jsh/service/basic/AssetNameIService.java delete mode 100644 src/com/jsh/service/basic/AssetNameService.java delete mode 100644 src/com/jsh/service/basic/CategoryIService.java delete mode 100644 src/com/jsh/service/basic/CategoryService.java delete mode 100644 src/com/jsh/service/basic/DepotIService.java delete mode 100644 src/com/jsh/service/basic/DepotService.java delete mode 100644 src/com/jsh/service/basic/FunctionsIService.java delete mode 100644 src/com/jsh/service/basic/FunctionsService.java delete mode 100644 src/com/jsh/service/basic/InOutItemIService.java delete mode 100644 src/com/jsh/service/basic/InOutItemService.java delete mode 100644 src/com/jsh/service/basic/LogIService.java delete mode 100644 src/com/jsh/service/basic/LogService.java delete mode 100644 src/com/jsh/service/basic/RoleIService.java delete mode 100644 src/com/jsh/service/basic/RoleService.java delete mode 100644 src/com/jsh/service/basic/SupplierIService.java delete mode 100644 src/com/jsh/service/basic/SupplierService.java delete mode 100644 src/com/jsh/service/basic/UserBusinessIService.java delete mode 100644 src/com/jsh/service/basic/UserBusinessService.java delete mode 100644 src/com/jsh/service/basic/UserIService.java delete mode 100644 src/com/jsh/service/basic/UserService.java delete mode 100644 src/com/jsh/service/materials/AccountHeadIService.java delete mode 100644 src/com/jsh/service/materials/AccountHeadService.java delete mode 100644 src/com/jsh/service/materials/AccountItemIService.java delete mode 100644 src/com/jsh/service/materials/AccountItemService.java delete mode 100644 src/com/jsh/service/materials/DepotHeadIService.java delete mode 100644 src/com/jsh/service/materials/DepotHeadService.java delete mode 100644 src/com/jsh/service/materials/DepotItemIService.java delete mode 100644 src/com/jsh/service/materials/DepotItemService.java delete mode 100644 src/com/jsh/service/materials/MaterialCategoryIService.java delete mode 100644 src/com/jsh/service/materials/MaterialCategoryService.java delete mode 100644 src/com/jsh/service/materials/MaterialIService.java delete mode 100644 src/com/jsh/service/materials/MaterialService.java delete mode 100644 src/com/jsh/service/materials/PersonIService.java delete mode 100644 src/com/jsh/service/materials/PersonService.java delete mode 100644 src/com/jsh/util/AssetConstants.java delete mode 100644 src/com/jsh/util/BeanFactoryUtil.java delete mode 100644 src/com/jsh/util/ExceptionCodeConstants.java delete mode 100644 src/com/jsh/util/JshConstants.java delete mode 100644 src/com/jsh/util/JshException.java delete mode 100644 src/com/jsh/util/OpenSessionInViewFilterExtend.java delete mode 100644 src/com/jsh/util/PageUtil.java delete mode 100644 src/com/jsh/util/PathTool.java delete mode 100644 src/com/jsh/util/SearchConditionUtil.java delete mode 100644 src/com/jsh/util/SessionFilter.java delete mode 100644 src/com/jsh/util/Tools.java diff --git a/src/com/jsh/action/asset/AssetAction.java b/src/com/jsh/action/asset/AssetAction.java deleted file mode 100644 index e92272fb7..000000000 --- a/src/com/jsh/action/asset/AssetAction.java +++ /dev/null @@ -1,517 +0,0 @@ -package com.jsh.action.asset; - -import java.io.IOException; -import java.io.InputStream; -import java.sql.Timestamp; -import java.text.ParseException; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -import org.springframework.dao.DataAccessException; - -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.util.AssetConstants; -import com.jsh.util.JshException; -import com.jsh.model.po.Asset; -import com.jsh.model.po.Assetname; -import com.jsh.model.po.Basicuser; -import com.jsh.model.po.Logdetails; -import com.jsh.model.po.Supplier; -import com.jsh.model.vo.asset.AssetModel; -import com.jsh.service.asset.AssetIService; -import com.jsh.service.basic.AssetNameIService; -import com.jsh.service.basic.CategoryIService; -import com.jsh.service.basic.SupplierIService; -import com.jsh.service.basic.UserIService; -import com.jsh.util.PageUtil; -import com.jsh.util.Tools; - -@SuppressWarnings("serial") -public class AssetAction extends BaseAction -{ - private AssetModel model = new AssetModel(); - private AssetIService assetService; - private CategoryIService categoryService; - private SupplierIService supplierService; - private UserIService userService; - private AssetNameIService assetnameService; - - @SuppressWarnings({ "rawtypes", "unchecked" }) - public String getBasicData() - { - Map mapData = model.getShowModel().getMap(); - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - try - { - Map condition = pageUtil.getAdvSearch(); - condition.put("id_s_order", "desc"); - categoryService.find(pageUtil); - mapData.put("categoryList", pageUtil.getPageList()); - supplierService.find(pageUtil); - mapData.put("supplierList", pageUtil.getPageList()); - - condition.put("isystem_n_eq", 1); - condition.put("id_s_order", "desc"); - userService.find(pageUtil); - mapData.put("userList", pageUtil.getPageList()); - - //清除搜索条件 防止对查询有影响 - condition.remove("isystem_n_eq"); - - assetnameService.find(pageUtil); - mapData.put("assetnameList", pageUtil.getPageList()); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>查找系统基础数据信息异常", e); - model.getShowModel().setMsgTip("exceptoin"); - } - return SUCCESS; - } - - /** - * 增加资产 - * @return - */ - public void create() - { - Log.infoFileSync("==================开始调用增加资产方法==================="); - Boolean flag = false; - try - { - Asset asset = new Asset(); - //添加设置 - asset.setAssetname(new Assetname(model.getAssetNameID())); - - asset.setLocation(model.getLocation()); - asset.setStatus(model.getStatus()); - asset.setPrice(model.getPrice()); - - if(null != model.getUserID()) - { - asset.setUser( new Basicuser(model.getUserID())); - } - try - { - //购买日期 - asset.setPurchasedate(new Timestamp(Tools.parse(model.getPurchasedate(), "yyyy-MM-dd").getTime())); - //有效日期 - asset.setPeriodofvalidity(new Timestamp(Tools.parse(model.getPeriodofvalidity(), "yyyy-MM-dd").getTime())); - //保修日期 - asset.setWarrantydate(new Timestamp(Tools.parse(model.getWarrantydate(), "yyyy-MM-dd").getTime())); - } - catch (ParseException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>解析购买日期格式异常", e); - } - - asset.setAssetnum(model.getAssetnum()); - asset.setSerialnum(model.getSerialnum()); - asset.setLabels(model.getLabels()); - - asset.setSupplier( new Supplier(model.getSupplierID())); - asset.setDescription(model.getDescription()); - - asset.setCreatetime(new Timestamp(new Date().getTime())); - asset.setCreator(getUser()); - asset.setUpdatetime(new Timestamp(new Date().getTime())); - asset.setUpdator(getUser()); - asset.setAddMonth(Tools.getCurrentMonth()); - assetService.create(asset); - //========标识位=========== - flag = true; - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加资产异常", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>增加资产回写客户端结果异常", e); - } - } - - logService.create(new Logdetails(getUser(), "增加资产", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "增加资产名称ID为 "+ model.getAssetNameID() + " " + tipMsg + "！", "增加资产" + tipMsg)); - Log.infoFileSync("==================结束调用增加资产方法==================="); - } - - /** - * 删除资产 - * @return - */ - public String delete() - { - Log.infoFileSync("====================开始调用删除资产信息方法delete()================"); - try - { - assetService.delete(model.getAssetID()); - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getAssetID() + " 的资产异常", e); - tipMsg = "失败"; - tipType = 1; - } - model.getShowModel().setMsgTip(tipMsg); - logService.create(new Logdetails(getUser(), "删除资产", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "删除资产ID为 "+ model.getAssetID() + " " + tipMsg + "！", "删除资产" + tipMsg)); - Log.infoFileSync("====================结束调用删除资产信息方法delete()================"); - return SUCCESS; - } - - /** - * 更新资产 - * @return - */ - public void update() - { - Boolean flag = false; - try - { - Asset asset = assetService.get(model.getAssetID()); - - //设置要更新的熟悉值 - asset.setAssetname(new Assetname(model.getAssetNameID())); - - asset.setLocation(model.getLocation()); - asset.setStatus(model.getStatus()); - asset.setPrice(model.getPrice()); - - if(null != model.getUserID()) - asset.setUser(new Basicuser(model.getUserID())); - else - asset.setUser(null); - try - { - //购买日期 - asset.setPurchasedate(new Timestamp(Tools.parse(model.getPurchasedate(), "yyyy-MM-dd").getTime())); - //有效日期 - asset.setPeriodofvalidity(new Timestamp(Tools.parse(model.getPeriodofvalidity(), "yyyy-MM-dd").getTime())); - //保修日期 - asset.setWarrantydate(new Timestamp(Tools.parse(model.getWarrantydate(), "yyyy-MM-dd").getTime())); - } - catch (ParseException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>解析购买日期格式异常", e); - } - - asset.setAssetnum(model.getAssetnum()); - asset.setSerialnum(model.getSerialnum()); - asset.setLabels(model.getLabels()); - - asset.setSupplier(new Supplier(model.getSupplierID())); - asset.setDescription(model.getDescription()); - - asset.setUpdatetime(new Timestamp(new Date().getTime())); - asset.setUpdator(getUser()); - assetService.update(asset); - flag = true; - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改资产ID为 ： " + model.getAssetID() + "信息失败", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>修改资产回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新资产", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新资产ID为 "+ model.getAssetID() + " " + tipMsg + "！", "更新资产" + tipMsg)); - } - - /** - * 批量删除指定ID资产 - * @return - */ - public String batchDelete() - { - try - { - assetService.batchDelete(model.getAssetIDs()); - model.getShowModel().setMsgTip("成功"); - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>批量删除资产ID为：" + model.getAssetIDs() + "信息异常", e); - tipMsg = "失败"; - tipType = 1; - } - - logService.create(new Logdetails(getUser(), "批量删除资产", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "批量删除资产ID为 "+ model.getAssetIDs() + " " + tipMsg + "！", "批量删除资产" + tipMsg)); - return SUCCESS; - } - - /** - * 查找资产信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getCondition()); - assetService.find(pageUtil); - - getSession().put("pageUtil", pageUtil); - List dataList = pageUtil.getPageList(); - - //开始拼接json数据 -// {"total":28,"rows":[ -// {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"} -// ]} - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Asset asset:dataList) - { - JSONObject item = new JSONObject(); - item.put("id", asset.getId()); - //添加资产属性 - item.put("assetname", asset.getAssetname().getAssetname()); - item.put("assetnameID", asset.getAssetname().getId()); - //单价 - item.put("price", Tools.dealNullStr(asset.getPrice() + "")); - //分类 - item.put("category", asset.getAssetname().getCategory().getAssetname()); - item.put("categoryID", asset.getAssetname().getCategory().getId()); - //资产的状态：0==在库，1==在用，2==消费 - item.put("status", getStatusInfo(asset.getStatus())); - item.put("statushort", asset.getStatus()); - //在用用户名称 - item.put("username", asset.getUser()==null?"":asset.getUser().getUsername()); - item.put("userID", asset.getUser()==null?"":asset.getUser().getId()); - //位置 - item.put("location", Tools.dealNullStr(asset.getLocation())); - - //购买日期 - item.put("purchasedate", asset.getPurchasedate()==null?"":Tools.getCurrentMonth(asset.getPurchasedate())); - //有效日期 - item.put("periodofvalidity", asset.getPeriodofvalidity()==null?"":Tools.getCurrentMonth(asset.getPeriodofvalidity())); - //保修日期 - item.put("warrantydate", asset.getWarrantydate()==null?"":Tools.getCurrentMonth(asset.getWarrantydate())); - //资产编号 - item.put("assetnum", Tools.dealNullStr(asset.getAssetnum())); - //资产序列号 - item.put("serialnum", Tools.dealNullStr(asset.getSerialnum())); - //供应商 - item.put("supplier", asset.getSupplier()==null?"":asset.getSupplier().getSupplier()); - //供应商 - item.put("supplierID", asset.getSupplier()==null?"":asset.getSupplier().getId()); - //标签 - item.put("labels", Tools.dealNullStr(asset.getLabels())); - item.put("description", Tools.dealNullStr(asset.getDescription())); - item.put("op", 1); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>查找资产信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>回写查询资产信息结果异常", e); - } - } - - /** - * 导出excel表格 - * @return - */ - @SuppressWarnings("unchecked") - public String exportExcel() - { - Log.infoFileSync("===================调用导出资产信息action方法exportExcel开始======================="); - try - { - PageUtil pageUtil = (PageUtil)getSession().get("pageUtil"); - - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - //pageUtil.setAdvSearch(getCondition()); - String isCurrentPage = model.getIsAllData(); - model.setFileName(Tools.changeUnicode(model.getFileName() + ".xls",model.getBrowserType())); - model.setExcelStream(assetService.exmportExcel(isCurrentPage,pageUtil)); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>>>>调用导出资产信息action方法exportExcel异常",e); - model.getShowModel().setMsgTip("export excel exception"); - } - Log.infoFileSync("===================调用导出资产信息action方法exportExcel结束=================="); - return AssetConstants.BusinessForExcel.EXCEL; - } - - - /** - * 导入资产excel表格内容 - */ - public String importExcel() - { - //资产excel表格file - Boolean result = false; - String returnStr = ""; - try - { - InputStream in = assetService.importExcel(model.getAssetFile(), model.getIsCheck()); - - if(null != in) - { - model.setFileName(Tools.getRandomChar() + Tools.getNow2(Calendar.getInstance().getTime()) + "_wrong.xls"); - model.setExcelStream(in); - returnStr = AssetConstants.BusinessForExcel.EXCEL; - } - else - { - result = true; - try - { - toClient(result.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>回写导入资产信息结果异常", e); - } - //导入数据成功 - returnStr = SUCCESS; - } - - } - catch (JshException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>导入excel表格信息异常", e); - } - return returnStr; - } - - /** - * 拼接搜索条件 - * @return - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("assetname.id_n_eq", model.getAssetNameID()); - condition.put("assetname.category.id_n_eq", model.getAssetCategoryID()); - condition.put("user.id_n_eq", model.getUserID()); - condition.put("status_n_eq", model.getStatus()); - condition.put("supplier.id_n_eq", model.getSupplierID()); - condition.put("createtime_s_order", "desc"); - return condition; - } - - /** - * 根据状态码转化成说明字符串 - * 资产的状态：0==在库，1==在用，2==消费 - * @param statusCode - * @return - */ - private String getStatusInfo(short statusCode) - { - String statusInfo = ""; - switch(statusCode) - { - case AssetConstants.BusinessForExcel.EXCEl_STATUS_ZAIKU: - statusInfo = "在库"; - break; - - case AssetConstants.BusinessForExcel.EXCEl_STATUS_INUSE: - statusInfo = "在用"; - break; - - case AssetConstants.BusinessForExcel.EXCEl_STATUS_CONSUME: - statusInfo = "消费"; - break; - } - return statusInfo; - } - - //=========Spring注入以及model驱动公共方法=========== - public void setAssetService(AssetIService assetService) - { - this.assetService = assetService; - } - - public void setCategoryService(CategoryIService categoryService) - { - this.categoryService = categoryService; - } - - public void setSupplierService(SupplierIService supplierService) - { - this.supplierService = supplierService; - } - - public void setUserService(UserIService userService) - { - this.userService = userService; - } - - public void setAssetnameService(AssetNameIService assetnameService) - { - this.assetnameService = assetnameService; - } - - @Override - public AssetModel getModel() - { - return model; - } -} diff --git a/src/com/jsh/action/asset/ReportAction.java b/src/com/jsh/action/asset/ReportAction.java deleted file mode 100644 index 0404c2bde..000000000 --- a/src/com/jsh/action/asset/ReportAction.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.jsh.action.asset; - -import java.util.HashMap; -import java.util.Map; - -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.util.JshException; -import com.jsh.model.po.Asset; -import com.jsh.model.vo.asset.ReportModel; -import com.jsh.service.asset.ReportIService; -import com.jsh.util.PageUtil; - -@SuppressWarnings("serial") -public class ReportAction extends BaseAction -{ - private ReportModel model = new ReportModel(); - private ReportIService reportService; - - /** - * 查找资产信息 - * @return - */ - public String find() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - pageUtil.setAdvSearch(getCondition()); - String reportType = getReportType(new HashMap()); - reportService.find(pageUtil,reportType.split("_")[0],reportType.split("_")[1]); - model.getShowModel().setReportData(pageUtil.getPageList()); - } - catch (JshException e) - { - Log.errorFileSync(">>>>>>>>>查找资产信息异常", e); - model.getShowModel().setMsgTip("get report data exception"); - } - return SUCCESS; - } - - /** - * 拼接搜索条件 - * @return - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("assetname.id_n_eq", model.getAssetNameID()); - condition.put("assetname.category.id_n_eq", model.getAssetCategoryID()); - condition.put("user.id_n_eq", model.getUsernameID()); - condition.put("status_n_eq", model.getStatus()); - condition.put("supplier.id_n_eq", model.getSupplierID()); - condition.put("dataSum_s_order","desc"); - //拼接统计数据条件 - getReportType(condition); - return condition; - } - - /** - * 获取统计条件 - * @param condition - */ - private String getReportType(Map condition) - { -// -// -// -// -// - int reportType = model.getReportType(); - String reportTypeInfo = ""; - String reportTypeName = ""; - switch(reportType) - { - case 0: - condition.put("status_s_gb", "group"); - reportTypeInfo = "status"; - reportTypeName = "status"; - break; - case 1: - condition.put("assetname.category.id_s_gb", "group"); - reportTypeInfo = "assetname.category.id"; - reportTypeName = "assetname.category.assetname"; - break; - case 2: - condition.put("supplier.id_s_gb", "group"); - reportTypeInfo = "supplier.id"; - reportTypeName = "supplier.supplier"; - break; - case 3: - condition.put("assetname.id_s_gb", "group"); - reportTypeInfo = "assetname.id"; - reportTypeName = "assetname.assetname"; - break; - case 4: - condition.put("user.id_s_gb", "group"); - reportTypeInfo = "user.id"; - reportTypeName = "user.username"; - break; - } - return reportTypeInfo + "_" + reportTypeName; - } - //=========Spring注入以及model驱动公共方法=========== - public void setReportService(ReportIService reportService) - { - this.reportService = reportService; - } - - @Override - public ReportModel getModel() - { - return model; - } -} diff --git a/src/com/jsh/action/basic/AccountAction.java b/src/com/jsh/action/basic/AccountAction.java deleted file mode 100644 index 768a04cd1..000000000 --- a/src/com/jsh/action/basic/AccountAction.java +++ /dev/null @@ -1,446 +0,0 @@ -package com.jsh.action.basic; - -import java.io.IOException; -import java.sql.Timestamp; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.springframework.dao.DataAccessException; -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.model.po.DepotHead; -import com.jsh.model.po.Logdetails; -import com.jsh.model.po.Account; -import com.jsh.model.vo.basic.AccountModel; -import com.jsh.service.basic.AccountIService; -import com.jsh.service.materials.DepotHeadIService; -import com.jsh.util.PageUtil; -import com.jsh.util.Tools; -/** - * 结算账户 - * @author ji sheng hua qq752718920 - */ -@SuppressWarnings("serial") -public class AccountAction extends BaseAction -{ - private AccountIService accountService; - private DepotHeadIService depotHeadService; - private AccountModel model = new AccountModel(); - - @SuppressWarnings({ "rawtypes", "unchecked" }) - public String getAccount() - { - Map mapData = model.getShowModel().getMap(); - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - try - { - Map condition = pageUtil.getAdvSearch(); - condition.put("Id_s_order", "asc"); - accountService.find(pageUtil); - mapData.put("accountList", pageUtil.getPageList()); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>查找账户信息异常", e); - model.getShowModel().setMsgTip("exception"); - } - return SUCCESS; - } - - /** - * 增加结算账户 - * @return - */ - public void create() - { - Log.infoFileSync("==================开始调用增加结算账户方法==================="); - Boolean flag = false; - try - { - Account Account = new Account(); - Account.setName(model.getName()); - Account.setSerialNo(model.getSerialNo()); - Account.setInitialAmount(model.getInitialAmount()!=null ? model.getInitialAmount() : 0); - Account.setCurrentAmount(model.getCurrentAmount()); - Account.setRemark(model.getRemark()); - accountService.create(Account); - - //========标识位=========== - flag = true; - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加结算账户异常", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>增加结算账户回写客户端结果异常", e); - } - } - - logService.create(new Logdetails(getUser(), "增加结算账户", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "增加结算账户名称为 "+ model.getName() + " " + tipMsg + "！", "增加结算账户" + tipMsg)); - Log.infoFileSync("==================结束调用增加结算账户方法==================="); - } - - /** - * 删除结算账户 - * @return - */ - public String delete() - { - Log.infoFileSync("====================开始调用删除结算账户信息方法delete()================"); - try - { - accountService.delete(model.getAccountID()); - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getAccountID() + " 的结算账户异常", e); - tipMsg = "失败"; - tipType = 1; - } - model.getShowModel().setMsgTip(tipMsg); - logService.create(new Logdetails(getUser(), "删除结算账户", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "删除结算账户ID为 "+ model.getAccountID() + ",名称为 " + model.getName() + tipMsg + "！", "删除结算账户" + tipMsg)); - Log.infoFileSync("====================结束调用删除结算账户信息方法delete()================"); - return SUCCESS; - } - - /** - * 更新结算账户 - * @return - */ - public void update() - { - Boolean flag = false; - try - { - Account Account = accountService.get(model.getAccountID()); - Account.setName(model.getName()); - Account.setSerialNo(model.getSerialNo()); - Account.setInitialAmount(model.getInitialAmount()!=null ? model.getInitialAmount() : 0); - Account.setCurrentAmount(model.getCurrentAmount()); - Account.setRemark(model.getRemark()); - accountService.update(Account); - - flag = true; - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改结算账户ID为 ： " + model.getAccountID() + "信息失败", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>修改结算账户回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新结算账户", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新结算账户ID为 "+ model.getAccountID() + " " + tipMsg + "！", "更新结算账户" + tipMsg)); - } - - /** - * 更新结算账户金额 - * @return - */ - public void updateAmount() - { - Boolean flag = false; - try - { - Account Account = accountService.get(model.getAccountID()); - Account.setCurrentAmount(model.getCurrentAmount()); - accountService.update(Account); - - flag = true; - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改结算账户ID为 ： " + model.getAccountID() + "信息失败", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>修改结算账户回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新结算账户", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新结算账户ID为 "+ model.getAccountID() + " " + tipMsg + "！", "更新结算账户" + tipMsg)); - } - - /** - * 批量删除指定ID结算账户 - * @return - */ - public String batchDelete() - { - try - { - accountService.batchDelete(model.getAccountIDs()); - model.getShowModel().setMsgTip("成功"); - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>批量删除结算账户ID为：" + model.getAccountIDs() + "信息异常", e); - tipMsg = "失败"; - tipType = 1; - } - - logService.create(new Logdetails(getUser(), "批量删除结算账户", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "批量删除结算账户ID为 "+ model.getAccountIDs() + " " + tipMsg + "！", "批量删除结算账户" + tipMsg)); - return SUCCESS; - } - - /** - * 检查输入名称是否存在 - */ - public void checkIsNameExist() - { - Boolean flag = false; - try - { - flag = accountService.checkIsNameExist("name", model.getName(), "id", model.getAccountID()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>检查结算账户名称为：" + model.getName() + " ID为： " + model.getAccountID() + " 是否存在异常！"); - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>回写检查结算账户名称为：" + model.getName() + " ID为： " + model.getAccountID() + " 是否存在异常！",e); - } - } - } - - /** - * 查找结算账户信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getCondition()); - accountService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Account account:dataList) - { - JSONObject item = new JSONObject(); - item.put("id", account.getId()); - //结算账户名称 - item.put("name", account.getName()); - item.put("serialNo", account.getSerialNo()); - item.put("initialAmount", account.getInitialAmount()); - String monthTime = Tools.getCurrentMonth(); - item.put("thisMonthAmount", getAccountSum(account.getId(),monthTime)); //本月发生额 - item.put("currentAmount", getAccountSum(account.getId(),"") + account.getInitialAmount()); //当前余额 - item.put("remark", account.getRemark()); - item.put("op", 1); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>查找结算账户信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>回写查询结算账户信息结果异常", e); - } - } - /** - * 单个账户的金额求和 - * @param id - * @return - */ - public Double getAccountSum(Long id,String monthTime){ - Double accountSum = 0.0; - try{ - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - pageUtil.setAdvSearch(getCondition_getSum(id,monthTime)); - depotHeadService.find(pageUtil); - List dataList = pageUtil.getPageList(); - if(dataList!= null){ - for(DepotHead depotHead:dataList){ - accountSum = accountSum + depotHead.getChangeAmount(); - } - } - } - catch (DataAccessException e){ - Log.errorFileSync(">>>>>>>>>查找进销存信息异常", e); - } - return accountSum; - } - - /** - * 查找结算账户信息-下拉框 - * @return - */ - public void findBySelect() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - pageUtil.setAdvSearch(getCondition_select()); - accountService.find(pageUtil); - List dataList = pageUtil.getPageList(); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Account account:dataList) - { - JSONObject item = new JSONObject(); - item.put("Id", account.getId()); - //结算账户名称 - item.put("AccountName", account.getName()); - dataArray.add(item); - } - } - //回写查询结果 - toClient(dataArray.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>查找结算账户信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>回写查询结算账户信息结果异常", e); - } - } - - /** - * 拼接搜索条件 - * @return - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("name_s_like", model.getName()); - condition.put("serialNo_s_like", model.getSerialNo()); - condition.put("remark_s_like", model.getRemark()); - condition.put("id_s_order", "desc"); - return condition; - } - - /** - * 拼接搜索条件-下拉框-结算账户 - * @return - */ - private Map getCondition_select() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("id_s_order", "desc"); - return condition; - } - - /** - * 拼接搜索条件-结算账户当前余额求和 - * @return - */ - private Map getCondition_getSum(Long id,String monthTime) - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("AccountId_n_eq", id); - if(!monthTime.equals("")){ - condition.put("OperTime_s_gteq", monthTime + "-01 00:00:00"); - condition.put("OperTime_s_lteq", monthTime + "-31 00:00:00"); - } - return condition; - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override - public AccountModel getModel() - { - return model; - } - public void setAccountService(AccountIService accountService) - { - this.accountService = accountService; - } - public void setDepotHeadService(DepotHeadIService depotHeadService) { - this.depotHeadService = depotHeadService; - } -} diff --git a/src/com/jsh/action/basic/AppAction.java b/src/com/jsh/action/basic/AppAction.java deleted file mode 100644 index 96c8e4c2d..000000000 --- a/src/com/jsh/action/basic/AppAction.java +++ /dev/null @@ -1,541 +0,0 @@ -package com.jsh.action.basic; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.sql.Timestamp; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.apache.struts2.ServletActionContext; -import org.springframework.dao.DataAccessException; -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.util.JshException; -import com.jsh.model.po.App; -import com.jsh.model.po.Logdetails; -import com.jsh.model.vo.basic.AppModel; -import com.jsh.service.basic.AppIService; -import com.jsh.service.basic.UserBusinessIService; -import com.jsh.util.PageUtil; -/** - * 应用 - * @author ji_sheng_hua qq752 718 920 - */ -@SuppressWarnings("serial") -public class AppAction extends BaseAction -{ - private AppIService appService; - private UserBusinessIService userBusinessService; - private AppModel model = new AppModel(); - - - /** - * 增加应用 - * @return - */ - public void create() - { - Log.infoFileSync("==================开始调用增加应用方法create()==================="); - Boolean flag = false; - try - { - App app = new App(); - app.setNumber(model.getNumber()); - app.setName(model.getName()); - app.setType(model.getType()); - - try { - if(model.getIcon()!=null) - { - String path = ServletActionContext.getServletContext().getRealPath("/upload/images/deskIcon"); - String iconName=model.getIcon(); - File file1 = new File(iconName); //文件 - String FileName = file1.getName(); //获取文件名 - app.setIcon(FileName); //设置图片ICON - InputStream is = new FileInputStream(iconName); - File file = new File(path, FileName); - OutputStream os = new FileOutputStream(file); - byte[] b = new byte[1024]; - int bs = 0; - while ((bs = is.read(b)) > 0) { - os.write(b, 0, bs); - } - is.close(); - os.close(); - } - - } catch (FileNotFoundException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - app.setURL(model.getURL()); - app.setWidth(model.getWidth()); - app.setHeight(model.getHeight()); - app.setReSize(model.getReSize()); - app.setOpenMax(model.getOpenMax()); - app.setFlash(model.getFlash()); - app.setZL(model.getZL()); - app.setSort(model.getSort()); - app.setRemark(model.getRemark()); - app.setEnabled(model.getEnabled()); - appService.create(app); - - //========标识位=========== - flag = true; - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加应用异常", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>增加应用回写客户端结果异常", e); - } - } - - logService.create(new Logdetails(getUser(), "增加应用", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "增加应用名称为 "+ model.getName() + " " + tipMsg + "！", "增加应用" + tipMsg)); - Log.infoFileSync("==================结束调用增加应用方法create()==================="); - } - - /** - * 删除应用 - * @return - */ - public String delete() - { - Log.infoFileSync("====================开始调用删除应用方法delete()================"); - try - { - appService.delete(model.getAppID()); - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getAppID() + " 的应用异常", e); - tipMsg = "失败"; - tipType = 1; - } - model.getShowModel().setMsgTip(tipMsg); - logService.create(new Logdetails(getUser(), "删除应用", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "删除应用ID为 "+ model.getAppID() + " " + tipMsg + "！", "删除应用" + tipMsg)); - Log.infoFileSync("====================结束调用删除应用方法delete()================"); - return SUCCESS; - } - - /** - * 更新仓库 - * @return - */ - public void update() - { - Boolean flag = false; - try - { - App app = appService.get(model.getAppID()); - app.setNumber(model.getNumber()); - app.setName(model.getName()); - app.setType(model.getType()); - //app.setIcon(model.getIcon()); - app.setURL(model.getURL()); - app.setWidth(model.getWidth()); - app.setHeight(model.getHeight()); - app.setReSize(model.getReSize()); - app.setOpenMax(model.getOpenMax()); - app.setFlash(model.getFlash()); - app.setZL(model.getZL()); - app.setSort(model.getSort()); - app.setRemark(model.getRemark()); - app.setEnabled(model.getEnabled()); - appService.update(app); - - flag = true; - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改应用ID为 ： " + model.getAppID() + "信息失败", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>修改应用回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新应用", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新应用ID为 "+ model.getAppID() + " " + tipMsg + "！", "更新应用" + tipMsg)); - } - - /** - * 批量删除指定ID应用 - * @return - */ - public String batchDelete() - { - try - { - appService.batchDelete(model.getAppIDs()); - model.getShowModel().setMsgTip("成功"); - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>批量删除应用ID为：" + model.getAppIDs() + "信息异常", e); - tipMsg = "失败"; - tipType = 1; - } - - logService.create(new Logdetails(getUser(), "批量删除应用", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "批量删除应用ID为 "+ model.getAppIDs() + " " + tipMsg + "！", "批量删除应用" + tipMsg)); - return SUCCESS; - } - - /** - * 检查输入名称是否存在 - */ - public void checkIsNameExist() - { - Boolean flag = false; - try - { - flag = appService.checkIsNameExist("name",model.getName(),"Id", model.getAppID()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>检查应用名称为：" + model.getName() + " ID为： " + model.getAppID() + " 是否存在异常！"); - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>回写检查应用名称为：" + model.getName() + " ID为： " + model.getAppID() + " 是否存在异常！",e); - } - } - } - - /** - * 查找应用信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getCondition()); - appService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - //开始拼接json数据 -// {"total":28,"rows":[ -// {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"} -// ]} - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(App app:dataList) - { - JSONObject item = new JSONObject(); - item.put("Id", app.getId()); - //应用名称 - item.put("Number", app.getNumber()); - item.put("Name", app.getName()); - item.put("Type", app.getType()); - item.put("Icon", app.getIcon()); - item.put("URL", app.getURL()); - item.put("Width", app.getWidth()); - item.put("Height", app.getHeight()); - item.put("ReSize", app.getReSize()); - item.put("OpenMax", app.getOpenMax()); - item.put("Flash", app.getFlash()); - item.put("ZL", app.getZL()); - item.put("Sort", app.getSort()); - item.put("Remark", app.getRemark()); - item.put("Enabled", app.getEnabled()); - item.put("op", 1); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找应用异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询应用结果异常", e); - } - } - - /** - * 桌面应用显示 - * @return - */ - public void findDesk() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(100); - //pageUtil.setCurPage(model.getPageNo()); - - JSONObject outer = new JSONObject(); - - //下面是dock - pageUtil.setAdvSearch(getCondition_dock()); - appService.find(pageUtil); - List dataList1 = pageUtil.getPageList(); - - //开始拼接json数据 - //存放数据json数组 - JSONArray dataArray1 = new JSONArray(); - if(null != dataList1) - { - for(App app:dataList1) - { - JSONObject item = new JSONObject(); - item.put("id", app.getId()); - item.put("title", app.getName()); - item.put("type", app.getType()); - item.put("icon", "../../upload/images/deskIcon/"+app.getIcon()); - item.put("url", app.getURL()); - item.put("width", app.getWidth()); - item.put("height", app.getHeight()); - item.put("isresize", app.getReSize()); - item.put("isopenmax", app.getOpenMax()); - item.put("isflash", app.getFlash()); - dataArray1.add(item); - } - } - outer.put("dock", dataArray1); - - //下面是desk - pageUtil.setAdvSearch(getCondition_desk()); - appService.find(pageUtil); - List dataList2 = pageUtil.getPageList(); - - //开始拼接json数据 - //存放数据json数组 - JSONArray dataArray2 = new JSONArray(); - if(null != dataList2) - { - for(App app:dataList2) - { - JSONObject item = new JSONObject(); - item.put("id", app.getId()); - item.put("title", app.getName()); - item.put("type", app.getType()); - item.put("icon", "../../upload/images/deskIcon/"+app.getIcon()); - item.put("url", "../../pages/common/menu.jsp?appID="+app.getNumber()+"&id="+app.getId()); - item.put("width", app.getWidth()); - item.put("height", app.getHeight()); - item.put("isresize", app.getReSize()); - item.put("isopenmax", app.getOpenMax()); - item.put("isflash", app.getFlash()); - dataArray2.add(item); - } - } - outer.put("desk", dataArray2); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找应用异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询应用结果异常", e); - } - } - - - /** - * 角色对应应用显示 - * @return - */ - public void findRoleAPP() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(100); - //pageUtil.setCurPage(model.getPageNo()); - - pageUtil.setAdvSearch(getCondition_RoleAPP()); - appService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - //开始拼接json数据 - JSONObject outer = new JSONObject(); - outer.put("id", 1); - outer.put("text", "应用列表"); - outer.put("state", "open"); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(App app:dataList) - { - JSONObject item = new JSONObject(); - item.put("id", app.getId()); - item.put("text", app.getName()); - //勾选判断1 - Boolean flag = false; - try - { - flag = userBusinessService.checkIsUserBusinessExist("Type",model.getUBType(),"KeyId",model.getUBKeyId(),"Value","["+app.getId().toString()+"]"); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>设置角色对应的应用：类型" + model.getUBType() + " KeyId为： " + model.getUBKeyId() + " 存在异常！"); - } - if (flag==true){item.put("checked", true);} - //结束 - dataArray.add(item); - } - } - outer.put("children", dataArray); - //回写查询结果 - toClient("["+outer.toString()+"]"); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找应用异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询应用结果异常", e); - } - } - - /** - * 拼接搜索条件 - * @return - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("Name_s_like", model.getName()); - condition.put("Type_s_like", model.getType()); - condition.put("Sort_s_order", "asc"); - return condition; - } - - /** - * 拼接搜索条件-桌面dock - * @return - */ - private Map getCondition_dock() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("ZL_s_eq", "dock"); - condition.put("Enabled_n_eq", 1); - condition.put("Sort_s_order", "asc"); - return condition; - } - - /** - * 拼接搜索条件-桌面desk - * @return - */ - private Map getCondition_desk() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("ZL_s_eq", "desk"); - condition.put("Enabled_n_eq", 1); - condition.put("Sort_s_order", "asc"); - return condition; - } - - /** - * 拼接搜索条件-角色对应应用 - * @return - */ - private Map getCondition_RoleAPP() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("Enabled_n_eq", 1); - condition.put("Sort_s_order", "asc"); - return condition; - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override - public AppModel getModel() - { - return model; - } - public void setAppService(AppIService appService) - { - this.appService = appService; - } - - public void setUserBusinessService(UserBusinessIService userBusinessService) { - this.userBusinessService = userBusinessService; - } - -} diff --git a/src/com/jsh/action/basic/AssetNameAction.java b/src/com/jsh/action/basic/AssetNameAction.java deleted file mode 100644 index e31dc973b..000000000 --- a/src/com/jsh/action/basic/AssetNameAction.java +++ /dev/null @@ -1,286 +0,0 @@ -package com.jsh.action.basic; - -import java.io.IOException; -import java.sql.Timestamp; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.springframework.dao.DataAccessException; -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.model.po.Assetname; -import com.jsh.model.po.Category; -import com.jsh.model.po.Logdetails; -import com.jsh.model.vo.basic.AssetNameModel; -import com.jsh.service.basic.AssetNameIService; -import com.jsh.util.PageUtil; - -@SuppressWarnings("serial") -public class AssetNameAction extends BaseAction -{ - private AssetNameModel model = new AssetNameModel(); - - private AssetNameIService assetnameService; - /** - * 增加资产名称 - * @return - */ - public void create() - { - Log.infoFileSync("==================开始调用增加资产名称方法create()==================="); - Boolean flag = false; - try - { - Assetname assetname = new Assetname(); - assetname.setAssetname(model.getAssetName()); - //增加资产类型 - assetname.setCategory(new Category(model.getCategoryID())); - - assetname.setIsystem((short)1); - assetname.setIsconsumables(model.getConsumable()); - assetname.setDescription(model.getDescription()); - assetnameService.create(assetname); - - //========标识位=========== - flag = true; - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加资产名称异常", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>增加资产名称回写客户端结果异常", e); - } - } - - logService.create(new Logdetails(getUser(), "增加资产名称", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "增加资产名称名称为 "+ model.getAssetName() + " " + tipMsg + "！", "增加资产名称" + tipMsg)); - Log.infoFileSync("==================结束调用增加资产名称方法create()==================="); - } - - /** - * 删除资产名称 - * @return - */ - public String delete() - { - Log.infoFileSync("====================开始调用删除资产名称信息方法delete()================"); - try - { - assetnameService.delete(model.getAssetNameID()); - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getAssetNameID() + " 的资产名称异常", e); - tipMsg = "失败"; - tipType = 1; - } - model.getShowModel().setMsgTip(tipMsg); - logService.create(new Logdetails(getUser(), "删除资产名称", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "删除资产名称ID为 "+ model.getAssetNameID() + " " + tipMsg + "！", "删除资产名称" + tipMsg)); - Log.infoFileSync("====================结束调用删除资产名称信息方法delete()================"); - return SUCCESS; - } - - /** - * 更新资产名称 - * @return - */ - public void update() - { - Boolean flag = false; - try - { - Assetname assetname = assetnameService.get(model.getAssetNameID()); - //增加资产类型 - assetname.setCategory(new Category(model.getCategoryID())); - assetname.setAssetname(model.getAssetName()); - assetname.setIsconsumables(model.getConsumable()); - assetname.setDescription(model.getDescription()); - assetnameService.update(assetname); - - flag = true; - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改资产名称ID为 ： " + model.getAssetNameID() + "信息失败", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>修改资产名称回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新资产名称", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新资产名称ID为 "+ model.getAssetNameID() + " " + tipMsg + "！", "更新资产名称" + tipMsg)); - } - - /** - * 批量删除指定ID资产名称 - * @return - */ - public String batchDelete() - { - try - { - assetnameService.batchDelete(model.getAssetNameIDs()); - model.getShowModel().setMsgTip("成功"); - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>批量删除资产名称ID为：" + model.getAssetNameIDs() + "信息异常", e); - tipMsg = "失败"; - tipType = 1; - } - - logService.create(new Logdetails(getUser(), "批量删除资产名称", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "批量删除资产名称ID为 "+ model.getAssetNameIDs() + " " + tipMsg + "！", "批量删除资产名称" + tipMsg)); - return SUCCESS; - } - - /** - * 检查输入名称是否存在 - */ - public void checkIsNameExist() - { - Boolean flag = false; - try - { - flag = assetnameService.checkIsNameExist("assetname",model.getAssetName(),"id", model.getAssetNameID()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>检查资产名称名称为：" + model.getAssetName() + " ID为： " + model.getAssetNameID() + " 是否存在异常！"); - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>回写检查资产名称名称为：" + model.getAssetName() + " ID为： " + model.getAssetNameID() + " 是否存在异常！",e); - } - } - } - - /** - * 查找供应商信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getCondition()); - assetnameService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - //开始拼接json数据 -// {"total":28,"rows":[ -// {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"} -// ]} - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Assetname assetname:dataList) - { - JSONObject item = new JSONObject(); - item.put("id", assetname.getId()); - //供应商名称 - item.put("assetname", assetname.getAssetname()); - item.put("isystem", assetname.getIsystem() == (short)0?"是":"否"); - item.put("consumable", assetname.getIsconsumables() == (short)0?"是":"否"); - item.put("consumableStatus", assetname.getIsconsumables()); - item.put("description", assetname.getDescription()); - item.put("categoryID", assetname.getCategory().getId()); - item.put("category", assetname.getCategory().getAssetname()); - item.put("op", assetname.getIsystem()); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找资产名称信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询资产名称信息结果异常", e); - } - } - - /** - * 拼接搜索条件 - * @return - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("assetname_s_like", model.getAssetName()); - condition.put("isconsumables_n_eq", model.getConsumable()); - condition.put("description_s_like", model.getDescription()); - condition.put("category.id_n_eq", model.getCategoryID()); - condition.put("id_s_order", "desc"); - return condition; - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override - public AssetNameModel getModel() - { - return model; - } - - public void setAssetnameService(AssetNameIService assetnameService) - { - this.assetnameService = assetnameService; - } -} diff --git a/src/com/jsh/action/basic/CategoryAction.java b/src/com/jsh/action/basic/CategoryAction.java deleted file mode 100644 index 1dd59931b..000000000 --- a/src/com/jsh/action/basic/CategoryAction.java +++ /dev/null @@ -1,272 +0,0 @@ -package com.jsh.action.basic; - -import java.io.IOException; -import java.sql.Timestamp; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.springframework.dao.DataAccessException; -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.model.po.Category; -import com.jsh.model.po.Logdetails; -import com.jsh.model.vo.basic.CategoryModel; -import com.jsh.service.basic.CategoryIService; -import com.jsh.util.PageUtil; -/* - * @author jishenghua qq:7-5-2-7-1-8-9-2-0 -*/ -@SuppressWarnings("serial") -public class CategoryAction extends BaseAction -{ - private CategoryIService categoryService; - private CategoryModel model = new CategoryModel(); - /** - * 增加资产类型 - * @return - */ - public void create() - { - Log.infoFileSync("==================开始调用增加资产类型方法create()==================="); - Boolean flag = false; - try - { - Category category = new Category(); - category.setAssetname(model.getCategoryName()); - category.setIsystem((short)1); - category.setDescription(model.getDescription()); - categoryService.create(category); - - //========标识位=========== - flag = true; - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加资产类型异常", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>增加资产类型回写客户端结果异常", e); - } - } - - logService.create(new Logdetails(getUser(), "增加资产类型", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "增加资产类型名称为 "+ model.getCategoryName() + " " + tipMsg + "！", "增加资产类型" + tipMsg)); - Log.infoFileSync("==================结束调用增加资产类型方法create()==================="); - } - - /** - * 删除资产类型 - * @return - */ - public String delete() - { - Log.infoFileSync("====================开始调用删除资产类型信息方法delete()================"); - try - { - categoryService.delete(model.getCategoryID()); - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getCategoryID() + " 的资产类型异常", e); - tipMsg = "失败"; - tipType = 1; - } - model.getShowModel().setMsgTip(tipMsg); - logService.create(new Logdetails(getUser(), "删除资产类型", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "删除资产类型ID为 "+ model.getCategoryID() + " " + tipMsg + "！", "删除资产类型" + tipMsg)); - Log.infoFileSync("====================结束调用删除资产类型信息方法delete()================"); - return SUCCESS; - } - - /** - * 更新资产类型 - * @return - */ - public void update() - { - Boolean flag = false; - try - { - Category category = categoryService.get(model.getCategoryID()); - category.setAssetname(model.getCategoryName()); - category.setDescription(model.getDescription()); - categoryService.update(category); - - flag = true; - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改资产类型ID为 ： " + model.getCategoryID() + "信息失败", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>修改资产类型回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新资产类型", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新资产类型ID为 "+ model.getCategoryID() + " " + tipMsg + "！", "更新资产类型" + tipMsg)); - } - - /** - * 批量删除指定ID资产类型 - * @return - */ - public String batchDelete() - { - try - { - categoryService.batchDelete(model.getCategoryIDs()); - model.getShowModel().setMsgTip("成功"); - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>批量删除资产类型ID为：" + model.getCategoryIDs() + "信息异常", e); - tipMsg = "失败"; - tipType = 1; - } - - logService.create(new Logdetails(getUser(), "批量删除资产类型", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "批量删除资产类型ID为 "+ model.getCategoryIDs() + " " + tipMsg + "！", "批量删除资产类型" + tipMsg)); - return SUCCESS; - } - - /** - * 检查输入名称是否存在 - */ - public void checkIsNameExist() - { - Boolean flag = false; - try - { - flag = categoryService.checkIsNameExist("assetname",model.getCategoryName(),"id", model.getCategoryID()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>检查资产类型名称为：" + model.getCategoryName() + " ID为： " + model.getCategoryID() + " 是否存在异常！"); - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>回写检查资产类型名称为：" + model.getCategoryName() + " ID为： " + model.getCategoryID() + " 是否存在异常！",e); - } - } - } - - /** - * 查找供应商信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getCondition()); - categoryService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - //开始拼接json数据 -// {"total":28,"rows":[ -// {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"} -// ]} - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Category category:dataList) - { - JSONObject item = new JSONObject(); - item.put("id", category.getId()); - //供应商名称 - item.put("categoryname", category.getAssetname()); - item.put("isystem", category.getIsystem() == (short)0?"是":"否"); - item.put("description", category.getDescription()); - item.put("op", category.getIsystem()); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找资产类型信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询资产类型信息结果异常", e); - } - } - - /** - * 拼接搜索条件 - * @return - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("assetname_s_like", model.getCategoryName()); - condition.put("description_s_like", model.getDescription()); - condition.put("id_s_order", "desc"); - return condition; - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override - public CategoryModel getModel() - { - return model; - } - public void setCategoryService(CategoryIService categoryService) - { - this.categoryService = categoryService; - } -} diff --git a/src/com/jsh/action/basic/DepotAction.java b/src/com/jsh/action/basic/DepotAction.java deleted file mode 100644 index d1c798e08..000000000 --- a/src/com/jsh/action/basic/DepotAction.java +++ /dev/null @@ -1,376 +0,0 @@ -package com.jsh.action.basic; - -import java.io.IOException; -import java.sql.Timestamp; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.springframework.dao.DataAccessException; -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.util.JshException; -import com.jsh.model.po.Depot; -import com.jsh.model.po.Logdetails; -import com.jsh.model.po.Role; -import com.jsh.model.vo.basic.DepotModel; -import com.jsh.service.basic.DepotIService; -import com.jsh.service.basic.UserBusinessIService; -import com.jsh.util.PageUtil; -/** - * 仓库管理 - * @author jishenghua qq:7-5-2-7-1-8-9-2-0 - */ -@SuppressWarnings("serial") -public class DepotAction extends BaseAction -{ - private DepotIService depotService; - private UserBusinessIService userBusinessService; - private DepotModel model = new DepotModel(); - - - @SuppressWarnings({ "rawtypes", "unchecked" }) - public String getBasicData() - { - Map mapData = model.getShowModel().getMap(); - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - try - { - Map condition = pageUtil.getAdvSearch(); - condition.put("sort_s_order", "asc"); - depotService.find(pageUtil); - mapData.put("depotList", pageUtil.getPageList()); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>查找系统基础数据信息异常", e); - model.getShowModel().setMsgTip("exceptoin"); - } - return SUCCESS; - } - - /** - * 增加仓库 - * @return - */ - public void create() - { - Log.infoFileSync("==================开始调用增加仓库信息方法create()==================="); - Boolean flag = false; - try - { - Depot depot = new Depot(); - depot.setName(model.getName()); - depot.setSort(model.getSort()); - depot.setRemark(model.getRemark()); - depotService.create(depot); - - //========标识位=========== - flag = true; - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加仓库信息异常", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>增加仓库信息回写客户端结果异常", e); - } - } - - logService.create(new Logdetails(getUser(), "增加仓库", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "增加仓库名称为 "+ model.getName() + " " + tipMsg + "！", "增加仓库" + tipMsg)); - Log.infoFileSync("==================结束调用增加仓库方法create()==================="); - } - - /** - * 删除仓库 - * @return - */ - public String delete() - { - Log.infoFileSync("====================开始调用删除仓库信息方法delete()================"); - try - { - depotService.delete(model.getDepotID()); - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getDepotID() + " 的仓库异常", e); - tipMsg = "失败"; - tipType = 1; - } - model.getShowModel().setMsgTip(tipMsg); - logService.create(new Logdetails(getUser(), "删除仓库", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "删除仓库ID为 "+ model.getDepotID() + " " + tipMsg + "！", "删除仓库" + tipMsg)); - Log.infoFileSync("====================结束调用删除仓库信息方法delete()================"); - return SUCCESS; - } - - /** - * 更新仓库 - * @return - */ - public void update() - { - Boolean flag = false; - try - { - Depot depot = depotService.get(model.getDepotID()); - depot.setName(model.getName()); - depot.setSort(model.getSort()); - depot.setRemark(model.getRemark()); - depotService.update(depot); - - flag = true; - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改仓库ID为 ： " + model.getDepotID() + "信息失败", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>修改仓库回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新仓库", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新仓库ID为 "+ model.getDepotID() + " " + tipMsg + "！", "更新仓库" + tipMsg)); - } - - /** - * 批量删除指定ID仓库 - * @return - */ - public String batchDelete() - { - try - { - depotService.batchDelete(model.getDepotIDs()); - model.getShowModel().setMsgTip("成功"); - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>批量删除仓库ID为：" + model.getDepotIDs() + "信息异常", e); - tipMsg = "失败"; - tipType = 1; - } - - logService.create(new Logdetails(getUser(), "批量删除仓库", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "批量删除仓库ID为 "+ model.getDepotIDs() + " " + tipMsg + "！", "批量删除仓库" + tipMsg)); - return SUCCESS; - } - - /** - * 检查输入名称是否存在 - */ - public void checkIsNameExist() - { - Boolean flag = false; - try - { - flag = depotService.checkIsNameExist("name",model.getName(),"id", model.getDepotID()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>检查仓库名称为：" + model.getName() + " ID为： " + model.getDepotID() + " 是否存在异常！"); - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>回写检查仓库名称为：" + model.getName() + " ID为： " + model.getDepotID() + " 是否存在异常！",e); - } - } - } - - /** - * 查找仓库信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getCondition()); - depotService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Depot depot:dataList) - { - JSONObject item = new JSONObject(); - item.put("id", depot.getId()); - //供应商名称 - item.put("name", depot.getName()); - item.put("sort", depot.getSort()); - item.put("remark", depot.getRemark()); - item.put("op", 1); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓库信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓库信息结果异常", e); - } - } - - /** - * 用户对应仓库显示 - * @return - */ - public void findUserDepot() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(100); - //pageUtil.setCurPage(model.getPageNo()); - - pageUtil.setAdvSearch(getCondition_UserDepot()); - depotService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - //开始拼接json数据 - JSONObject outer = new JSONObject(); - outer.put("id", 1); - outer.put("text", "仓库列表"); - outer.put("state", "open"); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Depot depot:dataList) - { - JSONObject item = new JSONObject(); - item.put("id", depot.getId()); - item.put("text", depot.getName()); - //勾选判断1 - Boolean flag = false; - try - { - flag = userBusinessService.checkIsUserBusinessExist("Type",model.getUBType(),"KeyId",model.getUBKeyId(),"Value","["+depot.getId().toString()+"]"); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>设置用户对应的仓库：类型" + model.getUBType() + " KeyId为： " + model.getUBKeyId() + " 存在异常！"); - } - if (flag==true){item.put("checked", true);} - //结束 - dataArray.add(item); - } - } - outer.put("children", dataArray); - //回写查询结果 - toClient("["+outer.toString()+"]"); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓库异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓库结果异常", e); - } - } - - /** - * 拼接搜索条件 - * @return - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("name_s_like", model.getName()); - condition.put("remark_s_like", model.getRemark()); - condition.put("sort_s_order", "asc"); - return condition; - } - - /** - * 拼接搜索条件-用户对应部门 - * @return - */ - private Map getCondition_UserDepot() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("sort_s_order", "asc"); - return condition; - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override - public DepotModel getModel() - { - return model; - } - public void setDepotService(DepotIService depotService) - { - this.depotService = depotService; - } - - public void setUserBusinessService(UserBusinessIService userBusinessService) { - this.userBusinessService = userBusinessService; - } - -} diff --git a/src/com/jsh/action/basic/FunctionsAction.java b/src/com/jsh/action/basic/FunctionsAction.java deleted file mode 100644 index 1d2ee60cb..000000000 --- a/src/com/jsh/action/basic/FunctionsAction.java +++ /dev/null @@ -1,588 +0,0 @@ -package com.jsh.action.basic; - -import java.io.IOException; -import java.sql.Timestamp; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.springframework.dao.DataAccessException; -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.util.JshException; -import com.jsh.model.po.App; -import com.jsh.model.po.Functions; -import com.jsh.model.po.Logdetails; -import com.jsh.model.vo.basic.FunctionsModel; -import com.jsh.service.basic.FunctionsIService; -import com.jsh.service.basic.UserBusinessIService; -import com.jsh.util.PageUtil; -/* -* 功能管理 -* @author jishenghua qq:7-5-2-7-1-8-9-2-0 -*/ -@SuppressWarnings("serial") -public class FunctionsAction extends BaseAction -{ - private FunctionsIService functionsService; - private UserBusinessIService userBusinessService; - private FunctionsModel model = new FunctionsModel(); - /** - * 增加功能 - * @return - */ - public void create() - { - Log.infoFileSync("==================开始调用增加功能信息方法create()==================="); - Boolean flag = false; - try - { - Functions functions = new Functions(); - functions.setNumber(model.getNumber()); - functions.setName(model.getName()); - functions.setPNumber(model.getPNumber()); - functions.setURL(model.getURL()); - functions.setState(model.getState()); - functions.setSort(model.getSort()); - functions.setEnabled(model.getEnabled()); - functions.setType(model.getType()); - - functionsService.create(functions); - - //========标识位=========== - flag = true; - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加功能信息异常", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>增加功能信息回写客户端结果异常", e); - } - } - - logService.create(new Logdetails(getUser(), "增加功能", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "增加功能名称为 "+ model.getName() + " " + tipMsg + "！", "增加功能" + tipMsg)); - Log.infoFileSync("==================结束调用增加功能方法create()==================="); - } - - /** - * 删除功能 - * @return - */ - public String delete() - { - Log.infoFileSync("====================开始调用删除功能信息方法delete()================"); - try - { - functionsService.delete(model.getFunctionsID()); - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getFunctionsID() + " 的功能异常", e); - tipMsg = "失败"; - tipType = 1; - } - model.getShowModel().setMsgTip(tipMsg); - logService.create(new Logdetails(getUser(), "删除功能", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "删除功能ID为 "+ model.getFunctionsID() + " " + tipMsg + "！", "删除功能" + tipMsg)); - Log.infoFileSync("====================结束调用删除功能信息方法delete()================"); - return SUCCESS; - } - - /** - * 更新功能 - * @return - */ - public void update() - { - Boolean flag = false; - try - { - Functions functions = functionsService.get(model.getFunctionsID()); - functions.setNumber(model.getNumber()); - functions.setName(model.getName()); - functions.setPNumber(model.getPNumber()); - functions.setURL(model.getURL()); - functions.setState(model.getState()); - functions.setSort(model.getSort()); - functions.setEnabled(model.getEnabled()); - functions.setType(model.getType()); - functionsService.update(functions); - - flag = true; - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改功能ID为 ： " + model.getFunctionsID() + "信息失败", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>修改功能回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新功能", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新功能ID为 "+ model.getFunctionsID() + " " + tipMsg + "！", "更新功能" + tipMsg)); - } - - /** - * 批量删除指定ID功能 - * @return - */ - public String batchDelete() - { - try - { - functionsService.batchDelete(model.getFunctionsIDs()); - model.getShowModel().setMsgTip("成功"); - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>批量删除功能ID为：" + model.getFunctionsIDs() + "信息异常", e); - tipMsg = "失败"; - tipType = 1; - } - - logService.create(new Logdetails(getUser(), "批量删除功能", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "批量删除功能ID为 "+ model.getFunctionsIDs() + " " + tipMsg + "！", "批量删除功能" + tipMsg)); - return SUCCESS; - } - - /** - * 检查输入名称是否存在 - */ - public void checkIsNameExist() - { - Boolean flag = false; - try - { - flag = functionsService.checkIsNameExist("Name",model.getName(),"Id", model.getFunctionsID()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>检查功能名称为：" + model.getName() + " ID为： " + model.getFunctionsID() + " 是否存在异常！"); - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>回写检查功能名称为：" + model.getName() + " ID为： " + model.getFunctionsID() + " 是否存在异常！",e); - } - } - } - - /** - * 查找功能信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getCondition()); - functionsService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - //开始拼接json数据 -// {"total":28,"rows":[ -// {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"} -// ]} - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Functions functions:dataList) - { - JSONObject item = new JSONObject(); - item.put("Id", functions.getId()); - item.put("Number", functions.getNumber()); - item.put("Name", functions.getName()); - item.put("PNumber", functions.getPNumber()); - item.put("URL", functions.getURL()); - item.put("State", functions.getState()); - item.put("Sort", functions.getSort()); - item.put("Enabled", functions.getEnabled()); - item.put("Type", functions.getType()); - item.put("op", 1); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找功能信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询功能信息结果异常", e); - } - } - - - /** - * 角色对应功能显示 - * @return - */ - public void findRoleFunctions() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(200); - pageUtil.setAdvSearch(getCondition_RoleFunctions("0")); - functionsService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - //开始拼接json数据 - JSONObject outer = new JSONObject(); - outer.put("id", 1); - outer.put("text", "功能列表"); - outer.put("state", "open"); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Functions functions:dataList) - { - JSONObject item = new JSONObject(); - item.put("id", functions.getId()); - item.put("text", functions.getName()); - - //勾选判断1 - Boolean flag = false; - try - { - flag = userBusinessService.checkIsUserBusinessExist("Type",model.getUBType(),"KeyId",model.getUBKeyId(),"Value","["+functions.getId().toString()+"]"); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>设置角色对应的功能：类型" + model.getUBType() + " KeyId为： " + model.getUBKeyId() + " 存在异常！"); - } - if (flag==true){item.put("checked", true);} - //结束 - - pageUtil.setAdvSearch(getCondition_RoleFunctions(functions.getNumber())); - functionsService.find(pageUtil); - List dataList1 = pageUtil.getPageList(); - JSONArray dataArray1 = new JSONArray(); - if(null != dataList1) - { - - for(Functions functions1:dataList1) - { - item.put("state", "open"); //如果不为空，节点不展开 - JSONObject item1 = new JSONObject(); - item1.put("id", functions1.getId()); - item1.put("text", functions1.getName()); - - //勾选判断2 - //Boolean flag = false; - try - { - flag = userBusinessService.checkIsUserBusinessExist("Type",model.getUBType(),"KeyId",model.getUBKeyId(),"Value","["+functions1.getId().toString()+"]"); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>设置角色对应的功能：类型" + model.getUBType() + " KeyId为： " + model.getUBKeyId() + " 存在异常！"); - } - if (flag==true){item1.put("checked", true);} - //结束 - - pageUtil.setAdvSearch(getCondition_RoleFunctions(functions1.getNumber())); - functionsService.find(pageUtil); - List dataList2 = pageUtil.getPageList(); - JSONArray dataArray2 = new JSONArray(); - if(null != dataList2) - { - - for(Functions functions2:dataList2) - { - item1.put("state", "closed"); //如果不为空，节点不展开 - JSONObject item2 = new JSONObject(); - item2.put("id", functions2.getId()); - item2.put("text", functions2.getName()); - - //勾选判断3 - //Boolean flag = false; - try - { - flag = userBusinessService.checkIsUserBusinessExist("Type",model.getUBType(),"KeyId",model.getUBKeyId(),"Value","["+functions2.getId().toString()+"]"); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>设置角色对应的功能：类型" + model.getUBType() + " KeyId为： " + model.getUBKeyId() + " 存在异常！"); - } - if (flag==true){item2.put("checked", true);} - //结束 - - pageUtil.setAdvSearch(getCondition_RoleFunctions(functions2.getNumber())); - functionsService.find(pageUtil); - List dataList3 = pageUtil.getPageList(); - JSONArray dataArray3 = new JSONArray(); - if(null != dataList3) - { - - for(Functions functions3:dataList3) - { - item2.put("state", "closed"); //如果不为空，节点不展开 - JSONObject item3 = new JSONObject(); - item3.put("id", functions3.getId()); - item3.put("text", functions3.getName()); - - //勾选判断4 - //Boolean flag = false; - try - { - flag = userBusinessService.checkIsUserBusinessExist("Type",model.getUBType(),"KeyId",model.getUBKeyId(),"Value","["+functions3.getId().toString()+"]"); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>设置角色对应的功能：类型" + model.getUBType() + " KeyId为： " + model.getUBKeyId() + " 存在异常！"); - } - if (flag==true){item3.put("checked", true);} - //结束 - - dataArray3.add(item3); - item2.put("children", dataArray3); - } - } - - dataArray2.add(item2); - item1.put("children", dataArray2); - } - } - - dataArray1.add(item1); - item.put("children", dataArray1); - } - - } - - dataArray.add(item); - } - outer.put("children", dataArray); - } - //回写查询结果 - toClient("["+outer.toString()+"]"); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找应用异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询应用结果异常", e); - } - } - - - /** - * 页面显示菜单 - * @return - */ - public void findMenu() - { - try - { - String fc=model.getHasFunctions(); //当前用户所拥有的功能列表，格式如：[1][2][5] - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(200); - pageUtil.setAdvSearch(getCondition_RoleFunctions(model.getPNumber())); - functionsService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Functions functions:dataList) - { - JSONObject item = new JSONObject(); - item.put("id", functions.getId()); - - pageUtil.setAdvSearch(getCondition_RoleFunctions(functions.getNumber())); - functionsService.find(pageUtil); - List dataList1 = pageUtil.getPageList(); - JSONArray dataArray1 = new JSONArray(); - if(dataList1.size()!=0) - { - item.put("text", functions.getName()); //是目录就没链接 - for(Functions functions1:dataList1) - { - item.put("state", "open"); //如果不为空，节点展开 - JSONObject item1 = new JSONObject(); - - pageUtil.setAdvSearch(getCondition_RoleFunctions(functions1.getNumber())); - functionsService.find(pageUtil); - List dataList2 = pageUtil.getPageList(); - if(fc.indexOf("["+functions1.getId().toString()+"]")!=-1||dataList2.size()!=0) - { - item1.put("id", functions1.getId()); - JSONArray dataArray2 = new JSONArray(); - if(dataList2.size()!=0) - { - item1.put("text", functions1.getName());//是目录就没链接 - for(Functions functions2:dataList2) - { - item1.put("state", "closed"); //如果不为空，节点不展开 - JSONObject item2 = new JSONObject(); - - pageUtil.setAdvSearch(getCondition_RoleFunctions(functions2.getNumber())); - functionsService.find(pageUtil); - List dataList3 = pageUtil.getPageList(); - if(fc.indexOf("["+functions2.getId().toString()+"]")!=-1||dataList3.size()!=0) - { - item2.put("id", functions2.getId()); - JSONArray dataArray3 = new JSONArray(); - if(dataList3.size()!=0) - { - item2.put("text", functions2.getName());//是目录就没链接 - for(Functions functions3:dataList3) - { - item2.put("state", "closed"); //如果不为空，节点不展开 - JSONObject item3 = new JSONObject(); - item3.put("id", functions3.getId()); - item3.put("text", functions3.getName()); - // - dataArray3.add(item3); - item2.put("children", dataArray3); - } - } - else - { - //不是目录，有链接 - item2.put("text", ""+functions2.getName()+""); - } - - dataArray2.add(item2); - item1.put("children", dataArray2); - } - } - } - else - { - //不是目录，有链接 - item1.put("text", ""+functions1.getName()+""); - } - - dataArray1.add(item1); - item.put("children", dataArray1); - } - } - } - else - { - //不是目录，有链接 - item.put("text", ""+functions.getName()+""); - } - - dataArray.add(item); - } - } - //回写查询结果 - toClient(dataArray.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找应用异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询应用结果异常", e); - } - } - - /** - * 拼接搜索条件 - * @return - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("Name_s_like", model.getName()); - condition.put("Type_s_eq", model.getType()); - condition.put("Sort_s_order", "asc"); - return condition; - } - - /** - * 拼接搜索条件-角色对应功能 - * @return - */ - private Map getCondition_RoleFunctions(String num) - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("Enabled_n_eq", 1); - condition.put("PNumber_s_eq", num); - condition.put("Sort_s_order", "asc"); - return condition; - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override - public FunctionsModel getModel() - { - return model; - } - public void setFunctionsService(FunctionsIService functionsService) - { - this.functionsService = functionsService; - } - - public void setUserBusinessService(UserBusinessIService userBusinessService) { - this.userBusinessService = userBusinessService; - } - -} diff --git a/src/com/jsh/action/basic/InOutItemAction.java b/src/com/jsh/action/basic/InOutItemAction.java deleted file mode 100644 index f6f40a91f..000000000 --- a/src/com/jsh/action/basic/InOutItemAction.java +++ /dev/null @@ -1,331 +0,0 @@ -package com.jsh.action.basic; - -import java.io.IOException; -import java.sql.Timestamp; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.springframework.dao.DataAccessException; -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.model.po.Logdetails; -import com.jsh.model.po.InOutItem; -import com.jsh.model.vo.basic.InOutItemModel; -import com.jsh.service.basic.InOutItemIService; -import com.jsh.util.PageUtil; -/** - * 收支项目 - * @author ji*sheng*hua qq 7.5.2.7.1.8.9.2.0 - */ -@SuppressWarnings("serial") -public class InOutItemAction extends BaseAction -{ - private InOutItemIService inOutItemService; - private InOutItemModel model = new InOutItemModel(); - - /** - * 增加收支项目 - * @return - */ - public void create() - { - Log.infoFileSync("==================开始调用增加收支项目方法==================="); - Boolean flag = false; - try - { - InOutItem inOutItem = new InOutItem(); - inOutItem.setName(model.getName()); - inOutItem.setType(model.getType()); - inOutItem.setRemark(model.getRemark()); - inOutItemService.create(inOutItem); - - //========标识位=========== - flag = true; - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加收支项目异常", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>增加收支项目回写客户端结果异常", e); - } - } - - logService.create(new Logdetails(getUser(), "增加收支项目", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "增加收支项目名称为 "+ model.getName() + " " + tipMsg + "！", "增加收支项目" + tipMsg)); - Log.infoFileSync("==================结束调用增加收支项目方法==================="); - } - - /** - * 删除收支项目 - * @return - */ - public String delete() - { - Log.infoFileSync("====================开始调用删除收支项目信息方法delete()================"); - try - { - inOutItemService.delete(model.getInOutItemID()); - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getInOutItemID() + " 的收支项目异常", e); - tipMsg = "失败"; - tipType = 1; - } - model.getShowModel().setMsgTip(tipMsg); - logService.create(new Logdetails(getUser(), "删除收支项目", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "删除收支项目ID为 "+ model.getInOutItemID() + ",名称为 " + model.getName() + tipMsg + "！", "删除收支项目" + tipMsg)); - Log.infoFileSync("====================结束调用删除收支项目信息方法delete()================"); - return SUCCESS; - } - - /** - * 更新收支项目 - * @return - */ - public void update() - { - Boolean flag = false; - try - { - InOutItem inOutItem = inOutItemService.get(model.getInOutItemID()); - inOutItem.setName(model.getName()); - inOutItem.setType(model.getType()); - inOutItem.setRemark(model.getRemark()); - inOutItemService.update(inOutItem); - - flag = true; - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改收支项目ID为 ： " + model.getInOutItemID() + "信息失败", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>修改收支项目回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新收支项目", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新收支项目ID为 "+ model.getInOutItemID() + " " + tipMsg + "！", "更新收支项目" + tipMsg)); - } - - /** - * 批量删除指定ID收支项目 - * @return - */ - public String batchDelete() - { - try - { - inOutItemService.batchDelete(model.getInOutItemIDs()); - model.getShowModel().setMsgTip("成功"); - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>批量删除收支项目ID为：" + model.getInOutItemIDs() + "信息异常", e); - tipMsg = "失败"; - tipType = 1; - } - - logService.create(new Logdetails(getUser(), "批量删除收支项目", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "批量删除收支项目ID为 "+ model.getInOutItemIDs() + " " + tipMsg + "！", "批量删除收支项目" + tipMsg)); - return SUCCESS; - } - - /** - * 检查输入名称是否存在 - */ - public void checkIsNameExist() - { - Boolean flag = false; - try - { - flag = inOutItemService.checkIsNameExist("name",model.getName(),"id", model.getInOutItemID()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>检查收支项目名称为：" + model.getName() + " ID为： " + model.getInOutItemID() + " 是否存在异常！"); - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>回写检查收支项目名称为：" + model.getName() + " ID为： " + model.getInOutItemID() + " 是否存在异常！",e); - } - } - } - - /** - * 查找收支项目信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getCondition()); - inOutItemService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(InOutItem inOutItem:dataList) - { - JSONObject item = new JSONObject(); - item.put("id", inOutItem.getId()); - //收支项目名称 - item.put("name", inOutItem.getName()); - item.put("type", inOutItem.getType()); - item.put("remark", inOutItem.getRemark()); - item.put("op", 1); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>查找收支项目信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>回写查询收支项目信息结果异常", e); - } - } - - /** - * 查找收支项目信息-下拉框 - * @return - */ - public void findBySelect() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - pageUtil.setAdvSearch(getCondition_select()); - inOutItemService.find(pageUtil); - List dataList = pageUtil.getPageList(); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(InOutItem inOutItem:dataList) - { - JSONObject item = new JSONObject(); - item.put("Id", inOutItem.getId()); - //收支项目名称 - item.put("InOutItemName", inOutItem.getName()); - dataArray.add(item); - } - } - //回写查询结果 - toClient(dataArray.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>查找收支项目信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>回写查询收支项目信息结果异常", e); - } - } - - /** - * 拼接搜索条件 - * @return - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("name_s_like", model.getName()); - condition.put("remark_s_like", model.getRemark()); - condition.put("id_s_order", "desc"); - return condition; - } - - /** - * 拼接搜索条件-下拉框-收支项目 - * @return - */ - private Map getCondition_select() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - if(model.getType().equals("in")) { - condition.put("type_s_eq", "收入"); - } - else if(model.getType().equals("out")) { - condition.put("type_s_eq", "支出"); - } - condition.put("id_s_order", "desc"); - return condition; - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override - public InOutItemModel getModel() - { - return model; - } - public void setInOutItemService(InOutItemIService inOutItemService) - { - this.inOutItemService = inOutItemService; - } -} diff --git a/src/com/jsh/action/basic/LogAction.java b/src/com/jsh/action/basic/LogAction.java deleted file mode 100644 index e4a22d309..000000000 --- a/src/com/jsh/action/basic/LogAction.java +++ /dev/null @@ -1,193 +0,0 @@ -package com.jsh.action.basic; - -import java.io.IOException; -import java.sql.Timestamp; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.springframework.dao.DataAccessException; -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.model.po.Logdetails; -import com.jsh.model.vo.basic.LogModel; -import com.jsh.service.basic.UserIService; -import com.jsh.util.PageUtil; -import com.jsh.util.Tools; - -/* - *日志管理 - * @author jishenghua qq:7-5-2-7-1-8-9-2-0 -*/ -@SuppressWarnings("serial") -public class LogAction extends BaseAction -{ - private LogModel model = new LogModel(); - private UserIService userService; - - @SuppressWarnings({ "rawtypes", "unchecked" }) - public String getBasicData() - { - Map mapData = model.getShowModel().getMap(); - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - try - { - Map condition = pageUtil.getAdvSearch(); - condition.clear(); - condition.put("ismanager_n_eq", 0); - userService.find(pageUtil); - mapData.put("userList", pageUtil.getPageList()); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>查找系统基础数据信息异常", e); - model.getShowModel().setMsgTip("exceptoin"); - } - return SUCCESS; - } - - /** - * 删除日志 - * @return - */ - public String delete() - { - Log.infoFileSync("====================开始调用删除日志信息方法delete()================"); - try - { - logService.delete(model.getLogID()); - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getLogID() + " 的日志异常", e); - tipMsg = "失败"; - tipType = 1; - } - model.getShowModel().setMsgTip(tipMsg); - logService.create(new Logdetails(getUser(), "删除日志", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "删除日志ID为 "+ model.getLogID() + " " + tipMsg + "！", "删除日志" + tipMsg)); - Log.infoFileSync("====================结束调用删除日志信息方法delete()================"); - return SUCCESS; - } - - /** - * 批量删除指定ID日志 - * @return - */ - public String batchDelete() - { - try - { - logService.batchDelete(model.getLogIDs()); - model.getShowModel().setMsgTip("成功"); - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>批量删除日志ID为：" + model.getLogIDs() + "信息异常", e); - tipMsg = "失败"; - tipType = 1; - } - - logService.create(new Logdetails(getUser(), "批量删除日志", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "批量删除日志ID为 "+ model.getLogIDs() + " " + tipMsg + "！", "批量删除日志" + tipMsg)); - return SUCCESS; - } - - /** - * 查找日志信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getCondition()); - logService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - //开始拼接json数据 -// {"total":28,"rows":[ -// {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"} -// ]} - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Logdetails log:dataList) - { - JSONObject item = new JSONObject(); - item.put("id", log.getId()); - item.put("clientIP", log.getClientIp()); - item.put("details", log.getContentdetails()); - item.put("createTime", Tools.getCenternTime(log.getCreatetime())); - item.put("operation", log.getOperation()); - item.put("remark", log.getRemark()); - item.put("status", log.getStatus() == 0 ?"成功":"失败"); - item.put("statusShort", log.getStatus()); - item.put("username", log.getUser()==null?"":log.getUser().getUsername()); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>查找日志信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>回写查询日志信息结果异常", e); - } - } - - /** - * 拼接搜索条件 - * @return - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("user.id_n_eq", model.getUsernameID()); - condition.put("createtime_s_gteq", model.getBeginTime()); - condition.put("createtime_s_lteq", model.getEndTime()); - condition.put("operation_s_like", model.getOperation()); - condition.put("clientIp_s_like", model.getClientIp()); - condition.put("status_n_eq", model.getStatus()); - condition.put("contentdetails_s_like", model.getContentdetails()); - condition.put("remark_s_like", model.getRemark()); - condition.put("createtime_s_order", "desc"); - return condition; - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - public void setUserService(UserIService userService) - { - this.userService = userService; - } - - @Override - public LogModel getModel() - { - return model; - } -} diff --git a/src/com/jsh/action/basic/RoleAction.java b/src/com/jsh/action/basic/RoleAction.java deleted file mode 100644 index 65c2d7818..000000000 --- a/src/com/jsh/action/basic/RoleAction.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.jsh.action.basic; - -import java.io.IOException; -import java.sql.Timestamp; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.springframework.dao.DataAccessException; -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.util.JshException; -import com.jsh.model.po.App; -import com.jsh.model.po.Role; -import com.jsh.model.po.Logdetails; -import com.jsh.model.vo.basic.RoleModel; -import com.jsh.service.basic.RoleIService; -import com.jsh.service.basic.UserBusinessIService; -import com.jsh.util.PageUtil; -/* - * 角色管理 - * @author jishenghua qq:7-5-2-7-1-8-9-2-0 -*/ -@SuppressWarnings("serial") -public class RoleAction extends BaseAction -{ - private RoleIService roleService; - private UserBusinessIService userBusinessService; - private RoleModel model = new RoleModel(); - /** - * 增加角色 - * @return - */ - public void create() - { - Log.infoFileSync("==================开始调用增加角色信息方法create()==================="); - Boolean flag = false; - try - { - Role role = new Role(); - role.setName(model.getName()); - roleService.create(role); - - //========标识位=========== - flag = true; - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加角色信息异常", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>增加角色信息回写客户端结果异常", e); - } - } - - logService.create(new Logdetails(getUser(), "增加角色", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "增加角色名称为 "+ model.getName() + " " + tipMsg + "！", "增加角色" + tipMsg)); - Log.infoFileSync("==================结束调用增加角色方法create()==================="); - } - - /** - * 删除角色 - * @return - */ - public String delete() - { - Log.infoFileSync("====================开始调用删除角色信息方法delete()================"); - try - { - roleService.delete(model.getRoleID()); - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getRoleID() + " 的角色异常", e); - tipMsg = "失败"; - tipType = 1; - } - model.getShowModel().setMsgTip(tipMsg); - logService.create(new Logdetails(getUser(), "删除角色", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "删除角色ID为 "+ model.getRoleID() + " " + tipMsg + "！", "删除角色" + tipMsg)); - Log.infoFileSync("====================结束调用删除角色信息方法delete()================"); - return SUCCESS; - } - - /** - * 更新角色 - * @return - */ - public void update() - { - Boolean flag = false; - try - { - Role role = roleService.get(model.getRoleID()); - role.setName(model.getName()); - roleService.update(role); - - flag = true; - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改角色ID为 ： " + model.getRoleID() + "信息失败", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>修改角色回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新角色", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新角色ID为 "+ model.getRoleID() + " " + tipMsg + "！", "更新角色" + tipMsg)); - } - - /** - * 批量删除指定ID角色 - * @return - */ - public String batchDelete() - { - try - { - roleService.batchDelete(model.getRoleIDs()); - model.getShowModel().setMsgTip("成功"); - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>批量删除角色ID为：" + model.getRoleIDs() + "信息异常", e); - tipMsg = "失败"; - tipType = 1; - } - - logService.create(new Logdetails(getUser(), "批量删除角色", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "批量删除角色ID为 "+ model.getRoleIDs() + " " + tipMsg + "！", "批量删除角色" + tipMsg)); - return SUCCESS; - } - - /** - * 检查输入名称是否存在 - */ - public void checkIsNameExist() - { - Boolean flag = false; - try - { - flag = roleService.checkIsNameExist("name",model.getName(),"Id", model.getRoleID()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>检查角色名称为：" + model.getName() + " ID为： " + model.getRoleID() + " 是否存在异常！"); - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>回写检查角色名称为：" + model.getName() + " ID为： " + model.getRoleID() + " 是否存在异常！",e); - } - } - } - - /** - * 查找角色信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getCondition()); - roleService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - //开始拼接json数据 -// {"total":28,"rows":[ -// {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"} -// ]} - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Role role:dataList) - { - JSONObject item = new JSONObject(); - item.put("Id", role.getId()); - //供应商名称 - item.put("Name", role.getName()); - item.put("op", 1); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找角色信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询角色信息结果异常", e); - } - } - - /** - * 用户对应角色显示 - * @return - */ - public void findUserRole() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(100); - //pageUtil.setCurPage(model.getPageNo()); - - pageUtil.setAdvSearch(getCondition_UserRole()); - roleService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - //开始拼接json数据 - JSONObject outer = new JSONObject(); - outer.put("id", 1); - outer.put("text", "角色列表"); - outer.put("state", "open"); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Role role:dataList) - { - JSONObject item = new JSONObject(); - item.put("id", role.getId()); - item.put("text", role.getName()); - //勾选判断1 - Boolean flag = false; - try - { - flag = userBusinessService.checkIsUserBusinessExist("Type",model.getUBType(),"KeyId",model.getUBKeyId(),"Value","["+role.getId().toString()+"]"); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>设置用户对应的角色：类型" + model.getUBType() + " KeyId为： " + model.getUBKeyId() + " 存在异常！"); - } - if (flag==true){item.put("checked", true);} - //结束 - dataArray.add(item); - } - } - outer.put("children", dataArray); - //回写查询结果 - toClient("["+outer.toString()+"]"); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找角色异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询角色结果异常", e); - } - } - - /** - * 拼接搜索条件 - * @return - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("Name_s_like", model.getName()); - condition.put("Id_s_order", "asc"); - return condition; - } - - /** - * 拼接搜索条件-用户对应角色 - * @return - */ - private Map getCondition_UserRole() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("Id_s_order", "asc"); - return condition; - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override - public RoleModel getModel() - { - return model; - } - public void setRoleService(RoleIService roleService) - { - this.roleService = roleService; - } - public void setUserBusinessService(UserBusinessIService userBusinessService) { - this.userBusinessService = userBusinessService; - } -} diff --git a/src/com/jsh/action/basic/SupplierAction.java b/src/com/jsh/action/basic/SupplierAction.java deleted file mode 100644 index f54942be0..000000000 --- a/src/com/jsh/action/basic/SupplierAction.java +++ /dev/null @@ -1,406 +0,0 @@ -package com.jsh.action.basic; - -import java.io.IOException; -import java.sql.Timestamp; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.springframework.dao.DataAccessException; -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.model.po.Logdetails; -import com.jsh.model.po.Supplier; -import com.jsh.model.vo.basic.SupplierModel; -import com.jsh.service.basic.SupplierIService; -import com.jsh.util.PageUtil; -/* - * 单位管理 - * @author jishenghua qq:752718920 -*/ -@SuppressWarnings("serial") -public class SupplierAction extends BaseAction -{ - private SupplierIService supplierService; - private SupplierModel model = new SupplierModel(); - - /** - * 增加供应商 - * @return - */ - public void create() - { - Log.infoFileSync("==================开始调用增加供应商方法==================="); - Boolean flag = false; - try - { - Supplier supplier = new Supplier(); - supplier.setContacts(model.getContacts()); - supplier.setType(model.getType()); - supplier.setDescription(model.getDescription()); - supplier.setEmail(model.getEmail()); - supplier.setBeginNeedGet(model.getBeginNeedGet()); - supplier.setBeginNeedPay(model.getBeginNeedPay()); - supplier.setIsystem((short)1); - supplier.setPhonenum(model.getPhonenum()); - supplier.setSupplier(model.getSupplier()); - supplier.setEnabled(model.getEnabled()); - supplierService.create(supplier); - - //========标识位=========== - flag = true; - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加供应商异常", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>增加供应商回写客户端结果异常", e); - } - } - - logService.create(new Logdetails(getUser(), "增加供应商", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "增加供应商名称为 "+ model.getSupplier() + " " + tipMsg + "！", "增加供应商" + tipMsg)); - Log.infoFileSync("==================结束调用增加供应商方法==================="); - } - - /** - * 删除供应商 - * @return - */ - public String delete() - { - Log.infoFileSync("====================开始调用删除供应商信息方法delete()================"); - try - { - supplierService.delete(model.getSupplierID()); - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getSupplierID() + " 的供应商异常", e); - tipMsg = "失败"; - tipType = 1; - } - model.getShowModel().setMsgTip(tipMsg); - logService.create(new Logdetails(getUser(), "删除供应商", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "删除供应商ID为 "+ model.getSupplierID() + ",名称为 " + model.getSupplier() + tipMsg + "！", "删除供应商" + tipMsg)); - Log.infoFileSync("====================结束调用删除供应商信息方法delete()================"); - return SUCCESS; - } - - /** - * 更新供应商 - * @return - */ - public void update() - { - Boolean flag = false; - try - { - Supplier supplier = supplierService.get(model.getSupplierID()); - supplier.setContacts(model.getContacts()); - supplier.setType(model.getType()); - supplier.setDescription(model.getDescription()); - supplier.setEmail(model.getEmail()); - supplier.setBeginNeedGet(model.getBeginNeedGet()); - supplier.setBeginNeedPay(model.getBeginNeedPay()); - supplier.setIsystem((short)1); - supplier.setPhonenum(model.getPhonenum()); - supplier.setSupplier(model.getSupplier()); - supplier.setEnabled(model.getEnabled()); - supplierService.update(supplier); - - flag = true; - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改供应商ID为 ： " + model.getSupplierID() + "信息失败", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>修改供应商回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新供应商", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新供应商ID为 "+ model.getSupplierID() + " " + tipMsg + "！", "更新供应商" + tipMsg)); - } - - /** - * 批量删除指定ID供应商 - * @return - */ - public String batchDelete() - { - try - { - supplierService.batchDelete(model.getSupplierIDs()); - model.getShowModel().setMsgTip("成功"); - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>批量删除供应商ID为：" + model.getSupplierIDs() + "信息异常", e); - tipMsg = "失败"; - tipType = 1; - } - - logService.create(new Logdetails(getUser(), "批量删除供应商", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "批量删除供应商ID为 "+ model.getSupplierIDs() + " " + tipMsg + "！", "批量删除供应商" + tipMsg)); - return SUCCESS; - } - - /** - * 检查输入名称是否存在 - */ - public void checkIsNameExist() - { - Boolean flag = false; - try - { - flag = supplierService.checkIsNameExist("supplier",model.getSupplier(),"id", model.getSupplierID()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>检查供应商名称为：" + model.getSupplier() + " ID为： " + model.getSupplierID() + " 是否存在异常！"); - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>回写检查供应商名称为：" + model.getSupplier() + " ID为： " + model.getSupplierID() + " 是否存在异常！",e); - } - } - } - - /** - * 查找供应商信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getCondition()); - supplierService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Supplier supplier:dataList) - { - JSONObject item = new JSONObject(); - item.put("id", supplier.getId()); - //供应商名称 - item.put("supplier", supplier.getSupplier()); - item.put("type", supplier.getType()); - item.put("contacts",supplier.getContacts()); - item.put("phonenum", supplier.getPhonenum()); - item.put("email", supplier.getEmail()); - item.put("BeginNeedGet",supplier.getBeginNeedGet()); - item.put("BeginNeedPay",supplier.getBeginNeedPay()); - item.put("AllNeedGet",supplier.getAllNeedGet()); - item.put("AllNeedPay",supplier.getAllNeedPay()); - item.put("isystem", supplier.getIsystem() == (short)0?"是":"否"); - item.put("description", supplier.getDescription()); - item.put("enabled", supplier.getEnabled()); - item.put("op", supplier.getIsystem()); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>查找供应商信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e); - } - } - - /** - * 查找供应商信息-下拉框 - * @return - */ - public void findBySelect_sup() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - pageUtil.setAdvSearch(getCondition_Select_sup()); - supplierService.find(pageUtil); - List dataList = pageUtil.getPageList(); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Supplier supplier:dataList) - { - JSONObject item = new JSONObject(); - item.put("id", supplier.getId()); - //供应商名称 - item.put("supplier", supplier.getSupplier()); - dataArray.add(item); - } - } - //回写查询结果 - toClient(dataArray.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>查找供应商信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e); - } - } - /** - * 查找客户信息-下拉框 - * @return - */ - public void findBySelect_cus() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - pageUtil.setAdvSearch(getCondition_Select_cus()); - supplierService.find(pageUtil); - List dataList = pageUtil.getPageList(); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Supplier supplier:dataList) - { - JSONObject item = new JSONObject(); - item.put("id", supplier.getId()); - //客户名称 - item.put("supplier", supplier.getSupplier()); - dataArray.add(item); - } - } - //回写查询结果 - toClient(dataArray.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>查找客户信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>回写查询客户信息结果异常", e); - } - } - - /** - * 拼接搜索条件 - * @return - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("supplier_s_like", model.getSupplier()); - condition.put("type_s_like", model.getType()); - condition.put("contacts_s_like", model.getContacts()); - condition.put("phonenum_s_like", model.getPhonenum()); - condition.put("email_s_like", model.getEmail()); - condition.put("description_s_like", model.getDescription()); - condition.put("id_s_order", "desc"); - return condition; - } - - /** - * 拼接搜索条件-下拉框-供应商 - * @return - */ - private Map getCondition_Select_sup() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("type_s_like", "供应商"); - condition.put("id_s_order", "desc"); - return condition; - } - /** - * 拼接搜索条件-下拉框-客户 - * @return - */ - private Map getCondition_Select_cus() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("type_s_like", "客户"); - condition.put("id_s_order", "desc"); - return condition; - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override - public SupplierModel getModel() - { - return model; - } - public void setSupplierService(SupplierIService supplierService) - { - this.supplierService = supplierService; - } -} diff --git a/src/com/jsh/action/basic/UserAction.java b/src/com/jsh/action/basic/UserAction.java deleted file mode 100644 index 3c51c16ae..000000000 --- a/src/com/jsh/action/basic/UserAction.java +++ /dev/null @@ -1,481 +0,0 @@ -package com.jsh.action.basic; - -import java.io.IOException; -import java.security.NoSuchAlgorithmException; -import java.sql.Timestamp; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.springframework.dao.DataAccessException; -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.util.ExceptionCodeConstants; -import com.jsh.model.po.Basicuser; -import com.jsh.model.po.Logdetails; -import com.jsh.model.vo.basic.UserModel; -import com.jsh.service.basic.UserIService; -import com.jsh.util.PageUtil; -import com.jsh.util.Tools; -/* - * 用户管理 - * @author jishenghua qq:752718920 -*/ -@SuppressWarnings("serial") -public class UserAction extends BaseAction -{ - private UserModel model = new UserModel(); - private UserIService userService; - - /** - * 需要判断用户状态，用户名密码错误不能登录 ，黑名单用户不能登录，如果已经登录过，不再进行处理，直接进入管理页面 - * @return - */ - public String login() - { - Log.infoFileSync("============用户登录 login 方法调用开始=============="); - String username = model.getLoginame().trim(); - String password = model.getPassword().trim(); - //因密码用MD5加密，需要对密码进行转化 - try - { - password = Tools.md5Encryp(password); - System.out.println(password); - } - catch (NoSuchAlgorithmException e) - { - e.printStackTrace(); - Log.errorFileSync(">>>>>>>>>>>>>>转化MD5字符串错误 ：" + e.getMessage(), e); - } - - //判断用户是否已经登录过，登录过不再处理 - Basicuser sessionUser = (Basicuser)getSession().get("user"); - if(null != sessionUser && username.equalsIgnoreCase(sessionUser.getLoginame()) - && sessionUser.getPassword().equals(password)) - { - Log.infoFileSync("====用户 "+ username + "已经登录过, login 方法调用结束===="); - model.getShowModel().setMsgTip("user already login"); - /*return "login";*/ - } - - //获取用户状态 - int userStatus = -1; - try - { - userStatus = userService.validateUser(username, password); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>用户 " + username + " 登录 login 方法 访问服务层异常====",e); - model.getShowModel().setMsgTip("access service exception"); - } - switch (userStatus) - { - case ExceptionCodeConstants.UserExceptionCode.USER_NOT_EXIST: - model.getShowModel().setMsgTip("user is not exist"); - break; - case ExceptionCodeConstants.UserExceptionCode.USER_PASSWORD_ERROR: - model.getShowModel().setMsgTip("user password error"); - break; - case ExceptionCodeConstants.UserExceptionCode.BLACK_USER: - model.getShowModel().setMsgTip("user is black"); - break; - case ExceptionCodeConstants.UserExceptionCode.USER_ACCESS_EXCEPTION: - model.getShowModel().setMsgTip("access service error"); - break; - default: - try - { - //验证通过 ，可以登录，放入session，记录登录日志 - Basicuser user = userService.getUser(username); - logService.create(new Logdetails(user, "登录系统", model.getClientIp(), - new Timestamp(System.currentTimeMillis()), (short)0,"管理用户：" + username + " 登录系统",username + " 登录系统")); - model.getShowModel().setMsgTip("user can login"); - getSession().put("user", user); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>查询用户名为:" + username + " ，用户信息异常", e); - } - break; - } - /*if(ExceptionCodeConstants.UserExceptionCode.USER_CONDITION_FIT == userStatus) - return "login";*/ - Log.infoFileSync("===============用户登录 login 方法调用结束==============="); - return SUCCESS; - } - - /** - * 用户退出登录 - * @return - */ - public String logout() - { - logService.create(new Logdetails(getUser(), "退出系统", model.getClientIp(), - new Timestamp(System.currentTimeMillis()), (short)0, - "管理用户：" + getUser().getLoginame() + " 退出系统",getUser().getLoginame() + " 退出系统")); - getSession().remove("user"); - return SUCCESS; - } - - /** - * 增加用户 - * @return - */ - public void create() - { - Log.infoFileSync("==================开始调用增加用户方法==================="); - Boolean flag = false; - try - { - Basicuser user = new Basicuser(); - user.setDepartment(model.getDepartment()); - user.setDescription(model.getDescription()); - user.setEmail(model.getEmail()); -// user.setIsmanager(model.getIsmanager()); - user.setIsystem((short)1); - user.setIsmanager((short)1); - user.setLoginame(model.getLoginame()); - String password ="123456"; - //因密码用MD5加密，需要对密码进行转化 - try - { - password=Tools.md5Encryp(password); - } - catch (NoSuchAlgorithmException e) - { - e.printStackTrace(); - Log.errorFileSync(">>>>>>>>>>>>>>转化MD5字符串错误 ：" + e.getMessage(), e); - } - user.setPassword(password); - - user.setPhonenum(model.getPhonenum()); - user.setPosition(model.getPosition()); - user.setUsername(model.getUsername()); - - userService.create(user); - //========标识位=========== - flag = true; - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加用户异常", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>增加用户回写客户端结果异常", e); - } - } - - logService.create(new Logdetails(getUser(), "增加用户", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "增加用户名称为 "+ model.getUsername() + " " + tipMsg + "！", "增加用户" + tipMsg)); - Log.infoFileSync("==================结束调用增加用户方法==================="); - } - - /** - * 删除用户 - * @return - */ - public String delete() - { - Log.infoFileSync("====================开始调用删除用户信息方法delete()================"); - try - { - userService.delete(model.getUserID()); - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getUserID() + " 的用户异常", e); - tipMsg = "失败"; - tipType = 1; - } - model.getShowModel().setMsgTip(tipMsg); - logService.create(new Logdetails(getUser(), "删除用户", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "删除用户ID为 "+ model.getUserID() + " " + tipMsg + "！", "删除用户" + tipMsg)); - Log.infoFileSync("====================结束调用删除用户信息方法delete()================"); - return SUCCESS; - } - - /** - * 更新用户 - * @return - */ - public void update() - { - Boolean flag = false; - try - { - Basicuser user = userService.get(model.getUserID()); - user.setDepartment(model.getDepartment()); - user.setDescription(model.getDescription()); - user.setEmail(model.getEmail()); - //user.setIsmanager(model.getIsmanager()); - user.setLoginame(model.getLoginame()); - //user.setPassword(model.getPassword()); - user.setPhonenum(model.getPhonenum()); - user.setPosition(model.getPosition()); - user.setUsername(model.getUsername()); - userService.update(user); - - //看是否需要更新seesion中user - if(getUser().getId() == model.getUserID()) - { - getSession().put("user", user); - } - - flag = true; - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改用户ID为 ： " + model.getUserID() + "信息失败", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>修改用户回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新用户", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新用户ID为 "+ model.getUserID() + " " + tipMsg + "！", "更新用户" + tipMsg)); - } - - /** - * 修改密码 - */ - public void updatePwd() - { - Integer flag = 0; - try - { - Basicuser user = getUser(); - String orgPassword = Tools.md5Encryp(model.getOrgpwd()); - String md5Pwd = Tools.md5Encryp(model.getPassword()); - //必须和原始密码一致才可以更新密码 - if(orgPassword.equalsIgnoreCase(user.getPassword())) - { - - user.setPassword(md5Pwd); - userService.update(user); - - //看是否需要更新seesion中user -// if(getUser().getId() == model.getUserID()) -// { -// getSession().put("user", user); -// } - - flag = 1; - tipMsg = "成功"; - tipType = 0; - } - else - { - flag = 2; - tipMsg = "失败"; - tipType = 1; - } - - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改用户ID为 ： " + model.getUserID() + "密码信息失败", e); - flag = 3; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>修改用户密码回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新用户", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新用户ID为 "+ model.getUserID() + "密码信息 " + tipMsg + "！", "更新用户" + tipMsg)); - } - - /** - * 批量删除指定ID用户 - * @return - */ - public String batchDelete() - { - try - { - userService.batchDelete(model.getUserIDs()); - model.getShowModel().setMsgTip("成功"); - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>批量删除用户ID为：" + model.getUserIDs() + "信息异常", e); - tipMsg = "失败"; - tipType = 1; - } - - logService.create(new Logdetails(getUser(), "批量删除用户", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "批量删除用户ID为 "+ model.getUserIDs() + " " + tipMsg + "！", "批量删除用户" + tipMsg)); - return SUCCESS; - } - - /** - * 检查输入名称是否存在 - */ - public void checkIsNameExist() - { - Boolean flag = false; - String fieldName = ""; - String fieldValue = ""; - try - { - if(0 == model.getCheckFlag()) - { - fieldName = "username"; - fieldValue = model.getUsername(); - } - else - { - fieldName = "loginame"; - fieldValue = model.getLoginame(); - } - flag = userService.checkIsNameExist(fieldName,fieldValue, model.getUserID()); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>检查用户名称为：" + fieldValue + " ID为： " + model.getUserID() + " 是否存在异常！"); - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>回写检查用户名称为：" + fieldValue + " ID为： " + model.getUserID() + " 是否存在异常！",e); - } - } - } - - /** - * 查找用户信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getCondition()); - userService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - //开始拼接json数据 -// {"total":28,"rows":[ -// {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"} -// ]} - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Basicuser user:dataList) - { - - JSONObject item = new JSONObject(); - item.put("id", user.getId()); - item.put("username", user.getUsername()); - item.put("loginame", Tools.dealNullStr(user.getLoginame())); - item.put("password", Tools.dealNullStr(user.getPassword())); - item.put("position", Tools.dealNullStr(user.getPosition())); - item.put("department", Tools.dealNullStr(user.getDepartment())); - item.put("email", Tools.dealNullStr(user.getEmail())); - item.put("phonenum", Tools.dealNullStr(user.getPhonenum())); - item.put("ismanager", user.getIsmanager()== (short)0?"是":"否"); - item.put("isystem",user.getIsystem() == (short)0?"是":"否"); - item.put("status", user.getStatus()); - item.put("description", Tools.dealNullStr(user.getDescription())); - item.put("remark",user.getRemark()); - item.put("op", user.getIsystem()); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>查找用户信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>回写查询用户信息结果异常", e); - } - } - - /** - * 拼接搜索条件 - * @return 拼接后的条件 - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("username_s_like", model.getUsername()); - condition.put("loginame_s_like", model.getLoginame()); - condition.put("id_s_order", "asc"); - return condition; - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override - public UserModel getModel() - { - return model; - } - public void setUserService(UserIService userService) - { - this.userService = userService; - } -} diff --git a/src/com/jsh/action/basic/UserBusinessAction.java b/src/com/jsh/action/basic/UserBusinessAction.java deleted file mode 100644 index 63d68ae03..000000000 --- a/src/com/jsh/action/basic/UserBusinessAction.java +++ /dev/null @@ -1,229 +0,0 @@ -package com.jsh.action.basic; - -import java.io.IOException; -import java.sql.Timestamp; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.springframework.dao.DataAccessException; -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.model.po.UserBusiness; -import com.jsh.model.po.Logdetails; -import com.jsh.model.vo.basic.UserBusinessModel; -import com.jsh.service.basic.UserBusinessIService; -import com.jsh.util.PageUtil; -/* - * 权限关系管理 - * @author jishenghua qq:752718920 -*/ -@SuppressWarnings("serial") -public class UserBusinessAction extends BaseAction -{ - private UserBusinessIService userBusinessService; - private UserBusinessModel model = new UserBusinessModel(); - - @SuppressWarnings({ "rawtypes", "unchecked" }) - public String getBasicData() - { - Map mapData = model.getShowModel().getMap(); - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - try - { - Map condition = pageUtil.getAdvSearch(); - condition.put("KeyId_s_eq", model.getKeyId()); - condition.put("Type_s_eq", model.getType()); - userBusinessService.find(pageUtil); - mapData.put("userBusinessList", pageUtil.getPageList()); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>查找UserBusiness信息异常", e); - model.getShowModel().setMsgTip("exceptoin"); - } - return SUCCESS; - } - - /* - * 测试hql语句的写法 - */ - @SuppressWarnings({ "rawtypes", "unchecked" }) - public String getceshi() - { - Map mapData = model.getShowModel().getMap(); - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - try - { - Map condition = pageUtil.getAdvSearch(); - condition.put("Type_s_eq", model.getType()); - userBusinessService.find(pageUtil,"ceshi"); - mapData.put("userBusinessList", pageUtil.getPageList()); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>查找UserBusiness信息异常", e); - model.getShowModel().setMsgTip("exceptoin"); - } - return SUCCESS; - } - - /** - * 增加UserBusiness - * @return - */ - public void create() - { - Log.infoFileSync("==================开始调用增加UserBusiness信息方法create()==================="); - Boolean flag = false; - try - { - UserBusiness userBusiness = new UserBusiness(); - userBusiness.setType(model.getType()); - userBusiness.setKeyId(model.getKeyId()); - userBusiness.setValue(model.getValue()); - userBusinessService.create(userBusiness); - - //========标识位=========== - flag = true; - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加UserBusiness信息异常", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>增加UserBusiness信息回写客户端结果异常", e); - } - } - - logService.create(new Logdetails(getUser(), "增加UserBusiness", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "增加UserBusiness为 "+ model.getType() + " " + tipMsg + "！", "增加UserBusiness" + tipMsg)); - Log.infoFileSync("==================结束调用增加UserBusiness方法create()==================="); - } - - /** - * 更新UserBusiness - * @return - */ - public void update() - { - Boolean flag = false; - Long id=0l; - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getCondition_RoleAPP()); - userBusinessService.find(pageUtil); - List dataList = pageUtil.getPageList(); - if(null != dataList) - { - for(UserBusiness userBusiness:dataList) - { - id=userBusiness.getId(); - } - UserBusiness userBusiness = userBusinessService.get(id); - userBusiness.setType(model.getType()); - userBusiness.setKeyId(model.getKeyId()); - userBusiness.setValue(model.getValue()); - userBusinessService.update(userBusiness); - } - - flag = true; - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改UserBusiness的ID为 ： " + id + "信息失败", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>修改UserBusiness回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新UserBusiness", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新UserBusiness的ID为 "+ id + " " + tipMsg + "！", "更新UserBusiness" + tipMsg)); - } - - /** - * 拼接搜索条件-RoleAPP - * @return - */ - private Map getCondition_RoleAPP() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("Type_s_eq", model.getType()); - condition.put("KeyId_s_eq", model.getKeyId()); - return condition; - } - - /** - * 检查角色对应应用/功能是否存在 - */ - public void checkIsValueExist() - { - Boolean flag = false; - try - { - flag = userBusinessService.checkIsValueExist("Type",model.getType(),"KeyId", model.getKeyId()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>检查角色对应应用/功能的类型为：" + model.getType() + " KeyId为： " + model.getKeyId() + " 是否存在异常！"); - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>回写检查角色对应应用/功能的类型为：" + model.getType() + " KeyId为： " + model.getKeyId() + " 是否存在异常！",e); - } - } - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override - public UserBusinessModel getModel() - { - return model; - } - public void setUserBusinessService(UserBusinessIService userBusinessService) - { - this.userBusinessService = userBusinessService; - } -} diff --git a/src/com/jsh/action/materials/AccountHeadAction.java b/src/com/jsh/action/materials/AccountHeadAction.java deleted file mode 100644 index 3a055bdbc..000000000 --- a/src/com/jsh/action/materials/AccountHeadAction.java +++ /dev/null @@ -1,308 +0,0 @@ -package com.jsh.action.materials; - -import java.io.IOException; -import java.sql.Timestamp; -import java.text.ParseException; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.springframework.dao.DataAccessException; -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.model.po.Account; -import com.jsh.model.po.AccountHead; -import com.jsh.model.po.Logdetails; -import com.jsh.model.po.Person; -import com.jsh.model.po.Supplier; -import com.jsh.model.vo.materials.AccountHeadModel; -import com.jsh.service.materials.AccountHeadIService; -import com.jsh.util.PageUtil; -import com.jsh.util.Tools; -/* - * 财务表头管理 - * @author jishenghua qq:752718920 - */ -@SuppressWarnings("serial") -public class AccountHeadAction extends BaseAction -{ - private AccountHeadIService accountHeadService; - private AccountHeadModel model = new AccountHeadModel(); - - /* - * 获取MaxId - */ - @SuppressWarnings({ "rawtypes", "unchecked" }) - public String getMaxId() - { - Map mapData = model.getShowModel().getMap(); - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - try - { - accountHeadService.find(pageUtil,"maxId"); - mapData.put("accountHeadMax", pageUtil.getPageList()); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>查找最大的Id信息异常", e); - model.getShowModel().setMsgTip("exceptoin"); - } - return SUCCESS; - } - - /** - * 增加财务 - * @return - */ - public void create() - { - Log.infoFileSync("==================开始调用增加财务信息方法create()==================="); - Boolean flag = false; - try - { - AccountHead accountHead = new AccountHead(); - accountHead.setType(model.getType()); - if(model.getOrganId()!=null){accountHead.setOrganId(new Supplier(model.getOrganId()));} - if(model.getHandsPersonId()!=null){accountHead.setHandsPersonId(new Person(model.getHandsPersonId()));} - accountHead.setChangeAmount(model.getChangeAmount()); - accountHead.setTotalPrice(model.getTotalPrice()); - if(model.getAccountId()!=null){accountHead.setAccountId(new Account(model.getAccountId()));} - accountHead.setBillNo(model.getBillNo()); - try - { - accountHead.setBillTime(new Timestamp(Tools.parse(model.getBillTime(), "yyyy-MM-dd").getTime())); - } - catch (ParseException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>解析购买日期格式异常", e); - } - accountHead.setRemark(model.getRemark()); - accountHeadService.create(accountHead); - - //========标识位=========== - flag = true; - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加财务信息异常", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>增加财务信息回写客户端结果异常", e); - } - } - - logService.create(new Logdetails(getUser(), "增加财务", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "增加财务编号为 "+ model.getBillNo() + " " + tipMsg + "！", "增加财务" + tipMsg)); - Log.infoFileSync("==================结束调用增加财务方法create()==================="); - } - - /** - * 删除财务 - * @return - */ - public String delete() - { - Log.infoFileSync("====================开始调用删除财务信息方法delete()================"); - try - { - accountHeadService.delete(model.getAccountHeadID()); - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getAccountHeadID() + " 的财务异常", e); - tipMsg = "失败"; - tipType = 1; - } - model.getShowModel().setMsgTip(tipMsg); - logService.create(new Logdetails(getUser(), "删除财务", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "删除财务ID为 "+ model.getAccountHeadID() + " " + tipMsg + "！", "删除财务" + tipMsg)); - Log.infoFileSync("====================结束调用删除财务信息方法delete()================"); - return SUCCESS; - } - - /** - * 更新财务 - * @return - */ - public void update() - { - Boolean flag = false; - try - { - AccountHead accountHead = accountHeadService.get(model.getAccountHeadID()); - accountHead.setType(model.getType()); - if(model.getOrganId()!=null){accountHead.setOrganId(new Supplier(model.getOrganId()));} - if(model.getHandsPersonId()!=null){accountHead.setHandsPersonId(new Person(model.getHandsPersonId()));} - accountHead.setChangeAmount(model.getChangeAmount()); - accountHead.setTotalPrice(model.getTotalPrice()); - if(model.getAccountId()!=null){accountHead.setAccountId(new Account(model.getAccountId()));} - accountHead.setBillNo(model.getBillNo()); - try - { - accountHead.setBillTime(new Timestamp(Tools.parse(model.getBillTime(), "yyyy-MM-dd").getTime())); - } - catch (ParseException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>解析购买日期格式异常", e); - } - accountHead.setRemark(model.getRemark()); - accountHeadService.update(accountHead); - - flag = true; - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改财务ID为 ： " + model.getAccountHeadID() + "信息失败", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>修改财务回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新财务", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新财务ID为 "+ model.getAccountHeadID() + " " + tipMsg + "！", "更新财务" + tipMsg)); - } - - /** - * 批量删除指定ID财务 - * @return - */ - public String batchDelete() - { - try - { - accountHeadService.batchDelete(model.getAccountHeadIDs()); - model.getShowModel().setMsgTip("成功"); - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>批量删除财务ID为：" + model.getAccountHeadIDs() + "信息异常", e); - tipMsg = "失败"; - tipType = 1; - } - - logService.create(new Logdetails(getUser(), "批量删除财务", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "批量删除财务ID为 "+ model.getAccountHeadIDs() + " " + tipMsg + "！", "批量删除财务" + tipMsg)); - return SUCCESS; - } - - /** - * 查找财务信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getCondition()); - accountHeadService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(AccountHead accountHead:dataList) - { - JSONObject item = new JSONObject(); - item.put("Id", accountHead.getId()); - item.put("OrganId", accountHead.getOrganId()==null?"":accountHead.getOrganId().getId()); - item.put("OrganName", accountHead.getOrganId()==null?"":accountHead.getOrganId().getSupplier()); - item.put("HandsPersonId", accountHead.getHandsPersonId()==null?"":accountHead.getHandsPersonId().getId()); - item.put("HandsPersonName", accountHead.getHandsPersonId()==null?"":accountHead.getHandsPersonId().getName()); - item.put("AccountId", accountHead.getAccountId()==null?"":accountHead.getAccountId().getId()); - item.put("AccountName", accountHead.getAccountId()==null?"":accountHead.getAccountId().getName()); - item.put("BillNo", accountHead.getBillNo()); - item.put("BillTime", Tools.getCurrentMonth(accountHead.getBillTime())); - item.put("ChangeAmount", accountHead.getChangeAmount()==null?"":Math.abs(accountHead.getChangeAmount())); - item.put("TotalPrice", accountHead.getTotalPrice()==null?"":Math.abs(accountHead.getTotalPrice())); - item.put("Remark", accountHead.getRemark()); - item.put("op", 1); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找财务信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询财务信息结果异常", e); - } - } - - /** - * 拼接搜索条件 - * @return - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - {condition.put("BillNo_s_like", model.getBillNo());} - condition.put("Type_s_eq",model.getType()); - condition.put("BillTime_s_gteq",model.getBeginTime()); - condition.put("BillTime_s_lteq",model.getEndTime()); - condition.put("Id_s_order","desc"); - return condition; - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override - public AccountHeadModel getModel() - { - return model; - } - public void setAccountHeadService(AccountHeadIService accountHeadService) - { - this.accountHeadService = accountHeadService; - } -} diff --git a/src/com/jsh/action/materials/AccountItemAction.java b/src/com/jsh/action/materials/AccountItemAction.java deleted file mode 100644 index ba7e1954c..000000000 --- a/src/com/jsh/action/materials/AccountItemAction.java +++ /dev/null @@ -1,192 +0,0 @@ -package com.jsh.action.materials; - -import java.io.IOException; -import java.sql.Timestamp; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.springframework.dao.DataAccessException; -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.model.po.AccountHead; -import com.jsh.model.po.AccountItem; -import com.jsh.model.po.Logdetails; -import com.jsh.model.po.Account; -import com.jsh.model.po.InOutItem; -import com.jsh.model.vo.materials.AccountItemModel; -import com.jsh.service.materials.AccountItemIService; -import com.jsh.util.PageUtil; -/* - * 财务明细管理(收支|收付款|转账) - * @author jishenghua qq:752718920 - */ -@SuppressWarnings("serial") -public class AccountItemAction extends BaseAction -{ - private AccountItemIService accountItemService; - private AccountItemModel model = new AccountItemModel(); - - /** - * 保存明细 - * @return - */ - public void saveDetials() - { - Log.infoFileSync("==================开始调用保存财务明细信息方法saveDetials()==================="); - Boolean flag = false; - try - { - Long headerId=model.getHeaderId(); - String inserted=model.getInserted(); - String deleted=model.getDeleted(); - String updated=model.getUpdated(); - //转为json - JSONArray insertedJson = JSONArray.fromObject(inserted); - JSONArray deletedJson = JSONArray.fromObject(deleted); - JSONArray updatedJson = JSONArray.fromObject(updated); - if(null != insertedJson) - { - for(int i = 0;i < insertedJson.size(); i++) - { - AccountItem accountItem = new AccountItem(); - JSONObject tempInsertedJson = JSONObject.fromObject(insertedJson.get(i)); - accountItem.setHeaderId(new AccountHead(headerId)); - if(tempInsertedJson.get("AccountId")!=null&&!tempInsertedJson.get("AccountId").equals("")){accountItem.setAccountId(new Account(tempInsertedJson.getLong("AccountId")));} - if(tempInsertedJson.get("InOutItemId")!=null&&!tempInsertedJson.get("InOutItemId").equals("")){accountItem.setInOutItemId(new InOutItem(tempInsertedJson.getLong("InOutItemId")));} - if(tempInsertedJson.get("EachAmount")!=null){accountItem.setEachAmount(tempInsertedJson.getDouble("EachAmount"));} - accountItem.setRemark(tempInsertedJson.getString("Remark")); - accountItemService.create(accountItem); - } - } - if(null != deletedJson) - { - for(int i = 0;i < deletedJson.size(); i++) - { - JSONObject tempDeletedJson = JSONObject.fromObject(deletedJson.get(i)); - accountItemService.delete(tempDeletedJson.getLong("Id")); - } - } - if(null != updatedJson) - { - for(int i = 0;i < updatedJson.size(); i++) - { - JSONObject tempUpdatedJson = JSONObject.fromObject(updatedJson.get(i)); - AccountItem accountItem = accountItemService.get(tempUpdatedJson.getLong("Id")); - accountItem.setHeaderId(new AccountHead(headerId)); - if(tempUpdatedJson.get("AccountId")!=null&&!tempUpdatedJson.get("AccountId").equals("")){accountItem.setAccountId(new Account(tempUpdatedJson.getLong("AccountId")));} - if(tempUpdatedJson.get("InOutItemId")!=null&&!tempUpdatedJson.get("InOutItemId").equals("")){accountItem.setInOutItemId(new InOutItem(tempUpdatedJson.getLong("InOutItemId")));} - if(tempUpdatedJson.get("EachAmount")!=null){accountItem.setEachAmount(tempUpdatedJson.getDouble("EachAmount"));} - accountItem.setRemark(tempUpdatedJson.getString("Remark")); - accountItemService.create(accountItem); - } - } - - //========标识位=========== - flag = true; - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>保存财务明细信息异常", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>保存财务明细信息回写客户端结果异常", e); - } - } - - logService.create(new Logdetails(getUser(), "保存财务明细", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "保存财务明细对应主表编号为 "+ model.getHeaderId() + " " + tipMsg + "！", "保存财务明细" + tipMsg)); - Log.infoFileSync("==================结束调用保存财务明细方法saveDetials()==================="); - } - - - /** - * 查找财务信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getCondition()); - accountItemService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(AccountItem accountItem:dataList) - { - JSONObject item = new JSONObject(); - item.put("Id", accountItem.getId()); - item.put("AccountId", accountItem.getAccountId()==null?"":accountItem.getAccountId().getId()); - item.put("AccountName", accountItem.getAccountId()==null?"":accountItem.getAccountId().getName()); - item.put("InOutItemId", accountItem.getInOutItemId()==null?"":accountItem.getInOutItemId().getId()); - item.put("InOutItemName", accountItem.getInOutItemId()==null?"":accountItem.getInOutItemId().getName()); - item.put("EachAmount", accountItem.getEachAmount()); - item.put("Remark", accountItem.getRemark()); - item.put("op", 1); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找财务信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询财务信息结果异常", e); - } - } - - /** - * 拼接搜索条件 - * @return - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("HeaderId_n_eq", model.getHeaderId()); - condition.put("Id_s_order","asc"); - return condition; - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override - public AccountItemModel getModel() - { - return model; - } - public void setAccountItemService(AccountItemIService accountItemService) - { - this.accountItemService = accountItemService; - } -} diff --git a/src/com/jsh/action/materials/DepotHeadAction.java b/src/com/jsh/action/materials/DepotHeadAction.java deleted file mode 100644 index 427ce27b1..000000000 --- a/src/com/jsh/action/materials/DepotHeadAction.java +++ /dev/null @@ -1,374 +0,0 @@ -package com.jsh.action.materials; - -import java.io.IOException; -import java.sql.Timestamp; -import java.text.ParseException; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.springframework.dao.DataAccessException; -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.model.po.Account; -import com.jsh.model.po.Depot; -import com.jsh.model.po.DepotHead; -import com.jsh.model.po.Logdetails; -import com.jsh.model.po.Person; -import com.jsh.model.po.Supplier; -import com.jsh.model.vo.materials.DepotHeadModel; -import com.jsh.service.materials.DepotHeadIService; -import com.jsh.util.PageUtil; -import com.jsh.util.Tools; -/* - * 单据表头管理 - * @author jishenghua qq:752718920 -*/ -@SuppressWarnings("serial") -public class DepotHeadAction extends BaseAction -{ - private DepotHeadIService depotHeadService; - private DepotHeadModel model = new DepotHeadModel(); - - /* - * 获取MaxId - */ - @SuppressWarnings({ "rawtypes", "unchecked" }) - public String getMaxId() - { - Map mapData = model.getShowModel().getMap(); - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - try - { - depotHeadService.find(pageUtil,"maxId"); - mapData.put("depotHeadMax", pageUtil.getPageList()); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>查找最大的Id信息异常", e); - model.getShowModel().setMsgTip("exceptoin"); - } - return SUCCESS; - } - - /** - * 增加仓管通 - * @return - */ - public void create() - { - Log.infoFileSync("==================开始调用增加仓管通信息信息方法create()==================="); - Boolean flag = false; - try - { - DepotHead depotHead = new DepotHead(); - depotHead.setType(model.getType()); - depotHead.setSubType(model.getSubType()); - depotHead.setProjectId(new Depot(model.getProjectId())); - depotHead.setNumber(model.getNumber()); - depotHead.setOperPersonName(getUser().getUsername()); - depotHead.setCreateTime(new Timestamp(new Date().getTime())); - try - { - depotHead.setOperTime(new Timestamp(Tools.parse(model.getOperTime(), "yyyy-MM-dd").getTime())); - } - catch (ParseException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>解析购买日期格式异常", e); - } - if(model.getOrganId()!=null){depotHead.setOrganId(new Supplier(model.getOrganId()));} - if(model.getHandsPersonId()!=null){depotHead.setHandsPersonId(new Person(model.getHandsPersonId()));} - if(model.getAccountId()!=null){depotHead.setAccountId(new Account(model.getAccountId()));} - depotHead.setChangeAmount(model.getChangeAmount()); - if(model.getAllocationProjectId()!=null){depotHead.setAllocationProjectId(new Depot(model.getAllocationProjectId()));} - depotHead.setTotalPrice(model.getTotalPrice()); - depotHead.setRemark(model.getRemark()); - depotHeadService.create(depotHead); - - //========标识位=========== - flag = true; - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加仓管通信息异常", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>增加仓管通信息回写客户端结果异常", e); - } - } - - logService.create(new Logdetails(getUser(), "增加仓管通", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "增加仓管通编号为 "+ model.getNumber() + " " + tipMsg + "！", "增加仓管通" + tipMsg)); - Log.infoFileSync("==================结束调用增加仓管通方法create()==================="); - } - - /** - * 删除仓管通 - * @return - */ - public String delete() - { - Log.infoFileSync("====================开始调用删除仓管通信息方法delete()================"); - try - { - depotHeadService.delete(model.getDepotHeadID()); - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getDepotHeadID() + " 的仓管通异常", e); - tipMsg = "失败"; - tipType = 1; - } - model.getShowModel().setMsgTip(tipMsg); - logService.create(new Logdetails(getUser(), "删除仓管通", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "删除仓管通ID为 "+ model.getDepotHeadID() + " " + tipMsg + "！", "删除仓管通" + tipMsg)); - Log.infoFileSync("====================结束调用删除仓管通信息方法delete()================"); - return SUCCESS; - } - - /** - * 更新仓管通 - * @return - */ - public void update() - { - Boolean flag = false; - try - { - DepotHead depotHead = depotHeadService.get(model.getDepotHeadID()); - depotHead.setType(model.getType()); - depotHead.setSubType(model.getSubType()); - depotHead.setProjectId(new Depot(model.getProjectId())); - depotHead.setNumber(model.getNumber()); - depotHead.setOperPersonName(getUser().getUsername()); - try - { - depotHead.setOperTime(new Timestamp(Tools.parse(model.getOperTime(), "yyyy-MM-dd").getTime())); - } - catch (ParseException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>解析入库时间格式异常", e); - } - if(model.getOrganId()!=null){depotHead.setOrganId(new Supplier(model.getOrganId()));} - if(model.getHandsPersonId()!=null){depotHead.setHandsPersonId(new Person(model.getHandsPersonId()));} - if(model.getAccountId()!=null){depotHead.setAccountId(new Account(model.getAccountId()));} - depotHead.setChangeAmount(model.getChangeAmount()); - if(model.getAllocationProjectId()!=null){depotHead.setAllocationProjectId(new Depot(model.getAllocationProjectId()));} - depotHead.setTotalPrice(model.getTotalPrice()); - depotHead.setRemark(model.getRemark()); - depotHeadService.update(depotHead); - - flag = true; - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改仓管通ID为 ： " + model.getDepotHeadID() + "信息失败", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>修改仓管通回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新仓管通", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新仓管通ID为 "+ model.getDepotHeadID() + " " + tipMsg + "！", "更新仓管通" + tipMsg)); - } - - /** - * 批量删除指定ID仓管通 - * @return - */ - public String batchDelete() - { - try - { - depotHeadService.batchDelete(model.getDepotHeadIDs()); - model.getShowModel().setMsgTip("成功"); - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>批量删除仓管通ID为：" + model.getDepotHeadIDs() + "信息异常", e); - tipMsg = "失败"; - tipType = 1; - } - - logService.create(new Logdetails(getUser(), "批量删除仓管通", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "批量删除仓管通ID为 "+ model.getDepotHeadIDs() + " " + tipMsg + "！", "批量删除仓管通" + tipMsg)); - return SUCCESS; - } - - /** - * 查找仓管通信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getCondition()); - depotHeadService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(DepotHead depotHead:dataList) - { - JSONObject item = new JSONObject(); - item.put("Id", depotHead.getId()); - item.put("ProjectId", depotHead.getProjectId()==null?"":depotHead.getProjectId().getId()); - item.put("ProjectName", depotHead.getProjectId()==null?"":depotHead.getProjectId().getName()); - item.put("Number", depotHead.getNumber()); - item.put("OperPersonName", depotHead.getOperPersonName()); - item.put("CreateTime", Tools.getCurrentMonth(depotHead.getCreateTime())); - item.put("OperTime", Tools.getCurrentMonth(depotHead.getOperTime())); - item.put("OrganId", depotHead.getOrganId()==null?"":depotHead.getOrganId().getId()); - item.put("OrganName", depotHead.getOrganId()==null?"":depotHead.getOrganId().getSupplier()); - item.put("HandsPersonId", depotHead.getHandsPersonId()==null?"":depotHead.getHandsPersonId().getId()); - item.put("HandsPersonName", depotHead.getHandsPersonId()==null?"":depotHead.getHandsPersonId().getName()); - item.put("AccountId", depotHead.getAccountId()==null?"":depotHead.getAccountId().getId()); - item.put("AccountName", depotHead.getAccountId()==null?"":depotHead.getAccountId().getName()); - item.put("ChangeAmount", depotHead.getChangeAmount()==null?"":Math.abs(depotHead.getChangeAmount())); - item.put("AllocationProjectId", depotHead.getAllocationProjectId()==null?"":depotHead.getAllocationProjectId().getId()); - item.put("AllocationProjectName", depotHead.getAllocationProjectId()==null?"":depotHead.getAllocationProjectId().getName()); - item.put("TotalPrice", depotHead.getTotalPrice()==null?"":Math.abs(depotHead.getTotalPrice())); - item.put("Remark", depotHead.getRemark()); - item.put("op", 1); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓管通信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓管通信息结果异常", e); - } - } - - /** - * 查找进销存_根据月份(报表) - * @return - */ - public void findByMonth() { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(1000); - pageUtil.setCurPage(1); - pageUtil.setAdvSearch(getConditionHead()); - depotHeadService.find(pageUtil); - List dataList = pageUtil.getPageList(); - JSONObject outer = new JSONObject(); - String headId = ""; - if(null != dataList) - { - for(DepotHead depotHead:dataList) - { - headId = headId + depotHead.getId() + ","; - } - } - if(headId!="") { - headId = headId.substring(0, headId.lastIndexOf(",")); - } - outer.put("HeadIds", headId); - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓管通信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓管通信息结果异常", e); - } - } - - /** - * 拼接搜索条件 - * @return - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - if(model.getAllocationProjectId()!=null) - {condition.put("AllocationProjectId_n_eq", model.getAllocationProjectId());} - if(model.getProjectId()!=null) - {condition.put("ProjectId_n_eq", model.getProjectId());} - condition.put("Type_s_eq",model.getType()); - condition.put("SubType_s_eq",model.getSubType()); - condition.put("Number_s_like",model.getNumber()); - condition.put("OperTime_s_gteq",model.getBeginTime()); - condition.put("OperTime_s_lteq",model.getEndTime()); - condition.put("Id_s_order","desc"); - return condition; - } - - private Map getConditionHead() - { - Map condition = new HashMap(); - condition.put("OperTime_s_lteq",model.getMonthTime() + "-31 00:00:00"); - return condition; - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override - public DepotHeadModel getModel() - { - return model; - } - public void setDepotHeadService(DepotHeadIService depotHeadService) - { - this.depotHeadService = depotHeadService; - } -} diff --git a/src/com/jsh/action/materials/DepotItemAction.java b/src/com/jsh/action/materials/DepotItemAction.java deleted file mode 100644 index 83d951a23..000000000 --- a/src/com/jsh/action/materials/DepotItemAction.java +++ /dev/null @@ -1,542 +0,0 @@ -package com.jsh.action.materials; - -import java.io.File; -import java.io.IOException; -import java.sql.Timestamp; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletResponse; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.springframework.dao.DataAccessException; -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.util.AssetConstants; -import com.jsh.util.JshException; -import com.jsh.model.po.Asset; -import com.jsh.model.po.DepotHead; -import com.jsh.model.po.DepotItem; -import com.jsh.model.po.Logdetails; -import com.jsh.model.po.Material; -import com.jsh.model.vo.materials.DepotItemModel; -import com.jsh.service.materials.DepotHeadIService; -import com.jsh.service.materials.DepotItemIService; -import com.jsh.util.PageUtil; -import com.jsh.util.Tools; -/* - * 单据明细管理 - * @author jishenghua qq:752718920 -*/ -@SuppressWarnings("serial") -public class DepotItemAction extends BaseAction -{ - private DepotItemIService depotItemService; - private DepotItemModel model = new DepotItemModel(); - /** - * action返回excel结果 - */ - public static final String EXCEL = "excel"; - - /** - * 保存明细 - * @return - */ - public void saveDetials() - { - Log.infoFileSync("==================开始调用保存仓管通明细信息方法saveDetials()==================="); - Boolean flag = false; - try - { - Long headerId=model.getHeaderId(); - String inserted=model.getInserted(); - String deleted=model.getDeleted(); - String updated=model.getUpdated(); - //转为json - JSONArray insertedJson = JSONArray.fromObject(inserted); - JSONArray deletedJson = JSONArray.fromObject(deleted); - JSONArray updatedJson = JSONArray.fromObject(updated); - if(null != insertedJson) - { - for(int i = 0;i < insertedJson.size(); i++) - { - DepotItem depotItem = new DepotItem(); - JSONObject tempInsertedJson = JSONObject.fromObject(insertedJson.get(i)); - depotItem.setHeaderId(new DepotHead(headerId)); - depotItem.setMaterialId(new Material(tempInsertedJson.getLong("MaterialId"))); - depotItem.setOperNumber(tempInsertedJson.getDouble("OperNumber")); - if(tempInsertedJson.get("UnitPrice")!=null){depotItem.setUnitPrice(tempInsertedJson.getDouble("UnitPrice"));} - if(tempInsertedJson.get("AllPrice")!=null){depotItem.setAllPrice(tempInsertedJson.getDouble("AllPrice"));} - depotItem.setRemark(tempInsertedJson.getString("Remark")); - depotItemService.create(depotItem); - } - } - if(null != deletedJson) - { - for(int i = 0;i < deletedJson.size(); i++) - { - JSONObject tempDeletedJson = JSONObject.fromObject(deletedJson.get(i)); - depotItemService.delete(tempDeletedJson.getLong("Id")); - } - } - if(null != updatedJson) - { - for(int i = 0;i < updatedJson.size(); i++) - { - JSONObject tempUpdatedJson = JSONObject.fromObject(updatedJson.get(i)); - DepotItem depotItem = depotItemService.get(tempUpdatedJson.getLong("Id")); - depotItem.setMaterialId(new Material(tempUpdatedJson.getLong("MaterialId"))); - depotItem.setOperNumber(tempUpdatedJson.getDouble("OperNumber")); - if(tempUpdatedJson.get("UnitPrice")!=null){depotItem.setUnitPrice(tempUpdatedJson.getDouble("UnitPrice"));} - if(tempUpdatedJson.get("AllPrice")!=null){depotItem.setAllPrice(tempUpdatedJson.getDouble("AllPrice"));} - depotItem.setRemark(tempUpdatedJson.getString("Remark")); - depotItemService.create(depotItem); - } - } - - //========标识位=========== - flag = true; - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>保存仓管通明细信息异常", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>保存仓管通明细信息回写客户端结果异常", e); - } - } - - logService.create(new Logdetails(getUser(), "保存仓管通明细", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "保存仓管通明细对应主表编号为 "+ model.getHeaderId() + " " + tipMsg + "！", "保存仓管通明细" + tipMsg)); - Log.infoFileSync("==================结束调用保存仓管通明细方法saveDetials()==================="); - } - - - /** - * 查找仓管通信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getCondition()); - depotItemService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(DepotItem depotItem:dataList) - { - JSONObject item = new JSONObject(); - item.put("Id", depotItem.getId()); - item.put("MaterialId", depotItem.getMaterialId()==null?"":depotItem.getMaterialId().getId()); - String MaterialName = ((depotItem.getMaterialId().getModel().equals(""))?"":""+depotItem.getMaterialId().getModel())+" "+depotItem.getMaterialId().getName() - +((depotItem.getMaterialId().getColor() == null)?"(":"("+depotItem.getMaterialId().getColor()) + ")" - +((depotItem.getMaterialId().getUnit() == null)?"(":"("+depotItem.getMaterialId().getUnit()) + ")"; - item.put("MaterialName", MaterialName); - item.put("OperNumber", depotItem.getOperNumber()); - item.put("UnitPrice", depotItem.getUnitPrice()); - item.put("AllPrice", depotItem.getAllPrice()); - item.put("Remark", depotItem.getRemark()); - item.put("Img", depotItem.getImg()); - item.put("op", 1); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓管通信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓管通信息结果异常", e); - } - } - - /** - * 查找进销存 - * @return - */ - public void findByAll() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getConditionALL()); - depotItemService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(DepotItem depotItem:dataList) - { - JSONObject item = new JSONObject(); - Integer prevSum = sumNumber("入库",depotItem.getMaterialId().getId(),model.getMonthTime(),true) - sumNumber("出库",depotItem.getMaterialId().getId(),model.getMonthTime(),true); - Integer InSum = sumNumber("入库",depotItem.getMaterialId().getId(),model.getMonthTime(),false); - Integer OutSum = sumNumber("出库",depotItem.getMaterialId().getId(),model.getMonthTime(),false); - item.put("Id", depotItem.getId()); - item.put("MaterialId", depotItem.getMaterialId()==null?"":depotItem.getMaterialId().getId()); - item.put("MaterialName", depotItem.getMaterialId().getName()); - item.put("MaterialModel", depotItem.getMaterialId().getModel()); - item.put("MaterialColor", depotItem.getMaterialId().getColor()); - item.put("prevSum", prevSum); - item.put("InSum", InSum); - item.put("OutSum", OutSum); - item.put("thisSum", prevSum + InSum - OutSum); - item.put("thisAllPrice", depotItem.getUnitPrice() * (prevSum + InSum - OutSum)); - item.put("UnitPrice", depotItem.getUnitPrice()); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e); - } - } - /** - * 进货统计 - * @return - */ - public void buyIn() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getConditionALL()); - depotItemService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(DepotItem depotItem:dataList) - { - JSONObject item = new JSONObject(); - Integer InSum = sumNumberBuyOrSale("入库","采购",depotItem.getMaterialId().getId(),model.getMonthTime()); - Integer OutSum = sumNumberBuyOrSale("出库","采购退货",depotItem.getMaterialId().getId(),model.getMonthTime()); - Double InSumPrice = sumPriceBuyOrSale("入库","采购",depotItem.getMaterialId().getId(),model.getMonthTime()); - Double OutSumPrice = sumPriceBuyOrSale("出库","采购退货",depotItem.getMaterialId().getId(),model.getMonthTime()); - item.put("Id", depotItem.getId()); - item.put("MaterialId", depotItem.getMaterialId()==null?"":depotItem.getMaterialId().getId()); - item.put("MaterialName", depotItem.getMaterialId().getName()); - item.put("MaterialModel", depotItem.getMaterialId().getModel()); - item.put("MaterialColor", depotItem.getMaterialId().getColor()); - item.put("InSum", InSum); - item.put("OutSum", OutSum); - item.put("InSumPrice", InSumPrice); - item.put("OutSumPrice", OutSumPrice); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e); - } - } - /** - * 销售统计 - * @return - */ - public void saleOut() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getConditionALL()); - depotItemService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(DepotItem depotItem:dataList) - { - JSONObject item = new JSONObject(); - Integer OutSum = sumNumberBuyOrSale("出库","销售",depotItem.getMaterialId().getId(),model.getMonthTime()); - Integer InSum = sumNumberBuyOrSale("入库","销售退货",depotItem.getMaterialId().getId(),model.getMonthTime()); - Double OutSumPrice = sumPriceBuyOrSale("出库","销售",depotItem.getMaterialId().getId(),model.getMonthTime()); - Double InSumPrice = sumPriceBuyOrSale("入库","销售退货",depotItem.getMaterialId().getId(),model.getMonthTime()); - item.put("Id", depotItem.getId()); - item.put("MaterialId", depotItem.getMaterialId()==null?"":depotItem.getMaterialId().getId()); - item.put("MaterialName", depotItem.getMaterialId().getName()); - item.put("MaterialModel", depotItem.getMaterialId().getModel()); - item.put("MaterialColor", depotItem.getMaterialId().getColor()); - item.put("OutSum", OutSum); - item.put("InSum", InSum); - item.put("OutSumPrice", OutSumPrice); - item.put("InSumPrice", InSumPrice); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e); - } - } - /** - * 统计总计金额 - * @return - */ - public void totalCountMoney() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - pageUtil.setAdvSearch(getConditionALL()); - depotItemService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - JSONObject outer = new JSONObject(); - Double thisAllPrice = 0.0; - if(null != dataList) - { - for(DepotItem depotItem:dataList) - { - Integer prevSum = sumNumber("入库",depotItem.getMaterialId().getId(),model.getMonthTime(),true) - sumNumber("出库",depotItem.getMaterialId().getId(),model.getMonthTime(),true); - Integer InSum = sumNumber("入库",depotItem.getMaterialId().getId(),model.getMonthTime(),false); - Integer OutSum = sumNumber("出库",depotItem.getMaterialId().getId(),model.getMonthTime(),false); - thisAllPrice = thisAllPrice + depotItem.getUnitPrice() * (prevSum + InSum - OutSum); - } - } - outer.put("totalCount", thisAllPrice); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e); - } - } - - /** - * 导出excel表格 - * @return - */ - @SuppressWarnings("unchecked") - public String exportExcel() - { - Log.infoFileSync("===================调用导出信息action方法exportExcel开始======================="); - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getConditionALL()); - depotItemService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(DepotItem depotItem:dataList) - { - JSONObject item = new JSONObject(); - Integer prevSum = sumNumber("入库",depotItem.getMaterialId().getId(),model.getMonthTime(),true) - sumNumber("出库",depotItem.getMaterialId().getId(),model.getMonthTime(),true); - Integer InSum = sumNumber("入库",depotItem.getMaterialId().getId(),model.getMonthTime(),false); - Integer OutSum = sumNumber("出库",depotItem.getMaterialId().getId(),model.getMonthTime(),false); - item.put("Id", depotItem.getId()); - item.put("MaterialId", depotItem.getMaterialId()==null?"":depotItem.getMaterialId().getId()); - item.put("MaterialName", depotItem.getMaterialId().getName()); - item.put("MaterialModel", depotItem.getMaterialId().getModel()); - item.put("MaterialColor", depotItem.getMaterialId().getColor()); - item.put("prevSum", prevSum); - item.put("InSum", InSum); - item.put("OutSum", OutSum); - item.put("thisSum", prevSum + InSum - OutSum); - item.put("thisAllPrice", depotItem.getUnitPrice() * (prevSum + InSum - OutSum)); - item.put("UnitPrice", depotItem.getUnitPrice()); - dataArray.add(item); - } - } - String isCurrentPage = "allPage"; - model.setFileName(Tools.changeUnicode("report.xls",model.getBrowserType())); - model.setExcelStream(depotItemService.exmportExcel(isCurrentPage,dataArray)); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>>>>调用导出信息action方法exportExcel异常",e); - model.getShowModel().setMsgTip("export excel exception"); - } - Log.infoFileSync("===================调用导出信息action方法exportExcel结束=================="); - return EXCEL; - } - - @SuppressWarnings("unchecked") - public Integer sumNumber(String type,Long MId,String MonthTime, Boolean isPrev) { - Integer sumNumber = 0; - String allNumber = ""; - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - try { - depotItemService.findByType(pageUtil, type, MId, MonthTime, isPrev); - allNumber = pageUtil.getPageList().toString(); - allNumber = allNumber.substring(1,allNumber.length()-1); - if(allNumber.equals("null")){ - allNumber = "0"; - } - allNumber = allNumber.replace(".0", ""); - } catch (JshException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - sumNumber = Integer.parseInt(allNumber); - return sumNumber; - } - @SuppressWarnings("unchecked") - public Integer sumNumberBuyOrSale(String type,String subType,Long MId,String MonthTime) { - Integer sumNumber = 0; - String allNumber = ""; - String sumType = "Number"; - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - try { - depotItemService.buyOrSale(pageUtil, type, subType, MId, MonthTime, sumType); - allNumber = pageUtil.getPageList().toString(); - allNumber = allNumber.substring(1,allNumber.length()-1); - if(allNumber.equals("null")){ - allNumber = "0"; - } - allNumber = allNumber.replace(".0", ""); - } catch (JshException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - sumNumber = Integer.parseInt(allNumber); - return sumNumber; - } - @SuppressWarnings("unchecked") - public Double sumPriceBuyOrSale(String type,String subType,Long MId,String MonthTime) { - Double sumPrice = 0.0; - String allPrice = ""; - String sumType = "Price"; - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - try { - depotItemService.buyOrSale(pageUtil, type, subType, MId, MonthTime, sumType); - allPrice = pageUtil.getPageList().toString(); - allPrice = allPrice.substring(1,allPrice.length()-1); - if(allPrice.equals("null")){ - allPrice = "0"; - } - allPrice = allPrice.replace(".0", ""); - } catch (JshException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - sumPrice = Double.parseDouble(allPrice); - return sumPrice; - } - /** - * 拼接搜索条件 - * @return - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("HeaderId_n_eq", model.getHeaderId()); - condition.put("Id_s_order","asc"); - return condition; - } - - private Map getConditionALL() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("HeaderId_s_in", model.getHeadIds()); - condition.put("MaterialId_s_in", model.getMaterialIds()); - condition.put("MaterialId_s_gb","aaa"); - return condition; - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override - public DepotItemModel getModel() - { - return model; - } - public void setDepotItemService(DepotItemIService depotItemService) - { - this.depotItemService = depotItemService; - } -} diff --git a/src/com/jsh/action/materials/MaterialAction.java b/src/com/jsh/action/materials/MaterialAction.java deleted file mode 100644 index 4c1d034a1..000000000 --- a/src/com/jsh/action/materials/MaterialAction.java +++ /dev/null @@ -1,402 +0,0 @@ -package com.jsh.action.materials; - -import java.io.IOException; -import java.sql.Timestamp; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.springframework.dao.DataAccessException; -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.model.po.DepotHead; -import com.jsh.model.po.Material; -import com.jsh.model.po.Logdetails; -import com.jsh.model.po.MaterialCategory; -import com.jsh.model.po.Supplier; -import com.jsh.model.vo.materials.MaterialModel; -import com.jsh.service.materials.MaterialIService; -import com.jsh.util.PageUtil; -/* - * 商品管理 - * @author jishenghua qq:752718920 -*/ -@SuppressWarnings("serial") -public class MaterialAction extends BaseAction -{ - private MaterialIService materialService; - private MaterialModel model = new MaterialModel(); - - /** - * 增加商品 - * @return - */ - public void create() - { - Log.infoFileSync("==================开始调用增加商品信息方法create()==================="); - Boolean flag = false; - try - { - Material material = new Material(); - material.setMaterialCategory(new MaterialCategory(model.getCategoryId())); - - material.setName(model.getName()); - material.setModel(model.getModel()); - material.setColor(model.getColor()); - material.setUnit(model.getUnit()); - material.setRetailPrice(model.getRetailPrice()); - material.setLowPrice(model.getLowPrice()); - material.setPresetPriceOne(model.getPresetPriceOne()); - material.setPresetPriceTwo(model.getPresetPriceTwo()); - material.setRemark(model.getRemark()); - materialService.create(material); - - //========标识位=========== - flag = true; - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加商品信息异常", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>增加商品信息回写客户端结果异常", e); - } - } - - logService.create(new Logdetails(getUser(), "增加商品", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "增加商品名称为 "+ model.getName() + " " + tipMsg + "！", "增加商品" + tipMsg)); - Log.infoFileSync("==================结束调用增加商品方法create()==================="); - } - - /** - * 删除商品 - * @return - */ - public String delete() - { - Log.infoFileSync("====================开始调用删除商品信息方法delete()================"); - try - { - materialService.delete(model.getMaterialID()); - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getMaterialID() + " 的商品异常", e); - tipMsg = "失败"; - tipType = 1; - } - model.getShowModel().setMsgTip(tipMsg); - logService.create(new Logdetails(getUser(), "删除商品", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "删除商品ID为 "+ model.getMaterialID() + " " + tipMsg + "！", "删除商品" + tipMsg)); - Log.infoFileSync("====================结束调用删除商品信息方法delete()================"); - return SUCCESS; - } - - /** - * 更新商品 - * @return - */ - public void update() - { - Boolean flag = false; - try - { - Material material = materialService.get(model.getMaterialID()); - material.setMaterialCategory(new MaterialCategory(model.getCategoryId())); - - material.setName(model.getName()); - material.setModel(model.getModel()); - material.setColor(model.getColor()); - material.setUnit(model.getUnit()); - material.setRetailPrice(model.getRetailPrice()); - material.setLowPrice(model.getLowPrice()); - material.setPresetPriceOne(model.getPresetPriceOne()); - material.setPresetPriceTwo(model.getPresetPriceTwo()); - material.setRemark(model.getRemark()); - material.setName(model.getName()); - materialService.update(material); - - flag = true; - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改商品ID为 ： " + model.getMaterialID() + "信息失败", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>修改商品回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新商品", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新商品ID为 "+ model.getMaterialID() + " " + tipMsg + "！", "更新商品" + tipMsg)); - } - - /** - * 批量删除指定ID商品 - * @return - */ - public String batchDelete() - { - try - { - materialService.batchDelete(model.getMaterialIDs()); - model.getShowModel().setMsgTip("成功"); - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>批量删除商品ID为：" + model.getMaterialIDs() + "信息异常", e); - tipMsg = "失败"; - tipType = 1; - } - - logService.create(new Logdetails(getUser(), "批量删除商品", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "批量删除商品ID为 "+ model.getMaterialIDs() + " " + tipMsg + "！", "批量删除商品" + tipMsg)); - return SUCCESS; - } - - /** - * 查找商品信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - Long lei=model.getCategoryId(); - if(1==lei) //判断值还真不能用String类型的判断 - { - pageUtil.setAdvSearch(getCondition_all()); - } - else if(1!=lei) - { - pageUtil.setAdvSearch(getCondition()); - } - materialService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Material material:dataList) - { - JSONObject item = new JSONObject(); - item.put("Id", material.getId()); - item.put("Name", material.getName()); - item.put("Model", material.getModel()); - item.put("Color", material.getColor()); - item.put("Unit", material.getUnit()); - item.put("RetailPrice", material.getRetailPrice()); - item.put("LowPrice", material.getLowPrice()); - item.put("PresetPriceOne", material.getPresetPriceOne()); - item.put("PresetPriceTwo", material.getPresetPriceTwo()); - item.put("Remark", material.getRemark()); - item.put("op", 1); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找商品信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询商品信息结果异常", e); - } - } - - /** - * 查找商品信息-下拉框 - * @return - */ - public void findBySelect() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - pageUtil.setAdvSearch(getCondition_Select()); - materialService.find(pageUtil); - List dataList = pageUtil.getPageList(); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Material material:dataList) - { - JSONObject item = new JSONObject(); - item.put("Id", material.getId()); - //名称 - String MaterialName = ((material.getModel().equals(""))?"":""+material.getModel()) +" "+ material.getName() - + ((material.getColor() == null)?"":"("+material.getColor() + ")") - + ((material.getUnit() == null)?"":"("+material.getUnit() + ")"); - item.put("MaterialName", MaterialName); - dataArray.add(item); - } - } - //回写查询结果 - toClient(dataArray.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>查找供应商信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e); - } - } - - /** - * 查找商品信息-统计排序 - * @return - */ - public void findByOrder() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - pageUtil.setAdvSearch(getCondition_Order()); - materialService.find(pageUtil); - List dataList = pageUtil.getPageList(); - //存放数据json数组 - JSONObject outer = new JSONObject(); - String mId = ""; - if(null != dataList) - { - for(Material material:dataList) - { - mId = mId + material.getId() + ","; - } - } - if(mId!="") { - mId = mId.substring(0, mId.lastIndexOf(",")); - } - outer.put("mIds", mId); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>查找供应商信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>回写查询供应商信息结果异常", e); - } - } - - /** - * 拼接搜索条件(查全部) - * @return - */ - private Map getCondition_all() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("Id_s_order", "asc"); - return condition; - } - - /** - * 拼接搜索条件 - * @return - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("CategoryId_s_in", model.getCategoryIds()); - condition.put("Id_s_order", "asc"); - return condition; - } - - /** - * 拼接搜索条件-下拉框 - * @return - */ - private Map getCondition_Select() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("Id_s_order", "asc"); - return condition; - } - - /** - * 拼接搜索条件-下拉框 - * @return - */ - private Map getCondition_Order() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("Name,Model_s_order", "asc"); - return condition; - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override - public MaterialModel getModel() - { - return model; - } - public void setMaterialService(MaterialIService materialService) - { - this.materialService = materialService; - } -} diff --git a/src/com/jsh/action/materials/MaterialCategoryAction.java b/src/com/jsh/action/materials/MaterialCategoryAction.java deleted file mode 100644 index 938154d04..000000000 --- a/src/com/jsh/action/materials/MaterialCategoryAction.java +++ /dev/null @@ -1,275 +0,0 @@ -package com.jsh.action.materials; - -import java.io.IOException; -import java.sql.Timestamp; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.springframework.dao.DataAccessException; -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.model.po.MaterialCategory; -import com.jsh.model.po.Logdetails; -import com.jsh.model.vo.materials.MaterialCategoryModel; -import com.jsh.service.materials.MaterialCategoryIService; -import com.jsh.util.PageUtil; -/* - * 商品类型管理 - * @author jishenghua qq:752718920 -*/ -@SuppressWarnings("serial") -public class MaterialCategoryAction extends BaseAction -{ - private MaterialCategoryIService materialCategoryService; - private MaterialCategoryModel model = new MaterialCategoryModel(); - - - @SuppressWarnings({ "rawtypes", "unchecked" }) - public String getBasicData() - { - Map mapData = model.getShowModel().getMap(); - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - try - { - Map condition = pageUtil.getAdvSearch(); - condition.put("ParentId_n_eq", model.getParentId()); - condition.put("Id_n_neq", 1); - condition.put("Id_s_order", "asc"); - materialCategoryService.find(pageUtil); - mapData.put("materialCategoryList", pageUtil.getPageList()); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>查找商品类别信息异常", e); - model.getShowModel().setMsgTip("exceptoin"); - } - return SUCCESS; - } - - /** - * 增加商品类别 - * @return - */ - public void create() - { - Log.infoFileSync("==================开始调用增加商品类别信息方法create()==================="); - Boolean flag = false; - try - { - MaterialCategory materialCategory = new MaterialCategory(); - materialCategory.setMaterialCategory(new MaterialCategory(model.getParentId())); - - materialCategory.setCategoryLevel(model.getCategoryLevel()); - materialCategory.setName(model.getName()); - materialCategoryService.create(materialCategory); - - //========标识位=========== - flag = true; - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加商品类别信息异常", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>增加商品类别信息回写客户端结果异常", e); - } - } - - logService.create(new Logdetails(getUser(), "增加商品类别", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "增加商品类别名称为 "+ model.getName() + " " + tipMsg + "！", "增加商品类别" + tipMsg)); - Log.infoFileSync("==================结束调用增加商品类别方法create()==================="); - } - - /** - * 删除商品类别 - * @return - */ - public String delete() - { - Log.infoFileSync("====================开始调用删除商品类别信息方法delete()================"); - try - { - materialCategoryService.delete(model.getMaterialCategoryID()); - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getMaterialCategoryID() + " 的商品类别异常", e); - tipMsg = "失败"; - tipType = 1; - } - model.getShowModel().setMsgTip(tipMsg); - logService.create(new Logdetails(getUser(), "删除商品类别", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "删除商品类别ID为 "+ model.getMaterialCategoryID() + " " + tipMsg + "！", "删除商品类别" + tipMsg)); - Log.infoFileSync("====================结束调用删除商品类别信息方法delete()================"); - return SUCCESS; - } - - /** - * 更新商品类别 - * @return - */ - public void update() - { - Boolean flag = false; - try - { - MaterialCategory materialCategory = materialCategoryService.get(model.getMaterialCategoryID()); - materialCategory.setMaterialCategory(new MaterialCategory(model.getParentId())); - - materialCategory.setCategoryLevel(model.getCategoryLevel()); - materialCategory.setName(model.getName()); - materialCategoryService.update(materialCategory); - - flag = true; - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改商品类别ID为 ： " + model.getMaterialCategoryID() + "信息失败", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>修改商品类别回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新商品类别", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新商品类别ID为 "+ model.getMaterialCategoryID() + " " + tipMsg + "！", "更新商品类别" + tipMsg)); - } - - /** - * 批量删除指定ID商品类别 - * @return - */ - public String batchDelete() - { - try - { - materialCategoryService.batchDelete(model.getMaterialCategoryIDs()); - model.getShowModel().setMsgTip("成功"); - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>批量删除商品类别ID为：" + model.getMaterialCategoryIDs() + "信息异常", e); - tipMsg = "失败"; - tipType = 1; - } - - logService.create(new Logdetails(getUser(), "批量删除商品类别", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "批量删除商品类别ID为 "+ model.getMaterialCategoryIDs() + " " + tipMsg + "！", "批量删除商品类别" + tipMsg)); - return SUCCESS; - } - - /** - * 查找商品类别信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getCondition()); - materialCategoryService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - //开始拼接json数据 -// {"total":28,"rows":[ -// {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"} -// ]} - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(MaterialCategory materialCategory:dataList) - { - JSONObject item = new JSONObject(); - item.put("Id", materialCategory.getId()); - item.put("ParentId", materialCategory.getMaterialCategory().getId()); - item.put("ParentName", materialCategory.getMaterialCategory().getName()); - item.put("CategoryLevel", materialCategory.getCategoryLevel()); - item.put("Name", materialCategory.getName()); - item.put("op", 1); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找商品类别信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询商品类别信息结果异常", e); - } - } - - /** - * 拼接搜索条件 - * @return - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("ParentId_n_eq", model.getParentId()); - condition.put("Id_n_neq", 1); - condition.put("Id_s_order", "asc"); - return condition; - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override - public MaterialCategoryModel getModel() - { - return model; - } - public void setMaterialCategoryService(MaterialCategoryIService materialCategoryService) - { - this.materialCategoryService = materialCategoryService; - } -} diff --git a/src/com/jsh/action/materials/PersonAction.java b/src/com/jsh/action/materials/PersonAction.java deleted file mode 100644 index 94e9d9843..000000000 --- a/src/com/jsh/action/materials/PersonAction.java +++ /dev/null @@ -1,287 +0,0 @@ -package com.jsh.action.materials; - -import java.io.IOException; -import java.sql.Timestamp; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.springframework.dao.DataAccessException; -import com.jsh.base.BaseAction; -import com.jsh.base.Log; -import com.jsh.model.po.Depot; -import com.jsh.model.po.Person; -import com.jsh.model.po.Logdetails; -import com.jsh.model.vo.materials.PersonModel; -import com.jsh.service.materials.PersonIService; -import com.jsh.util.PageUtil; -/* - * 经手人管理 - * @author jishenghua qq:752718920 -*/ -@SuppressWarnings("serial") -public class PersonAction extends BaseAction -{ - private PersonIService personService; - private PersonModel model = new PersonModel(); - - @SuppressWarnings({ "rawtypes", "unchecked" }) - public String getBasicData() - { - Map mapData = model.getShowModel().getMap(); - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - try - { - Map condition = pageUtil.getAdvSearch(); - condition.put("Id_s_order", "asc"); - personService.find(pageUtil); - mapData.put("personList", pageUtil.getPageList()); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>查找系统基础数据信息异常", e); - model.getShowModel().setMsgTip("exceptoin"); - } - return SUCCESS; - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - public String getPersonByType() - { - Map mapData = model.getShowModel().getMap(); - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - try - { - Map condition = pageUtil.getAdvSearch(); - condition.put("Type_s_eq", model.getType()); - condition.put("Id_s_order", "asc"); - personService.find(pageUtil); - mapData.put("personList", pageUtil.getPageList()); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>查找系统基础数据信息异常", e); - model.getShowModel().setMsgTip("exceptoin"); - } - return SUCCESS; - } - - /** - * 增加经手人 - * @return - */ - public void create() - { - Log.infoFileSync("==================开始调用增加经手人信息方法create()==================="); - Boolean flag = false; - try - { - Person person = new Person(); - - person.setType(model.getType()); - person.setName(model.getName()); - personService.create(person); - - //========标识位=========== - flag = true; - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加经手人信息异常", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>增加经手人信息回写客户端结果异常", e); - } - } - - logService.create(new Logdetails(getUser(), "增加经手人", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "增加经手人名称为 "+ model.getName() + " " + tipMsg + "！", "增加经手人" + tipMsg)); - Log.infoFileSync("==================结束调用增加经手人方法create()==================="); - } - - /** - * 删除经手人 - * @return - */ - public String delete() - { - Log.infoFileSync("====================开始调用删除经手人信息方法delete()================"); - try - { - personService.delete(model.getPersonID()); - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getPersonID() + " 的经手人异常", e); - tipMsg = "失败"; - tipType = 1; - } - model.getShowModel().setMsgTip(tipMsg); - logService.create(new Logdetails(getUser(), "删除经手人", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "删除经手人ID为 "+ model.getPersonID() + " " + tipMsg + "！", "删除经手人" + tipMsg)); - Log.infoFileSync("====================结束调用删除经手人信息方法delete()================"); - return SUCCESS; - } - - /** - * 更新经手人 - * @return - */ - public void update() - { - Boolean flag = false; - try - { - Person person = personService.get(model.getPersonID()); - - person.setType(model.getType()); - person.setName(model.getName()); - personService.update(person); - - flag = true; - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>修改经手人ID为 ： " + model.getPersonID() + "信息失败", e); - flag = false; - tipMsg = "失败"; - tipType = 1; - } - finally - { - try - { - toClient(flag.toString()); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>修改经手人回写客户端结果异常", e); - } - } - logService.create(new Logdetails(getUser(), "更新经手人", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "更新经手人ID为 "+ model.getPersonID() + " " + tipMsg + "！", "更新经手人" + tipMsg)); - } - - /** - * 批量删除指定ID经手人 - * @return - */ - public String batchDelete() - { - try - { - personService.batchDelete(model.getPersonIDs()); - model.getShowModel().setMsgTip("成功"); - //记录操作日志使用 - tipMsg = "成功"; - tipType = 0; - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>批量删除经手人ID为：" + model.getPersonIDs() + "信息异常", e); - tipMsg = "失败"; - tipType = 1; - } - - logService.create(new Logdetails(getUser(), "批量删除经手人", model.getClientIp(), - new Timestamp(System.currentTimeMillis()) - , tipType, "批量删除经手人ID为 "+ model.getPersonIDs() + " " + tipMsg + "！", "批量删除经手人" + tipMsg)); - return SUCCESS; - } - - /** - * 查找经手人信息 - * @return - */ - public void findBy() - { - try - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(model.getPageSize()); - pageUtil.setCurPage(model.getPageNo()); - pageUtil.setAdvSearch(getCondition()); - personService.find(pageUtil); - List dataList = pageUtil.getPageList(); - - JSONObject outer = new JSONObject(); - outer.put("total", pageUtil.getTotalCount()); - //存放数据json数组 - JSONArray dataArray = new JSONArray(); - if(null != dataList) - { - for(Person person:dataList) - { - JSONObject item = new JSONObject(); - item.put("Id", person.getId()); - item.put("Type", person.getType()); - item.put("Name", person.getName()); - item.put("op", 1); - dataArray.add(item); - } - } - outer.put("rows", dataArray); - //回写查询结果 - toClient(outer.toString()); - } - catch (DataAccessException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找经手人信息异常", e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询经手人信息结果异常", e); - } - } - - /** - * 拼接搜索条件 - * @return - */ - private Map getCondition() - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("Name_s_like", model.getName()); - condition.put("Type_s_eq", model.getType()); - return condition; - } - - //=============以下spring注入以及Model驱动公共方法，与Action处理无关================== - @Override - public PersonModel getModel() - { - return model; - } - public void setPersonService(PersonIService personService) - { - this.personService = personService; - } -} diff --git a/src/com/jsh/base/BaseAction.java b/src/com/jsh/base/BaseAction.java deleted file mode 100644 index d8af6b1e5..000000000 --- a/src/com/jsh/base/BaseAction.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.jsh.base; - -import java.io.IOException; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts2.ServletActionContext; - -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.ModelDriven; -import com.jsh.model.po.Basicuser; -import com.jsh.service.basic.LogIService; -/** - * struts2工具类 - * @author jishenghua qq752718920 - * struts2 base action 一些常用方法获取 - */ -@SuppressWarnings("serial") -public abstract class BaseAction extends ActionSupport implements ModelDriven -{ - public LogIService logService; - - /** - * 操作日志使用 是否成功表示 - */ - public String tipMsg = "成功"; - - /** - * 操作日志使用 是否成功表示 0 ==成功 1==失败 - */ - public short tipType = 0; - - public void setLogService(LogIService logService) - { - this.logService = logService; - } - - /** - * 获取session - * @return - */ - public static Map getSession() - { - return ActionContext.getContext().getSession(); - } - - /** - * 获取request - * @return - */ - public static HttpServletRequest getRequest() - { - return ServletActionContext.getRequest(); - } - /** - * 获取response - * @return response - */ - public static HttpServletResponse getResponse() - { - return ServletActionContext.getResponse(); - } - - /** - * 添加错误信息 - * @param anErrorMessage - */ - public void addActionError(String anErrorMessage) - { - super.addActionError(anErrorMessage); - } - - /** - * 添加消息 - * @param aMessage - */ - public void addActionMessage(String aMessage) - { - clearErrorsAndMessages(); - super.addActionMessage(aMessage); - } - - /** - * 添加字段错误 - * @param fieldName - * @param errorMessage - */ - public void addFieldError(String fieldName, String errorMessage) - { - clearErrorsAndMessages(); - super.addFieldError(fieldName, errorMessage); - } - - /** - * 登录用户信息 - * @return 登录用户对象 - */ - public Basicuser getUser() - { - return (Basicuser)getSession().get("user"); - } - - /** - * 回写客户端数据 - * @throws IOException - */ - public void toClient(String jsonData) throws IOException - { - HttpServletResponse response = ServletActionContext.getResponse(); - response.setContentType("text/html;charset=utf-8"); - response.getWriter().print(jsonData); - } -} diff --git a/src/com/jsh/base/BaseDAO.java b/src/com/jsh/base/BaseDAO.java deleted file mode 100644 index da1fd279d..000000000 --- a/src/com/jsh/base/BaseDAO.java +++ /dev/null @@ -1,140 +0,0 @@ -package com.jsh.base; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -import org.hibernate.Query; -import org.springframework.dao.DataAccessException; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; - -import com.jsh.util.PageUtil; -import com.jsh.util.SearchConditionUtil; -/** - * 基础dao - * @author ji_sheng_hua qq:752718920 - */ -public class BaseDAO extends HibernateDaoSupport implements BaseIDAO -{ - protected Class entityClass; - - public void setPoJoClass(Class c) - { - this.entityClass = c; - } - - protected Class getEntityClass() - { - return this.entityClass; - } - - @Override - public Serializable create(T t) throws DataAccessException - { - return this.getHibernateTemplate().save(t); - } - - @Override - public void delete(T t) throws DataAccessException - { - this.getHibernateTemplate().delete(t); - } - - @Override - public T get(Long objID) throws DataAccessException - { - return (T) this.getHibernateTemplate().get(getEntityClass(), objID); - } - - @Override - public void update(T t) throws DataAccessException - { - this.getHibernateTemplate().update(t); - } - - @Override - public void batchDelete(String objIDs) throws DataAccessException - { - this.getHibernateTemplate().bulkUpdate("delete from " + getEntityClass().getName() + " where id in ("+ objIDs + ")"); - } - - @SuppressWarnings("unchecked") - @Override - public void find(PageUtil pageUtil) throws DataAccessException - { - Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession() - .createQuery(" from " + getEntityClass().getName() + " where 1=1 "+ - SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); - pageUtil.setTotalCount(query.list().size()); - - // 分页查询 - int pageNo = pageUtil.getCurPage(); - int pageSize = pageUtil.getPageSize(); - if (0 != pageNo && 0 != pageSize) - { - query.setFirstResult((pageNo - 1) * pageSize); - query.setMaxResults(pageSize); - } - pageUtil.setPageList(query.list()); - } - -// @SuppressWarnings("unchecked") -// @Override -// public List find(Map conditon)throws DataAccessException -// { -// return this.getHibernateTemplate().find(" from " + getEntityClass().getName() + " where 1=1 "+ SearchConditionUtil.getCondition(conditon)); -// } - -// @SuppressWarnings("unchecked") -// @Override -// public List find(String hql) throws DataAccessException -// { -// return this.getHibernateTemplate().find(" from " + getEntityClass().getName() + " where 1=1 "+ hql); -// } - - @SuppressWarnings("unchecked") - @Override - public List find(Map conditon, int pageSize, int pageNo)throws DataAccessException - { - Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession() - .createQuery(" from " + getEntityClass().getName() + " where 1=1 "+ SearchConditionUtil.getCondition(conditon)); - query.setFirstResult((pageNo - 1) * pageSize); - query.setMaxResults(pageSize); - return query.list(); - } - - @SuppressWarnings("unchecked") - @Override - public List find(String hql, int pageSize, int pageNo)throws DataAccessException - { - Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession() - .createQuery(" from " + getEntityClass().getName() + " where 1=1 "+ hql); - query.setFirstResult((pageNo - 1) * pageSize); - query.setMaxResults(pageSize); - return query.list(); - } - - @SuppressWarnings("unchecked") - @Override - public Integer countSum(Map conditon)throws DataAccessException - { - List dataList = this.getHibernateTemplate().getSessionFactory().getCurrentSession() - .createQuery(" from " + getEntityClass().getName() + " where 1=1 "+ SearchConditionUtil.getCondition(conditon)).list(); - return dataList ==null?0:dataList.size(); - } - - @SuppressWarnings("unchecked") - @Override - public Integer countSum(String hql) throws DataAccessException - { - List dataList = this.getHibernateTemplate().getSessionFactory().getCurrentSession() - .createQuery(" from " + getEntityClass().getName() + " where 1=1 "+ hql).list(); - return dataList ==null?0:dataList.size(); - } - - @Override - public void save(T t) throws DataAccessException - { - this.getHibernateTemplate().save(t); - } -} diff --git a/src/com/jsh/base/BaseIDAO.java b/src/com/jsh/base/BaseIDAO.java deleted file mode 100644 index 148d378a9..000000000 --- a/src/com/jsh/base/BaseIDAO.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.jsh.base; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -import org.springframework.dao.DataAccessException; - -import com.jsh.util.PageUtil; - -/** - * 常用增删改查操作 - * @author ji-sheng-hua qq752718920 - * @param - */ -public interface BaseIDAO -{ - - /** - * 设置操作类对象 - * @param paramClass - */ - void setPoJoClass(Class paramClass); - - /** - * 增加 - * @param t 对象 - * @throws DataAccessException - */ - Serializable create(T t)throws DataAccessException; - - /** - * 增加 - * @param t 对象 - * @throws DataAccessException - */ - void save(T t)throws DataAccessException; - - /** - * 删除 - * @param t 对象 - * @throws DataAccessException - */ - void delete(T t)throws DataAccessException; - - /** - * 获取 - * @param objID ID - * @return 对象 - * @throws DataAccessException - */ - T get(Long objID)throws DataAccessException; - - /** - * 修改信息 - * @param t 要修改的对象 - * @throws DataAccessException - */ - void update(T t)throws DataAccessException; - - /** - * 批量删除信息 - * @param 以逗号分割的ID - * @throws DataAccessException - */ - void batchDelete(String objIDs)throws DataAccessException; - - /** - * 查找列表 - * @param pageUtil 分页工具类 - * @throws DataAccessException - */ - void find(PageUtil pageUtil)throws DataAccessException; - - /** - * 根据条件查询列表--没有分页信息 - * @param conditon 查询条件 - * @return 查询列表数据 - */ -// List find(Map conditon)throws DataAccessException; - - /** - * 根据hql查询 --没有分页信息 - * @param hql hibernate查询 - * @return 查询列表数据 - */ -// List find(String hql)throws DataAccessException; - - /** - * 根据搜索条件查询--分页 - * @param conditon 查询条件 - * @param pageSize 每页个数 - * @param pageNo 页码 - * @return 查询列表数据 - * @throws DataAccessException - */ - List find(Map conditon,int pageSize,int pageNo)throws DataAccessException; - - /** - * 根据hql查询--分页 - * @param hql hibernate查询语句 - * @param pageSize 每页个数 - * @param pageNo 页码 - * @return 查询列表数据 - * @throws DataAccessException - */ - List find(String hql,int pageSize,int pageNo)throws DataAccessException; - - /** - * 查找符合条件的总数 - * @param conditon - * @return - * @throws DataAccessException - */ - Integer countSum(Map conditon)throws DataAccessException; - - /** - * 查找符合条件的总数 - * @param hql - * @return - * @throws DataAccessException - */ - Integer countSum(String hql)throws DataAccessException; -} diff --git a/src/com/jsh/base/BaseIService.java b/src/com/jsh/base/BaseIService.java deleted file mode 100644 index 703e6dc47..000000000 --- a/src/com/jsh/base/BaseIService.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.jsh.base; - -import java.io.Serializable; - -import org.springframework.dao.DataAccessException; - -import com.jsh.util.PageUtil; -/** - * 服务层底层接口 - * @author ji-sheng-hua qq752718920 - * @param - */ -public interface BaseIService -{ - /** - * 增加 - * @param t 对象 - * @throws DataAccessException - */ - Serializable create(T t)throws DataAccessException; - - /** - * 增加 - * @param t 对象 - * @throws DataAccessException - */ - void save(T t)throws DataAccessException; - - /** - * 删除 - * @param t 对象 - * @throws DataAccessException - */ - void delete(T t)throws DataAccessException; - - /** - * 删除 - * @param id 对象ID - * @throws DataAccessException - */ - void delete(Long id)throws DataAccessException; - - /** - * 获取 - * @param objID ID - * @return 对象 - * @throws DataAccessException - */ - T get(Long objID)throws DataAccessException; - - /** - * 修改信息 - * @param t 要修改的对象 - * @throws DataAccessException - */ - void update(T t)throws DataAccessException; - - /** - * 批量删除信息 - * @param 以逗号分割的ID - * @throws DataAccessException - */ - void batchDelete(String objIDs)throws DataAccessException; - - /** - * 查找列表 - * @param pageUtil 分页工具类 - * @throws DataAccessException - */ - void find(PageUtil pageUtil) throws DataAccessException; - - /** - * 检查名称是否存在，页面唯一性效验使用 - * @param filedName 效验的字段名称 - * @param filedVale 校验值 - * @param idFiled ID字段名称 - * @param objectID 修改时对象ID - * @return true==存在 false==不存在 - * @throws DataAccessException - */ - Boolean checkIsNameExist(String filedName,String filedVale,String idFiled,Long objectID) throws DataAccessException; - - /** - * 检查UserBusiness是否存在，页面唯一性效验使用 - * @param TypeName 类型名称 - * @param TypeVale 类型值 - * @param KeyIdName 关键id - * @param KeyIdValue 关键值 - * @param UBName 关系名称 - * @param UBValue 关系值 - * @return true==存在 false==不存在 - * @throws DataAccessException - */ - Boolean checkIsUserBusinessExist(String TypeName,String TypeVale,String KeyIdName,String KeyIdValue,String UBName,String UBValue) throws DataAccessException; - - /** - * 检查UserBusiness是否存在，页面唯一性效验使用 - * @param TypeName 类型名称 - * @param TypeVale 类型值 - * @param KeyIdName 关键id - * @param KeyIdValue 关键值 - * @return true==存在 false==不存在 - * @throws DataAccessException - */ - Boolean checkIsValueExist(String TypeName, String TypeVale, String KeyIdName, String KeyIdValue) throws DataAccessException; - - - -} diff --git a/src/com/jsh/base/BaseService.java b/src/com/jsh/base/BaseService.java deleted file mode 100644 index 01b54480d..000000000 --- a/src/com/jsh/base/BaseService.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.jsh.base; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.dao.DataAccessException; - -import com.jsh.util.JshException; -import com.jsh.model.po.Basicuser; -import com.jsh.util.PageUtil; -/** - * 底层服务层 - * @author ji-sheng-hua qq752718920 - * @param - */ -public abstract class BaseService implements BaseIService -{ - /** - * Dao对象 - */ - private BaseIDAO baseDao; - - protected Class entityClass; - - public void setBaseDao(BaseIDAO baseDao) - { - this.baseDao = baseDao; - setPoJoClass(getEntityClass()); - } - - protected BaseIDAO getBaseDao() - { - return this.baseDao; - } - - private void setPoJoClass(Class c) - { - this.baseDao.setPoJoClass(c); - } - - protected abstract Class getEntityClass(); - - @Override - public Serializable create(T t) throws DataAccessException - { - return baseDao.create(t); - } - - @Override - public void save(T t) throws DataAccessException - { - baseDao.save(t); - } - - @Override - public void delete(T t) throws DataAccessException - { - baseDao.delete(t); - } - - @Override - public void delete(Long id) throws DataAccessException - { - baseDao.batchDelete(id.toString()); - } - - @Override - public T get(Long objID) throws DataAccessException - { - return baseDao.get(objID); - } - - @Override - public void update(T t) throws DataAccessException - { - baseDao.update(t); - } - - @Override - public void batchDelete(String objIDs) throws DataAccessException - { - baseDao.batchDelete(objIDs); - } - - @Override - public void find(PageUtil pageUtil) throws DataAccessException - { - baseDao.find(pageUtil); - } - - @Override - public Boolean checkIsNameExist(String filedName, String filedVale,String idFiled,Long objectID) throws DataAccessException - { - PageUtil pageUtil = new PageUtil(); - Map condition = new HashMap(); - condition.put(filedName + "_s_eq", filedVale); - condition.put(idFiled + "_n_neq", objectID); - pageUtil.setAdvSearch(condition); - baseDao.find(pageUtil); - - List dataList = pageUtil.getPageList(); - if(null != dataList && dataList.size() > 0) - return true; - return false; - } - - @Override - public Boolean checkIsUserBusinessExist(String TypeName,String TypeVale,String KeyIdName,String KeyIdValue,String UBName,String UBValue) throws DataAccessException - { - PageUtil pageUtil = new PageUtil(); - Map condition = new HashMap(); - condition.put(TypeName + "_s_eq", TypeVale); - condition.put(KeyIdName + "_s_eq", KeyIdValue); - condition.put(UBName + "_s_like", UBValue); - pageUtil.setAdvSearch(condition); - baseDao.find(pageUtil); - - List dataList = pageUtil.getPageList(); - if(null != dataList && dataList.size() > 0) - return true; - return false; - } - - @Override - public Boolean checkIsValueExist(String TypeName, String TypeVale, String KeyIdName, String KeyIdValue) throws DataAccessException - { - PageUtil pageUtil = new PageUtil(); - Map condition = new HashMap(); - condition.put(TypeName + "_s_eq", TypeVale); - condition.put(KeyIdName + "_s_eq", KeyIdValue); - pageUtil.setAdvSearch(condition); - baseDao.find(pageUtil); - - List dataList = pageUtil.getPageList(); - if(null != dataList && dataList.size() > 0) - return true; - return false; - } -} diff --git a/src/com/jsh/base/Log.java b/src/com/jsh/base/Log.java deleted file mode 100644 index 1a665d308..000000000 --- a/src/com/jsh/base/Log.java +++ /dev/null @@ -1,174 +0,0 @@ -package com.jsh.base; - -import org.apache.log4j.Logger; - -/** - * 封装log4j日志信息，打印日志信息类 - * @author ji/sheng/hua qq_7527.18920 - * @since 2014-01-22 - */ -public class Log -{ - /** - * 根据异常信息获取调用类的信息 - */ - private static final Exception ex = new Exception(); - - /** - * 获取Log4j实例 - */ - private static final Logger log = Logger.getLogger("jsh"); - - /** - * Info级别日志前缀 - */ - public static final String LOG_INFO_PREFIX = "=========="; - - /** - * error级别日志前缀 - */ - public static final String LOG_ERROR_PREFIX = ">>>>>>>>>>"; - - /** - * debug级别日志前缀 - */ - public static final String LOG_DEBUG_PREFIX = "-----------"; - - /** - * fatal级别日志前缀 - */ - public static final String LOG_FATAL_PREFIX = "$$$$$$$$$$"; - - /** - * warn级别日志前缀 - */ - public static final String LOG_WARN_PREFIX = "##########"; - - /** - * 打印deug日期信息 - * @param msg 日志信息 - */ - public static void debugFileSync(Object msg) - { - log.debug(getLogDetail(msg)); - } - - /** - * 打印debug异常信息 - * @param msg 日志信息 - * @param e 异常堆栈 - */ - public static void debugFileSync(Object msg, Throwable e) - { - log.debug(getLogDetail(msg), e); - } - - /** - * 打印info日志信息 - * @param msg 日志信息 - */ - public static void infoFileSync(Object msg) - { - log.info(getLogDetail(msg)); - } - - /** - * 打印 info日志带异常信息 - * @param msg 日志信息 - * @param e 异常堆栈 - */ - public static void infoFileSync(Object msg, Throwable e) - { - log.info(getLogDetail(msg), e); - } - - /** - * 打印warn日期信息 - * @param msg 日志信息 - */ - public static void warnFileSync(Object msg) - { - log.warn(getLogDetail(msg)); - } - - /** - * 打印warn日志信息带异常 - * @param msg日志信息 - * @param e 异常堆栈 - */ - public static void warnFileSync(Object msg, Throwable e) - { - log.warn(getLogDetail(msg), e); - } - - /** - * 打印error日志信息 - * @param msg 日志信息 - */ - public static void errorFileSync(Object msg) - { - log.error(getLogDetail(msg)); - } - - /** - * 打印error日志信息带异常 - * @param msg 日志信息 - * @param e 异常堆栈 - */ - public static void errorFileSync(Object msg, Throwable e) - { - log.error(getLogDetail(msg), e); - } - - /** - * 打印fatal日志信息 - * @param msg 日志信息 - */ - public static void fatalFileSync(Object msg) - { - log.fatal(getLogDetail(msg)); - } - - /** - * 打印fatal日志信息带异常 - * @param msg 日志信息 - * @param e 异常堆栈 - */ - public static void fatalFileSync(Object msg, Throwable e) - { - log.fatal(getLogDetail(msg), e); - } - - /** - * 拼装日志详细信息 - * @param message 要打印的日志信息 - * @return 封装后的日志详细信息 - */ - private static synchronized String getLogDetail(Object message) - { - String msg = ""; - if (null != message) - msg = message.toString(); - StringBuffer bf = new StringBuffer(); - try - { - ex.fillInStackTrace(); - throw ex; - } - catch (Exception ex) - { - StackTraceElement[] trace = ex.getStackTrace(); - //获取异常堆栈中的调用类信息 - final int pos = 2; - bf.append(msg); - bf.append(" [class:"); - bf.append(trace[pos].getClassName()); - bf.append(" method:"); - bf.append(trace[pos].getMethodName()); - bf.append(" line:"); - bf.append(trace[pos].getLineNumber()); - bf.append("]"); - } - return bf.toString(); - } -} diff --git a/src/com/jsh/dao/asset/AssetDAO.java b/src/com/jsh/dao/asset/AssetDAO.java deleted file mode 100644 index 7df4bdcb1..000000000 --- a/src/com/jsh/dao/asset/AssetDAO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jsh.dao.asset; - -import com.jsh.base.BaseDAO; -import com.jsh.model.po.Asset; - -public class AssetDAO extends BaseDAO implements AssetIDAO -{ - /** - * 设置dao映射基类 - * @return - */ - @Override - public Class getEntityClass() - { - return Asset.class; - } -} diff --git a/src/com/jsh/dao/asset/AssetIDAO.java b/src/com/jsh/dao/asset/AssetIDAO.java deleted file mode 100644 index 8bd454fed..000000000 --- a/src/com/jsh/dao/asset/AssetIDAO.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.dao.asset; - -import com.jsh.base.BaseIDAO; -import com.jsh.model.po.Asset; - -public interface AssetIDAO extends BaseIDAO -{ - -} diff --git a/src/com/jsh/dao/asset/ReportDAO.java b/src/com/jsh/dao/asset/ReportDAO.java deleted file mode 100644 index 7cdb034e3..000000000 --- a/src/com/jsh/dao/asset/ReportDAO.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jsh.dao.asset; - -import org.hibernate.Query; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; - -import com.jsh.util.JshException; -import com.jsh.model.po.Asset; -import com.jsh.util.PageUtil; -import com.jsh.util.SearchConditionUtil; - -public class ReportDAO extends HibernateDaoSupport implements ReportIDAO -{ - @SuppressWarnings("unchecked") - @Override - public void find(PageUtil pageUtil,String reportType,String reportName) throws JshException - { - Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select count(" + reportType +") as dataSum, " + reportName + " from Asset asset where 1=1 " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); - pageUtil.setTotalCount(query.list().size()); - pageUtil.setPageList(query.list()); - } -} diff --git a/src/com/jsh/dao/asset/ReportIDAO.java b/src/com/jsh/dao/asset/ReportIDAO.java deleted file mode 100644 index 1281c90c5..000000000 --- a/src/com/jsh/dao/asset/ReportIDAO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jsh.dao.asset; - -import com.jsh.util.JshException; -import com.jsh.model.po.Asset; -import com.jsh.util.PageUtil; - -public interface ReportIDAO -{ - /** - * 查找资产列表 - * @param pageUtil 分页工具类 - * @param reportType 报表统计字段 - * @throws JshException - */ - void find(PageUtil pageUtil,String reportType,String reportName) throws JshException; -} diff --git a/src/com/jsh/dao/basic/AccountDAO.java b/src/com/jsh/dao/basic/AccountDAO.java deleted file mode 100644 index 8af8992bb..000000000 --- a/src/com/jsh/dao/basic/AccountDAO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseDAO; -import com.jsh.model.po.Account; - -public class AccountDAO extends BaseDAO implements AccountIDAO -{ - /** - * 设置dao映射基类 - * @return - */ - @Override - public Class getEntityClass() - { - return Account.class; - } -} diff --git a/src/com/jsh/dao/basic/AccountIDAO.java b/src/com/jsh/dao/basic/AccountIDAO.java deleted file mode 100644 index a6f90bd50..000000000 --- a/src/com/jsh/dao/basic/AccountIDAO.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseIDAO; -import com.jsh.model.po.Account; - -public interface AccountIDAO extends BaseIDAO -{ - -} diff --git a/src/com/jsh/dao/basic/AppDAO.java b/src/com/jsh/dao/basic/AppDAO.java deleted file mode 100644 index 82bf34ee7..000000000 --- a/src/com/jsh/dao/basic/AppDAO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseDAO; -import com.jsh.model.po.App; - -public class AppDAO extends BaseDAO implements AppIDAO -{ - /** - * 设置dao映射基类 - * @return - */ - @Override - public Class getEntityClass() - { - return App.class; - } -} diff --git a/src/com/jsh/dao/basic/AppIDAO.java b/src/com/jsh/dao/basic/AppIDAO.java deleted file mode 100644 index 954c447b8..000000000 --- a/src/com/jsh/dao/basic/AppIDAO.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseIDAO; -import com.jsh.model.po.App; - -public interface AppIDAO extends BaseIDAO -{ - -} diff --git a/src/com/jsh/dao/basic/AssetNameDAO.java b/src/com/jsh/dao/basic/AssetNameDAO.java deleted file mode 100644 index acf3b7834..000000000 --- a/src/com/jsh/dao/basic/AssetNameDAO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseDAO; -import com.jsh.model.po.Assetname; - -public class AssetNameDAO extends BaseDAO implements AssetNameIDAO -{ - /** - * 设置dao映射基类 - * @return - */ - @Override - public Class getEntityClass() - { - return Assetname.class; - } -} diff --git a/src/com/jsh/dao/basic/AssetNameIDAO.java b/src/com/jsh/dao/basic/AssetNameIDAO.java deleted file mode 100644 index 7942aae88..000000000 --- a/src/com/jsh/dao/basic/AssetNameIDAO.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseIDAO; -import com.jsh.model.po.Assetname; - -public interface AssetNameIDAO extends BaseIDAO -{ - -} diff --git a/src/com/jsh/dao/basic/CategoryDAO.java b/src/com/jsh/dao/basic/CategoryDAO.java deleted file mode 100644 index b63ce3ecb..000000000 --- a/src/com/jsh/dao/basic/CategoryDAO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseDAO; -import com.jsh.model.po.Category; - -public class CategoryDAO extends BaseDAO implements CategoryIDAO -{ - /** - * 设置dao映射基类 - * @return - */ - @Override - public Class getEntityClass() - { - return Category.class; - } -} diff --git a/src/com/jsh/dao/basic/CategoryIDAO.java b/src/com/jsh/dao/basic/CategoryIDAO.java deleted file mode 100644 index 758690217..000000000 --- a/src/com/jsh/dao/basic/CategoryIDAO.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseIDAO; -import com.jsh.model.po.Category; - -public interface CategoryIDAO extends BaseIDAO -{ - -} diff --git a/src/com/jsh/dao/basic/DepotDAO.java b/src/com/jsh/dao/basic/DepotDAO.java deleted file mode 100644 index 5cba5386e..000000000 --- a/src/com/jsh/dao/basic/DepotDAO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseDAO; -import com.jsh.model.po.Depot; - -public class DepotDAO extends BaseDAO implements DepotIDAO -{ - /** - * 设置dao映射基类 - * @return - */ - @Override - public Class getEntityClass() - { - return Depot.class; - } -} diff --git a/src/com/jsh/dao/basic/DepotIDAO.java b/src/com/jsh/dao/basic/DepotIDAO.java deleted file mode 100644 index fbf407b7b..000000000 --- a/src/com/jsh/dao/basic/DepotIDAO.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseIDAO; -import com.jsh.model.po.Depot; - -public interface DepotIDAO extends BaseIDAO -{ - -} diff --git a/src/com/jsh/dao/basic/FunctionsDAO.java b/src/com/jsh/dao/basic/FunctionsDAO.java deleted file mode 100644 index f163b6958..000000000 --- a/src/com/jsh/dao/basic/FunctionsDAO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseDAO; -import com.jsh.model.po.Functions; - -public class FunctionsDAO extends BaseDAO implements FunctionsIDAO -{ - /** - * 设置dao映射基类 - * @return - */ - @Override - public Class getEntityClass() - { - return Functions.class; - } -} diff --git a/src/com/jsh/dao/basic/FunctionsIDAO.java b/src/com/jsh/dao/basic/FunctionsIDAO.java deleted file mode 100644 index 53d4cd0c1..000000000 --- a/src/com/jsh/dao/basic/FunctionsIDAO.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseIDAO; -import com.jsh.model.po.Functions; - -public interface FunctionsIDAO extends BaseIDAO -{ - -} diff --git a/src/com/jsh/dao/basic/InOutItemDAO.java b/src/com/jsh/dao/basic/InOutItemDAO.java deleted file mode 100644 index 669fcdde5..000000000 --- a/src/com/jsh/dao/basic/InOutItemDAO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseDAO; -import com.jsh.model.po.InOutItem; - -public class InOutItemDAO extends BaseDAO implements InOutItemIDAO -{ - /** - * 设置dao映射基类 - * @return - */ - @Override - public Class getEntityClass() - { - return InOutItem.class; - } -} diff --git a/src/com/jsh/dao/basic/InOutItemIDAO.java b/src/com/jsh/dao/basic/InOutItemIDAO.java deleted file mode 100644 index c9c96d414..000000000 --- a/src/com/jsh/dao/basic/InOutItemIDAO.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseIDAO; -import com.jsh.model.po.InOutItem; - -public interface InOutItemIDAO extends BaseIDAO -{ - -} diff --git a/src/com/jsh/dao/basic/LogDAO.java b/src/com/jsh/dao/basic/LogDAO.java deleted file mode 100644 index 4d0654095..000000000 --- a/src/com/jsh/dao/basic/LogDAO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseDAO; -import com.jsh.model.po.Logdetails; - -public class LogDAO extends BaseDAO implements LogIDAO -{ - /** - * 设置dao映射基类 - * @return - */ - @Override - public Class getEntityClass() - { - return Logdetails.class; - } - -} diff --git a/src/com/jsh/dao/basic/LogIDAO.java b/src/com/jsh/dao/basic/LogIDAO.java deleted file mode 100644 index 9a86c2c6e..000000000 --- a/src/com/jsh/dao/basic/LogIDAO.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseIDAO; -import com.jsh.model.po.Logdetails; - -/** - * 日志相关处理接口 - * @author angel - */ -public interface LogIDAO extends BaseIDAO -{ - -} diff --git a/src/com/jsh/dao/basic/RoleDAO.java b/src/com/jsh/dao/basic/RoleDAO.java deleted file mode 100644 index bdc6c384c..000000000 --- a/src/com/jsh/dao/basic/RoleDAO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseDAO; -import com.jsh.model.po.Role; - -public class RoleDAO extends BaseDAO implements RoleIDAO -{ - /** - * 设置dao映射基类 - * @return - */ - @Override - public Class getEntityClass() - { - return Role.class; - } -} diff --git a/src/com/jsh/dao/basic/RoleIDAO.java b/src/com/jsh/dao/basic/RoleIDAO.java deleted file mode 100644 index c11ee2aa7..000000000 --- a/src/com/jsh/dao/basic/RoleIDAO.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseIDAO; -import com.jsh.model.po.Role; - -public interface RoleIDAO extends BaseIDAO -{ - -} diff --git a/src/com/jsh/dao/basic/SupplierDAO.java b/src/com/jsh/dao/basic/SupplierDAO.java deleted file mode 100644 index 4710ba268..000000000 --- a/src/com/jsh/dao/basic/SupplierDAO.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseDAO; -import com.jsh.model.po.Supplier; - -public class SupplierDAO extends BaseDAO implements SupplierIDAO -{ - /** - * 设置dao映射基类 - * @return - */ - @Override - public Class getEntityClass() - { - return Supplier.class; - } - - -} diff --git a/src/com/jsh/dao/basic/SupplierIDAO.java b/src/com/jsh/dao/basic/SupplierIDAO.java deleted file mode 100644 index 199dac0cf..000000000 --- a/src/com/jsh/dao/basic/SupplierIDAO.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseIDAO; -import com.jsh.model.po.Supplier; - -public interface SupplierIDAO extends BaseIDAO -{ - -} diff --git a/src/com/jsh/dao/basic/UserBusinessDAO.java b/src/com/jsh/dao/basic/UserBusinessDAO.java deleted file mode 100644 index 41c0260b6..000000000 --- a/src/com/jsh/dao/basic/UserBusinessDAO.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.jsh.dao.basic; - -import org.hibernate.Query; - -import com.jsh.base.BaseDAO; -import com.jsh.util.JshException; -import com.jsh.model.po.Asset; -import com.jsh.model.po.UserBusiness; -import com.jsh.util.PageUtil; -import com.jsh.util.SearchConditionUtil; - -public class UserBusinessDAO extends BaseDAO implements UserBusinessIDAO -{ - /** - * 设置dao映射基类 - * @return - */ - @Override - public Class getEntityClass() - { - return UserBusiness.class; - } - - @SuppressWarnings("unchecked") - @Override - public void find(PageUtil pageUtil,String ceshi) throws JshException - { - Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select count(id),sum(id) from UserBusiness userBusiness where 1=1 " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); - pageUtil.setTotalCount(query.list().size()); - pageUtil.setPageList(query.list()); - } -} diff --git a/src/com/jsh/dao/basic/UserBusinessIDAO.java b/src/com/jsh/dao/basic/UserBusinessIDAO.java deleted file mode 100644 index e50ffc8df..000000000 --- a/src/com/jsh/dao/basic/UserBusinessIDAO.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseIDAO; -import com.jsh.util.JshException; -import com.jsh.model.po.UserBusiness; -import com.jsh.util.PageUtil; - -public interface UserBusinessIDAO extends BaseIDAO -{ - /* - * 测试hql语句 - */ - void find(PageUtil pageUtil,String ceshi) throws JshException; -} diff --git a/src/com/jsh/dao/basic/UserDAO.java b/src/com/jsh/dao/basic/UserDAO.java deleted file mode 100644 index 1f6dcc476..000000000 --- a/src/com/jsh/dao/basic/UserDAO.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseDAO; -import com.jsh.model.po.Basicuser; - -public class UserDAO extends BaseDAO implements UserIDAO -{ - /** - * 设置dao映射基类 - * @return - */ - @Override - public Class getEntityClass() - { - return Basicuser.class; - } - - -} diff --git a/src/com/jsh/dao/basic/UserIDAO.java b/src/com/jsh/dao/basic/UserIDAO.java deleted file mode 100644 index 1910baa67..000000000 --- a/src/com/jsh/dao/basic/UserIDAO.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.dao.basic; - -import com.jsh.base.BaseIDAO; -import com.jsh.model.po.Basicuser; - -public interface UserIDAO extends BaseIDAO -{ - -} diff --git a/src/com/jsh/dao/materials/AccountHeadDAO.java b/src/com/jsh/dao/materials/AccountHeadDAO.java deleted file mode 100644 index 3bfb48395..000000000 --- a/src/com/jsh/dao/materials/AccountHeadDAO.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.jsh.dao.materials; - -import org.hibernate.Query; - -import com.jsh.base.BaseDAO; -import com.jsh.util.JshException; -import com.jsh.model.po.AccountHead; -import com.jsh.model.po.UserBusiness; -import com.jsh.util.PageUtil; -import com.jsh.util.SearchConditionUtil; - -public class AccountHeadDAO extends BaseDAO implements AccountHeadIDAO -{ - /** - * 设置dao映射基类 - * @return - */ - @Override - public Class getEntityClass() - { - return AccountHead.class; - } - - @SuppressWarnings("unchecked") - @Override - public void find(PageUtil pageUtil,String maxid) throws JshException - { - Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select max(Id) as Id from AccountHead accountHead where 1=1 " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); - pageUtil.setTotalCount(query.list().size()); - pageUtil.setPageList(query.list()); - } -} diff --git a/src/com/jsh/dao/materials/AccountHeadIDAO.java b/src/com/jsh/dao/materials/AccountHeadIDAO.java deleted file mode 100644 index b350f2f0b..000000000 --- a/src/com/jsh/dao/materials/AccountHeadIDAO.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jsh.dao.materials; - -import com.jsh.base.BaseIDAO; -import com.jsh.util.JshException; -import com.jsh.model.po.AccountHead; -import com.jsh.model.po.UserBusiness; -import com.jsh.util.PageUtil; - -public interface AccountHeadIDAO extends BaseIDAO -{ - /* - * 获取MaxId - */ - void find(PageUtil pageUtil,String maxid) throws JshException; -} diff --git a/src/com/jsh/dao/materials/AccountItemDAO.java b/src/com/jsh/dao/materials/AccountItemDAO.java deleted file mode 100644 index 31472f9cc..000000000 --- a/src/com/jsh/dao/materials/AccountItemDAO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.jsh.dao.materials; - -import org.hibernate.Query; - -import com.jsh.base.BaseDAO; -import com.jsh.util.JshException; -import com.jsh.model.po.AccountItem; -import com.jsh.util.PageUtil; -import com.jsh.util.SearchConditionUtil; - -public class AccountItemDAO extends BaseDAO implements AccountItemIDAO -{ - /** - * 设置dao映射基类 - * @return - */ - @Override - public Class getEntityClass() - { - return AccountItem.class; - } -} diff --git a/src/com/jsh/dao/materials/AccountItemIDAO.java b/src/com/jsh/dao/materials/AccountItemIDAO.java deleted file mode 100644 index 56ff921c0..000000000 --- a/src/com/jsh/dao/materials/AccountItemIDAO.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.jsh.dao.materials; - -import com.jsh.base.BaseIDAO; -import com.jsh.util.JshException; -import com.jsh.model.po.AccountItem; -import com.jsh.util.PageUtil; - -public interface AccountItemIDAO extends BaseIDAO -{ - -} - diff --git a/src/com/jsh/dao/materials/DepotHeadDAO.java b/src/com/jsh/dao/materials/DepotHeadDAO.java deleted file mode 100644 index a5240497e..000000000 --- a/src/com/jsh/dao/materials/DepotHeadDAO.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.jsh.dao.materials; - -import org.hibernate.Query; - -import com.jsh.base.BaseDAO; -import com.jsh.util.JshException; -import com.jsh.model.po.DepotHead; -import com.jsh.model.po.UserBusiness; -import com.jsh.util.PageUtil; -import com.jsh.util.SearchConditionUtil; - -public class DepotHeadDAO extends BaseDAO implements DepotHeadIDAO -{ - /** - * 设置dao映射基类 - * @return - */ - @Override - public Class getEntityClass() - { - return DepotHead.class; - } - - @SuppressWarnings("unchecked") - @Override - public void find(PageUtil pageUtil,String maxid) throws JshException - { - Query query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createQuery("select max(Id) as Id from DepotHead depotHead where 1=1 " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); - pageUtil.setTotalCount(query.list().size()); - pageUtil.setPageList(query.list()); - } -} diff --git a/src/com/jsh/dao/materials/DepotHeadIDAO.java b/src/com/jsh/dao/materials/DepotHeadIDAO.java deleted file mode 100644 index 9bd606f52..000000000 --- a/src/com/jsh/dao/materials/DepotHeadIDAO.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jsh.dao.materials; - -import com.jsh.base.BaseIDAO; -import com.jsh.util.JshException; -import com.jsh.model.po.DepotHead; -import com.jsh.model.po.UserBusiness; -import com.jsh.util.PageUtil; - -public interface DepotHeadIDAO extends BaseIDAO -{ - /* - * 获取MaxId - */ - void find(PageUtil pageUtil,String maxid) throws JshException; -} diff --git a/src/com/jsh/dao/materials/DepotItemDAO.java b/src/com/jsh/dao/materials/DepotItemDAO.java deleted file mode 100644 index 06d1cf26a..000000000 --- a/src/com/jsh/dao/materials/DepotItemDAO.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.jsh.dao.materials; - -import org.hibernate.Query; - -import com.jsh.base.BaseDAO; -import com.jsh.util.JshException; -import com.jsh.model.po.DepotHead; -import com.jsh.model.po.DepotItem; -import com.jsh.util.PageUtil; -import com.jsh.util.SearchConditionUtil; - -public class DepotItemDAO extends BaseDAO implements DepotItemIDAO -{ - /** - * 设置dao映射基类 - * @return - */ - @Override - public Class getEntityClass() - { - return DepotItem.class; - } - - @SuppressWarnings("unchecked") - @Override - public void findByType(PageUtil pageUtil,String type,Long MId,String MonthTime,Boolean isPrev) throws JshException - { - //多表联查,多表连查，此处用到了createSQLQuery，可以随便写sql语句，很方便 - Query query; - if(isPrev) { - query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery("select sum(OperNumber) as OperNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type +"' and MaterialId ="+ MId + " and jsh_depothead.OperTime <'"+ MonthTime +"-01 00:00:00' " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); - } - else { - query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery("select sum(OperNumber) as OperNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type +"' and MaterialId ="+ MId + " and jsh_depothead.OperTime >='"+ MonthTime +"-01 00:00:00' and jsh_depothead.OperTime <='"+ MonthTime +"-31 00:00:00' " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); - } - pageUtil.setTotalCount(query.list().size()); - pageUtil.setPageList(query.list()); - } - - @SuppressWarnings("unchecked") - @Override - public void buyOrSale(PageUtil pageUtil,String type, String subType,Long MId,String MonthTime, String sumType) throws JshException - { - //多表联查,多表连查，此处用到了createSQLQuery，可以随便写sql语句，很方便 - Query query; - if(sumType.equals("Number")) { - query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery("select sum(OperNumber) as OperNumber from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type +"' and subType='" + subType +"' and MaterialId ="+ MId + " and jsh_depothead.OperTime >='"+ MonthTime +"-01 00:00:00' and jsh_depothead.OperTime <='"+ MonthTime +"-31 00:00:00' " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); - } - else { - query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery("select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead where jsh_depotitem.HeaderId = jsh_depothead.id and type='" + type +"' and subType='" + subType +"' and MaterialId ="+ MId + " and jsh_depothead.OperTime >='"+ MonthTime +"-01 00:00:00' and jsh_depothead.OperTime <='"+ MonthTime +"-31 00:00:00' " + SearchConditionUtil.getCondition(pageUtil.getAdvSearch())); - } - pageUtil.setTotalCount(query.list().size()); - pageUtil.setPageList(query.list()); - } -} - - - diff --git a/src/com/jsh/dao/materials/DepotItemIDAO.java b/src/com/jsh/dao/materials/DepotItemIDAO.java deleted file mode 100644 index 6ccc31c64..000000000 --- a/src/com/jsh/dao/materials/DepotItemIDAO.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.jsh.dao.materials; - -import com.jsh.base.BaseIDAO; -import com.jsh.util.JshException; -import com.jsh.model.po.DepotHead; -import com.jsh.model.po.DepotItem; -import com.jsh.util.PageUtil; - -public interface DepotItemIDAO extends BaseIDAO -{ - void findByType(PageUtil pageUtil,String type,Long MId, String MonthTime,Boolean isPrev) throws JshException; - - void buyOrSale(PageUtil pageUtil,String type, String subType,Long MId, String MonthTime, String sumType) throws JshException; -} diff --git a/src/com/jsh/dao/materials/MaterialCategoryDAO.java b/src/com/jsh/dao/materials/MaterialCategoryDAO.java deleted file mode 100644 index 121ecbb1e..000000000 --- a/src/com/jsh/dao/materials/MaterialCategoryDAO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jsh.dao.materials; - -import com.jsh.base.BaseDAO; -import com.jsh.model.po.MaterialCategory; - -public class MaterialCategoryDAO extends BaseDAO implements MaterialCategoryIDAO -{ - /** - * 设置dao映射基类 - * @return - */ - @Override - public Class getEntityClass() - { - return MaterialCategory.class; - } -} diff --git a/src/com/jsh/dao/materials/MaterialCategoryIDAO.java b/src/com/jsh/dao/materials/MaterialCategoryIDAO.java deleted file mode 100644 index 39058cea3..000000000 --- a/src/com/jsh/dao/materials/MaterialCategoryIDAO.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.dao.materials; - -import com.jsh.base.BaseIDAO; -import com.jsh.model.po.MaterialCategory; - -public interface MaterialCategoryIDAO extends BaseIDAO -{ - -} diff --git a/src/com/jsh/dao/materials/MaterialDAO.java b/src/com/jsh/dao/materials/MaterialDAO.java deleted file mode 100644 index bbefa62a7..000000000 --- a/src/com/jsh/dao/materials/MaterialDAO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jsh.dao.materials; - -import com.jsh.base.BaseDAO; -import com.jsh.model.po.Material; - -public class MaterialDAO extends BaseDAO implements MaterialIDAO -{ - /** - * 设置dao映射基类 - * @return - */ - @Override - public Class getEntityClass() - { - return Material.class; - } -} diff --git a/src/com/jsh/dao/materials/MaterialIDAO.java b/src/com/jsh/dao/materials/MaterialIDAO.java deleted file mode 100644 index 962ef83a8..000000000 --- a/src/com/jsh/dao/materials/MaterialIDAO.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.dao.materials; - -import com.jsh.base.BaseIDAO; -import com.jsh.model.po.Material; - -public interface MaterialIDAO extends BaseIDAO -{ - -} diff --git a/src/com/jsh/dao/materials/PersonDAO.java b/src/com/jsh/dao/materials/PersonDAO.java deleted file mode 100644 index d397673e5..000000000 --- a/src/com/jsh/dao/materials/PersonDAO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jsh.dao.materials; - -import com.jsh.base.BaseDAO; -import com.jsh.model.po.Person; - -public class PersonDAO extends BaseDAO implements PersonIDAO -{ - /** - * 设置dao映射基类 - * @return - */ - @Override - public Class getEntityClass() - { - return Person.class; - } -} diff --git a/src/com/jsh/dao/materials/PersonIDAO.java b/src/com/jsh/dao/materials/PersonIDAO.java deleted file mode 100644 index 1a5c121b0..000000000 --- a/src/com/jsh/dao/materials/PersonIDAO.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.dao.materials; - -import com.jsh.base.BaseIDAO; -import com.jsh.model.po.Person; - -public interface PersonIDAO extends BaseIDAO -{ - -} diff --git a/src/com/jsh/model/po/Account.hbm.xml b/src/com/jsh/model/po/Account.hbm.xml deleted file mode 100644 index 321003ea9..000000000 --- a/src/com/jsh/model/po/Account.hbm.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - 名称 - - - - - 编号 - - - - - 期初金额 - - - - - 当前余额 - - - - - 备注 - - - - diff --git a/src/com/jsh/model/po/Account.java b/src/com/jsh/model/po/Account.java deleted file mode 100644 index cfe5ffd08..000000000 --- a/src/com/jsh/model/po/Account.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.jsh.model.po; - -@SuppressWarnings("serial") -public class Account implements java.io.Serializable -{ - private Long Id; - private String Name; - private String SerialNo; - private Double InitialAmount; - private Double CurrentAmount; - private String Remark; - - public Account() - { - - } - - public Account(Long Id) - { - this.Id = Id; - } - - public Account(String name, String serialNo, Double initialAmount, Double currentAmount, String remark) { - Name = name; - SerialNo = serialNo; - InitialAmount = initialAmount; - CurrentAmount = currentAmount; - Remark = remark; - } - - public void setId(Long id) - { - Id = id; - } - - public Long getId() - { - return Id; - } - - public void setName(String name) - { - Name = name; - } - - public String getName() - { - return Name; - } - - public void setSerialNo(String serialNo) - { - SerialNo = serialNo; - } - - public String getSerialNo() - { - return SerialNo; - } - - public void setInitialAmount(Double initialAmount) - { - InitialAmount = initialAmount; - } - - public Double getInitialAmount() - { - return InitialAmount; - } - - public void setCurrentAmount(Double currentAmount) - { - CurrentAmount = currentAmount; - } - - public Double getCurrentAmount() - { - return CurrentAmount; - } - - public void setRemark(String remark) - { - Remark = remark; - } - - public String getRemark() - { - return Remark; - } -} diff --git a/src/com/jsh/model/po/AccountHead.hbm.xml b/src/com/jsh/model/po/AccountHead.hbm.xml deleted file mode 100644 index c854333e3..000000000 --- a/src/com/jsh/model/po/AccountHead.hbm.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - 类型(支出/收入/收款/付款/转账) - - - - - 单位Id(收款/付款单位) - - - - - 经手人Id - - - - - 变动金额(优惠/收款/付款/实付) - - - - - 合计金额 - - - - - 账户(收款/付款) - - - - - 单据编号 - - - - - 单据日期 - - - - - 备注 - - - - diff --git a/src/com/jsh/model/po/AccountHead.java b/src/com/jsh/model/po/AccountHead.java deleted file mode 100644 index ac4b5de97..000000000 --- a/src/com/jsh/model/po/AccountHead.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.jsh.model.po; - -import java.sql.Timestamp; - -@SuppressWarnings("serial") -public class AccountHead implements java.io.Serializable -{ - private Long Id; - private String Type; - private Supplier OrganId; - private Person HandsPersonId; - private Double ChangeAmount; - private Double TotalPrice; - private Account AccountId; - private String BillNo; - private Timestamp BillTime; - private String Remark; - - public AccountHead() - { - - } - - public AccountHead(Long Id) - { - this.Id = Id ; - } - - public AccountHead(String type, Supplier organId, - Person handsPersonId, Double changeAmount, Double totalPrice, - Account accountId, String billNo, Timestamp billTime, String remark) - { - super(); - Type = type; - OrganId = organId; - HandsPersonId = handsPersonId; - ChangeAmount = changeAmount; - TotalPrice = totalPrice; - AccountId = accountId; - BillNo = billNo; - BillTime = billTime; - Remark = remark; - } - - public void setId(Long id) - { - Id = id; - } - - public Long getId() - { - return Id; - } - - public void setType(String type) - { - Type = type; - } - - public String getType() - { - return Type; - } - - public void setOrganId(Supplier organId) - { - OrganId = organId; - } - - public Supplier getOrganId() - { - return OrganId; - } - - public void setHandsPersonId(Person handsPersonId) - { - HandsPersonId = handsPersonId; - } - - public Person getHandsPersonId() - { - return HandsPersonId; - } - - public void setChangeAmount(Double changeAmount) - { - ChangeAmount = changeAmount; - } - - public Double getChangeAmount() - { - return ChangeAmount; - } - - public void setTotalPrice(Double totalPrice) { - TotalPrice = totalPrice; - } - - public Double getTotalPrice() { - return TotalPrice; - } - - public void setAccountId(Account accountId) - { - AccountId = accountId; - } - - public Account getAccountId() - { - return AccountId; - } - - public void setBillNo(String billNo) - { - BillNo = billNo; - } - - public String getBillNo() - { - return BillNo; - } - - public void setBillTime(Timestamp billTime) - { - BillTime = billTime; - } - - public Timestamp getBillTime() - { - return BillTime; - } - - public void setRemark(String remark) - { - Remark = remark; - } - - public String getRemark() - { - return Remark; - } - -} diff --git a/src/com/jsh/model/po/AccountItem.hbm.xml b/src/com/jsh/model/po/AccountItem.hbm.xml deleted file mode 100644 index 581854b0f..000000000 --- a/src/com/jsh/model/po/AccountItem.hbm.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - 表头Id - - - - - 账户Id - - - - - 收支项目Id - - - - - 单项金额 - - - - - 单据备注 - - - - diff --git a/src/com/jsh/model/po/AccountItem.java b/src/com/jsh/model/po/AccountItem.java deleted file mode 100644 index ab5f1f0ff..000000000 --- a/src/com/jsh/model/po/AccountItem.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.jsh.model.po; - -@SuppressWarnings("serial") -public class AccountItem implements java.io.Serializable -{ - private Long Id; - private AccountHead HeaderId; - private Account AccountId; - private InOutItem InOutItemId; - private Double EachAmount; - private String Remark; - - public AccountItem() - { - - } - - public AccountItem(Long Id) - { - this.Id = Id ; - } - - public AccountItem(AccountHead headerId, Account accountId, - InOutItem inOutItemId, Double eachAmount, String remark) - { - super(); - HeaderId = headerId; - AccountId = accountId; - InOutItemId = inOutItemId; - EachAmount = eachAmount; - Remark = remark; - } - - public void setId(Long id) - { - Id = id; - } - - public Long getId() - { - return Id; - } - - public void setHeaderId(AccountHead headerId) - { - HeaderId = headerId; - } - - public AccountHead getHeaderId() - { - return HeaderId; - } - - public void setAccountId(Account accountId) - { - AccountId = accountId; - } - - public Account getAccountId() - { - return AccountId; - } - - public void setInOutItemId(InOutItem inOutItemId) - { - InOutItemId = inOutItemId; - } - - public InOutItem getInOutItemId() - { - return InOutItemId; - } - - public void setEachAmount(Double eachAmount) - { - EachAmount = eachAmount; - } - - public Double getEachAmount() - { - return EachAmount; - } - - public void setRemark(String remark) - { - Remark = remark; - } - - public String getRemark() - { - return Remark; - } - -} diff --git a/src/com/jsh/model/po/App.hbm.xml b/src/com/jsh/model/po/App.hbm.xml deleted file mode 100644 index 6daa362fc..000000000 --- a/src/com/jsh/model/po/App.hbm.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - 代号 - - - - - 名称 - - - - - 类型 - - - - - 图标 - - - - - 链接 - - - - - 宽度 - - - - - 高度 - - - - - 拉伸 - - - - - 最大化 - - - - - Flash - - - - - 种类 - - - - - 排序号 - - - - - 备注 - - - - - 启用 - - - - diff --git a/src/com/jsh/model/po/App.java b/src/com/jsh/model/po/App.java deleted file mode 100644 index 80e3ee34f..000000000 --- a/src/com/jsh/model/po/App.java +++ /dev/null @@ -1,174 +0,0 @@ -package com.jsh.model.po; - -@SuppressWarnings("serial") -public class App implements java.io.Serializable -{ - private Long Id; - private String Number; - private String Name; - private String Type; - private String Icon; - private String URL; - private String Width; - private String Height; - private Boolean ReSize; - private Boolean OpenMax; - private Boolean Flash; - private String ZL; - private String Sort; - private String Remark; - private Boolean Enabled; - - - public App() - { - - } - - public App(Long Id) - { - this.Id = Id ; - } - - public App(String Number, String Name, String Type, String Icon, String URL, String Width, - String Height, Boolean ReSize, Boolean OpenMax, Boolean Flash, String ZL, String Sort, - String Remark, Boolean Enabled) - { - this.Number = Number; - this.Name = Name; - this.Type = Type; - this.Icon = Icon; - this.URL = URL; - this.Width = Width; - this.Height = Height; - this.ReSize = ReSize; - this.OpenMax = OpenMax; - this.Flash = Flash; - this.ZL = ZL; - this.Sort = Sort; - this.Remark = Remark; - this.Enabled = Enabled; - } - - public Long getId() { - return Id; - } - - public void setId(Long id) { - Id = id; - } - - public String getNumber() { - return Number; - } - - public void setNumber(String number) { - Number = number; - } - - public String getName() { - return Name; - } - - public void setName(String name) { - Name = name; - } - - public String getType() { - return Type; - } - - public void setType(String type) { - Type = type; - } - - public String getIcon() { - return Icon; - } - - public void setIcon(String icon) { - Icon = icon; - } - - public String getURL() { - return URL; - } - - public void setURL(String uRL) { - URL = uRL; - } - - public String getWidth() { - return Width; - } - - public void setWidth(String width) { - Width = width; - } - - public String getHeight() { - return Height; - } - - public void setHeight(String height) { - Height = height; - } - - public Boolean getReSize() { - return ReSize; - } - - public void setReSize(Boolean reSize) { - ReSize = reSize; - } - - public Boolean getOpenMax() { - return OpenMax; - } - - public void setOpenMax(Boolean openMax) { - OpenMax = openMax; - } - - public Boolean getFlash() { - return Flash; - } - - public void setFlash(Boolean flash) { - Flash = flash; - } - - public String getZL() { - return ZL; - } - - public void setZL(String zL) { - ZL = zL; - } - - public String getSort() { - return Sort; - } - - public void setSort(String sort) { - Sort = sort; - } - - public String getRemark() { - return Remark; - } - - public void setRemark(String remark) { - Remark = remark; - } - - public Boolean getEnabled() { - return Enabled; - } - - public void setEnabled(Boolean enabled) { - Enabled = enabled; - } - - -} \ No newline at end of file diff --git a/src/com/jsh/model/po/Asset.hbm.xml b/src/com/jsh/model/po/Asset.hbm.xml deleted file mode 100644 index 1bf1e386e..000000000 --- a/src/com/jsh/model/po/Asset.hbm.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - 位置 - - - - - 标签：以空格为分隔符 - - - - - 资产的状态：0==在库，1==在用，2==消费 - - - - - - - - - - 购买价格 - - - - - 购买日期 - - - - - 有效日期 - - - - - 保修日期 - - - - - 资产编号 - - - - - 资产序列号 - - - - - - - - - - 描述信息 - - - - - 资产添加时间，统计报表使用 - - - - - - - - - - - - - - - - - - - diff --git a/src/com/jsh/model/po/Asset.java b/src/com/jsh/model/po/Asset.java deleted file mode 100644 index d4b448ac7..000000000 --- a/src/com/jsh/model/po/Asset.java +++ /dev/null @@ -1,379 +0,0 @@ -package com.jsh.model.po; - -import java.sql.Timestamp; -import java.util.Map; - -@SuppressWarnings("serial") -public class Asset implements java.io.Serializable -{ - private Long id; - private Assetname assetname; - private String location; - private Short status; - private Basicuser user; - private Double price; - private Timestamp purchasedate; - private Timestamp periodofvalidity; - private Timestamp warrantydate; - private String assetnum; - private String serialnum; - private Supplier supplier; - private String labels; - private String description; - private String addMonth; - private Timestamp createtime; - private Basicuser creator; - private Timestamp updatetime; - private Basicuser updator; - - //----------以下属性导入exel表格使用-------------------- - /** - * 类型 right--正确 warn--警告 wrong--错误 - */ - private Map cellInfo; - - /** - * 行号 - */ - private Integer rowLineNum; - - /** - * 保存价格 - */ - private String priceStr; - - /** - * 资产名称 - */ - private String assetnameStr; - - /** - * 资产类型 - */ - private String category; - - /** - * 购买日期 - */ - private String purchasedateStr; - - /** - * 有效日期 - */ - private String periodofvalidityStr; - - /** - * 保修日期 - */ - private String warrantydateStr; - - public Asset() - { - - } - - public Asset(Long id) - { - this.id = id; - } - - public Asset(Assetname assetname, String location, - Short status, Basicuser user, Double price, Timestamp purchasedate, - Timestamp periodofvalidity, Timestamp warrantydate, - String assetnum, String serialnum, Supplier supplier, - String description, Timestamp createtime, Basicuser creator, - Timestamp updatetime,String labels, Basicuser updator,String addMonth) - { - super(); - this.assetname = assetname; - this.location = location; - this.status = status; - this.user = user; - this.price = price; - this.purchasedate = purchasedate; - this.periodofvalidity = periodofvalidity; - this.warrantydate = warrantydate; - this.assetnum = assetnum; - this.serialnum = serialnum; - this.supplier = supplier; - this.description = description; - this.createtime = createtime; - this.creator = creator; - this.updatetime = updatetime; - this.updator = updator; - this.labels = labels; - this.addMonth = addMonth; - } - - - - public Long getId() - { - return id; - } - - public void setId(Long id) - { - this.id = id; - } - - public Assetname getAssetname() - { - return assetname; - } - - public void setAssetname(Assetname assetname) - { - this.assetname = assetname; - } - - public String getLocation() - { - return location; - } - - public void setLocation(String location) - { - this.location = location; - } - - public Short getStatus() - { - return status; - } - - public void setStatus(Short status) - { - this.status = status; - } - - public Basicuser getUser() - { - return user; - } - - public void setUser(Basicuser user) - { - this.user = user; - } - - public Double getPrice() - { - return price; - } - - public void setPrice(Double price) - { - this.price = price; - } - - public Timestamp getPurchasedate() - { - return purchasedate; - } - - public void setPurchasedate(Timestamp purchasedate) - { - this.purchasedate = purchasedate; - } - - public Timestamp getPeriodofvalidity() - { - return periodofvalidity; - } - - public void setPeriodofvalidity(Timestamp periodofvalidity) - { - this.periodofvalidity = periodofvalidity; - } - - public Timestamp getWarrantydate() - { - return warrantydate; - } - - public void setWarrantydate(Timestamp warrantydate) - { - this.warrantydate = warrantydate; - } - - public String getAssetnum() - { - return assetnum; - } - - public void setAssetnum(String assetnum) - { - this.assetnum = assetnum; - } - - public String getSerialnum() - { - return serialnum; - } - - public void setSerialnum(String serialnum) - { - this.serialnum = serialnum; - } - - public Supplier getSupplier() - { - return supplier; - } - - public void setSupplier(Supplier supplier) - { - this.supplier = supplier; - } - - public String getDescription() - { - return description; - } - - public void setDescription(String description) - { - this.description = description; - } - - public Timestamp getCreatetime() - { - return createtime; - } - - public void setCreatetime(Timestamp createtime) - { - this.createtime = createtime; - } - - public Basicuser getCreator() - { - return creator; - } - - public void setCreator(Basicuser creator) - { - this.creator = creator; - } - - public Timestamp getUpdatetime() - { - return updatetime; - } - - public void setUpdatetime(Timestamp updatetime) - { - this.updatetime = updatetime; - } - - public Basicuser getUpdator() - { - return updator; - } - - public void setUpdator(Basicuser updator) - { - this.updator = updator; - } - - public String getLabels() - { - return labels; - } - - public void setLabels(String labels) - { - this.labels = labels; - } - - public String getAddMonth() - { - return addMonth; - } - - public void setAddMonth(String addMonth) - { - this.addMonth = addMonth; - } - - public Integer getRowLineNum() - { - return rowLineNum; - } - - public void setRowLineNum(Integer rowLineNum) - { - this.rowLineNum = rowLineNum; - } - - public Map getCellInfo() - { - return cellInfo; - } - - public void setCellInfo(Map cellInfo) - { - this.cellInfo = cellInfo; - } - - public String getPriceStr() - { - return priceStr; - } - - public void setPriceStr(String priceStr) - { - this.priceStr = priceStr; - } - - public String getAssetnameStr() - { - return assetnameStr; - } - - public void setAssetnameStr(String assetnameStr) - { - this.assetnameStr = assetnameStr; - } - - public String getCategory() - { - return category; - } - - public void setCategory(String category) - { - this.category = category; - } - - public String getPurchasedateStr() - { - return purchasedateStr; - } - - public void setPurchasedateStr(String purchasedateStr) - { - this.purchasedateStr = purchasedateStr; - } - - public String getPeriodofvalidityStr() - { - return periodofvalidityStr; - } - - public void setPeriodofvalidityStr(String periodofvalidityStr) - { - this.periodofvalidityStr = periodofvalidityStr; - } - - public String getWarrantydateStr() - { - return warrantydateStr; - } - - public void setWarrantydateStr(String warrantydateStr) - { - this.warrantydateStr = warrantydateStr; - } -} \ No newline at end of file diff --git a/src/com/jsh/model/po/Assetcategory.hbm.xml b/src/com/jsh/model/po/Assetcategory.hbm.xml deleted file mode 100644 index 72b098164..000000000 --- a/src/com/jsh/model/po/Assetcategory.hbm.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - 资产类型名称 - - - - - 是否系统自带 0==系统 1==非系统 - - - - - 描述信息 - - - - diff --git a/src/com/jsh/model/po/Assetcategory.java b/src/com/jsh/model/po/Assetcategory.java deleted file mode 100644 index 302c6971d..000000000 --- a/src/com/jsh/model/po/Assetcategory.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.jsh.model.po; - -@SuppressWarnings("serial") -public class Assetcategory implements java.io.Serializable -{ - private Long id; - private String assetname; - private Short isystem; - private String description; - - public Assetcategory() - { - - } - - public Assetcategory(Long id) - { - this.id = id ; - } - - public Assetcategory(String assetname, Short isystem, String description) - { - this.assetname = assetname; - this.isystem = isystem; - this.description = description; - } - - public Long getId() - { - return this.id; - } - - public void setId(Long id) - { - this.id = id; - } - - public String getAssetname() - { - return this.assetname; - } - - public void setAssetname(String assetname) - { - this.assetname = assetname; - } - - public Short getIsystem() - { - return this.isystem; - } - - public void setIsystem(Short isystem) - { - this.isystem = isystem; - } - - public String getDescription() - { - return this.description; - } - - public void setDescription(String description) - { - this.description = description; - } -} \ No newline at end of file diff --git a/src/com/jsh/model/po/Assetname.hbm.xml b/src/com/jsh/model/po/Assetname.hbm.xml deleted file mode 100644 index 45610bdb2..000000000 --- a/src/com/jsh/model/po/Assetname.hbm.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - 资产名称 - - - - - - - - 是否系统自带 0==系统 1==非系统 - - - - - 描述信息 - - - - - 是否为耗材 0==否 1==是 耗材状态只能是消费 - - - - diff --git a/src/com/jsh/model/po/Assetname.java b/src/com/jsh/model/po/Assetname.java deleted file mode 100644 index 28b84039c..000000000 --- a/src/com/jsh/model/po/Assetname.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.jsh.model.po; - -@SuppressWarnings("serial") -public class Assetname implements java.io.Serializable -{ - private Long id; - private String assetname; - private Short isystem; - private Category category; - private String description; - private Short isconsumables; - - public Assetname() - { - - } - - public Assetname(Long id) - { - this.id = id; - } - - public Assetname(String assetname, Short isystem, String description, - Short isconsumables,Category category) - { - this.assetname = assetname; - this.isystem = isystem; - this.description = description; - this.isconsumables = isconsumables; - this.category = category; - } - - public Long getId() - { - return this.id; - } - - public void setId(Long id) - { - this.id = id; - } - - public String getAssetname() - { - return this.assetname; - } - - public void setAssetname(String assetname) - { - this.assetname = assetname; - } - - public Short getIsystem() - { - return this.isystem; - } - - public void setIsystem(Short isystem) - { - this.isystem = isystem; - } - - public String getDescription() - { - return this.description; - } - - public void setDescription(String description) - { - this.description = description; - } - - public Short getIsconsumables() - { - return this.isconsumables; - } - - public void setIsconsumables(Short isconsumables) - { - this.isconsumables = isconsumables; - } - - public Category getCategory() - { - return category; - } - - public void setCategory(Category category) - { - this.category = category; - } - -} \ No newline at end of file diff --git a/src/com/jsh/model/po/Basicuser.hbm.xml b/src/com/jsh/model/po/Basicuser.hbm.xml deleted file mode 100644 index e6abb717e..000000000 --- a/src/com/jsh/model/po/Basicuser.hbm.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - 用户姓名--例如张三 - - - - - 登录用户名--可能为空 - - - - - 登陆密码 - - - - - 职位 - - - - - 所属部门 - - - - - 电子邮箱 - - - - - 手机号码 - - - - - 是否为管理者 0==管理者 1==员工 - - - - - 是否系统自带数据 - - - - - 用户状态 - - - - - 用户描述信息 - - - - - - - diff --git a/src/com/jsh/model/po/Basicuser.java b/src/com/jsh/model/po/Basicuser.java deleted file mode 100644 index 97f85be2d..000000000 --- a/src/com/jsh/model/po/Basicuser.java +++ /dev/null @@ -1,177 +0,0 @@ -package com.jsh.model.po; - -@SuppressWarnings("serial") -public class Basicuser implements java.io.Serializable -{ - private Long id; - private String username; - private String loginame; - private String password; - private String position; - private String department; - private String email; - private String phonenum; - private Short ismanager; - private Short isystem; - private Short status; - private String description; - private String remark; - - public Basicuser() - { - } - - public Basicuser(Long id) - { - this.id = id; - } - - public Basicuser(String username, String loginame, String password, - String position, String department, String email, String phonenum, - Short ismanager, Short isystem, Short status, String description, - String remark) - { - this.username = username; - this.loginame = loginame; - this.password = password; - this.position = position; - this.department = department; - this.email = email; - this.phonenum = phonenum; - this.ismanager = ismanager; - this.isystem = isystem; - this.status = status; - this.description = description; - this.remark = remark; - } - - public Long getId() - { - return this.id; - } - - public void setId(Long id) - { - this.id = id; - } - - public String getUsername() - { - return this.username; - } - - public void setUsername(String username) - { - this.username = username; - } - - public String getLoginame() - { - return this.loginame; - } - - public void setLoginame(String loginame) - { - this.loginame = loginame; - } - - public String getPassword() - { - return this.password; - } - - public void setPassword(String password) - { - this.password = password; - } - - public String getPosition() - { - return this.position; - } - - public void setPosition(String position) - { - this.position = position; - } - - public String getDepartment() - { - return this.department; - } - - public void setDepartment(String department) - { - this.department = department; - } - - public String getEmail() - { - return this.email; - } - - public void setEmail(String email) - { - this.email = email; - } - - public String getPhonenum() - { - return this.phonenum; - } - - public void setPhonenum(String phonenum) - { - this.phonenum = phonenum; - } - - public Short getIsmanager() - { - return this.ismanager; - } - - public void setIsmanager(Short ismanager) - { - this.ismanager = ismanager; - } - - public Short getIsystem() - { - return this.isystem; - } - - public void setIsystem(Short isystem) - { - this.isystem = isystem; - } - - public Short getStatus() - { - return this.status; - } - - public void setStatus(Short status) - { - this.status = status; - } - - public String getDescription() - { - return this.description; - } - - public void setDescription(String description) - { - this.description = description; - } - - public String getRemark() - { - return this.remark; - } - - public void setRemark(String remark) - { - this.remark = remark; - } -} \ No newline at end of file diff --git a/src/com/jsh/model/po/Category.hbm.xml b/src/com/jsh/model/po/Category.hbm.xml deleted file mode 100644 index 0e8086006..000000000 --- a/src/com/jsh/model/po/Category.hbm.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - 资产类型名称 - - - - - 是否系统自带 0==系统 1==非系统 - - - - - 描述信息 - - - - diff --git a/src/com/jsh/model/po/Category.java b/src/com/jsh/model/po/Category.java deleted file mode 100644 index 09a41f087..000000000 --- a/src/com/jsh/model/po/Category.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.jsh.model.po; - -@SuppressWarnings("serial") -public class Category implements java.io.Serializable -{ - private Long id; - private String assetname; - private Short isystem; - private String description; - - public Category() - { - - } - - public Category(Long id) - { - this.id = id ; - } - - public Category(String assetname, Short isystem, String description) - { - this.assetname = assetname; - this.isystem = isystem; - this.description = description; - } - - public Long getId() - { - return this.id; - } - - public void setId(Long id) - { - this.id = id; - } - - public String getAssetname() - { - return this.assetname; - } - - public void setAssetname(String assetname) - { - this.assetname = assetname; - } - - public Short getIsystem() - { - return this.isystem; - } - - public void setIsystem(Short isystem) - { - this.isystem = isystem; - } - - public String getDescription() - { - return this.description; - } - - public void setDescription(String description) - { - this.description = description; - } -} \ No newline at end of file diff --git a/src/com/jsh/model/po/Depot.hbm.xml b/src/com/jsh/model/po/Depot.hbm.xml deleted file mode 100644 index 17fdd785f..000000000 --- a/src/com/jsh/model/po/Depot.hbm.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - 仓库名称 - - - - - 排序 - - - - - 描述 - - - - diff --git a/src/com/jsh/model/po/Depot.java b/src/com/jsh/model/po/Depot.java deleted file mode 100644 index 7e8c69c13..000000000 --- a/src/com/jsh/model/po/Depot.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.jsh.model.po; - -@SuppressWarnings("serial") -public class Depot implements java.io.Serializable -{ - private Long id; - private String name; - private String sort; - private String remark; - - public Depot() - { - - } - - public Depot(Long id) - { - this.id = id ; - } - - public Depot(String name, String sort, String remark) - { - this.name = name; - this.sort = sort; - this.remark = remark; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getSort() { - return sort; - } - - public void setSort(String sort) { - this.sort = sort; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - -} \ No newline at end of file diff --git a/src/com/jsh/model/po/DepotHead.hbm.xml b/src/com/jsh/model/po/DepotHead.hbm.xml deleted file mode 100644 index 80352b748..000000000 --- a/src/com/jsh/model/po/DepotHead.hbm.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - 类型(出库/入库) - - - - - 出入库分类 - - - - - 项目Id - - - - - 票据号 - - - - - 操作员名字 - - - - - 创建时间 - - - - - 出入库时间 - - - - - 供应商Id - - - - - 经手人Id - - - - - 账户Id - - - - - 变动金额(收款/付款) - - - - - 调拨时，对方项目Id - - - - - 合计金额 - - - - - 备注 - - - - diff --git a/src/com/jsh/model/po/DepotHead.java b/src/com/jsh/model/po/DepotHead.java deleted file mode 100644 index 6b15402ff..000000000 --- a/src/com/jsh/model/po/DepotHead.java +++ /dev/null @@ -1,174 +0,0 @@ -package com.jsh.model.po; - -import java.sql.Timestamp; - -@SuppressWarnings("serial") -public class DepotHead implements java.io.Serializable -{ - private Long Id; - private String Type; - private String SubType; - private Depot ProjectId; - private String Number; - private String OperPersonName; - private Timestamp CreateTime; - private Timestamp OperTime; - private Supplier OrganId; - private Person HandsPersonId; - private Account AccountId; - private Double ChangeAmount; - private Depot AllocationProjectId; - private Double TotalPrice; - private String Remark; - - public DepotHead() - { - - } - - public DepotHead(Long Id) - { - this.Id = Id ; - } - - public DepotHead(String type, String subType, Depot projectId, - String number, String operPersonName, Timestamp createTime, - Timestamp operTime, Supplier organId, Person handsPersonId, - Account accountId, Double changeAmount, Depot allocationProjectId, Double totalPrice, String remark) { - super(); - Type = type; - SubType = subType; - ProjectId = projectId; - Number = number; - OperPersonName = operPersonName; - CreateTime = createTime; - OperTime = operTime; - OrganId = organId; - HandsPersonId = handsPersonId; - AccountId = accountId; - ChangeAmount = changeAmount; - AllocationProjectId = allocationProjectId; - TotalPrice = totalPrice; - Remark = remark; - } - - public Long getId() { - return Id; - } - - public void setId(Long id) { - Id = id; - } - - public String getType() { - return Type; - } - - public void setType(String type) { - Type = type; - } - - public String getSubType() { - return SubType; - } - - public void setSubType(String subType) { - SubType = subType; - } - - public Depot getProjectId() { - return ProjectId; - } - - public void setProjectId(Depot projectId) { - ProjectId = projectId; - } - - public String getNumber() { - return Number; - } - - public void setNumber(String number) { - Number = number; - } - - public String getOperPersonName() { - return OperPersonName; - } - - public void setOperPersonName(String operPersonName) { - OperPersonName = operPersonName; - } - - public Timestamp getCreateTime() { - return CreateTime; - } - - public void setCreateTime(Timestamp createTime) { - CreateTime = createTime; - } - - public Timestamp getOperTime() { - return OperTime; - } - - public void setOperTime(Timestamp operTime) { - OperTime = operTime; - } - - public Supplier getOrganId() { - return OrganId; - } - - public void setOrganId(Supplier organId) { - OrganId = organId; - } - - public Person getHandsPersonId() { - return HandsPersonId; - } - - public void setHandsPersonId(Person handsPersonId) { - HandsPersonId = handsPersonId; - } - - public Account getAccountId() { - return AccountId; - } - - public void setAccountId(Account accountId) { - AccountId = accountId; - } - - public Double getChangeAmount() { - return ChangeAmount; - } - - public void setChangeAmount(Double changeAmount) { - ChangeAmount = changeAmount; - } - - public Depot getAllocationProjectId() { - return AllocationProjectId; - } - - public void setAllocationProjectId(Depot allocationProjectId) { - AllocationProjectId = allocationProjectId; - } - - public Double getTotalPrice() { - return TotalPrice; - } - - public void setTotalPrice(Double totalPrice) { - TotalPrice = totalPrice; - } - - public String getRemark() { - return Remark; - } - - public void setRemark(String remark) { - Remark = remark; - } -} \ No newline at end of file diff --git a/src/com/jsh/model/po/DepotItem.hbm.xml b/src/com/jsh/model/po/DepotItem.hbm.xml deleted file mode 100644 index c6de4ed93..000000000 --- a/src/com/jsh/model/po/DepotItem.hbm.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - 表头Id - - - - - 材料Id - - - - - 数量 - - - - - 单价 - - - - - 金额 - - - - - 描述 - - - - - 图片 - - - - diff --git a/src/com/jsh/model/po/DepotItem.java b/src/com/jsh/model/po/DepotItem.java deleted file mode 100644 index f3cec78b8..000000000 --- a/src/com/jsh/model/po/DepotItem.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.jsh.model.po; - -@SuppressWarnings("serial") -public class DepotItem implements java.io.Serializable -{ - private Long Id; - private DepotHead HeaderId; - private Material MaterialId; - private Double OperNumber; - private Double UnitPrice; - private Double AllPrice; - private String Remark; - private String Img; - - public DepotItem() - { - - } - - public DepotItem(Long Id) - { - this.Id = Id ; - } - - public DepotItem(DepotHead headerId, Material materialId, - Double operNumber, Double unitPrice, Double allPrice, - String remark, String img) { - super(); - HeaderId = headerId; - MaterialId = materialId; - OperNumber = operNumber; - UnitPrice = unitPrice; - AllPrice = allPrice; - Remark = remark; - Img = img; - } - - public Long getId() { - return Id; - } - - public void setId(Long id) { - Id = id; - } - - public DepotHead getHeaderId() { - return HeaderId; - } - - public void setHeaderId(DepotHead headerId) { - HeaderId = headerId; - } - - public Material getMaterialId() { - return MaterialId; - } - - public void setMaterialId(Material materialId) { - MaterialId = materialId; - } - - public Double getOperNumber() { - return OperNumber; - } - - public void setOperNumber(Double operNumber) { - OperNumber = operNumber; - } - - public Double getUnitPrice() { - return UnitPrice; - } - - public void setUnitPrice(Double unitPrice) { - UnitPrice = unitPrice; - } - - public Double getAllPrice() { - return AllPrice; - } - - public void setAllPrice(Double allPrice) { - AllPrice = allPrice; - } - - public String getRemark() { - return Remark; - } - - public void setRemark(String remark) { - Remark = remark; - } - - public String getImg() { - return Img; - } - - public void setImg(String img) { - Img = img; - } - - -} diff --git a/src/com/jsh/model/po/Functions.hbm.xml b/src/com/jsh/model/po/Functions.hbm.xml deleted file mode 100644 index 2a8923bcf..000000000 --- a/src/com/jsh/model/po/Functions.hbm.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - 编号 - - - - - 名称 - - - - - 上级编号 - - - - - 链接 - - - - - 收缩 - - - - - 排序 - - - - - 启用 - - - - - 类型 - - - - - - - diff --git a/src/com/jsh/model/po/Functions.java b/src/com/jsh/model/po/Functions.java deleted file mode 100644 index 121c661cf..000000000 --- a/src/com/jsh/model/po/Functions.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.jsh.model.po; - -@SuppressWarnings("serial") -public class Functions implements java.io.Serializable -{ - private Long Id; - private String Number; - private String Name; - private String PNumber; - private String URL; - private Boolean State; - private String Sort; - private Boolean Enabled; - private String Type; - - public Functions() - { - - } - - public Long getId() { - return Id; - } - - public void setId(Long id) { - Id = id; - } - - public String getNumber() { - return Number; - } - - public void setNumber(String number) { - Number = number; - } - - public String getName() { - return Name; - } - - public void setName(String name) { - Name = name; - } - - public String getPNumber() { - return PNumber; - } - - public void setPNumber(String pNumber) { - PNumber = pNumber; - } - - public String getURL() { - return URL; - } - - public void setURL(String uRL) { - URL = uRL; - } - - public Boolean getState() { - return State; - } - - public void setState(Boolean state) { - State = state; - } - - public String getSort() { - return Sort; - } - - public void setSort(String sort) { - Sort = sort; - } - - public Boolean getEnabled() { - return Enabled; - } - - public void setEnabled(Boolean enabled) { - Enabled = enabled; - } - - public String getType() { - return Type; - } - - public void setType(String type) { - Type = type; - } - -} \ No newline at end of file diff --git a/src/com/jsh/model/po/InOutItem.hbm.xml b/src/com/jsh/model/po/InOutItem.hbm.xml deleted file mode 100644 index 4e8afb9c2..000000000 --- a/src/com/jsh/model/po/InOutItem.hbm.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - 名称 - - - - - 类型 - - - - - 备注 - - - - diff --git a/src/com/jsh/model/po/InOutItem.java b/src/com/jsh/model/po/InOutItem.java deleted file mode 100644 index 09ca13734..000000000 --- a/src/com/jsh/model/po/InOutItem.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.jsh.model.po; - -@SuppressWarnings("serial") -public class InOutItem implements java.io.Serializable -{ - private Long Id; - private String Name; - private String Type; - private String Remark; - - public InOutItem() - { - - } - - public InOutItem(Long Id) - { - this.Id = Id; - } - - public InOutItem(String name, String type, String remark) { - Name = name; - Type = type; - Remark = remark; - } - - public void setId(Long id) - { - Id = id; - } - - public Long getId() - { - return Id; - } - - public void setName(String name) - { - Name = name; - } - - public String getName() - { - return Name; - } - - public void setType(String type) - { - Type = type; - } - - public String getType() - { - return Type; - } - - public void setRemark(String remark) - { - Remark = remark; - } - - public String getRemark() - { - return Remark; - } -} diff --git a/src/com/jsh/model/po/Logdetails.hbm.xml b/src/com/jsh/model/po/Logdetails.hbm.xml deleted file mode 100644 index 8f6d4429f..000000000 --- a/src/com/jsh/model/po/Logdetails.hbm.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - 操作模块名称 - - - - - 客户端IP - - - - - 创建时间 - - - - - 操作状态 0==成功，1==失败 - - - - - 操作详情 - - - - - 备注信息 - - - - diff --git a/src/com/jsh/model/po/Logdetails.java b/src/com/jsh/model/po/Logdetails.java deleted file mode 100644 index df9ad7bbd..000000000 --- a/src/com/jsh/model/po/Logdetails.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.jsh.model.po; - -import java.sql.Timestamp; - -@SuppressWarnings("serial") -public class Logdetails implements java.io.Serializable -{ - - private Long id; - private Basicuser user; - private String operation; - private String clientIp; - private Timestamp createtime; - private Short status; - private String contentdetails; - private String remark; - - public Logdetails() - { - - } - - public Logdetails(Long id) - { - this.id = id; - } - - public Logdetails(Basicuser user, String operation, String clientIp, - Timestamp createtime, Short status, String contentdetails, - String remark) - { - this.user = user; - this.operation = operation; - this.clientIp = clientIp; - this.createtime = createtime; - this.status = status; - this.contentdetails = contentdetails; - this.remark = remark; - } - - public Long getId() - { - return this.id; - } - - public void setId(Long id) - { - this.id = id; - } - - public Basicuser getUser() { - return user; - } - - public void setUser(Basicuser user) { - this.user = user; - } - - public String getOperation() - { - return this.operation; - } - - public void setOperation(String operation) - { - this.operation = operation; - } - - public String getClientIp() - { - return this.clientIp; - } - - public void setClientIp(String clientIp) - { - this.clientIp = clientIp; - } - - public Timestamp getCreatetime() - { - return this.createtime; - } - - public void setCreatetime(Timestamp createtime) - { - this.createtime = createtime; - } - - public Short getStatus() - { - return this.status; - } - - public void setStatus(Short status) - { - this.status = status; - } - - public String getContentdetails() - { - return this.contentdetails; - } - - public void setContentdetails(String contentdetails) - { - this.contentdetails = contentdetails; - } - - public String getRemark() - { - return this.remark; - } - - public void setRemark(String remark) - { - this.remark = remark; - } - -} \ No newline at end of file diff --git a/src/com/jsh/model/po/Material.hbm.xml b/src/com/jsh/model/po/Material.hbm.xml deleted file mode 100644 index 4b947e839..000000000 --- a/src/com/jsh/model/po/Material.hbm.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - 名称 - - - - - 型号 - - - - - 颜色 - - - - - 单位 - - - - - 零售价 - - - - - 最低售价 - - - - - 预设售价一 - - - - - 预设售价二 - - - - - 备注 - - - - diff --git a/src/com/jsh/model/po/Material.java b/src/com/jsh/model/po/Material.java deleted file mode 100644 index fa8dd3528..000000000 --- a/src/com/jsh/model/po/Material.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.jsh.model.po; - -@SuppressWarnings("serial") -public class Material implements java.io.Serializable -{ - private Long Id; - private MaterialCategory materialCategory; - private String Name; - private String Model; - private String Color; - private String Unit; - private Double RetailPrice; - private Double LowPrice; - private Double PresetPriceOne; - private Double PresetPriceTwo; - private String Remark; - - public Material() - { - - } - - public Material(Long Id) - { - this.Id = Id; - } - - public Material(MaterialCategory materialCategory, String name, - String model, String color, String unit, String remark, - Double retailPrice, Double lowPrice, Double presetPriceOne, Double presetPriceTwo) - { - super(); - this.materialCategory = materialCategory; - Name = name; - Model = model; - Color = color; - Unit = unit; - RetailPrice = retailPrice; - LowPrice = lowPrice; - PresetPriceOne = presetPriceOne; - PresetPriceTwo = presetPriceTwo; - Remark = remark; - } - - public Long getId() - { - return Id; - } - - public void setId(Long id) - { - Id = id; - } - - public MaterialCategory getMaterialCategory() - { - return materialCategory; - } - - public void setMaterialCategory(MaterialCategory materialCategory) - { - this.materialCategory = materialCategory; - } - - public String getName() - { - return Name; - } - - public void setName(String name) - { - Name = name; - } - - public String getModel() - { - return Model; - } - - public void setModel(String model) - { - Model = model; - } - - public String getColor() - { - return Color; - } - - public void setColor(String color) - { - Color = color; - } - - public String getUnit() - { - return Unit; - } - - public void setUnit(String unit) - { - Unit = unit; - } - - public void setRetailPrice(Double retailPrice) - { - RetailPrice = retailPrice; - } - - public Double getRetailPrice() - { - return RetailPrice; - } - - public void setLowPrice(Double lowPrice) - { - LowPrice = lowPrice; - } - - public Double getLowPrice() - { - return LowPrice; - } - - public void setPresetPriceOne(Double presetPriceOne) - { - PresetPriceOne = presetPriceOne; - } - - public Double getPresetPriceOne() - { - return PresetPriceOne; - } - - public void setPresetPriceTwo(Double presetPriceTwo) - { - PresetPriceTwo = presetPriceTwo; - } - - public Double getPresetPriceTwo() - { - return PresetPriceTwo; - } - - public String getRemark() - { - return Remark; - } - - public void setRemark(String remark) - { - Remark = remark; - } - -} diff --git a/src/com/jsh/model/po/MaterialCategory.hbm.xml b/src/com/jsh/model/po/MaterialCategory.hbm.xml deleted file mode 100644 index 211cd14bf..000000000 --- a/src/com/jsh/model/po/MaterialCategory.hbm.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - 名称 - - - - - 等级 - - - - - - - diff --git a/src/com/jsh/model/po/MaterialCategory.java b/src/com/jsh/model/po/MaterialCategory.java deleted file mode 100644 index 7aac5457f..000000000 --- a/src/com/jsh/model/po/MaterialCategory.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.jsh.model.po; - -@SuppressWarnings("serial") -public class MaterialCategory implements java.io.Serializable -{ - private Long Id; - private String Name; - private Short CategoryLevel; - private MaterialCategory materialCategory; - - - public MaterialCategory() - { - - } - - public MaterialCategory(Long Id) - { - this.Id = Id; - } - - public MaterialCategory(String name, Short categoryLevel, - MaterialCategory materialCategory) { - Name = name; - CategoryLevel = categoryLevel; - this.materialCategory = materialCategory; - } - - public Long getId() { - return Id; - } - - public void setId(Long id) { - Id = id; - } - - public String getName() { - return Name; - } - - public void setName(String name) { - Name = name; - } - - public Short getCategoryLevel() { - return CategoryLevel; - } - - public void setCategoryLevel(Short categoryLevel) { - CategoryLevel = categoryLevel; - } - - public MaterialCategory getMaterialCategory() { - return materialCategory; - } - - public void setMaterialCategory(MaterialCategory materialCategory) { - this.materialCategory = materialCategory; - } - -} \ No newline at end of file diff --git a/src/com/jsh/model/po/Person.hbm.xml b/src/com/jsh/model/po/Person.hbm.xml deleted file mode 100644 index f3e03159d..000000000 --- a/src/com/jsh/model/po/Person.hbm.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - 类型 - - - - - 姓名 - - - - diff --git a/src/com/jsh/model/po/Person.java b/src/com/jsh/model/po/Person.java deleted file mode 100644 index 6e739bd14..000000000 --- a/src/com/jsh/model/po/Person.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.jsh.model.po; - -@SuppressWarnings("serial") -public class Person implements java.io.Serializable -{ - private Long Id; - private String Type; - private String Name; - - public Person() - { - - } - - public Person(Long Id) - { - this.Id = Id; - } - - public Person(String type, String name) { - Type = type; - Name = name; - } - - public Long getId() { - return Id; - } - - public void setId(Long id) { - Id = id; - } - - public String getType() { - return Type; - } - - public void setType(String type) { - Type = type; - } - - public String getName() { - return Name; - } - - public void setName(String name) { - Name = name; - } - -} \ No newline at end of file diff --git a/src/com/jsh/model/po/Role.hbm.xml b/src/com/jsh/model/po/Role.hbm.xml deleted file mode 100644 index a76e27f1b..000000000 --- a/src/com/jsh/model/po/Role.hbm.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - 角色名称 - - - - diff --git a/src/com/jsh/model/po/Role.java b/src/com/jsh/model/po/Role.java deleted file mode 100644 index 1e82eb27f..000000000 --- a/src/com/jsh/model/po/Role.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.jsh.model.po; - -@SuppressWarnings("serial") -public class Role implements java.io.Serializable -{ - private Long Id; - private String Name; - - public Role() - { - - } - - public Long getId() { - return Id; - } - - public void setId(Long id) { - Id = id; - } - - public String getName() { - return Name; - } - - public void setName(String name) { - Name = name; - } - - -} \ No newline at end of file diff --git a/src/com/jsh/model/po/Supplier.hbm.xml b/src/com/jsh/model/po/Supplier.hbm.xml deleted file mode 100644 index c4410ec7d..000000000 --- a/src/com/jsh/model/po/Supplier.hbm.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - 供应商名称 - - - - - 类型 - - - - - 联系人 - - - - - 联系电话 - - - - - 电子邮箱 - - - - - 期初应收 - - - - - 期初应付 - - - - - 累计应收 - - - - - 累计应付 - - - - - - - - 是否系统自带 0==系统 1==非系统 - - - - - 启用 - - - - diff --git a/src/com/jsh/model/po/Supplier.java b/src/com/jsh/model/po/Supplier.java deleted file mode 100644 index 2578eb99c..000000000 --- a/src/com/jsh/model/po/Supplier.java +++ /dev/null @@ -1,163 +0,0 @@ -package com.jsh.model.po; - -@SuppressWarnings("serial") -public class Supplier implements java.io.Serializable -{ - private Long id; - private String supplier; - private String type; - private String contacts; - private String phonenum; - private String email; - private Double BeginNeedGet; - private Double BeginNeedPay; - private Double AllNeedGet; - private Double AllNeedPay; - private Short isystem; - private String description; - private Boolean enabled; - - public Supplier() - { - - } - - public Supplier(Long id) - { - this.id = id; - } - - public Supplier(String supplier, String type, String contacts, String phonenum, - String email, Short isystem, String description, Boolean enabled, - Double beginNeedGet,Double beginNeedPay,Double allNeedGet,Double allNeedPay) { - super(); - this.supplier = supplier; - this.type = type; - this.contacts = contacts; - this.phonenum = phonenum; - this.email = email; - this.BeginNeedGet = beginNeedGet; - this.BeginNeedPay = beginNeedPay; - this.AllNeedGet = allNeedGet; - this.AllNeedPay = allNeedPay; - this.isystem = isystem; - this.description = description; - this.enabled = enabled; - } - - public Long getId() - { - return id; - } - - public void setId(Long id) - { - this.id = id; - } - - public String getSupplier() - { - return supplier; - } - - public void setSupplier(String supplier) { - this.supplier = supplier; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getContacts() { - return contacts; - } - - public void setContacts(String contacts) { - this.contacts = contacts; - } - - public String getPhonenum() { - return phonenum; - } - - public void setPhonenum(String phonenum) { - this.phonenum = phonenum; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public void setBeginNeedGet(Double beginNeedGet) - { - BeginNeedGet = beginNeedGet; - } - - public Double getBeginNeedGet() - { - return BeginNeedGet; - } - - public void setBeginNeedPay(Double beginNeedPay) - { - BeginNeedPay = beginNeedPay; - } - - public Double getBeginNeedPay() - { - return BeginNeedPay; - } - - public void setAllNeedGet(Double allNeedGet) - { - AllNeedGet = allNeedGet; - } - - public Double getAllNeedGet() - { - return AllNeedGet; - } - - public void setAllNeedPay(Double allNeedPay) - { - AllNeedPay = allNeedPay; - } - - public Double getAllNeedPay() - { - return AllNeedPay; - } - - public Short getIsystem() { - return isystem; - } - - public void setIsystem(Short isystem) { - this.isystem = isystem; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Boolean getEnabled() { - return enabled; - } - - public void setEnabled(Boolean enabled) { - this.enabled = enabled; - } - -} diff --git a/src/com/jsh/model/po/UserBusiness.hbm.xml b/src/com/jsh/model/po/UserBusiness.hbm.xml deleted file mode 100644 index 98b9201b5..000000000 --- a/src/com/jsh/model/po/UserBusiness.hbm.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - 类别 - - - - - 主ID - - - - - 值 - - - - diff --git a/src/com/jsh/model/po/UserBusiness.java b/src/com/jsh/model/po/UserBusiness.java deleted file mode 100644 index 0505abdf8..000000000 --- a/src/com/jsh/model/po/UserBusiness.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.jsh.model.po; - -@SuppressWarnings("serial") -public class UserBusiness implements java.io.Serializable -{ - private Long Id; - private String Type; - private String KeyId; - private String Value; - - public UserBusiness() - { - - } - - public Long getId() { - return Id; - } - - public void setId(Long id) { - Id = id; - } - - public String getType() { - return Type; - } - - public void setType(String type) { - Type = type; - } - - public String getKeyId() { - return KeyId; - } - - public void setKeyId(String keyId) { - KeyId = keyId; - } - - public String getValue() { - return Value; - } - - public void setValue(String value) { - Value = value; - } - - -} \ No newline at end of file diff --git a/src/com/jsh/model/vo/asset/AssetModel.java b/src/com/jsh/model/vo/asset/AssetModel.java deleted file mode 100644 index 8b361f332..000000000 --- a/src/com/jsh/model/vo/asset/AssetModel.java +++ /dev/null @@ -1,429 +0,0 @@ -package com.jsh.model.vo.asset; - -import java.io.File; -import java.io.InputStream; -import java.io.Serializable; - -@SuppressWarnings("serial") -public class AssetModel implements Serializable -{ - private AssetShowModel showModel = new AssetShowModel(); - - - /**======开始接受页面参数=================**/ - /** - * 资产名称ID - */ - private Long assetNameID ; - - /** - * 资产类型ID - */ - private Long assetCategoryID ; - - /** - * 位置属性 - */ - private String location = ""; - - /** - * 状态属性 - */ - private Short status ; - - /** - * 用户ID - */ - private Long userID ; - - /** - * 资产单价 - */ - private double price = 0; - - /** - * 购买日期 - */ - private String purchasedate = ""; - - /** - * 有效日期 - */ - private String periodofvalidity = ""; - - /** - * 保修日期 - */ - private String warrantydate = ""; - - /** - * 资产编号 - */ - private String assetnum = ""; - - /** - * 资产序列号 - */ - private String serialnum = ""; - - /** - * 标签 - */ - private String labels = ""; - - /** - * 资产ID - */ - private Long supplierID; - - /** - * 描述信息 - */ - private String description = ""; - - - /** - * 资产ID - */ - private Long assetID; - - /** - * 资产IDs 批量操作使用 - */ - private String assetIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - /** - * 输入流，导出excel文件 - */ - private InputStream excelStream; - - /** - * 文件名称 - */ - private String fileName = ""; - - /** - * 是否全部数据--根据搜索条件 - */ - private String isAllData = ""; - - /** - * 浏览器类型--中文字符乱码问题解决，火狐和IE下字符类型不一样 - */ - private String browserType = ""; - - /** - * 导入excel文件 - */ - private File assetFile; - - /** - * 文件类型 - */ - private String assetFileContentType; - - /** - * 文件名称 - */ - private String assetFileFileName; - - /** - * 是否只手工检查数据 0==检查 1==不检查直接导入数据库中 - */ - private Integer isCheck; - - public AssetShowModel getShowModel() - { - return showModel; - } - - public void setShowModel(AssetShowModel showModel) - { - this.showModel = showModel; - } - - public String getDescription() - { - return description; - } - - public void setDescription(String description) - { - this.description = description; - } - - public Long getAssetID() - { - return assetID; - } - - public void setAssetID(Long assetID) - { - this.assetID = assetID; - } - - public String getAssetIDs() - { - return assetIDs; - } - - public void setAssetIDs(String assetIDs) - { - this.assetIDs = assetIDs; - } - - public int getPageSize() - { - return pageSize; - } - - public void setPageSize(int pageSize) - { - this.pageSize = pageSize; - } - - public int getPageNo() - { - return pageNo; - } - - public void setPageNo(int pageNo) - { - this.pageNo = pageNo; - } - - public String getClientIp() - { - return clientIp; - } - - public void setClientIp(String clientIp) - { - this.clientIp = clientIp; - } - - public Long getAssetNameID() - { - return assetNameID; - } - - public void setAssetNameID(Long assetNameID) - { - this.assetNameID = assetNameID; - } - - public Long getAssetCategoryID() - { - return assetCategoryID; - } - - public void setAssetCategoryID(Long assetCategoryID) - { - this.assetCategoryID = assetCategoryID; - } - - public String getLocation() - { - return location; - } - - public void setLocation(String location) - { - this.location = location; - } - - public Short getStatus() - { - return status; - } - - public void setStatus(Short status) - { - this.status = status; - } - - public Long getUserID() - { - return userID; - } - - public void setUserID(Long userID) - { - this.userID = userID; - } - - public double getPrice() - { - return price; - } - - public void setPrice(double price) - { - this.price = price; - } - - public String getPurchasedate() - { - return purchasedate; - } - - public void setPurchasedate(String purchasedate) - { - this.purchasedate = purchasedate; - } - - public String getPeriodofvalidity() - { - return periodofvalidity; - } - - public void setPeriodofvalidity(String periodofvalidity) - { - this.periodofvalidity = periodofvalidity; - } - - public String getWarrantydate() - { - return warrantydate; - } - - public void setWarrantydate(String warrantydate) - { - this.warrantydate = warrantydate; - } - - public String getLabels() - { - return labels; - } - - public void setLabels(String labels) - { - this.labels = labels; - } - - public Long getSupplierID() - { - return supplierID; - } - - public void setSupplierID(Long supplierID) - { - this.supplierID = supplierID; - } - - public String getAssetnum() - { - return assetnum; - } - - public void setAssetnum(String assetnum) - { - this.assetnum = assetnum; - } - - public String getSerialnum() - { - return serialnum; - } - - public void setSerialnum(String serialnum) - { - this.serialnum = serialnum; - } - - public InputStream getExcelStream() - { - return excelStream; - } - - public void setExcelStream(InputStream excelStream) - { - this.excelStream = excelStream; - } - - public String getFileName() - { - return fileName; - } - - public void setFileName(String fileName) - { - this.fileName = fileName; - } - - public String getIsAllData() - { - return isAllData; - } - - public void setIsAllData(String isAllData) - { - this.isAllData = isAllData; - } - - public String getBrowserType() - { - return browserType; - } - - public void setBrowserType(String browserType) - { - this.browserType = browserType; - } - - public File getAssetFile() - { - return assetFile; - } - - public void setAssetFile(File assetFile) - { - this.assetFile = assetFile; - } - - public Integer getIsCheck() - { - return isCheck; - } - - public void setIsCheck(Integer isCheck) - { - this.isCheck = isCheck; - } - - public String getAssetFileContentType() - { - return assetFileContentType; - } - - public void setAssetFileContentType(String assetFileContentType) - { - this.assetFileContentType = assetFileContentType; - } - - public String getAssetFileFileName() - { - return assetFileFileName; - } - - public void setAssetFileFileName(String assetFileFileName) - { - this.assetFileFileName = assetFileFileName; - } -} diff --git a/src/com/jsh/model/vo/asset/AssetShowModel.java b/src/com/jsh/model/vo/asset/AssetShowModel.java deleted file mode 100644 index 6ee4a3719..000000000 --- a/src/com/jsh/model/vo/asset/AssetShowModel.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.jsh.model.vo.asset; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@SuppressWarnings({ "serial" }) -public class AssetShowModel implements Serializable -{ - /** - * 提示信息 - */ - private String msgTip = ""; - - /** - * 系统数据 - */ - @SuppressWarnings("rawtypes") - private Map map = new HashMap(); - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } - - @SuppressWarnings("rawtypes") - public Map getMap() - { - return map; - } - - @SuppressWarnings("rawtypes") - public void setMap(Map map) - { - this.map = map; - } -} diff --git a/src/com/jsh/model/vo/asset/ReportModel.java b/src/com/jsh/model/vo/asset/ReportModel.java deleted file mode 100644 index 524682299..000000000 --- a/src/com/jsh/model/vo/asset/ReportModel.java +++ /dev/null @@ -1,321 +0,0 @@ -package com.jsh.model.vo.asset; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class ReportModel implements Serializable -{ - private ReportShowModel showModel = new ReportShowModel(); - - /**======开始接受页面参数=================**/ - /** - * 资产名称ID - */ - private Long assetNameID ; - - /** - * 资产类型ID - */ - private Long assetCategoryID ; - - /** - * 位置属性 - */ - private String location = ""; - - /** - * 状态属性 - */ - private Short status ; - - /** - * 用户ID - */ - private Long usernameID ; - - /** - * 资产单价 - */ - private float price = 0; - - /** - * 购买日期 - */ - private String purchasedate = ""; - - /** - * 有效日期 - */ - private String periodofvalidity = ""; - - /** - * 保修日期 - */ - private String warrantydate = ""; - - /** - * 资产编号 - */ - private String assetnum = ""; - - /** - * 资产序列号 - */ - private String serialnum = ""; - - /** - * 标签 - */ - private String labels = ""; - - /** - * 资产ID - */ - private Long supplierID; - - /** - * 描述信息 - */ - private String description = ""; - - - /** - * 资产ID - */ - private Long assetID; - - /** - * 资产IDs 批量操作使用 - */ - private String assetIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - /** - * 报表类型 - */ - private Integer reportType; - - public ReportShowModel getShowModel() - { - return showModel; - } - - public void setShowModel(ReportShowModel showModel) - { - this.showModel = showModel; - } - - public Long getAssetNameID() - { - return assetNameID; - } - - public void setAssetNameID(Long assetNameID) - { - this.assetNameID = assetNameID; - } - - public Long getAssetCategoryID() - { - return assetCategoryID; - } - - public void setAssetCategoryID(Long assetCategoryID) - { - this.assetCategoryID = assetCategoryID; - } - - public String getLocation() - { - return location; - } - - public void setLocation(String location) - { - this.location = location; - } - - public Short getStatus() - { - return status; - } - - public void setStatus(Short status) - { - this.status = status; - } - - public Long getUsernameID() - { - return usernameID; - } - - public void setUsernameID(Long usernameID) - { - this.usernameID = usernameID; - } - - public float getPrice() - { - return price; - } - - public void setPrice(float price) - { - this.price = price; - } - - public String getPurchasedate() - { - return purchasedate; - } - - public void setPurchasedate(String purchasedate) - { - this.purchasedate = purchasedate; - } - - public String getPeriodofvalidity() - { - return periodofvalidity; - } - - public void setPeriodofvalidity(String periodofvalidity) - { - this.periodofvalidity = periodofvalidity; - } - - public String getWarrantydate() - { - return warrantydate; - } - - public void setWarrantydate(String warrantydate) - { - this.warrantydate = warrantydate; - } - - public String getAssetnum() - { - return assetnum; - } - - public void setAssetnum(String assetnum) - { - this.assetnum = assetnum; - } - - public String getSerialnum() - { - return serialnum; - } - - public void setSerialnum(String serialnum) - { - this.serialnum = serialnum; - } - - public String getLabels() - { - return labels; - } - - public void setLabels(String labels) - { - this.labels = labels; - } - - public Long getSupplierID() - { - return supplierID; - } - - public void setSupplierID(Long supplierID) - { - this.supplierID = supplierID; - } - - public String getDescription() - { - return description; - } - - public void setDescription(String description) - { - this.description = description; - } - - public Long getAssetID() - { - return assetID; - } - - public void setAssetID(Long assetID) - { - this.assetID = assetID; - } - - public String getAssetIDs() - { - return assetIDs; - } - - public void setAssetIDs(String assetIDs) - { - this.assetIDs = assetIDs; - } - - public int getPageSize() - { - return pageSize; - } - - public void setPageSize(int pageSize) - { - this.pageSize = pageSize; - } - - public int getPageNo() - { - return pageNo; - } - - public void setPageNo(int pageNo) - { - this.pageNo = pageNo; - } - - public String getClientIp() - { - return clientIp; - } - - public void setClientIp(String clientIp) - { - this.clientIp = clientIp; - } - - public Integer getReportType() - { - return reportType; - } - - public void setReportType(Integer reportType) - { - this.reportType = reportType; - } -} diff --git a/src/com/jsh/model/vo/asset/ReportShowModel.java b/src/com/jsh/model/vo/asset/ReportShowModel.java deleted file mode 100644 index ac77a2420..000000000 --- a/src/com/jsh/model/vo/asset/ReportShowModel.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.jsh.model.vo.asset; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -@SuppressWarnings({"serial","rawtypes"}) -public class ReportShowModel implements Serializable -{ - //保存报表数据 - private List reportData = new ArrayList(); - //保存提示信息 - private String msgTip = ""; - - public List getReportData() - { - return reportData; - } - - public void setReportData(List reportData) - { - this.reportData = reportData; - } - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } -} diff --git a/src/com/jsh/model/vo/basic/AccountModel.java b/src/com/jsh/model/vo/basic/AccountModel.java deleted file mode 100644 index ec50f744a..000000000 --- a/src/com/jsh/model/vo/basic/AccountModel.java +++ /dev/null @@ -1,170 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class AccountModel implements Serializable -{ - private AccountShowModel showModel = new AccountShowModel(); - - /**======开始接受页面参数=================**/ - /** - * 名称 - */ - private String name = ""; - - /** - * 编号 - */ - private String serialNo = ""; - - /** - * 期初金额 - */ - private Double initialAmount; - - /** - * 当前余额 - */ - private Double currentAmount; - - /** - * 备注 - */ - private String remark = ""; - - /** - * 分类ID - */ - private Long accountID = 0l; - - /** - * 分类IDs 批量操作使用 - */ - private String accountIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - public void setShowModel(AccountShowModel showModel) - { - this.showModel = showModel; - } - - public AccountShowModel getShowModel() - { - return showModel; - } - - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - - public void setSerialNo(String serialNo) - { - this.serialNo = serialNo; - } - - public String getSerialNo() - { - return serialNo; - } - - public void setInitialAmount(Double initialAmount) - { - this.initialAmount = initialAmount; - } - - public Double getInitialAmount() - { - return initialAmount; - } - - public void setCurrentAmount(Double currentAmount) - { - this.currentAmount = currentAmount; - } - - public Double getCurrentAmount() - { - return currentAmount; - } - - public void setRemark(String remark) - { - this.remark = remark; - } - - public String getRemark() - { - return remark; - } - - public void setAccountID(Long accountID) - { - this.accountID = accountID; - } - - public Long getAccountID() - { - return accountID; - } - - public void setAccountIDs(String accountIDs) - { - this.accountIDs = accountIDs; - } - - public String getAccountIDs() - { - return accountIDs; - } - - public void setPageSize(int pageSize) - { - this.pageSize = pageSize; - } - - public int getPageSize() - { - return pageSize; - } - - public void setPageNo(int pageNo) - { - this.pageNo = pageNo; - } - - public int getPageNo() - { - return pageNo; - } - - public void setClientIp(String clientIp) - { - this.clientIp = clientIp; - } - - public String getClientIp() - { - return clientIp; - } -} diff --git a/src/com/jsh/model/vo/basic/AccountShowModel.java b/src/com/jsh/model/vo/basic/AccountShowModel.java deleted file mode 100644 index 96700bbd0..000000000 --- a/src/com/jsh/model/vo/basic/AccountShowModel.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@SuppressWarnings("serial") -public class AccountShowModel implements Serializable -{ - /** - * 提示信息 - */ - private String msgTip = ""; - - /** - * 系统数据 - */ - @SuppressWarnings("rawtypes") - private Map map = new HashMap(); - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } - - @SuppressWarnings("rawtypes") - public Map getMap() { - return map; - } - - @SuppressWarnings("rawtypes") - public void setMap(Map map) { - this.map = map; - } - - -} diff --git a/src/com/jsh/model/vo/basic/AppModel.java b/src/com/jsh/model/vo/basic/AppModel.java deleted file mode 100644 index 63187b8ef..000000000 --- a/src/com/jsh/model/vo/basic/AppModel.java +++ /dev/null @@ -1,294 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.File; -import java.io.Serializable; - -@SuppressWarnings("serial") -public class AppModel implements Serializable -{ - private AppShowModel showModel = new AppShowModel(); - - /**======开始接受页面参数=================**/ - /** - * 代号 - */ - private String Number = ""; - - /** - * 名称 - */ - private String Name = ""; - - /** - * 类型 - */ - private String Type = ""; - - /** - * 图标 - */ - private String Icon = ""; - - /** - * 链接 - */ - private String URL = ""; - - /** - * 宽度 - */ - private String Width = ""; - - /** - * 高度 - */ - private String Height = ""; - - /** - * 拉伸 - */ - private Boolean ReSize = false; - - /** - * 最大化 - */ - private Boolean OpenMax = false; - - /** - * Flash - */ - private Boolean Flash = false; - - /** - * 种类 - */ - private String ZL = ""; - - /** - * 排序号 - */ - private String Sort = ""; - - /** - * 备注 - */ - private String Remark = ""; - - /** - * 启用 - */ - private Boolean Enabled = false; - - /** - * 分类ID - */ - private Long appID = 0l; - - /** - * 分类IDs 批量操作使用 - */ - private String appIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - /** - * UBType，UserBusiness类型 - */ - private String UBType = ""; - - /** - * UBKeyId，UserBusiness关键id - */ - private String UBKeyId = ""; - - - public AppShowModel getShowModel() { - return showModel; - } - - public void setShowModel(AppShowModel showModel) { - this.showModel = showModel; - } - - public String getNumber() { - return Number; - } - - public void setNumber(String number) { - Number = number; - } - - public String getName() { - return Name; - } - - public void setName(String name) { - Name = name; - } - - public String getType() { - return Type; - } - - public void setType(String type) { - Type = type; - } - - public String getIcon() { - return Icon; - } - - public void setIcon(String icon) { - Icon = icon; - } - - public String getURL() { - return URL; - } - - public void setURL(String uRL) { - URL = uRL; - } - - public String getWidth() { - return Width; - } - - public void setWidth(String width) { - Width = width; - } - - public String getHeight() { - return Height; - } - - public void setHeight(String height) { - Height = height; - } - - public Boolean getReSize() { - return ReSize; - } - - public void setReSize(Boolean reSize) { - ReSize = reSize; - } - - public Boolean getOpenMax() { - return OpenMax; - } - - public void setOpenMax(Boolean openMax) { - OpenMax = openMax; - } - - public Boolean getFlash() { - return Flash; - } - - public void setFlash(Boolean flash) { - Flash = flash; - } - - public String getZL() { - return ZL; - } - - public void setZL(String zL) { - ZL = zL; - } - - public String getSort() { - return Sort; - } - - public void setSort(String sort) { - Sort = sort; - } - - public String getRemark() { - return Remark; - } - - public void setRemark(String remark) { - Remark = remark; - } - - public Boolean getEnabled() { - return Enabled; - } - - public void setEnabled(Boolean enabled) { - Enabled = enabled; - } - - public Long getAppID() { - return appID; - } - - public void setAppID(Long appID) { - this.appID = appID; - } - - public String getAppIDs() { - return appIDs; - } - - public void setAppIDs(String appIDs) { - this.appIDs = appIDs; - } - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public int getPageNo() { - return pageNo; - } - - public void setPageNo(int pageNo) { - this.pageNo = pageNo; - } - - public String getClientIp() { - return clientIp; - } - - public void setClientIp(String clientIp) { - this.clientIp = clientIp; - } - - public String getUBType() { - return UBType; - } - - public void setUBType(String uBType) { - UBType = uBType; - } - - public String getUBKeyId() { - return UBKeyId; - } - - public void setUBKeyId(String uBKeyId) { - UBKeyId = uBKeyId; - } - -} diff --git a/src/com/jsh/model/vo/basic/AppShowModel.java b/src/com/jsh/model/vo/basic/AppShowModel.java deleted file mode 100644 index ebaf0c180..000000000 --- a/src/com/jsh/model/vo/basic/AppShowModel.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class AppShowModel implements Serializable -{ - /** - * 提示信息 - */ - private String msgTip = ""; - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } -} diff --git a/src/com/jsh/model/vo/basic/AssetNameModel.java b/src/com/jsh/model/vo/basic/AssetNameModel.java deleted file mode 100644 index a1d09481d..000000000 --- a/src/com/jsh/model/vo/basic/AssetNameModel.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class AssetNameModel implements Serializable -{ - private AssetNameShowModel showModel = new AssetNameShowModel(); - /**======开始接受页面参数=================**/ - /** - * 名称 - */ - private String assetName = ""; - - /** - * 是否易耗品 - */ - private Short consumable; - - /** - * 描述信息 - */ - private String description = ""; - - /** - * 分类ID - */ - private Long categoryID; - - /** - * ID - */ - private Long assetNameID = 0l; - - /** - * IDs 批量操作使用 - */ - private String assetNameIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - public AssetNameShowModel getShowModel() - { - return showModel; - } - - public void setShowModel(AssetNameShowModel showModel) - { - this.showModel = showModel; - } - - public String getAssetName() - { - return assetName; - } - - public void setAssetName(String assetName) - { - this.assetName = assetName; - } - - public String getDescription() - { - return description; - } - - public void setDescription(String description) - { - this.description = description; - } - - public Long getAssetNameID() - { - return assetNameID; - } - - public void setAssetNameID(Long assetNameID) - { - this.assetNameID = assetNameID; - } - - public String getAssetNameIDs() - { - return assetNameIDs; - } - - public void setAssetNameIDs(String assetNameIDs) - { - this.assetNameIDs = assetNameIDs; - } - - public int getPageSize() - { - return pageSize; - } - - public void setPageSize(int pageSize) - { - this.pageSize = pageSize; - } - - public int getPageNo() - { - return pageNo; - } - - public void setPageNo(int pageNo) - { - this.pageNo = pageNo; - } - - public String getClientIp() - { - return clientIp; - } - - public void setClientIp(String clientIp) - { - this.clientIp = clientIp; - } - - public Short getConsumable() - { - return consumable; - } - - public void setConsumable(Short consumable) - { - this.consumable = consumable; - } - - public Long getCategoryID() - { - return categoryID; - } - - public void setCategoryID(Long categoryID) - { - this.categoryID = categoryID; - } -} diff --git a/src/com/jsh/model/vo/basic/AssetNameShowModel.java b/src/com/jsh/model/vo/basic/AssetNameShowModel.java deleted file mode 100644 index dd28afad3..000000000 --- a/src/com/jsh/model/vo/basic/AssetNameShowModel.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class AssetNameShowModel implements Serializable -{ - /** - * 提示信息 - */ - private String msgTip = ""; - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } -} diff --git a/src/com/jsh/model/vo/basic/CategoryModel.java b/src/com/jsh/model/vo/basic/CategoryModel.java deleted file mode 100644 index 1ec5ca99c..000000000 --- a/src/com/jsh/model/vo/basic/CategoryModel.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class CategoryModel implements Serializable -{ - private CategoryShowModel showModel = new CategoryShowModel(); - - /**======开始接受页面参数=================**/ - /** - * 分类名称 - */ - private String categoryName = ""; - - /** - * 描述信息 - */ - private String description = ""; - - /** - * 分类ID - */ - private Long categoryID = 0l; - - /** - * 分类IDs 批量操作使用 - */ - private String categoryIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - public CategoryShowModel getShowModel() - { - return showModel; - } - - public void setShowModel(CategoryShowModel showModel) - { - this.showModel = showModel; - } - - public String getCategoryName() - { - return categoryName; - } - - public void setCategoryName(String categoryName) - { - this.categoryName = categoryName; - } - - public String getDescription() - { - return description; - } - - public void setDescription(String description) - { - this.description = description; - } - - public Long getCategoryID() - { - return categoryID; - } - - public void setCategoryID(Long categoryID) - { - this.categoryID = categoryID; - } - - public String getCategoryIDs() - { - return categoryIDs; - } - - public void setCategoryIDs(String categoryIDs) - { - this.categoryIDs = categoryIDs; - } - - public int getPageSize() - { - return pageSize; - } - - public void setPageSize(int pageSize) - { - this.pageSize = pageSize; - } - - public int getPageNo() - { - return pageNo; - } - - public void setPageNo(int pageNo) - { - this.pageNo = pageNo; - } - - public String getClientIp() - { - return clientIp; - } - - public void setClientIp(String clientIp) - { - this.clientIp = clientIp; - } -} diff --git a/src/com/jsh/model/vo/basic/CategoryShowModel.java b/src/com/jsh/model/vo/basic/CategoryShowModel.java deleted file mode 100644 index f1e9d73b2..000000000 --- a/src/com/jsh/model/vo/basic/CategoryShowModel.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class CategoryShowModel implements Serializable -{ - /** - * 提示信息 - */ - private String msgTip = ""; - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } -} diff --git a/src/com/jsh/model/vo/basic/DepotModel.java b/src/com/jsh/model/vo/basic/DepotModel.java deleted file mode 100644 index 2856a6d82..000000000 --- a/src/com/jsh/model/vo/basic/DepotModel.java +++ /dev/null @@ -1,150 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class DepotModel implements Serializable -{ - private DepotShowModel showModel = new DepotShowModel(); - - /**======开始接受页面参数=================**/ - /** - * 仓库名称 - */ - private String name = ""; - - /** - * 排序 - */ - private String sort = ""; - - /** - * 描述 - */ - private String remark = ""; - - /** - * 分类ID - */ - private Long depotID = 0l; - - /** - * 分类IDs 批量操作使用 - */ - private String depotIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - /** - * UBType，UserBusiness类型 - */ - private String UBType = ""; - - /** - * UBKeyId，UserBusiness关键id - */ - private String UBKeyId = ""; - - public DepotShowModel getShowModel() { - return showModel; - } - - public void setShowModel(DepotShowModel showModel) { - this.showModel = showModel; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getSort() { - return sort; - } - - public void setSort(String sort) { - this.sort = sort; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public Long getDepotID() { - return depotID; - } - - public void setDepotID(Long depotID) { - this.depotID = depotID; - } - - public String getDepotIDs() { - return depotIDs; - } - - public void setDepotIDs(String depotIDs) { - this.depotIDs = depotIDs; - } - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public int getPageNo() { - return pageNo; - } - - public void setPageNo(int pageNo) { - this.pageNo = pageNo; - } - - public String getClientIp() { - return clientIp; - } - - public void setClientIp(String clientIp) { - this.clientIp = clientIp; - } - - public String getUBType() { - return UBType; - } - - public void setUBType(String uBType) { - UBType = uBType; - } - - public String getUBKeyId() { - return UBKeyId; - } - - public void setUBKeyId(String uBKeyId) { - UBKeyId = uBKeyId; - } - - -} diff --git a/src/com/jsh/model/vo/basic/DepotShowModel.java b/src/com/jsh/model/vo/basic/DepotShowModel.java deleted file mode 100644 index a56a4206b..000000000 --- a/src/com/jsh/model/vo/basic/DepotShowModel.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@SuppressWarnings("serial") -public class DepotShowModel implements Serializable -{ - /** - * 提示信息 - */ - private String msgTip = ""; - - /** - * 系统数据 - */ - @SuppressWarnings("rawtypes") - private Map map = new HashMap(); - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } - - @SuppressWarnings("rawtypes") - public Map getMap() { - return map; - } - - @SuppressWarnings("rawtypes") - public void setMap(Map map) { - this.map = map; - } - - -} diff --git a/src/com/jsh/model/vo/basic/FunctionsModel.java b/src/com/jsh/model/vo/basic/FunctionsModel.java deleted file mode 100644 index ccc3315a7..000000000 --- a/src/com/jsh/model/vo/basic/FunctionsModel.java +++ /dev/null @@ -1,219 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class FunctionsModel implements Serializable -{ - private FunctionsShowModel showModel = new FunctionsShowModel(); - - /**======开始接受页面参数=================**/ - /** - * 编号 - */ - private String Number = ""; - /** - * 名称 - */ - private String Name = ""; - /** - * 上级编号 - */ - private String PNumber = ""; - /** - * 链接 - */ - private String URL = ""; - /** - * 收缩 - */ - private Boolean State = false; - /** - * 排序 - */ - private String Sort = ""; - /** - * 启用 - */ - private Boolean Enabled = false; - /** - * 类型 - */ - private String Type = ""; - /** - * 拥有的功能列表 - */ - private String hasFunctions= ""; - /** - * 分类ID - */ - private Long functionsID = 0l; - - /** - * 分类IDs 批量操作使用 - */ - private String functionsIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - /** - * UBType，UserBusiness类型 - */ - private String UBType = ""; - - /** - * UBKeyId，UserBusiness关键id - */ - private String UBKeyId = ""; - - public FunctionsShowModel getShowModel() { - return showModel; - } - - public void setShowModel(FunctionsShowModel showModel) { - this.showModel = showModel; - } - - public String getNumber() { - return Number; - } - - public void setNumber(String number) { - Number = number; - } - - public String getName() { - return Name; - } - - public void setName(String name) { - Name = name; - } - - public String getPNumber() { - return PNumber; - } - - public void setPNumber(String pNumber) { - PNumber = pNumber; - } - - public String getURL() { - return URL; - } - - public void setURL(String uRL) { - URL = uRL; - } - - public Boolean getState() { - return State; - } - - public void setState(Boolean state) { - State = state; - } - - public String getSort() { - return Sort; - } - - public void setSort(String sort) { - Sort = sort; - } - - public Boolean getEnabled() { - return Enabled; - } - - public void setEnabled(Boolean enabled) { - Enabled = enabled; - } - - public String getType() { - return Type; - } - - public void setType(String type) { - Type = type; - } - - public Long getFunctionsID() { - return functionsID; - } - - public void setFunctionsID(Long functionsID) { - this.functionsID = functionsID; - } - - public String getFunctionsIDs() { - return functionsIDs; - } - - public void setFunctionsIDs(String functionsIDs) { - this.functionsIDs = functionsIDs; - } - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public int getPageNo() { - return pageNo; - } - - public void setPageNo(int pageNo) { - this.pageNo = pageNo; - } - - public String getClientIp() { - return clientIp; - } - - public void setClientIp(String clientIp) { - this.clientIp = clientIp; - } - - public String getUBType() { - return UBType; - } - - public void setUBType(String uBType) { - UBType = uBType; - } - - public String getUBKeyId() { - return UBKeyId; - } - - public void setUBKeyId(String uBKeyId) { - UBKeyId = uBKeyId; - } - - public String getHasFunctions() { - return hasFunctions; - } - - public void setHasFunctions(String hasFunctions) { - this.hasFunctions = hasFunctions; - } - - -} diff --git a/src/com/jsh/model/vo/basic/FunctionsShowModel.java b/src/com/jsh/model/vo/basic/FunctionsShowModel.java deleted file mode 100644 index 778b445ca..000000000 --- a/src/com/jsh/model/vo/basic/FunctionsShowModel.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class FunctionsShowModel implements Serializable -{ - /** - * 提示信息 - */ - private String msgTip = ""; - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } -} diff --git a/src/com/jsh/model/vo/basic/InOutItemModel.java b/src/com/jsh/model/vo/basic/InOutItemModel.java deleted file mode 100644 index 579c50844..000000000 --- a/src/com/jsh/model/vo/basic/InOutItemModel.java +++ /dev/null @@ -1,140 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class InOutItemModel implements Serializable -{ - private InOutItemShowModel showModel = new InOutItemShowModel(); - - /**======开始接受页面参数=================**/ - /** - * 名称 - */ - private String name = ""; - - /** - * 类型 - */ - private String type = ""; - - /** - * 备注 - */ - private String remark = ""; - - /** - * 分类ID - */ - private Long inOutItemID = 0l; - - /** - * 分类IDs 批量操作使用 - */ - private String inOutItemIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - public void setShowModel(InOutItemShowModel showModel) - { - this.showModel = showModel; - } - - public InOutItemShowModel getShowModel() - { - return showModel; - } - - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - - public void setType(String type) - { - this.type = type; - } - - public String getType() - { - return type; - } - - public void setRemark(String remark) - { - this.remark = remark; - } - - public String getRemark() - { - return remark; - } - - public void setInOutItemID(Long inOutItemID) - { - this.inOutItemID = inOutItemID; - } - - public Long getInOutItemID() - { - return inOutItemID; - } - - public void setInOutItemIDs(String inOutItemIDs) - { - this.inOutItemIDs = inOutItemIDs; - } - - public String getInOutItemIDs() - { - return inOutItemIDs; - } - - public void setPageSize(int pageSize) - { - this.pageSize = pageSize; - } - - public int getPageSize() - { - return pageSize; - } - - public void setPageNo(int pageNo) - { - this.pageNo = pageNo; - } - - public int getPageNo() - { - return pageNo; - } - - public void setClientIp(String clientIp) - { - this.clientIp = clientIp; - } - - public String getClientIp() - { - return clientIp; - } - } diff --git a/src/com/jsh/model/vo/basic/InOutItemShowModel.java b/src/com/jsh/model/vo/basic/InOutItemShowModel.java deleted file mode 100644 index f3967f4ea..000000000 --- a/src/com/jsh/model/vo/basic/InOutItemShowModel.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@SuppressWarnings("serial") -public class InOutItemShowModel implements Serializable -{ - /** - * 提示信息 - */ - private String msgTip = ""; - - /** - * 系统数据 - */ - @SuppressWarnings("rawtypes") - private Map map = new HashMap(); - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } - - @SuppressWarnings("rawtypes") - public Map getMap() { - return map; - } - - @SuppressWarnings("rawtypes") - public void setMap(Map map) { - this.map = map; - } - - -} diff --git a/src/com/jsh/model/vo/basic/LogModel.java b/src/com/jsh/model/vo/basic/LogModel.java deleted file mode 100644 index bdd5f2e41..000000000 --- a/src/com/jsh/model/vo/basic/LogModel.java +++ /dev/null @@ -1,200 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class LogModel implements Serializable -{ - private LogShowModel showModel = new LogShowModel(); - /**======开始接受页面参数=================**/ - /** - * 用户ID - */ - private Long usernameID ; - - /** - * 操作 - */ - private String operation; - - /** - * 开始时间 - */ - private String beginTime; - - /** - * 结束时间 - */ - private String endTime; - - /** - * 是否成功 0==成功 1==失败 - */ - private Short status; - - /** - * 操作具体内容 - */ - private String contentdetails; - - /** - * 描述信息 - */ - private String remark = ""; - - /** - * 日志ID - */ - private Long logID = 0l; - - /** - * 日志IDs 批量操作使用 - */ - private String logIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - public LogShowModel getShowModel() { - return showModel; - } - - public void setShowModel(LogShowModel showModel) { - this.showModel = showModel; - } - - public Long getLogID() - { - return logID; - } - - public void setLogID(Long logID) - { - this.logID = logID; - } - - public String getLogIDs() - { - return logIDs; - } - - public void setLogIDs(String logIDs) - { - this.logIDs = logIDs; - } - - public int getPageSize() - { - return pageSize; - } - - public void setPageSize(int pageSize) - { - this.pageSize = pageSize; - } - - public int getPageNo() - { - return pageNo; - } - - public void setPageNo(int pageNo) - { - this.pageNo = pageNo; - } - - public String getClientIp() - { - return clientIp; - } - - public void setClientIp(String clientIp) - { - this.clientIp = clientIp; - } - - public Long getUsernameID() - { - return usernameID; - } - - public void setUsernameID(Long usernameID) - { - this.usernameID = usernameID; - } - - public String getOperation() - { - return operation; - } - - public void setOperation(String operation) - { - this.operation = operation; - } - - public String getBeginTime() - { - if(null == beginTime || beginTime.length() == 0) - return beginTime; - return beginTime + " 00:00:00"; - } - - public void setBeginTime(String beginTime) - { - this.beginTime = beginTime; - } - - public String getEndTime() - { - if(null == endTime || endTime.length() ==0) - return endTime; - return endTime + " 23:59:59"; - } - - public void setEndTime(String endTime) - { - this.endTime = endTime; - } - - public Short getStatus() - { - return status; - } - - public void setStatus(Short status) - { - this.status = status; - } - - public String getContentdetails() - { - return contentdetails; - } - - public void setContentdetails(String contentdetails) - { - this.contentdetails = contentdetails; - } - - public String getRemark() - { - return remark; - } - - public void setRemark(String remark) - { - this.remark = remark; - } -} diff --git a/src/com/jsh/model/vo/basic/LogShowModel.java b/src/com/jsh/model/vo/basic/LogShowModel.java deleted file mode 100644 index 1dbb43b33..000000000 --- a/src/com/jsh/model/vo/basic/LogShowModel.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@SuppressWarnings("serial") -public class LogShowModel implements Serializable -{ - /** - * 提示信息 - */ - private String msgTip = ""; - - /** - * 系统数据 - */ - @SuppressWarnings("rawtypes") - private Map map = new HashMap(); - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } - - @SuppressWarnings("rawtypes") - public Map getMap() - { - return map; - } - - @SuppressWarnings("rawtypes") - public void setMap(Map map) - { - this.map = map; - } -} diff --git a/src/com/jsh/model/vo/basic/RoleModel.java b/src/com/jsh/model/vo/basic/RoleModel.java deleted file mode 100644 index 481fd4d06..000000000 --- a/src/com/jsh/model/vo/basic/RoleModel.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class RoleModel implements Serializable -{ - private RoleShowModel showModel = new RoleShowModel(); - - /**======开始接受页面参数=================**/ - /** - * 角色名称 - */ - private String Name = ""; - - /** - * 分类ID - */ - private Long roleID = 0l; - - /** - * 分类IDs 批量操作使用 - */ - private String roleIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - /** - * UBType，UserBusiness类型 - */ - private String UBType = ""; - - /** - * UBKeyId，UserBusiness关键id - */ - private String UBKeyId = ""; - - public RoleShowModel getShowModel() { - return showModel; - } - - public void setShowModel(RoleShowModel showModel) { - this.showModel = showModel; - } - - public String getName() { - return Name; - } - - public void setName(String name) { - Name = name; - } - - public Long getRoleID() { - return roleID; - } - - public void setRoleID(Long roleID) { - this.roleID = roleID; - } - - public String getRoleIDs() { - return roleIDs; - } - - public void setRoleIDs(String roleIDs) { - this.roleIDs = roleIDs; - } - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public int getPageNo() { - return pageNo; - } - - public void setPageNo(int pageNo) { - this.pageNo = pageNo; - } - - public String getClientIp() { - return clientIp; - } - - public void setClientIp(String clientIp) { - this.clientIp = clientIp; - } - - public String getUBType() { - return UBType; - } - - public void setUBType(String uBType) { - UBType = uBType; - } - - public String getUBKeyId() { - return UBKeyId; - } - - public void setUBKeyId(String uBKeyId) { - UBKeyId = uBKeyId; - } - -} diff --git a/src/com/jsh/model/vo/basic/RoleShowModel.java b/src/com/jsh/model/vo/basic/RoleShowModel.java deleted file mode 100644 index f61b6c41d..000000000 --- a/src/com/jsh/model/vo/basic/RoleShowModel.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class RoleShowModel implements Serializable -{ - /** - * 提示信息 - */ - private String msgTip = ""; - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } -} diff --git a/src/com/jsh/model/vo/basic/SupplierModel.java b/src/com/jsh/model/vo/basic/SupplierModel.java deleted file mode 100644 index 8ab7317cf..000000000 --- a/src/com/jsh/model/vo/basic/SupplierModel.java +++ /dev/null @@ -1,237 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class SupplierModel implements Serializable -{ - private SupplierShowModel showModel = new SupplierShowModel(); - - /**======开始接受页面参数=================**/ - /** - * 供应商名称 - */ - private String supplier = ""; - - /** - * 类型 - */ - private String type = ""; - - /** - * 联系人 - */ - private String contacts = ""; - - /** - * 联系电话 - */ - private String phonenum = ""; - - /** - * 电子邮箱 - */ - private String email = ""; - - /** - * 期初应收 - */ - private Double BeginNeedGet; - - /** - * 期初应付 - */ - private Double BeginNeedPay; - - /** - * 累计应收 - */ - private Double AllNeedGet; - - /** - * 累计应付 - */ - private Double AllNeedPay; - - /** - * 描述信息 - */ - private String description = ""; - - /** - * 启用 - */ - private Boolean enabled = false; - - /** - * 供应商ID - */ - private Long supplierID = 0l; - - /** - * 供应商IDs 批量操作使用 - */ - private String supplierIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - public SupplierShowModel getShowModel() { - return showModel; - } - - public void setShowModel(SupplierShowModel showModel) { - this.showModel = showModel; - } - - public String getSupplier() { - return supplier; - } - - public void setSupplier(String supplier) { - this.supplier = supplier; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getContacts() { - return contacts; - } - - public void setContacts(String contacts) { - this.contacts = contacts; - } - - public String getPhonenum() { - return phonenum; - } - - public void setPhonenum(String phonenum) { - this.phonenum = phonenum; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public void setBeginNeedGet(Double beginNeedGet) - { - BeginNeedGet = beginNeedGet; - } - - public Double getBeginNeedGet() - { - return BeginNeedGet; - } - - public void setBeginNeedPay(Double beginNeedPay) - { - BeginNeedPay = beginNeedPay; - } - - public Double getBeginNeedPay() - { - return BeginNeedPay; - } - - public void setAllNeedGet(Double allNeedGet) - { - AllNeedGet = allNeedGet; - } - - public Double getAllNeedGet() - { - return AllNeedGet; - } - - public void setAllNeedPay(Double allNeedPay) - { - AllNeedPay = allNeedPay; - } - - public Double getAllNeedPay() - { - return AllNeedPay; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Boolean getEnabled() { - return enabled; - } - - public void setEnabled(Boolean enabled) { - this.enabled = enabled; - } - - public Long getSupplierID() { - return supplierID; - } - - public void setSupplierID(Long supplierID) { - this.supplierID = supplierID; - } - - public String getSupplierIDs() { - return supplierIDs; - } - - public void setSupplierIDs(String supplierIDs) { - this.supplierIDs = supplierIDs; - } - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public int getPageNo() { - return pageNo; - } - - public void setPageNo(int pageNo) { - this.pageNo = pageNo; - } - - public String getClientIp() { - return clientIp; - } - - public void setClientIp(String clientIp) { - this.clientIp = clientIp; - } - - - -} diff --git a/src/com/jsh/model/vo/basic/SupplierShowModel.java b/src/com/jsh/model/vo/basic/SupplierShowModel.java deleted file mode 100644 index 9a0cffe7a..000000000 --- a/src/com/jsh/model/vo/basic/SupplierShowModel.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@SuppressWarnings("serial") -public class SupplierShowModel implements Serializable -{ - /** - * 提示信息 - */ - private String msgTip = ""; - - /** - * 系统数据 - */ - @SuppressWarnings("rawtypes") - private Map map = new HashMap(); - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } - - @SuppressWarnings("rawtypes") - public Map getMap() { - return map; - } - - @SuppressWarnings("rawtypes") - public void setMap(Map map) { - this.map = map; - } - -} diff --git a/src/com/jsh/model/vo/basic/UserBusinessModel.java b/src/com/jsh/model/vo/basic/UserBusinessModel.java deleted file mode 100644 index f44f0d8b1..000000000 --- a/src/com/jsh/model/vo/basic/UserBusinessModel.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class UserBusinessModel implements Serializable -{ - private UserBusinessShowModel showModel = new UserBusinessShowModel(); - - /**======开始接受页面参数=================**/ - /** - * 角色名称 - */ - private String Type = ""; - - /** - * 主ID - */ - private String KeyId = ""; - - /** - * 值 - */ - private String Value = ""; - - /** - * 分类ID - */ - private Long userBusinessID = 0l; - - /** - * 分类IDs 批量操作使用 - */ - private String userBusinessIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - public UserBusinessShowModel getShowModel() { - return showModel; - } - - public void setShowModel(UserBusinessShowModel showModel) { - this.showModel = showModel; - } - - public String getType() { - return Type; - } - - public void setType(String type) { - Type = type; - } - - public String getKeyId() { - return KeyId; - } - - public void setKeyId(String keyId) { - KeyId = keyId; - } - - public String getValue() { - return Value; - } - - public void setValue(String value) { - Value = value; - } - - public Long getUserBusinessID() { - return userBusinessID; - } - - public void setUserBusinessID(Long userBusinessID) { - this.userBusinessID = userBusinessID; - } - - public String getUserBusinessIDs() { - return userBusinessIDs; - } - - public void setUserBusinessIDs(String userBusinessIDs) { - this.userBusinessIDs = userBusinessIDs; - } - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public int getPageNo() { - return pageNo; - } - - public void setPageNo(int pageNo) { - this.pageNo = pageNo; - } - - public String getClientIp() { - return clientIp; - } - - public void setClientIp(String clientIp) { - this.clientIp = clientIp; - } - -} diff --git a/src/com/jsh/model/vo/basic/UserBusinessShowModel.java b/src/com/jsh/model/vo/basic/UserBusinessShowModel.java deleted file mode 100644 index 65dc4b273..000000000 --- a/src/com/jsh/model/vo/basic/UserBusinessShowModel.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@SuppressWarnings("serial") -public class UserBusinessShowModel implements Serializable -{ - /** - * 提示信息 - */ - private String msgTip = ""; - - /** - * 系统数据 - */ - @SuppressWarnings("rawtypes") - private Map map = new HashMap(); - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } - - @SuppressWarnings("rawtypes") - public Map getMap() { - return map; - } - - @SuppressWarnings("rawtypes") - public void setMap(Map map) { - this.map = map; - } - - -} diff --git a/src/com/jsh/model/vo/basic/UserModel.java b/src/com/jsh/model/vo/basic/UserModel.java deleted file mode 100644 index 42c8cf0ef..000000000 --- a/src/com/jsh/model/vo/basic/UserModel.java +++ /dev/null @@ -1,255 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class UserModel implements Serializable -{ - private UserShowModel showModel = new UserShowModel(); - - /*+++++用户登录开始+++++++++++*/ - private String username = "" ; - private String password = "" ; - /*+++++用户登录结束+++++++++++*/ - - /** - * ===============以下处理用户管理部分=============== - */ - /** - * 用户登录名称 - */ - private String loginame; - - /** - * 职位 - */ - private String position; - - /** - * 部门 - */ - private String department; - - /** - * 电子邮件 - */ - private String email; - - /** - * 电话号码 - */ - private String phonenum; - - /** - * 是否管理员 0 ==管理员 1==非管理员 - */ - private Short ismanager = 1; - - /** - * 用户描述 - */ - private String description; - - /** - * 用户ID - */ - private Long userID = 0l; - - /** - * 用户IDs 批量操作使用 - */ - private String userIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - /** - * 根据标识判断是校验登录名称还是用户名称 0==用户名称 1==登录名称 - */ - private int checkFlag = 0; - - private String orgpwd = ""; - - public String getClientIp() - { - return clientIp; - } - - public void setClientIp(String clientIp) - { - this.clientIp = clientIp; - } - - public String getUsername() - { - return username; - } - - public void setUsername(String username) - { - this.username = username; - } - - public String getPassword() - { - return password; - } - - public void setPassword(String password) - { - this.password = password; - } - - public UserShowModel getShowModel() - { - return showModel; - } - - public void setShowModel(UserShowModel showModel) - { - this.showModel = showModel; - } - - public String getLoginame() - { - return loginame; - } - - public void setLoginame(String loginame) - { - this.loginame = loginame; - } - - public String getPosition() - { - return position; - } - - public void setPosition(String position) - { - this.position = position; - } - - public String getDepartment() - { - return department; - } - - public void setDepartment(String department) - { - this.department = department; - } - - public String getEmail() - { - return email; - } - - public void setEmail(String email) - { - this.email = email; - } - - public String getPhonenum() - { - return phonenum; - } - - public void setPhonenum(String phonenum) - { - this.phonenum = phonenum; - } - - public Short getIsmanager() - { - return ismanager; - } - - public void setIsmanager(Short ismanager) - { - this.ismanager = ismanager; - } - - public String getDescription() - { - return description; - } - - public void setDescription(String description) - { - this.description = description; - } - - public Long getUserID() - { - return userID; - } - - public void setUserID(Long userID) - { - this.userID = userID; - } - - public String getUserIDs() - { - return userIDs; - } - - public void setUserIDs(String userIDs) - { - this.userIDs = userIDs; - } - - public int getPageSize() - { - return pageSize; - } - - public void setPageSize(int pageSize) - { - this.pageSize = pageSize; - } - - public int getPageNo() - { - return pageNo; - } - - public void setPageNo(int pageNo) - { - this.pageNo = pageNo; - } - - public int getCheckFlag() - { - return checkFlag; - } - - public void setCheckFlag(int checkFlag) - { - this.checkFlag = checkFlag; - } - - public String getOrgpwd() - { - return orgpwd; - } - - public void setOrgpwd(String orgpwd) - { - this.orgpwd = orgpwd; - } - -} diff --git a/src/com/jsh/model/vo/basic/UserShowModel.java b/src/com/jsh/model/vo/basic/UserShowModel.java deleted file mode 100644 index 3a62dc441..000000000 --- a/src/com/jsh/model/vo/basic/UserShowModel.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.jsh.model.vo.basic; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class UserShowModel implements Serializable -{ - /** - * 提示信息 - */ - private String msgTip = ""; - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } -} diff --git a/src/com/jsh/model/vo/materials/AccountHeadModel.java b/src/com/jsh/model/vo/materials/AccountHeadModel.java deleted file mode 100644 index 0c0b14324..000000000 --- a/src/com/jsh/model/vo/materials/AccountHeadModel.java +++ /dev/null @@ -1,225 +0,0 @@ -package com.jsh.model.vo.materials; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class AccountHeadModel implements Serializable -{ - private AccountHeadShowModel showModel = new AccountHeadShowModel(); - - /**======开始接受页面参数=================**/ - private String Type; - private Long OrganId; - private Long HandsPersonId; - private Double ChangeAmount; - private Double TotalPrice; - private Long AccountId; - private String BillNo; - private String BillTime; - private String Remark; - private String BeginTime; //查询开始时间 - private String EndTime; //查询结束时间 - private String MonthTime; //查询月份 - /** - * 分类ID - */ - private Long accountHeadID = 0l; - - /** - * 分类IDs 批量操作使用 - */ - private String accountHeadIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - public void setShowModel(AccountHeadShowModel showModel) - { - this.showModel = showModel; - } - - public AccountHeadShowModel getShowModel() - { - return showModel; - } - - public void setType(String type) - { - Type = type; - } - - public String getType() - { - return Type; - } - - public void setOrganId(Long organId) - { - OrganId = organId; - } - - public Long getOrganId() - { - return OrganId; - } - - public void setHandsPersonId(Long handsPersonId) - { - HandsPersonId = handsPersonId; - } - - public Long getHandsPersonId() - { - return HandsPersonId; - } - - public void setChangeAmount(Double changeAmount) - { - ChangeAmount = changeAmount; - } - - public Double getChangeAmount() - { - return ChangeAmount; - } - - public void setTotalPrice(Double totalPrice) { - TotalPrice = totalPrice; - } - - public Double getTotalPrice() { - return TotalPrice; - } - - public void setAccountId(Long accountId) - { - AccountId = accountId; - } - - public Long getAccountId() - { - return AccountId; - } - - public void setBillNo(String billNo) - { - BillNo = billNo; - } - - public String getBillNo() - { - return BillNo; - } - - public void setBillTime(String billTime) - { - BillTime = billTime; - } - - public String getBillTime() - { - return BillTime; - } - - public void setRemark(String remark) - { - Remark = remark; - } - - public String getRemark() - { - return Remark; - } - - public void setBeginTime(String beginTime) - { - BeginTime = beginTime; - } - - public String getBeginTime() - { - return BeginTime; - } - - public void setEndTime(String endTime) - { - EndTime = endTime; - } - - public String getEndTime() - { - return EndTime; - } - - public void setMonthTime(String monthTime) - { - MonthTime = monthTime; - } - - public String getMonthTime() - { - return MonthTime; - } - - public void setAccountHeadID(Long accountHeadID) - { - this.accountHeadID = accountHeadID; - } - - public Long getAccountHeadID() - { - return accountHeadID; - } - - public void setAccountHeadIDs(String accountHeadIDs) - { - this.accountHeadIDs = accountHeadIDs; - } - - public String getAccountHeadIDs() - { - return accountHeadIDs; - } - - public void setPageSize(int pageSize) - { - this.pageSize = pageSize; - } - - public int getPageSize() - { - return pageSize; - } - - public void setPageNo(int pageNo) - { - this.pageNo = pageNo; - } - - public int getPageNo() - { - return pageNo; - } - - - public void setClientIp(String clientIp) - { - this.clientIp = clientIp; - } - - public String getClientIp() - { - return clientIp; - }} diff --git a/src/com/jsh/model/vo/materials/AccountHeadShowModel.java b/src/com/jsh/model/vo/materials/AccountHeadShowModel.java deleted file mode 100644 index 1e14ae9ba..000000000 --- a/src/com/jsh/model/vo/materials/AccountHeadShowModel.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.jsh.model.vo.materials; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@SuppressWarnings("serial") -public class AccountHeadShowModel implements Serializable -{ - /** - * 提示信息 - */ - private String msgTip = ""; - - /** - * 系统数据 - */ - @SuppressWarnings("rawtypes") - private Map map = new HashMap(); - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } - - @SuppressWarnings("rawtypes") - public Map getMap() { - return map; - } - - @SuppressWarnings("rawtypes") - public void setMap(Map map) { - this.map = map; - } - -} diff --git a/src/com/jsh/model/vo/materials/AccountItemModel.java b/src/com/jsh/model/vo/materials/AccountItemModel.java deleted file mode 100644 index 25c42cae2..000000000 --- a/src/com/jsh/model/vo/materials/AccountItemModel.java +++ /dev/null @@ -1,251 +0,0 @@ -package com.jsh.model.vo.materials; - -import java.io.InputStream; -import java.io.Serializable; - -@SuppressWarnings("serial") -public class AccountItemModel implements Serializable -{ - private AccountItemShowModel showModel = new AccountItemShowModel(); - - /**======开始接受页面参数=================**/ - private Long HeaderId; - private Long AccountId; - private Long InOutItemId; - private Double EachAmount; - private String Remark = ""; - - private String Inserted = ""; //json插入记录 - private String Deleted = ""; //json删除记录 - private String Updated = ""; //json修改记录 - - private String HeadIds = ""; //表头集合列表 - private String MonthTime = ""; //月份 - private String browserType = ""; - /** - * 文件名称 - */ - private String fileName = ""; - /** - * 分类ID - */ - private Long accountItemID = 0l; - - /** - * 分类IDs 批量操作使用 - */ - private String accountItemIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 800; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - - /** - * 输入流，导出excel文件 - */ - private InputStream excelStream; - - public void setShowModel(AccountItemShowModel showModel) - { - this.showModel = showModel; - } - - public AccountItemShowModel getShowModel() - { - return showModel; - } - - public void setHeaderId(Long headerId) - { - HeaderId = headerId; - } - - public Long getHeaderId() - { - return HeaderId; - } - - public void setAccountId(Long accountId) - { - AccountId = accountId; - } - - public Long getAccountId() - { - return AccountId; - } - - public void setInOutItemId(Long inOutItemId) - { - InOutItemId = inOutItemId; - } - - public Long getInOutItemId() - { - return InOutItemId; - } - - public void setEachAmount(Double eachAmount) - { - EachAmount = eachAmount; - } - - public Double getEachAmount() - { - return EachAmount; - } - - public void setRemark(String remark) - { - Remark = remark; - } - - public String getRemark() - { - return Remark; - } - - public void setInserted(String inserted) - { - Inserted = inserted; - } - - public String getInserted() - { - return Inserted; - } - - public void setDeleted(String deleted) - { - Deleted = deleted; - } - - public String getDeleted() - { - return Deleted; - } - - public void setUpdated(String updated) - { - Updated = updated; - } - - public String getUpdated() - { - return Updated; - } - - public void setHeadIds(String headIds) - { - HeadIds = headIds; - } - - public String getHeadIds() - { - return HeadIds; - } - - public void setMonthTime(String monthTime) - { - MonthTime = monthTime; - } - - public String getMonthTime() - { - return MonthTime; - } - - public void setBrowserType(String browserType) - { - this.browserType = browserType; - } - - public String getBrowserType() - { - return browserType; - } - - public void setFileName(String fileName) - { - this.fileName = fileName; - } - - public String getFileName() - { - return fileName; - } - - public void setAccountItemID(Long accountItemID) - { - this.accountItemID = accountItemID; - } - - public Long getAccountItemID() - { - return accountItemID; - } - - public void setAccountItemIDs(String accountItemIDs) - { - this.accountItemIDs = accountItemIDs; - } - - public String getAccountItemIDs() - { - return accountItemIDs; - } - - public void setPageSize(int pageSize) - { - this.pageSize = pageSize; - } - - public int getPageSize() - { - return pageSize; - } - - public void setPageNo(int pageNo) - { - this.pageNo = pageNo; - } - - public int getPageNo() - { - return pageNo; - } - - public void setClientIp(String clientIp) - { - this.clientIp = clientIp; - } - - public String getClientIp() - { - return clientIp; - } - - - - public void setExcelStream(InputStream excelStream) - { - this.excelStream = excelStream; - } - - public InputStream getExcelStream() - { - return excelStream; - } -} diff --git a/src/com/jsh/model/vo/materials/AccountItemShowModel.java b/src/com/jsh/model/vo/materials/AccountItemShowModel.java deleted file mode 100644 index 99810cf38..000000000 --- a/src/com/jsh/model/vo/materials/AccountItemShowModel.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.jsh.model.vo.materials; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class AccountItemShowModel implements Serializable -{ - /** - * 提示信息 - */ - private String msgTip = ""; - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } -} diff --git a/src/com/jsh/model/vo/materials/DepotHeadModel.java b/src/com/jsh/model/vo/materials/DepotHeadModel.java deleted file mode 100644 index f41ffb8b7..000000000 --- a/src/com/jsh/model/vo/materials/DepotHeadModel.java +++ /dev/null @@ -1,229 +0,0 @@ -package com.jsh.model.vo.materials; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class DepotHeadModel implements Serializable -{ - private DepotHeadShowModel showModel = new DepotHeadShowModel(); - - /**======开始接受页面参数=================**/ - private String Type = ""; - private String SubType = ""; - private Long ProjectId; - private String Number = ""; - private String OperPersonName = ""; - private String OperTime; - private Long OrganId; - private Long HandsPersonId; - private Long AccountId; - private Double ChangeAmount; - private Long AllocationProjectId; - private Double TotalPrice; - private String Remark = ""; - - private String BeginTime; //查询开始时间 - private String EndTime; //查询结束时间 - private String MonthTime; //查询月份 - /** - * 分类ID - */ - private Long depotHeadID = 0l; - - /** - * 分类IDs 批量操作使用 - */ - private String depotHeadIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - public DepotHeadShowModel getShowModel() { - return showModel; - } - - public void setShowModel(DepotHeadShowModel showModel) { - this.showModel = showModel; - } - - public String getType() { - return Type; - } - - public void setType(String type) { - Type = type; - } - - public String getSubType() { - return SubType; - } - - public void setSubType(String subType) { - SubType = subType; - } - - public Long getProjectId() { - return ProjectId; - } - - public void setProjectId(Long projectId) { - ProjectId = projectId; - } - - public String getNumber() { - return Number; - } - - public void setNumber(String number) { - Number = number; - } - - public String getOperPersonName() { - return OperPersonName; - } - - public void setOperPersonName(String operPersonName) { - OperPersonName = operPersonName; - } - - public Long getOrganId() { - return OrganId; - } - - public void setOrganId(Long organId) { - OrganId = organId; - } - - public Long getHandsPersonId() { - return HandsPersonId; - } - - public void setHandsPersonId(Long handsPersonId) { - HandsPersonId = handsPersonId; - } - - public Long getAccountId() { - return AccountId; - } - - public void setAccountId(Long accountId) { - AccountId = accountId; - } - - public Double getChangeAmount() { - return ChangeAmount; - } - - public void setChangeAmount(Double changeAmount) { - ChangeAmount = changeAmount; - } - - public Long getAllocationProjectId() { - return AllocationProjectId; - } - - public void setAllocationProjectId(Long allocationProjectId) { - AllocationProjectId = allocationProjectId; - } - - public Double getTotalPrice() { - return TotalPrice; - } - - public void setTotalPrice(Double totalPrice) { - TotalPrice = totalPrice; - } - - public String getRemark() { - return Remark; - } - - public void setRemark(String remark) { - Remark = remark; - } - - public Long getDepotHeadID() { - return depotHeadID; - } - - public void setDepotHeadID(Long depotHeadID) { - this.depotHeadID = depotHeadID; - } - - public String getDepotHeadIDs() { - return depotHeadIDs; - } - - public void setDepotHeadIDs(String depotHeadIDs) { - this.depotHeadIDs = depotHeadIDs; - } - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public int getPageNo() { - return pageNo; - } - - public void setPageNo(int pageNo) { - this.pageNo = pageNo; - } - - public String getClientIp() { - return clientIp; - } - - public void setClientIp(String clientIp) { - this.clientIp = clientIp; - } - - public String getBeginTime() { - return BeginTime; - } - - public void setBeginTime(String beginTime) { - BeginTime = beginTime; - } - - public String getEndTime() { - return EndTime; - } - - public void setEndTime(String endTime) { - EndTime = endTime; - } - - public String getOperTime() { - return OperTime; - } - - public void setOperTime(String operTime) { - OperTime = operTime; - } - - public String getMonthTime() { - return MonthTime; - } - - public void setMonthTime(String monthTime) { - MonthTime = monthTime; - } - -} diff --git a/src/com/jsh/model/vo/materials/DepotHeadShowModel.java b/src/com/jsh/model/vo/materials/DepotHeadShowModel.java deleted file mode 100644 index 0c7289eb9..000000000 --- a/src/com/jsh/model/vo/materials/DepotHeadShowModel.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.jsh.model.vo.materials; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@SuppressWarnings("serial") -public class DepotHeadShowModel implements Serializable -{ - /** - * 提示信息 - */ - private String msgTip = ""; - - /** - * 系统数据 - */ - @SuppressWarnings("rawtypes") - private Map map = new HashMap(); - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } - - @SuppressWarnings("rawtypes") - public Map getMap() { - return map; - } - - @SuppressWarnings("rawtypes") - public void setMap(Map map) { - this.map = map; - } - -} diff --git a/src/com/jsh/model/vo/materials/DepotItemModel.java b/src/com/jsh/model/vo/materials/DepotItemModel.java deleted file mode 100644 index ea6d890eb..000000000 --- a/src/com/jsh/model/vo/materials/DepotItemModel.java +++ /dev/null @@ -1,238 +0,0 @@ -package com.jsh.model.vo.materials; - -import java.io.InputStream; -import java.io.Serializable; - -@SuppressWarnings("serial") -public class DepotItemModel implements Serializable -{ - private DepotItemShowModel showModel = new DepotItemShowModel(); - - /**======开始接受页面参数=================**/ - private Long HeaderId; - private Long MaterialId; - private Double OperNumber; - private Double UnitPrice; - private Double AllPrice; - private String Remark = ""; - private String Img = ""; - - private String Inserted = ""; //json插入记录 - private String Deleted = ""; //json删除记录 - private String Updated = ""; //json修改记录 - - private String HeadIds = ""; //表头集合列表 - private String MaterialIds = ""; //材料列表 - private String MonthTime = ""; //月份 - private String browserType = ""; - /** - * 文件名称 - */ - private String fileName = ""; - /** - * 分类ID - */ - private Long depotItemID = 0l; - - /** - * 分类IDs 批量操作使用 - */ - private String depotItemIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 800; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - - /** - * 输入流，导出excel文件 - */ - private InputStream excelStream; - - public DepotItemShowModel getShowModel() { - return showModel; - } - - public void setShowModel(DepotItemShowModel showModel) { - this.showModel = showModel; - } - - public Long getHeaderId() { - return HeaderId; - } - - public void setHeaderId(Long headerId) { - HeaderId = headerId; - } - - public Long getMaterialId() { - return MaterialId; - } - - public void setMaterialId(Long materialId) { - MaterialId = materialId; - } - - public Double getOperNumber() { - return OperNumber; - } - - public void setOperNumber(Double operNumber) { - OperNumber = operNumber; - } - - public Double getUnitPrice() { - return UnitPrice; - } - - public void setUnitPrice(Double unitPrice) { - UnitPrice = unitPrice; - } - - public Double getAllPrice() { - return AllPrice; - } - - public void setAllPrice(Double allPrice) { - AllPrice = allPrice; - } - - public String getRemark() { - return Remark; - } - - public void setRemark(String remark) { - Remark = remark; - } - - public String getImg() { - return Img; - } - - public void setImg(String img) { - Img = img; - } - - public Long getDepotItemID() { - return depotItemID; - } - - public void setDepotItemID(Long depotItemID) { - this.depotItemID = depotItemID; - } - - public String getDepotItemIDs() { - return depotItemIDs; - } - - public void setDepotItemIDs(String depotItemIDs) { - this.depotItemIDs = depotItemIDs; - } - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public int getPageNo() { - return pageNo; - } - - public void setPageNo(int pageNo) { - this.pageNo = pageNo; - } - - public String getClientIp() { - return clientIp; - } - - public void setClientIp(String clientIp) { - this.clientIp = clientIp; - } - - public String getInserted() { - return Inserted; - } - - public void setInserted(String inserted) { - Inserted = inserted; - } - - public String getDeleted() { - return Deleted; - } - - public void setDeleted(String deleted) { - Deleted = deleted; - } - - public String getUpdated() { - return Updated; - } - - public void setUpdated(String updated) { - Updated = updated; - } - - public String getHeadIds() { - return HeadIds; - } - - public void setHeadIds(String headIds) { - HeadIds = headIds; - } - - public String getMonthTime() { - return MonthTime; - } - - public void setMonthTime(String monthTime) { - MonthTime = monthTime; - } - - public String getMaterialIds() { - return MaterialIds; - } - - public void setMaterialIds(String materialIds) { - MaterialIds = materialIds; - } - - public String getBrowserType() { - return browserType; - } - - public void setBrowserType(String browserType) { - this.browserType = browserType; - } - - public String getFileName() { - return fileName; - } - - public void setFileName(String fileName) { - this.fileName = fileName; - } - - public InputStream getExcelStream() { - return excelStream; - } - - public void setExcelStream(InputStream excelStream) { - this.excelStream = excelStream; - } -} diff --git a/src/com/jsh/model/vo/materials/DepotItemShowModel.java b/src/com/jsh/model/vo/materials/DepotItemShowModel.java deleted file mode 100644 index 60826dbd7..000000000 --- a/src/com/jsh/model/vo/materials/DepotItemShowModel.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.jsh.model.vo.materials; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class DepotItemShowModel implements Serializable -{ - /** - * 提示信息 - */ - private String msgTip = ""; - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } -} diff --git a/src/com/jsh/model/vo/materials/MaterialCategoryModel.java b/src/com/jsh/model/vo/materials/MaterialCategoryModel.java deleted file mode 100644 index d63e32d96..000000000 --- a/src/com/jsh/model/vo/materials/MaterialCategoryModel.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.jsh.model.vo.materials; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class MaterialCategoryModel implements Serializable -{ - private MaterialCategoryShowModel showModel = new MaterialCategoryShowModel(); - - /**======开始接受页面参数=================**/ - /** - * 名称 - */ - private String Name = ""; - - /** - * 等级 - */ - private Short CategoryLevel; - - /** - * ParentId - */ - private Long ParentId; - - /** - * 分类ID - */ - private Long materialCategoryID = 0l; - - /** - * 分类IDs 批量操作使用 - */ - private String materialCategoryIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - public MaterialCategoryShowModel getShowModel() { - return showModel; - } - - public void setShowModel(MaterialCategoryShowModel showModel) { - this.showModel = showModel; - } - - public String getName() { - return Name; - } - - public void setName(String name) { - Name = name; - } - - public Short getCategoryLevel() { - return CategoryLevel; - } - - public void setCategoryLevel(Short categoryLevel) { - CategoryLevel = categoryLevel; - } - - public Long getParentId() { - return ParentId; - } - - public void setParentId(Long parentId) { - ParentId = parentId; - } - - public Long getMaterialCategoryID() { - return materialCategoryID; - } - - public void setMaterialCategoryID(Long materialCategoryID) { - this.materialCategoryID = materialCategoryID; - } - - public String getMaterialCategoryIDs() { - return materialCategoryIDs; - } - - public void setMaterialCategoryIDs(String materialCategoryIDs) { - this.materialCategoryIDs = materialCategoryIDs; - } - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public int getPageNo() { - return pageNo; - } - - public void setPageNo(int pageNo) { - this.pageNo = pageNo; - } - - public String getClientIp() { - return clientIp; - } - - public void setClientIp(String clientIp) { - this.clientIp = clientIp; - } - -} diff --git a/src/com/jsh/model/vo/materials/MaterialCategoryShowModel.java b/src/com/jsh/model/vo/materials/MaterialCategoryShowModel.java deleted file mode 100644 index 01b0e6ccc..000000000 --- a/src/com/jsh/model/vo/materials/MaterialCategoryShowModel.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.jsh.model.vo.materials; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@SuppressWarnings("serial") -public class MaterialCategoryShowModel implements Serializable -{ - /** - * 提示信息 - */ - private String msgTip = ""; - - /** - * 系统数据 - */ - @SuppressWarnings("rawtypes") - private Map map = new HashMap(); - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } - - @SuppressWarnings("rawtypes") - public Map getMap() { - return map; - } - - @SuppressWarnings("rawtypes") - public void setMap(Map map) { - this.map = map; - } - - -} diff --git a/src/com/jsh/model/vo/materials/MaterialModel.java b/src/com/jsh/model/vo/materials/MaterialModel.java deleted file mode 100644 index 0cc7bb518..000000000 --- a/src/com/jsh/model/vo/materials/MaterialModel.java +++ /dev/null @@ -1,235 +0,0 @@ -package com.jsh.model.vo.materials; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class MaterialModel implements Serializable -{ - private MaterialShowModel showModel = new MaterialShowModel(); - - /**======开始接受页面参数=================**/ - /** - * 名称 - */ - private String Name = ""; - - /** - * 型号 - */ - private String Model = ""; - - /** - * 颜色 - */ - private String Color = ""; - - /** - * 单位 - */ - private String Unit = ""; - - /** - * 零售价 - */ - private Double RetailPrice; - - /** - * 最低售价 - */ - private Double LowPrice; - - /** - * 预设售价一 - */ - private Double PresetPriceOne; - - /** - * 预设售价二 - */ - private Double PresetPriceTwo; - - /** - * 备注 - */ - private String Remark = ""; - - /** - * CategoryId - */ - private Long CategoryId; - - /** - * CategoryIds 用于in子查询 - */ - private String CategoryIds = "1"; - - /** - * 分类ID - */ - private Long materialID = 0l; - - /** - * 分类IDs 批量操作使用 - */ - private String materialIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - public MaterialShowModel getShowModel() { - return showModel; - } - - public void setShowModel(MaterialShowModel showModel) { - this.showModel = showModel; - } - - public String getName() { - return Name; - } - - public void setName(String name) { - Name = name; - } - - public String getModel() { - return Model; - } - - public void setModel(String model) { - Model = model; - } - - public String getColor() { - return Color; - } - - public void setColor(String color) { - Color = color; - } - - public String getUnit() { - return Unit; - } - - public void setUnit(String unit) { - Unit = unit; - } - - public void setRetailPrice(Double retailPrice) - { - RetailPrice = retailPrice; - } - - public Double getRetailPrice() - { - return RetailPrice; - } - - public void setLowPrice(Double lowPrice) - { - LowPrice = lowPrice; - } - - public Double getLowPrice() - { - return LowPrice; - } - - public void setPresetPriceOne(Double presetPriceOne) - { - PresetPriceOne = presetPriceOne; - } - - public Double getPresetPriceOne() - { - return PresetPriceOne; - } - - public void setPresetPriceTwo(Double presetPriceTwo) - { - PresetPriceTwo = presetPriceTwo; - } - - public Double getPresetPriceTwo() - { - return PresetPriceTwo; - } - - public String getRemark() { - return Remark; - } - - public void setRemark(String remark) { - Remark = remark; - } - - public Long getCategoryId() { - return CategoryId; - } - - public void setCategoryId(Long categoryId) { - CategoryId = categoryId; - } - - public Long getMaterialID() { - return materialID; - } - - public void setMaterialID(Long materialID) { - this.materialID = materialID; - } - - public String getMaterialIDs() { - return materialIDs; - } - - public void setMaterialIDs(String materialIDs) { - this.materialIDs = materialIDs; - } - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public int getPageNo() { - return pageNo; - } - - public void setPageNo(int pageNo) { - this.pageNo = pageNo; - } - - public String getClientIp() { - return clientIp; - } - - public void setClientIp(String clientIp) { - this.clientIp = clientIp; - } - - public String getCategoryIds() { - return CategoryIds; - } - - public void setCategoryIds(String categoryIds) { - CategoryIds = categoryIds; - } - -} diff --git a/src/com/jsh/model/vo/materials/MaterialShowModel.java b/src/com/jsh/model/vo/materials/MaterialShowModel.java deleted file mode 100644 index bcfcd00e1..000000000 --- a/src/com/jsh/model/vo/materials/MaterialShowModel.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.jsh.model.vo.materials; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@SuppressWarnings("serial") -public class MaterialShowModel implements Serializable -{ - /** - * 提示信息 - */ - private String msgTip = ""; - - /** - * 系统数据 - */ - @SuppressWarnings("rawtypes") - private Map map = new HashMap(); - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } - - @SuppressWarnings("rawtypes") - public Map getMap() { - return map; - } - - @SuppressWarnings("rawtypes") - public void setMap(Map map) { - this.map = map; - } - - -} diff --git a/src/com/jsh/model/vo/materials/PersonModel.java b/src/com/jsh/model/vo/materials/PersonModel.java deleted file mode 100644 index d6c072714..000000000 --- a/src/com/jsh/model/vo/materials/PersonModel.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.jsh.model.vo.materials; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class PersonModel implements Serializable -{ - private PersonShowModel showModel = new PersonShowModel(); - - /**======开始接受页面参数=================**/ - /** - * 类型 - */ - private String Type = ""; - /** - * 姓名 - */ - private String Name = ""; - - /** - * 分类ID - */ - private Long personID = 0l; - - /** - * 分类IDs 批量操作使用 - */ - private String personIDs = ""; - - /** - * 每页显示的个数 - */ - private int pageSize = 10; - - /** - * 当前页码 - */ - private int pageNo = 1; - - /** - * 用户IP，用户记录操作日志 - */ - private String clientIp = ""; - - public PersonShowModel getShowModel() { - return showModel; - } - - public void setShowModel(PersonShowModel showModel) { - this.showModel = showModel; - } - - public String getType() { - return Type; - } - - public void setType(String type) { - Type = type; - } - - public String getName() { - return Name; - } - - public void setName(String name) { - Name = name; - } - - public Long getPersonID() { - return personID; - } - - public void setPersonID(Long personID) { - this.personID = personID; - } - - public String getPersonIDs() { - return personIDs; - } - - public void setPersonIDs(String personIDs) { - this.personIDs = personIDs; - } - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public int getPageNo() { - return pageNo; - } - - public void setPageNo(int pageNo) { - this.pageNo = pageNo; - } - - public String getClientIp() { - return clientIp; - } - - public void setClientIp(String clientIp) { - this.clientIp = clientIp; - } - -} diff --git a/src/com/jsh/model/vo/materials/PersonShowModel.java b/src/com/jsh/model/vo/materials/PersonShowModel.java deleted file mode 100644 index 5c6380906..000000000 --- a/src/com/jsh/model/vo/materials/PersonShowModel.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.jsh.model.vo.materials; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@SuppressWarnings("serial") -public class PersonShowModel implements Serializable -{ - /** - * 提示信息 - */ - private String msgTip = ""; - - /** - * 系统数据 - */ - @SuppressWarnings("rawtypes") - private Map map = new HashMap(); - - public String getMsgTip() - { - return msgTip; - } - - public void setMsgTip(String msgTip) - { - this.msgTip = msgTip; - } - - @SuppressWarnings("rawtypes") - public Map getMap() { - return map; - } - - @SuppressWarnings("rawtypes") - public void setMap(Map map) { - this.map = map; - } - -} diff --git a/src/com/jsh/service/asset/AssetIService.java b/src/com/jsh/service/asset/AssetIService.java deleted file mode 100644 index 77bc7d549..000000000 --- a/src/com/jsh/service/asset/AssetIService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.jsh.service.asset; - -import java.io.File; -import java.io.InputStream; - -import com.jsh.base.BaseIService; -import com.jsh.util.JshException; -import com.jsh.model.po.Asset; -import com.jsh.util.PageUtil; - -public interface AssetIService extends BaseIService -{ - /** - * 导出信息 - * @return - */ - InputStream exmportExcel(String isAllPage,PageUtil pageUtil)throws JshException; - - /** - * 导入资产excel文件--表格格式 同 媒资列表 || 资产名称-资产类型-单价-用户-购买时间-状态-位置-资产编号-序列号-有效日期-保修日期-供应商-标签-描述 - * 业务规则：导入时，检查资产名称是否存在，如存在就不考虑表格中资产类型。如资产名不存在，就新建资产名，类型用表格中的，但类型必须是系统中存在的，不存在的不能导入。 - * 资产名称，用户可以添加，其他的应该不能填 - * - * @param assetFile excel表格文件 - * @param isCheck 是否检查 0--手工确定 1--直接导入数据库中 - * @return 错误的表格数据 - * @throws JshException - */ - InputStream importExcel(File assetFile,int isCheck)throws JshException; -} diff --git a/src/com/jsh/service/asset/AssetService.java b/src/com/jsh/service/asset/AssetService.java deleted file mode 100644 index 568b08dbb..000000000 --- a/src/com/jsh/service/asset/AssetService.java +++ /dev/null @@ -1,746 +0,0 @@ -package com.jsh.service.asset; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.sql.Timestamp; -import java.text.ParseException; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import jxl.Workbook; -import jxl.format.Colour; -import jxl.write.Label; -import jxl.write.WritableCellFormat; -import jxl.write.WritableSheet; -import jxl.write.WritableWorkbook; -import jxl.write.WriteException; - -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.DateUtil; -import org.apache.poi.ss.usermodel.Row; - -import com.jsh.base.BaseService; -import com.jsh.base.Log; -import com.jsh.util.AssetConstants; -import com.jsh.dao.asset.AssetIDAO; -import com.jsh.dao.basic.AssetNameIDAO; -import com.jsh.dao.basic.CategoryIDAO; -import com.jsh.dao.basic.SupplierIDAO; -import com.jsh.dao.basic.UserIDAO; -import com.jsh.util.JshException; -import com.jsh.model.po.Asset; -import com.jsh.model.po.Assetname; -import com.jsh.model.po.Category; -import com.jsh.model.po.Supplier; -import com.jsh.util.PageUtil; -import com.jsh.util.Tools; - -public class AssetService extends BaseService implements AssetIService -{ - private AssetIDAO assetDao; - - private AssetNameIDAO assetNameDao; - - private CategoryIDAO categoryDao; - - private SupplierIDAO supplierDao; - - private UserIDAO userDao; - - /** - * 初始化加载所有系统基础数据 - */ - @SuppressWarnings({"rawtypes"}) - private static Map mapData = new HashMap(); - - /** - * 错误的表格数据 - */ - private static List wrongData = new ArrayList(); - - /** - * 导出Excel表格 - */ - @Override - public InputStream exmportExcel(String isAllPage,PageUtil pageUtil)throws JshException - { - try - { - if("currentPage".equals(isAllPage)) - { - assetDao.find(pageUtil); - } - else - { - pageUtil.setCurPage(0); - pageUtil.setPageSize(0); - assetDao.find(pageUtil); - } - - //将OutputStream转化为InputStream - ByteArrayOutputStream out = new ByteArrayOutputStream(); - putDataOnOutputStream(out,pageUtil.getPageList()); - return new ByteArrayInputStream(out.toByteArray()); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>>>>>导出资产信息为excel表格异常", e); - throw new JshException("export asset info to excel exception",e); - } - } - - @Override - public InputStream importExcel(File assetFile,int isCheck) throws JshException - { - //全局变量--每次调用前需要清空数据 - mapData.clear(); - //1、加载系统基础数据 - loadSystemData(); - //2、解析文件成资产数据 - parseFile(assetFile); - - if(null != wrongData && wrongData.size()>0) - { - //将OutputStream转化为InputStream - ByteArrayOutputStream out = new ByteArrayOutputStream(); - putDataOnOutputStream(out,wrongData); - return new ByteArrayInputStream(out.toByteArray()); - } - else - return null; - //2、是否直接插入数据库中 -// if(0 == isCheck) -// System.out.println("手动检查"); -// else -// System.out.println("自动检查插入"); - } - - /** - * 初始加载系统基础数据--导入过程中，不用频繁查询数据库内容，影响系统性能。 - * @throws JshException - */ - @SuppressWarnings({ "unchecked", "rawtypes" }) - private void loadSystemData()throws JshException - { - PageUtil pageUtil = new PageUtil(); - pageUtil.setPageSize(0); - pageUtil.setCurPage(0); - try - { - Map condition = pageUtil.getAdvSearch(); - condition.put("id_s_order", "desc"); - categoryDao.find(pageUtil); - mapData.put("categoryList", pageUtil.getPageList()); - - supplierDao.find(pageUtil); - mapData.put("supplierList", pageUtil.getPageList()); - - condition.put("isystem_n_eq", 1); - condition.put("id_s_order", "desc"); - userDao.find(pageUtil); - mapData.put("userList", pageUtil.getPageList()); - - //清除搜索条件 防止对查询有影响 - condition.remove("isystem_n_eq"); - - assetNameDao.find(pageUtil); - mapData.put("assetnameList", pageUtil.getPageList()); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>查找系统基础数据信息异常", e); - } - } - - /** - * 解析excel表格 - * @param assetFile - */ - @SuppressWarnings("unchecked") - private void parseFile(File assetFile) - { - //每次调用前清空 - wrongData.clear(); - int totalRow = 0; - try - { - //创建对Excel工作簿文件的引用 - HSSFWorkbook workbook = new HSSFWorkbook(new FileInputStream(assetFile)); - //创建对工作表的引用,获取第一个工作表的内容 - HSSFSheet sheet = workbook.getSheetAt(0); - /** - * ===================================== - * 1、此处要增加文件的验证，如果不是资产文件需要进行特殊的处理,13列 - * 2、文件内容为空处理 - * 3、如果是修改过的文件内容 - */ - Iterator itsheet = sheet.rowIterator(); - while(itsheet.hasNext()) - { - //获取当前行数据 - Row row = itsheet.next(); - //获取一行有多少单元格 -// System.out.println(row.getLastCellNum()); - - //excel表格第几行数据 从1开始 0 是表头 - int rowNum = row.getRowNum(); - /** - * 表头跳过不读 - */ - if(AssetConstants.BusinessForExcel.EXCEL_TABLE_HEAD == rowNum) - continue; - - //开始处理excel表格内容 --每行数据读取,同时统计总共行数 - totalRow ++; - - //获取excel表格的每格数据内容 - Iterator it = row.cellIterator(); - //资产子类型--添加了一些excel表格数据 - Asset asset = new Asset(); - //保存每个单元格错误类型 - Map cellType = new HashMap(); - - //名称需要类型字段 - Assetname nameModel = null; - //资产名称 - @SuppressWarnings("unused") - String assetname = ""; - - //资产类型 - String categoryStr = ""; - //设置列号 - asset.setRowLineNum(rowNum); - - Cell cell = null; - //判断列号--从零开始 - int cellIndex = 0; - while(it.hasNext()) - { - //获取每个单元格对象 - cell = it.next(); - //获取列号 - cellIndex = cell.getColumnIndex(); - //设置此单元格为字符串类型 - cell.setCellType(Cell.CELL_TYPE_STRING); - - Log.infoFileSync("==================excel表格中第" + totalRow + "行的第 " + cellIndex + "列的值为" + cell.getStringCellValue()); - - //每行中数据顺序 资产名称-资产类型-单价-用户-购买时间-状态-位置-资产编号-序列号-有效日期-保修日期-供应商-标签-描述 - switch(cellIndex) - { - case AssetConstants.BusinessForExcel.EXCEL_ASSETNAME : - //资产名称是否存在 - boolean isAssetnameExist = false; - //此处添加资产名称处理 - String nameValue = cell.getStringCellValue(); - if(null == nameValue || "".equals(nameValue)) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>资产名称没有填写"); - cellType.put(cellIndex, "wrong"); - break; - } - assetname = nameValue; - - List nameList = mapData.get("assetnameList"); - for(Assetname name:nameList) - { - //表示名称存在--直接进行保存，不需要判断类型字段 - if(nameValue.equals(name.getAssetname())) - { - isAssetnameExist = true; - //直接进行设置 - asset.setAssetname(name); - break; - } - } - //名称不存在 重新创建 - if(!isAssetnameExist) - { - isAssetnameExist = false; - nameModel = new Assetname(); - nameModel.setAssetname(nameValue); - nameModel.setIsconsumables((short)0); - nameModel.setIsystem((short)1); - nameModel.setDescription(""); - - asset.setAssetnameStr(nameValue); - } - break; - case AssetConstants.BusinessForExcel.EXCEL_CATEGORY : - //此处添加资产类型处理 - //类型信息是否存在 - boolean isCategoryExist = false; - String categoryValue = cell.getStringCellValue(); - if((null == categoryValue || "".equals(categoryValue)) && null != nameModel) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>资产名称没有指定类型"); - cellType.put(cellIndex, "wrong"); - break; - } - categoryStr = categoryValue; - - List categoryList = mapData.get("categoryList"); - for(Category category:categoryList) - { - //表示新创建 --名称设置过 不需要再进行处理 - if(category.getAssetname().equals(categoryValue) && null != nameModel) - { - isCategoryExist = true; - nameModel.setCategory(category); - asset.setAssetname(nameModel); - assetNameDao.create(nameModel); - break; - } - } - //重新创建 - if(null != nameModel && !isCategoryExist) - { - //首先创建类型信息 - Category canew = new Category(); - canew.setAssetname(categoryValue); - canew.setIsystem((short)1); - canew.setDescription(""); - categoryDao.create(canew); - - nameModel.setCategory(canew); - - assetNameDao.create(nameModel); - - asset.setAssetname(nameModel); - } - //nameModel为空表示 已经处理过类型信息 --此处不需要进行处理 - else - { - asset.setCategory(categoryStr); - } - break; - case AssetConstants.BusinessForExcel.EXCEL_PRICE: - //此处添加单价处理 - String priceValue = cell.getStringCellValue(); - //String priceValue = getCellFormatValue(cell); - if(null == priceValue || "".equals(priceValue)) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>资产没有填写单价"); - break; - } - //解析价格 - if(Tools.checkStrIsNum(priceValue)) - asset.setPrice(Double.parseDouble(priceValue)); - else - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>资产价格不是数字格式"); - cellType.put(cellIndex, "wrong"); - asset.setPrice(0.00d); - asset.setPriceStr(priceValue); - } - break; - case AssetConstants.BusinessForExcel.EXCEL_USER : - //此处添加用户处理--用户信息不需要进行处理 - break; - case AssetConstants.BusinessForExcel.EXCEL_PURCHASE_DATE : - //此处添加购买时间处理--时间不需要处理 - String purchaseValue = cell.getStringCellValue(); - if(null == purchaseValue || "".equals(purchaseValue)) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>资产没有填写购买日期"); - break; - } - try - { - asset.setPurchasedate(new Timestamp(Tools.parse(purchaseValue, "yyyy-MM-dd").getTime())); - } - catch (ParseException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>解析购买日期异常", e); - try - { - asset.setPurchasedate(new Timestamp(DateUtil.getJavaDate(Double.parseDouble(purchaseValue)).getTime())); - } - catch (Exception t) - { - asset.setPurchasedateStr(purchaseValue); - cellType.put(cellIndex, "wrong"); - } - } - break; - case AssetConstants.BusinessForExcel.EXCEL_STATUS : - //此处添加状态处理--默认为在库状态 - asset.setStatus((short)0); - break; - case AssetConstants.BusinessForExcel.EXCEL_LOCATION : - //此处添加位置处理--不需要进行处理 - String locationValue = cell.getStringCellValue(); - if(null == locationValue || "".equals(locationValue)) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>资产没有填写位置信息"); - break; - } - asset.setLocation(locationValue); - break; - case AssetConstants.BusinessForExcel.EXCEL_NUM : - //此处添加资产编号处理 - String assetnumValue = cell.getStringCellValue(); - if(null == assetnumValue || "".equals(assetnumValue)) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>资产没有填写资产编号"); - break; - } - //设置资产编号 - asset.setAssetnum(assetnumValue); - break; - case AssetConstants.BusinessForExcel.EXCEL_SERIALNO : - //此处添加序列号处理 - String assetseriValue = cell.getStringCellValue(); - if(null == assetseriValue || "".equals(assetseriValue)) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>资产没有填写序列号"); - break; - } - //设置资产编号 - asset.setSerialnum(assetseriValue); - break; - case AssetConstants.BusinessForExcel.EXCEL_EXPIRATION_DATE : - //此处添加有效日期处理--不需要处理 - String expirationValue = cell.getStringCellValue(); - if(null == expirationValue || "".equals(expirationValue)) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>资产没有有效日期"); - break; - } - - try - { - asset.setPeriodofvalidity(new Timestamp(Tools.parse(expirationValue, "yyyy-MM-dd").getTime())); - } - catch (ParseException e) - { - try - { - asset.setPeriodofvalidity(new Timestamp(DateUtil.getJavaDate(Double.parseDouble(expirationValue)).getTime())); - } - catch (Exception t) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>解析有效日期异常", t); - asset.setPeriodofvalidityStr(expirationValue); - cellType.put(cellIndex, "wrong"); - } - } - break; - case AssetConstants.BusinessForExcel.EXCEL_WARRANTY_DATE : - //此处添加保修日期处理--不需要处理 - String warrantyValue = cell.getStringCellValue(); - if(null == warrantyValue || "".equals(warrantyValue)) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>资产没有保修日期"); - break; - } - try - { - asset.setWarrantydate(new Timestamp(Tools.parse(warrantyValue, "yyyy-MM-dd").getTime())); - } - catch (ParseException e) - { - try - { - asset.setWarrantydate(new Timestamp(DateUtil.getJavaDate(Double.parseDouble(warrantyValue)).getTime())); - } - catch (Exception t) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>解析保修日期异常", t); - asset.setWarrantydateStr(warrantyValue); - cellType.put(cellIndex, "wrong"); - } - } - break; - case AssetConstants.BusinessForExcel.EXCEL_SUPPLIER : - //此处添加供应商处理 - - String supplierValue = cell.getStringCellValue(); - if(null == supplierValue || "".equals(supplierValue)) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>资产没有填写供应商"); - cellType.put(cellIndex, "wrong"); - break; - } - //供应商 - List supplierList = mapData.get("supplierList"); - boolean isSupplerExist =false; - for(Supplier supplier:supplierList) - { - if(supplierValue.equals(supplier.getSupplier())) - { - isSupplerExist =true; - asset.setSupplier(supplier); - break; - } - } - if(!isSupplerExist) - { - Supplier sup = new Supplier(); - sup.setIsystem((short)1); - sup.setSupplier(supplierValue); - sup.setDescription(""); - supplierDao.create(sup); - //保存供应商信息 - asset.setSupplier(sup); - } - break; - case AssetConstants.BusinessForExcel.EXCEL_LABLE : - //此处添加标签处理 - String lableValue = cell.getStringCellValue(); - if(null == lableValue || "".equals(lableValue)) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>资产没有填写标签信息"); - break; - } - asset.setLabels(lableValue); - break; - case AssetConstants.BusinessForExcel.EXCEL_DESC : - //此处添加描述信息处理 - String descValue = cell.getStringCellValue(); - if(null == descValue || "".equals(descValue)) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>资产没有填写描述信息"); - break; - } - asset.setDescription(descValue); - break; - } - } - asset.setCreatetime(new Timestamp(Calendar.getInstance().getTime().getTime())); - asset.setUpdatetime(new Timestamp(Calendar.getInstance().getTime().getTime())); - asset.setCellInfo(cellType); - - Log.infoFileSync(totalRow + "行总共有" + cellIndex + "列"); - //资产文件为13列，否则不是资产模板文件--不输入的时候 判断会有问题 暂时去掉 -// if(cellIndex != 13) -// { -// Log.errorFileSync(">>>>>>>>>>>>>>>>>>>>>>导入文件格式不合法，请重新选择文件进行操作！"); -// return; -// } - - //判断完成后增加数据 - if((null!=cellType && cellType.size() >0) - || asset.getAssetname() == null || asset.getAssetname().getCategory() == null) - wrongData.add(asset); - else - { - if(null == asset.getStatus()) - asset.setStatus((short)0); - assetDao.save(asset); - } - } - } - catch (FileNotFoundException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>读取excel文件异常:找不到指定文件！",e); - } - catch (IOException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>读取excel文件异常，请确认文件格式是否正确 ！",e); - } - Log.infoFileSync("===================excel表格总共有 " + totalRow + " 条记录!"); - } - - /** - * 生成excel表格 - * @param os - */ - private void putDataOnOutputStream(OutputStream os,List dataList) - { - WritableWorkbook workbook = null; - try - { - workbook = Workbook.createWorkbook(os); - WritableSheet sheet = workbook.createSheet("资产详细信息", 0); - //增加列头 - int[] colunmWidth = {30,30,10,15,20,10,30,30,30,20,20,20,30,80}; - String[] colunmName = {"资产名称","资产类型","单价","用户","购买时间","状态","位置","资产编号","序列号","有效日期","保修日期","供应商","标签","描述"}; - for(int i = 0 ;i < colunmWidth.length;i ++) - { - sheet.setColumnView(i,colunmWidth[i]); - sheet.addCell(new Label(i, 0, colunmName[i])); - } - - if (null != dataList &&dataList.size() > 0) - { - int i = 1; - for (Asset asset: dataList) - { - int j = 0; - Map cellInfo = asset.getCellInfo(); - - //第一列,填充 数据, Label(列,行,值) - sheet.addCell(getLabelInfo(cellInfo,j++,i,asset.getAssetname() == null ?"":asset.getAssetname().getAssetname(),asset)); - sheet.addCell(getLabelInfo(cellInfo,j++,i,asset.getAssetname() == null || asset.getAssetname().getCategory() == null ?"":asset.getAssetname().getCategory().getAssetname(),asset)); - sheet.addCell(getLabelInfo(cellInfo,j++,i,asset.getPrice() == null?"":asset.getPrice().toString(),asset)); - sheet.addCell(new Label(j++, i, asset.getUser()==null?"":asset.getUser().getUsername())); - sheet.addCell(getLabelInfo(cellInfo,j++,i,asset.getPurchasedate() == null ?"":Tools.getCurrentMonth(asset.getPurchasedate()),asset)); - Short status = asset.getStatus(); - if(null == status) - status = 0 ; - if(AssetConstants.BusinessForExcel.EXCEl_STATUS_ZAIKU == status) - sheet.addCell(new Label(j++, i, "在库")); - else if(AssetConstants.BusinessForExcel.EXCEl_STATUS_INUSE == status) - sheet.addCell(new Label(j++, i, "在用")); - else if(AssetConstants.BusinessForExcel.EXCEl_STATUS_CONSUME == status) - sheet.addCell(new Label(j++, i, "消费")); - sheet.addCell(new Label(j++, i, asset.getLocation())); - sheet.addCell(new Label(j++, i, asset.getAssetnum())); - sheet.addCell(new Label(j++, i, asset.getSerialnum())); - sheet.addCell(getLabelInfo(cellInfo,j++,i, asset.getPeriodofvalidity() == null ?"":Tools.getCurrentMonth(asset.getPeriodofvalidity()),asset)); - sheet.addCell(getLabelInfo(cellInfo,j++,i,asset.getWarrantydate() == null ?"":Tools.getCurrentMonth(asset.getWarrantydate()),asset)); - sheet.addCell(new Label(j++, i, asset.getSupplier()==null?"":asset.getSupplier().getSupplier())); - sheet.addCell(new Label(j++, i, asset.getLabels())); - sheet.addCell(new Label(j++, i, asset.getDescription())); - - i++; - } - } - workbook.write(); - workbook.close(); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>>>>>导出资产信息为excel表格异常", e); - } - } - - /** - * 根据错误信息进行提示--execel表格背景设置为红色，表示导入信息有误 - * @param cellInfo - * @param cellNum - * @param columnNum - * @param value - * @return - */ - private Label getLabelInfo(Map cellInfo,int cellNum,int columnNum,String value,Asset asset) - { - Label label = null; - - //设置背景颜色 - WritableCellFormat cellFormat = new WritableCellFormat(); - try - { - cellFormat.setBackground(Colour.RED); - } - catch (WriteException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>>>设置单元格背景颜色错误", e); - } - - if(null == cellInfo || cellInfo.size() == 0) - { - if(cellNum == AssetConstants.BusinessForExcel.EXCEL_ASSETNAME) - { - if(null == asset.getAssetname() && null != asset.getAssetnameStr()) - label = new Label(cellNum, columnNum,asset.getAssetnameStr()); - else if(null != asset.getAssetname()) - label = new Label(cellNum, columnNum, value); - else - label = new Label(cellNum, columnNum, null,cellFormat); - } - else if(cellNum == AssetConstants.BusinessForExcel.EXCEL_CATEGORY) - { - if(null != asset.getAssetnameStr() && null == asset.getAssetname()) - label = new Label(cellNum, columnNum, null,cellFormat); - else if(null == asset.getAssetnameStr() && null == asset.getAssetname() - && asset.getCategory() != null &&asset.getCategory().length()>0) - label = new Label(cellNum, columnNum, asset.getCategory()); - else - label = new Label(cellNum, columnNum, value); - } - else - label = new Label(cellNum, columnNum, value); - } - else - { - //表示此单元格有错误 - if(cellInfo.containsKey(cellNum)) - { - if(cellNum == AssetConstants.BusinessForExcel.EXCEL_ASSETNAME) - { - if(null == asset.getAssetname() && null != asset.getAssetnameStr()) - label = new Label(cellNum, columnNum,asset.getAssetnameStr()); - if(null != asset.getAssetname()) - label = new Label(cellNum, columnNum,asset.getAssetname().getAssetname()); - else - label = new Label(cellNum, columnNum, value,cellFormat); - } - else if(cellNum == AssetConstants.BusinessForExcel.EXCEL_CATEGORY) - { - if(null != asset.getAssetnameStr() && null == asset.getAssetname()) - label = new Label(cellNum, columnNum, null,cellFormat); - else if(null == asset.getAssetnameStr() && null == asset.getAssetname() - && asset.getCategory() != null &&asset.getCategory().length()>0) - label = new Label(cellNum, columnNum, asset.getCategory()); - } - else if(cellNum == AssetConstants.BusinessForExcel.EXCEL_PRICE) - label = new Label(cellNum, columnNum,asset.getPriceStr(),cellFormat); - else if(cellNum == AssetConstants.BusinessForExcel.EXCEL_PURCHASE_DATE) - label = new Label(cellNum, columnNum,asset.getPurchasedateStr(),cellFormat); - else if(cellNum == AssetConstants.BusinessForExcel.EXCEL_WARRANTY_DATE) - label = new Label(cellNum, columnNum,asset.getWarrantydateStr(),cellFormat); - else if(cellNum == AssetConstants.BusinessForExcel.EXCEL_EXPIRATION_DATE) - label = new Label(cellNum, columnNum,asset.getPeriodofvalidityStr(),cellFormat); - else - label = new Label(cellNum, columnNum, value,cellFormat); - } - else - { - if(null == asset.getAssetname() && null != asset.getAssetnameStr()&& cellNum == 0) - label = new Label(cellNum, columnNum,asset.getAssetnameStr()); - else if(null == asset.getAssetnameStr() && null == asset.getAssetname() - && asset.getCategory() != null &&asset.getCategory().length()>0&& cellNum == 1) - label = new Label(cellNum, columnNum, asset.getCategory()); - else - label = new Label(cellNum, columnNum, value); - } - } - return label; - } - - /*=====================以下处理与业务无关的共用方法=================================*/ - public void setAssetDao(AssetIDAO assetDao) - { - this.assetDao = assetDao; - } - - public void setAssetNameDao(AssetNameIDAO assetNameDao) - { - this.assetNameDao = assetNameDao; - } - - public void setCategoryDao(CategoryIDAO categoryDao) - { - this.categoryDao = categoryDao; - } - - public void setSupplierDao(SupplierIDAO supplierDao) - { - this.supplierDao = supplierDao; - } - - public void setUserDao(UserIDAO userDao) - { - this.userDao = userDao; - } - - @Override - protected Class getEntityClass() - { - return Asset.class; - } -} diff --git a/src/com/jsh/service/asset/ReportIService.java b/src/com/jsh/service/asset/ReportIService.java deleted file mode 100644 index edd60a222..000000000 --- a/src/com/jsh/service/asset/ReportIService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jsh.service.asset; - -import com.jsh.util.JshException; -import com.jsh.model.po.Asset; -import com.jsh.util.PageUtil; - -public interface ReportIService -{ - /** - * 查找报表数据 - * @param asset - * @throws JshException - */ - void find(PageUtil asset,String reportType,String reportName)throws JshException; -} diff --git a/src/com/jsh/service/asset/ReportService.java b/src/com/jsh/service/asset/ReportService.java deleted file mode 100644 index f4baa0172..000000000 --- a/src/com/jsh/service/asset/ReportService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.jsh.service.asset; - -import com.jsh.dao.asset.ReportIDAO; -import com.jsh.util.JshException; -import com.jsh.model.po.Asset; -import com.jsh.util.PageUtil; - -public class ReportService implements ReportIService -{ - private ReportIDAO reportDao; - - public void setReportDao(ReportIDAO reportDao) - { - this.reportDao = reportDao; - } - - @Override - public void find(PageUtil pageUtil, String reportType,String reportName) throws JshException - { - reportDao.find(pageUtil, reportType,reportName); - } - -} diff --git a/src/com/jsh/service/basic/AccountIService.java b/src/com/jsh/service/basic/AccountIService.java deleted file mode 100644 index 48cf14045..000000000 --- a/src/com/jsh/service/basic/AccountIService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseIService; -import com.jsh.model.po.Account; - -public interface AccountIService extends BaseIService -{ - -} diff --git a/src/com/jsh/service/basic/AccountService.java b/src/com/jsh/service/basic/AccountService.java deleted file mode 100644 index 8d1d133bb..000000000 --- a/src/com/jsh/service/basic/AccountService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.jsh.service.basic; -import com.jsh.base.BaseService; -import com.jsh.dao.basic.AccountIDAO; -import com.jsh.model.po.Account; - -public class AccountService extends BaseService implements AccountIService -{ - @SuppressWarnings("unused") - private AccountIDAO accountDao; - - public void setAccountDao(AccountIDAO accountDao) - { - this.accountDao = accountDao; - } - - @Override - protected Class getEntityClass() - { - return Account.class; - } - -} diff --git a/src/com/jsh/service/basic/AppIService.java b/src/com/jsh/service/basic/AppIService.java deleted file mode 100644 index 84810fb61..000000000 --- a/src/com/jsh/service/basic/AppIService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseIService; -import com.jsh.model.po.App; - -public interface AppIService extends BaseIService -{ - -} diff --git a/src/com/jsh/service/basic/AppService.java b/src/com/jsh/service/basic/AppService.java deleted file mode 100644 index dbb056455..000000000 --- a/src/com/jsh/service/basic/AppService.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseService; -import com.jsh.dao.basic.AppIDAO; -import com.jsh.dao.basic.UserBusinessIDAO; -import com.jsh.model.po.App; - -public class AppService extends BaseService implements AppIService -{ - @SuppressWarnings("unused") - private AppIDAO appDao; - @SuppressWarnings("unused") - private UserBusinessIDAO userBusinessDao; - - - public void setAppDao(AppIDAO appDao) - { - this.appDao = appDao; - } - - public void setUserBusinessDao(UserBusinessIDAO userBusinessDao) { - this.userBusinessDao = userBusinessDao; - } - - @Override - protected Class getEntityClass() - { - return App.class; - } - -} diff --git a/src/com/jsh/service/basic/AssetNameIService.java b/src/com/jsh/service/basic/AssetNameIService.java deleted file mode 100644 index 35d4a5cdd..000000000 --- a/src/com/jsh/service/basic/AssetNameIService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseIService; -import com.jsh.model.po.Assetname; - -public interface AssetNameIService extends BaseIService -{ - -} diff --git a/src/com/jsh/service/basic/AssetNameService.java b/src/com/jsh/service/basic/AssetNameService.java deleted file mode 100644 index ee12b1688..000000000 --- a/src/com/jsh/service/basic/AssetNameService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseService; -import com.jsh.dao.basic.AssetNameIDAO; -import com.jsh.model.po.Assetname; - -public class AssetNameService extends BaseService implements AssetNameIService -{ - @SuppressWarnings("unused") - private AssetNameIDAO assetNameDao; - - public void setAssetNameDao(AssetNameIDAO assetNameDao) - { - this.assetNameDao = assetNameDao; - } - - @Override - protected Class getEntityClass() - { - return Assetname.class; - } -} diff --git a/src/com/jsh/service/basic/CategoryIService.java b/src/com/jsh/service/basic/CategoryIService.java deleted file mode 100644 index 209832f4c..000000000 --- a/src/com/jsh/service/basic/CategoryIService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseIService; -import com.jsh.model.po.Category; - -public interface CategoryIService extends BaseIService -{ - -} diff --git a/src/com/jsh/service/basic/CategoryService.java b/src/com/jsh/service/basic/CategoryService.java deleted file mode 100644 index 490b3efb1..000000000 --- a/src/com/jsh/service/basic/CategoryService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseService; -import com.jsh.dao.basic.CategoryIDAO; -import com.jsh.model.po.Category; - -public class CategoryService extends BaseService implements CategoryIService -{ - @SuppressWarnings("unused") - private CategoryIDAO categoryDao; - - public void setCategoryDao(CategoryIDAO categoryDao) - { - this.categoryDao = categoryDao; - } - - @Override - protected Class getEntityClass() - { - return Category.class; - } - -} diff --git a/src/com/jsh/service/basic/DepotIService.java b/src/com/jsh/service/basic/DepotIService.java deleted file mode 100644 index 30489e1f2..000000000 --- a/src/com/jsh/service/basic/DepotIService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseIService; -import com.jsh.model.po.Depot; - -public interface DepotIService extends BaseIService -{ - -} diff --git a/src/com/jsh/service/basic/DepotService.java b/src/com/jsh/service/basic/DepotService.java deleted file mode 100644 index 7da7f5b8b..000000000 --- a/src/com/jsh/service/basic/DepotService.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseService; -import com.jsh.dao.basic.DepotIDAO; -import com.jsh.dao.basic.UserBusinessIDAO; -import com.jsh.model.po.Depot; - -public class DepotService extends BaseService implements DepotIService -{ - @SuppressWarnings("unused") - private DepotIDAO depotDao; - @SuppressWarnings("unused") - private UserBusinessIDAO userBusinessDao; - - - public void setDepotDao(DepotIDAO depotDao) - { - this.depotDao = depotDao; - } - - public void setUserBusinessDao(UserBusinessIDAO userBusinessDao) { - this.userBusinessDao = userBusinessDao; - } - - - @Override - protected Class getEntityClass() - { - return Depot.class; - } - -} diff --git a/src/com/jsh/service/basic/FunctionsIService.java b/src/com/jsh/service/basic/FunctionsIService.java deleted file mode 100644 index 3fb4c71b4..000000000 --- a/src/com/jsh/service/basic/FunctionsIService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseIService; -import com.jsh.model.po.Functions; - -public interface FunctionsIService extends BaseIService -{ - -} diff --git a/src/com/jsh/service/basic/FunctionsService.java b/src/com/jsh/service/basic/FunctionsService.java deleted file mode 100644 index 775679867..000000000 --- a/src/com/jsh/service/basic/FunctionsService.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseService; -import com.jsh.dao.basic.FunctionsIDAO; -import com.jsh.dao.basic.UserBusinessIDAO; -import com.jsh.model.po.Functions; - -public class FunctionsService extends BaseService implements FunctionsIService -{ - @SuppressWarnings("unused") - private FunctionsIDAO functionsDao; - @SuppressWarnings("unused") - private UserBusinessIDAO userBusinessDao; - - - public void setFunctionsDao(FunctionsIDAO functionsDao) - { - this.functionsDao = functionsDao; - } - - public void setUserBusinessDao(UserBusinessIDAO userBusinessDao) { - this.userBusinessDao = userBusinessDao; - } - - @Override - protected Class getEntityClass() - { - return Functions.class; - } - -} diff --git a/src/com/jsh/service/basic/InOutItemIService.java b/src/com/jsh/service/basic/InOutItemIService.java deleted file mode 100644 index 0509160bd..000000000 --- a/src/com/jsh/service/basic/InOutItemIService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseIService; -import com.jsh.model.po.InOutItem; - -public interface InOutItemIService extends BaseIService -{ - -} diff --git a/src/com/jsh/service/basic/InOutItemService.java b/src/com/jsh/service/basic/InOutItemService.java deleted file mode 100644 index 960f0fb6f..000000000 --- a/src/com/jsh/service/basic/InOutItemService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseService; -import com.jsh.dao.basic.InOutItemIDAO; -import com.jsh.model.po.InOutItem; - -public class InOutItemService extends BaseService implements InOutItemIService -{ - @SuppressWarnings("unused") - private InOutItemIDAO inOutItemDao; - - public void setInOutItemDao(InOutItemIDAO inOutItemDao) - { - this.inOutItemDao = inOutItemDao; - } - - @Override - protected Class getEntityClass() - { - return InOutItem.class; - } - -} diff --git a/src/com/jsh/service/basic/LogIService.java b/src/com/jsh/service/basic/LogIService.java deleted file mode 100644 index f69101e7e..000000000 --- a/src/com/jsh/service/basic/LogIService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseIService; -import com.jsh.util.JshException; -import com.jsh.model.po.Logdetails; - -public interface LogIService extends BaseIService -{ - /** - * 增加 - * @param t 对象 - * @throws JshException - */ - @Override - void save(Logdetails t); -} diff --git a/src/com/jsh/service/basic/LogService.java b/src/com/jsh/service/basic/LogService.java deleted file mode 100644 index b0185c0e3..000000000 --- a/src/com/jsh/service/basic/LogService.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseService; -import com.jsh.base.Log; -import com.jsh.dao.basic.LogIDAO; -import com.jsh.model.po.Logdetails; - -public class LogService extends BaseService implements LogIService -{ - @SuppressWarnings("unused") - private LogIDAO logDao; - - public void setLogDao(LogIDAO logDao) - { - this.logDao = logDao; - } - - @Override - protected Class getEntityClass() - { - return Logdetails.class; - } - - @Override - public void save(Logdetails t) - { - try - { - super.save(t); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>创建操作日志异常", e); - } - } -} \ No newline at end of file diff --git a/src/com/jsh/service/basic/RoleIService.java b/src/com/jsh/service/basic/RoleIService.java deleted file mode 100644 index 6ee433ee7..000000000 --- a/src/com/jsh/service/basic/RoleIService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseIService; -import com.jsh.model.po.Role; - -public interface RoleIService extends BaseIService -{ - -} diff --git a/src/com/jsh/service/basic/RoleService.java b/src/com/jsh/service/basic/RoleService.java deleted file mode 100644 index 74b3b2b3b..000000000 --- a/src/com/jsh/service/basic/RoleService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseService; -import com.jsh.dao.basic.RoleIDAO; -import com.jsh.dao.basic.UserBusinessIDAO; -import com.jsh.model.po.Role; - -public class RoleService extends BaseService implements RoleIService -{ - @SuppressWarnings("unused") - private RoleIDAO roleDao; - @SuppressWarnings("unused") - private UserBusinessIDAO userBusinessDao; - - public void setRoleDao(RoleIDAO roleDao) - { - this.roleDao = roleDao; - } - - public void setUserBusinessDao(UserBusinessIDAO userBusinessDao) { - this.userBusinessDao = userBusinessDao; - } - - @Override - protected Class getEntityClass() - { - return Role.class; - } - -} diff --git a/src/com/jsh/service/basic/SupplierIService.java b/src/com/jsh/service/basic/SupplierIService.java deleted file mode 100644 index bf81a37f5..000000000 --- a/src/com/jsh/service/basic/SupplierIService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseIService; -import com.jsh.model.po.Supplier; - -public interface SupplierIService extends BaseIService -{ - -} diff --git a/src/com/jsh/service/basic/SupplierService.java b/src/com/jsh/service/basic/SupplierService.java deleted file mode 100644 index 96650a266..000000000 --- a/src/com/jsh/service/basic/SupplierService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseService; -import com.jsh.dao.basic.SupplierIDAO; -import com.jsh.model.po.Supplier; - -public class SupplierService extends BaseService implements SupplierIService -{ - @SuppressWarnings("unused") - private SupplierIDAO supplierDao; - - public void setSupplierDao(SupplierIDAO supplierDao) - { - this.supplierDao = supplierDao; - } - /** - * 设置映射基类 - * @return - */ - @Override - protected Class getEntityClass() - { - return Supplier.class; - } -} diff --git a/src/com/jsh/service/basic/UserBusinessIService.java b/src/com/jsh/service/basic/UserBusinessIService.java deleted file mode 100644 index 116861576..000000000 --- a/src/com/jsh/service/basic/UserBusinessIService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseIService; -import com.jsh.util.JshException; -import com.jsh.model.po.UserBusiness; -import com.jsh.util.PageUtil; - -public interface UserBusinessIService extends BaseIService -{ - /* - * 测试一下自定义hql语句 - */ - void find(PageUtil userBusiness,String ceshi)throws JshException; - -} diff --git a/src/com/jsh/service/basic/UserBusinessService.java b/src/com/jsh/service/basic/UserBusinessService.java deleted file mode 100644 index 0b20790a6..000000000 --- a/src/com/jsh/service/basic/UserBusinessService.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseService; -import com.jsh.dao.basic.UserBusinessIDAO; -import com.jsh.util.JshException; -import com.jsh.model.po.UserBusiness; -import com.jsh.util.PageUtil; - -public class UserBusinessService extends BaseService implements UserBusinessIService -{ - @SuppressWarnings("unused") - private UserBusinessIDAO userBusinessDao; - - public void setUserBusinessDao(UserBusinessIDAO userBusinessDao) - { - this.userBusinessDao = userBusinessDao; - } - - @Override - protected Class getEntityClass() - { - return UserBusiness.class; - } - - @Override - public void find(PageUtil pageUtil, String ceshi) throws JshException - { - userBusinessDao.find(pageUtil, ceshi); - } - - -} diff --git a/src/com/jsh/service/basic/UserIService.java b/src/com/jsh/service/basic/UserIService.java deleted file mode 100644 index 5acfc5155..000000000 --- a/src/com/jsh/service/basic/UserIService.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.jsh.service.basic; - -import com.jsh.base.BaseIService; -import com.jsh.util.JshException; -import com.jsh.model.po.Basicuser; - -public interface UserIService extends BaseIService -{ - /** - * 判断用户名是否符合登录条件 - * @param username 用户名 String password - * @return int 1、用户名不存在 2、密码不正确 3、黑名单用户 4、符合条件 5、访问后台异常 - */ - int validateUser(String username,String password)throws JshException; - - /** - * 获取用户信息 - * @param username - * @return 用户信息 - * @throws JshException - */ - public Basicuser getUser(String username) throws JshException; - - /** - * 检查用户名称是否存在 - * @param field 用户属性 - * @param username 用户名称 - * @param userID 供应商ID - * @return true==存在重名 false==不存在 - * @throws JshException - */ - Boolean checkIsNameExist(String field,String username,Long userID)throws JshException; -} diff --git a/src/com/jsh/service/basic/UserService.java b/src/com/jsh/service/basic/UserService.java deleted file mode 100644 index f4a52e0bc..000000000 --- a/src/com/jsh/service/basic/UserService.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.jsh.service.basic; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.jsh.base.BaseService; -import com.jsh.base.Log; -import com.jsh.util.ExceptionCodeConstants; -import com.jsh.dao.basic.UserBusinessIDAO; -import com.jsh.dao.basic.UserIDAO; -import com.jsh.util.JshException; -import com.jsh.model.po.Basicuser; -import com.jsh.util.PageUtil; - -public class UserService extends BaseService implements UserIService -{ - private PageUtil pageUtil = new PageUtil(); - private Map condition = new HashMap(); - private UserIDAO userDao; - - @Override - public int validateUser(String username, String password)throws JshException - { - try - { - //全局变量 每次使用前清除 - condition.clear(); - - /**默认是可以登录的*/ - List list = null ; - try - { - - condition.put("loginame_s_eq", username); - pageUtil.setAdvSearch(condition); - userDao.find(pageUtil); - list = pageUtil.getPageList(); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>访问验证用户姓名是否存在后台信息异常",e); - return ExceptionCodeConstants.UserExceptionCode.USER_ACCESS_EXCEPTION; - } - - if(null !=list && list.size() == 0) - return ExceptionCodeConstants.UserExceptionCode.USER_NOT_EXIST ; - - try - { - condition.put("loginame_s_eq", username); - condition.put("password_s_eq", password); - pageUtil.setAdvSearch(condition); - userDao.find(pageUtil); - list = pageUtil.getPageList(); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>访问验证用户密码后台信息异常",e); - return ExceptionCodeConstants.UserExceptionCode.USER_ACCESS_EXCEPTION; - } - - if(null !=list && list.size() == 0) - return ExceptionCodeConstants.UserExceptionCode.USER_PASSWORD_ERROR; - return ExceptionCodeConstants.UserExceptionCode.USER_CONDITION_FIT; - } - catch (Exception e) - { - throw new JshException("unknown exception",e); - } - } - - @Override - public Basicuser getUser(String username) throws JshException - { - //全局变量 每次使用前清除 - condition.clear(); - condition.put("loginame_s_eq", username); - pageUtil.setAdvSearch(condition); - userDao.find(pageUtil); - List list = pageUtil.getPageList(); - if(null != list && list.size() >0) - return list.get(0); - else - throw new JshException("no username exist"); - } - - @Override - public Boolean checkIsNameExist(String field,String username, Long userID)throws JshException - { - condition.clear(); - condition.put(field + "_s_eq", username); - condition.put("id_n_neq", userID); - pageUtil.setAdvSearch(condition); - userDao.find(pageUtil); - - List dataList = pageUtil.getPageList(); - if(null != dataList && dataList.size() > 0) - return true; - return false; - } - - //==============spring注入等公共方法，与业务无关========================= - public void setUserDao(UserIDAO userDao) - { - this.userDao = userDao; - } - - @Override - protected Class getEntityClass() - { - return Basicuser.class; - } -} diff --git a/src/com/jsh/service/materials/AccountHeadIService.java b/src/com/jsh/service/materials/AccountHeadIService.java deleted file mode 100644 index 90ba812a6..000000000 --- a/src/com/jsh/service/materials/AccountHeadIService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jsh.service.materials; - -import com.jsh.base.BaseIService; -import com.jsh.util.JshException; -import com.jsh.model.po.AccountHead; -import com.jsh.model.po.UserBusiness; -import com.jsh.util.PageUtil; - -public interface AccountHeadIService extends BaseIService -{ - /* - * 获取MaxId - */ - void find(PageUtil accountHead,String maxid)throws JshException; -} diff --git a/src/com/jsh/service/materials/AccountHeadService.java b/src/com/jsh/service/materials/AccountHeadService.java deleted file mode 100644 index 5b298234a..000000000 --- a/src/com/jsh/service/materials/AccountHeadService.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.jsh.service.materials; - -import com.jsh.base.BaseService; -import com.jsh.dao.materials.AccountHeadIDAO; -import com.jsh.util.JshException; -import com.jsh.model.po.AccountHead; -import com.jsh.model.po.UserBusiness; -import com.jsh.util.PageUtil; - -public class AccountHeadService extends BaseService implements AccountHeadIService -{ - @SuppressWarnings("unused") - private AccountHeadIDAO accountHeadDao; - - - public void setAccountHeadDao(AccountHeadIDAO accountHeadDao) { - this.accountHeadDao = accountHeadDao; - } - - - @Override - protected Class getEntityClass() - { - return AccountHead.class; - } - - @Override - public void find(PageUtil pageUtil, String maxid) throws JshException - { - accountHeadDao.find(pageUtil, maxid); - } -} diff --git a/src/com/jsh/service/materials/AccountItemIService.java b/src/com/jsh/service/materials/AccountItemIService.java deleted file mode 100644 index abd4bebbe..000000000 --- a/src/com/jsh/service/materials/AccountItemIService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.jsh.service.materials; - -import java.io.InputStream; -import java.util.List; - -import net.sf.json.JSONArray; - -import com.jsh.base.BaseIService; -import com.jsh.util.JshException; -import com.jsh.model.po.Asset; -import com.jsh.model.po.AccountHead; -import com.jsh.model.po.AccountItem; -import com.jsh.util.PageUtil; - -public interface AccountItemIService extends BaseIService -{ - -} diff --git a/src/com/jsh/service/materials/AccountItemService.java b/src/com/jsh/service/materials/AccountItemService.java deleted file mode 100644 index 8a982f9bf..000000000 --- a/src/com/jsh/service/materials/AccountItemService.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.jsh.service.materials; - -import java.util.List; -import java.util.Map; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -import com.jsh.base.BaseService; -import com.jsh.base.Log; -import com.jsh.util.AssetConstants; -import com.jsh.dao.materials.AccountItemIDAO; -import com.jsh.util.JshException; -import com.jsh.model.po.Asset; -import com.jsh.model.po.AccountHead; -import com.jsh.model.po.AccountItem; -import com.jsh.util.PageUtil; -import com.jsh.util.Tools; - -public class AccountItemService extends BaseService implements AccountItemIService -{ - @SuppressWarnings("unused") - private AccountItemIDAO accoumtItemDao; - - - public void setAccountItemDao(AccountItemIDAO accoumtItemDao) { - this.accoumtItemDao = accoumtItemDao; - } - - - @Override - protected Class getEntityClass() - { - return AccountItem.class; - } - - -} diff --git a/src/com/jsh/service/materials/DepotHeadIService.java b/src/com/jsh/service/materials/DepotHeadIService.java deleted file mode 100644 index a3e2bc595..000000000 --- a/src/com/jsh/service/materials/DepotHeadIService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jsh.service.materials; - -import com.jsh.base.BaseIService; -import com.jsh.util.JshException; -import com.jsh.model.po.DepotHead; -import com.jsh.model.po.UserBusiness; -import com.jsh.util.PageUtil; - -public interface DepotHeadIService extends BaseIService -{ - /* - * 获取MaxId - */ - void find(PageUtil depotHead,String maxid)throws JshException; -} diff --git a/src/com/jsh/service/materials/DepotHeadService.java b/src/com/jsh/service/materials/DepotHeadService.java deleted file mode 100644 index b912b84b9..000000000 --- a/src/com/jsh/service/materials/DepotHeadService.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.jsh.service.materials; - -import com.jsh.base.BaseService; -import com.jsh.dao.materials.DepotHeadIDAO; -import com.jsh.util.JshException; -import com.jsh.model.po.DepotHead; -import com.jsh.model.po.UserBusiness; -import com.jsh.util.PageUtil; - -public class DepotHeadService extends BaseService implements DepotHeadIService -{ - @SuppressWarnings("unused") - private DepotHeadIDAO depotHeadDao; - - - public void setDepotHeadDao(DepotHeadIDAO depotHeadDao) { - this.depotHeadDao = depotHeadDao; - } - - - @Override - protected Class getEntityClass() - { - return DepotHead.class; - } - - @Override - public void find(PageUtil pageUtil, String maxid) throws JshException - { - depotHeadDao.find(pageUtil, maxid); - } -} diff --git a/src/com/jsh/service/materials/DepotItemIService.java b/src/com/jsh/service/materials/DepotItemIService.java deleted file mode 100644 index 17e4ddedb..000000000 --- a/src/com/jsh/service/materials/DepotItemIService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.jsh.service.materials; - -import java.io.InputStream; -import java.util.List; - -import net.sf.json.JSONArray; - -import com.jsh.base.BaseIService; -import com.jsh.util.JshException; -import com.jsh.model.po.Asset; -import com.jsh.model.po.DepotHead; -import com.jsh.model.po.DepotItem; -import com.jsh.util.PageUtil; - -public interface DepotItemIService extends BaseIService -{ - void findByType(PageUtil depotItem, String type, Long MId, String MonthTime,Boolean isPrev)throws JshException; - - void buyOrSale(PageUtil depotItem, String type, String subType, Long MId, String MonthTime, String sumType)throws JshException; - - /** - * 导出信息 - * @return - */ - InputStream exmportExcel(String isAllPage,JSONArray dataArray)throws JshException; -} diff --git a/src/com/jsh/service/materials/DepotItemService.java b/src/com/jsh/service/materials/DepotItemService.java deleted file mode 100644 index ab8efea41..000000000 --- a/src/com/jsh/service/materials/DepotItemService.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.jsh.service.materials; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.io.OutputStream; -import java.text.DecimalFormat; -import java.util.List; -import java.util.Map; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -import jxl.Workbook; -import jxl.write.Label; -import jxl.write.WritableSheet; -import jxl.write.WritableWorkbook; - -import com.jsh.base.BaseService; -import com.jsh.base.Log; -import com.jsh.util.AssetConstants; -import com.jsh.dao.materials.DepotItemIDAO; -import com.jsh.util.JshException; -import com.jsh.model.po.Asset; -import com.jsh.model.po.DepotHead; -import com.jsh.model.po.DepotItem; -import com.jsh.util.PageUtil; -import com.jsh.util.Tools; - -public class DepotItemService extends BaseService implements DepotItemIService -{ - @SuppressWarnings("unused") - private DepotItemIDAO depotItemDao; - - - public void setDepotItemDao(DepotItemIDAO depotItemDao) { - this.depotItemDao = depotItemDao; - } - - - @Override - protected Class getEntityClass() - { - return DepotItem.class; - } - - @Override - public void findByType(PageUtil pageUtil, String type,Long MId, String MonthTime,Boolean isPrev) throws JshException - { - depotItemDao.findByType(pageUtil, type, MId, MonthTime,isPrev); - } - - @Override - public void buyOrSale(PageUtil pageUtil, String type,String subType, Long MId, String MonthTime, String sumType) throws JshException - { - depotItemDao.buyOrSale(pageUtil, type, subType, MId, MonthTime, sumType); - } - - /** - * 导出Excel表格 - */ - @Override - public InputStream exmportExcel(String isAllPage,JSONArray dataArray)throws JshException - { - try - { - //将OutputStream转化为InputStream - ByteArrayOutputStream out = new ByteArrayOutputStream(); - putDataOnOutputStream(out,dataArray); - return new ByteArrayInputStream(out.toByteArray()); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>>>>>导出信息为excel表格异常", e); - throw new JshException("export asset info to excel exception",e); - } - } - - /** - * 生成excel表格 - * @param os - */ - @SuppressWarnings("deprecation") - private void putDataOnOutputStream(OutputStream os,JSONArray dataArray) - { - WritableWorkbook workbook = null; - try - { - workbook = Workbook.createWorkbook(os); - WritableSheet sheet = workbook.createSheet("进销存报表", 0); - //增加列头 - int[] colunmWidth = {10,10,10,10,15,15,15,15,15}; - String[] colunmName = {"名称","款号","颜色","单价","上月结存数量","入库数量","出库数量","本月结存数量","结存金额"}; - for(int i = 0 ;i < colunmWidth.length;i ++) - { - sheet.setColumnView(i,colunmWidth[i]); - sheet.addCell(new Label(i, 0, colunmName[i])); - } - if (null != dataArray &&dataArray.size() > 0) - { - for(int j=0; j < dataArray.size(); j++){ - JSONObject jo = JSONObject.fromObject(dataArray.get(j)); - sheet.addCell(new Label(0, j+1, jo.getString("MaterialName"))); - sheet.addCell(new Label(1, j+1, jo.getString("MaterialModel"))); - sheet.addCell(new Label(2, j+1, jo.getString("MaterialColor"))); - sheet.addCell(new Label(3, j+1, jo.getString("UnitPrice"))); - sheet.addCell(new Label(4, j+1, jo.getString("prevSum"))); - sheet.addCell(new Label(5, j+1, jo.getString("InSum"))); - sheet.addCell(new Label(6, j+1, jo.getString("OutSum"))); - sheet.addCell(new Label(7, j+1, jo.getString("thisSum"))); - double d = Double.parseDouble(jo.getString("thisAllPrice").toString()); - String s1 = String.format("%.2f", d); - sheet.addCell(new Label(8, j+1, s1)); - } - } - workbook.write(); - workbook.close(); - } - catch (Exception e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>>>>>导出资产信息为excel表格异常", e); - } - } -} diff --git a/src/com/jsh/service/materials/MaterialCategoryIService.java b/src/com/jsh/service/materials/MaterialCategoryIService.java deleted file mode 100644 index f5bbbbfa5..000000000 --- a/src/com/jsh/service/materials/MaterialCategoryIService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.service.materials; - -import com.jsh.base.BaseIService; -import com.jsh.model.po.MaterialCategory; - -public interface MaterialCategoryIService extends BaseIService -{ - -} diff --git a/src/com/jsh/service/materials/MaterialCategoryService.java b/src/com/jsh/service/materials/MaterialCategoryService.java deleted file mode 100644 index 008058896..000000000 --- a/src/com/jsh/service/materials/MaterialCategoryService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.jsh.service.materials; - -import com.jsh.base.BaseService; -import com.jsh.dao.materials.MaterialCategoryIDAO; -import com.jsh.model.po.MaterialCategory; - -public class MaterialCategoryService extends BaseService implements MaterialCategoryIService -{ - @SuppressWarnings("unused") - private MaterialCategoryIDAO materialCategoryDao; - - - public void setMaterialCategoryDao(MaterialCategoryIDAO materialCategoryDao) { - this.materialCategoryDao = materialCategoryDao; - } - - - @Override - protected Class getEntityClass() - { - return MaterialCategory.class; - } - -} diff --git a/src/com/jsh/service/materials/MaterialIService.java b/src/com/jsh/service/materials/MaterialIService.java deleted file mode 100644 index 478024969..000000000 --- a/src/com/jsh/service/materials/MaterialIService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.service.materials; - -import com.jsh.base.BaseIService; -import com.jsh.model.po.Material; - -public interface MaterialIService extends BaseIService -{ - -} diff --git a/src/com/jsh/service/materials/MaterialService.java b/src/com/jsh/service/materials/MaterialService.java deleted file mode 100644 index a4d3921ab..000000000 --- a/src/com/jsh/service/materials/MaterialService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.jsh.service.materials; - -import com.jsh.base.BaseService; -import com.jsh.dao.materials.MaterialIDAO; -import com.jsh.model.po.Material; - -public class MaterialService extends BaseService implements MaterialIService -{ - @SuppressWarnings("unused") - private MaterialIDAO materialDao; - - - public void setMaterialDao(MaterialIDAO materialDao) { - this.materialDao = materialDao; - } - - - @Override - protected Class getEntityClass() - { - return Material.class; - } - -} diff --git a/src/com/jsh/service/materials/PersonIService.java b/src/com/jsh/service/materials/PersonIService.java deleted file mode 100644 index 8f49cd9b0..000000000 --- a/src/com/jsh/service/materials/PersonIService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jsh.service.materials; - -import com.jsh.base.BaseIService; -import com.jsh.model.po.Person; - -public interface PersonIService extends BaseIService -{ - -} diff --git a/src/com/jsh/service/materials/PersonService.java b/src/com/jsh/service/materials/PersonService.java deleted file mode 100644 index 47563a23b..000000000 --- a/src/com/jsh/service/materials/PersonService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.jsh.service.materials; - -import com.jsh.base.BaseService; -import com.jsh.dao.materials.PersonIDAO; -import com.jsh.model.po.Person; - -public class PersonService extends BaseService implements PersonIService -{ - @SuppressWarnings("unused") - private PersonIDAO personDao; - - - public void setPersonDao(PersonIDAO personDao) { - this.personDao = personDao; - } - - - @Override - protected Class getEntityClass() - { - return Person.class; - } - -} diff --git a/src/com/jsh/util/AssetConstants.java b/src/com/jsh/util/AssetConstants.java deleted file mode 100644 index 1940450e0..000000000 --- a/src/com/jsh/util/AssetConstants.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.jsh.util; - -/** - * 定义资产管理常量 - * @author jishenghua - */ -public interface AssetConstants -{ - /** - * 公共常量 - * @author jishenghua - */ - public class Common - { - - } - - /** - * 资产常量--导入导出excel表格业务相关 - * @author jishenghua - */ - public class BusinessForExcel - { - /** - * 资产名称常量 - */ - public static final int EXCEL_ASSETNAME = 0; - - /** - * 资产类型常量 - */ - public static final int EXCEL_CATEGORY = 1; - - /** - * 资产单价 - */ - public static final int EXCEL_PRICE = 2; - - /** - * 用户 - */ - public static final int EXCEL_USER = 3; - - /** - * 购买日期 - */ - public static final int EXCEL_PURCHASE_DATE = 4; - - /** - * 资产状态 - */ - public static final int EXCEL_STATUS = 5; - - /** - * 位置 - */ - public static final int EXCEL_LOCATION = 6; - - /** - * 资产编号 - */ - public static final int EXCEL_NUM = 7; - - /** - * 序列号 - */ - public static final int EXCEL_SERIALNO = 8; - - /** - * 有效日期 - */ - public static final int EXCEL_EXPIRATION_DATE = 9; - - /** - * 保修日期 - */ - public static final int EXCEL_WARRANTY_DATE = 10; - - /** - * 供应商 - */ - public static final int EXCEL_SUPPLIER = 11; - - /** - * 标签 - */ - public static final int EXCEL_LABLE = 12; - - /** - * 描述 - */ - public static final int EXCEL_DESC = 13; - - /** - * 表头 - */ - public static final int EXCEL_TABLE_HEAD = 0; - - /** - * 状态 --在库 - */ - public static final int EXCEl_STATUS_ZAIKU = 0; - - /** - * 状态 --在用 - */ - public static final int EXCEl_STATUS_INUSE = 1; - - /** - * 状态 -- 消费 - */ - public static final int EXCEl_STATUS_CONSUME = 2; - - /** - * action返回excel结果 - */ - public static final String EXCEL = "excel"; - } -} diff --git a/src/com/jsh/util/BeanFactoryUtil.java b/src/com/jsh/util/BeanFactoryUtil.java deleted file mode 100644 index fe01bf228..000000000 --- a/src/com/jsh/util/BeanFactoryUtil.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.jsh.util; - -import java.util.HashMap; -import java.util.Map; - -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.context.support.FileSystemXmlApplicationContext; - -/** - * 获取spring配置中的bean对象,是单例，只会加载一次，请注意使用 - * 注意：此工具类默认处理UI组件WEB-INF目录下的applicationContext.xml配置文件,请注意文件 名和路径 - * @author jishenghua - * @qq 7 5 2 7 1 8 9 2 0 - * @version V1.0 - */ -public class BeanFactoryUtil -{ - private static BeanFactoryUtil defaultBeanFactory; - - private ApplicationContext defaultAC = null; - - //private ApplicationContext autoLoadAC = null; - - private static BeanFactoryUtil specialBeanFactory; - - private ApplicationContext specialAC = null; - - private static Map beanMap = new HashMap(); - - //private Logger log = Logger.getLogger(BeanFactoryUtil.class); - - /** - * 私有构造函数,默认为UI组件WEB-INF目录下的applicationContext.xml配置文件 - */ - private BeanFactoryUtil() - { - String fileUrl = PathTool.getWebinfPath(); - //这里只对UI组件WEB-INF目录下的applicationContext.xml配置文件 - defaultAC = new FileSystemXmlApplicationContext( new - String[]{fileUrl - + "spring/basic-applicationContext.xml", - fileUrl + "spring/dao-applicationContext.xml"}); - } - - /** - * 私有构造函数,带有文件的classpath路径,可能是非applicationContext.xml文件 - */ - private BeanFactoryUtil(String fileClassPath) - { - specialAC = new ClassPathXmlApplicationContext("classpath:" - + fileClassPath); - } - - /** - * 非web.xml方式加载spring配置文件方式的实体实例获取方式 - * @param fileClassPath - * @param beanName - * @return - */ - public synchronized static Object getBeanByClassPathAndBeanName( - String fileClassPath, String beanName) - { - ApplicationContext ac = beanMap.get(fileClassPath); - if (null == ac) - { - ac = new ClassPathXmlApplicationContext("classpath:" - + fileClassPath); - beanMap.put(fileClassPath, ac); - } - return ac.getBean(beanName); - } - - /** - * 获取类实例 - * 默认加载UI组件WEB-INF目录下的applicationContext.xml配置文件 - * @return - * - */ - public synchronized static BeanFactoryUtil getInstance() - { - if (null == defaultBeanFactory) - { - defaultBeanFactory = new BeanFactoryUtil(); - } - return defaultBeanFactory; - } - - /** - * 获取类实例,这种情况一定是在依赖其他组件时没有在applicationContext.xml加载器spring文件时使用 - * 这种情况请少用 - * @param fileClassPath - * @return - */ - @Deprecated - public synchronized static BeanFactoryUtil getInstance(String fileClassPath) - { - if (null == specialBeanFactory) - { - specialBeanFactory = new BeanFactoryUtil(fileClassPath); - } - return specialBeanFactory; - } - - /** - * 获取UI组件WEB-INF目录下的applicationContext.xml配置文件中配置的bean实例 - * @param beanName - * @return - */ - public Object getBean(String beanName) - { - return defaultAC.getBean(beanName); - } - - /** - * 获取没有在applicationContext.xml配置文件中引入的spring配置文件，即没有用容器加载过的配置文件 - * 这里为特殊情况下使用,不推荐使用 - * 推荐在applicationContext.xml配置文件中引入需要使用的spring配置文件,然后使用BeanFactoryUtil.getInstance().getBean("")方法 - * @param beanName - * @return - */ - @Deprecated - public Object getSpecialBean(String beanName) - { - return specialAC.getBean(beanName); - } -} diff --git a/src/com/jsh/util/ExceptionCodeConstants.java b/src/com/jsh/util/ExceptionCodeConstants.java deleted file mode 100644 index 36de1fab1..000000000 --- a/src/com/jsh/util/ExceptionCodeConstants.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.jsh.util; - -public interface ExceptionCodeConstants -{ - /** - * 用户错误码定义 - */ - public class UserExceptionCode - { - /** - * 用户不存在 - */ - public static final int USER_NOT_EXIST = 1; - - /** - * 用户密码错误 - */ - public static final int USER_PASSWORD_ERROR = 2; - - /** - * 被加入黑名单 - */ - public static final int BLACK_USER = 3; - - /** - * 可以登录 - */ - public static final int USER_CONDITION_FIT = 4; - - /** - * 访问数据库异常 - */ - public static final int USER_ACCESS_EXCEPTION = 5; - } -} diff --git a/src/com/jsh/util/JshConstants.java b/src/com/jsh/util/JshConstants.java deleted file mode 100644 index a4a31dd1f..000000000 --- a/src/com/jsh/util/JshConstants.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.jsh.util; - -public interface JshConstants -{ - /** - * 定义资产管理公共常量 - * @author jishenghua - */ - public class Common - { - /** - * Info级别日志前缀 - */ - public static final String LOG_INFO_PREFIX = "=========="; - - /** - * error级别日志前缀 - */ - public static final String LOG_ERROR_PREFIX = ">>>>>>>>>>"; - - /** - * debug级别日志前缀 - */ - public static final String LOG_DEBUG_PREFIX = "-----------"; - - /** - * fatal级别日志前缀 - */ - public static final String LOG_FATAL_PREFIX = "$$$$$$$$$$"; - - /** - * warn级别日志前缀 - */ - public static final String LOG_WARN_PREFIX = "##########"; - } -} diff --git a/src/com/jsh/util/JshException.java b/src/com/jsh/util/JshException.java deleted file mode 100644 index ad6438689..000000000 --- a/src/com/jsh/util/JshException.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.jsh.util; - -/** - * @title: 平台异常基类 - * @description: 用于包装一些异常信息，打印日志等服务 - * @author jishenghua - * @qq 7 5 2 7 1 8 9 2 0 - * @since: 2014-02-24 - */ -@SuppressWarnings("serial") -public class JshException extends Exception -{ - public long errorCode = -1; - - public String message ; - - public JshException() - { - super(); - } - - public JshException(String message) - { - super(message); - this.message = message; - } - - public JshException(String message, Throwable cause) - { - super(message, cause); - this.message = message; - } - - public JshException(Throwable cause) - { - super(cause); - } - - public JshException(long errorCode) - { - super(); - this.errorCode = errorCode; - } - - public JshException(String message, long errorCode) - { - super(message); - this.errorCode = errorCode; - this.message = message; - } - - public JshException(String message, long errorCode, Throwable cause) - { - super(message, cause); - this.errorCode = errorCode; - this.message = message; - } - - public JshException(long errorCode, Throwable cause) - { - super(cause); - this.errorCode = errorCode; - } - - public long getErrorCode() - { - return errorCode; - } - - public String getMessage() - { - return message; - } -} diff --git a/src/com/jsh/util/OpenSessionInViewFilterExtend.java b/src/com/jsh/util/OpenSessionInViewFilterExtend.java deleted file mode 100644 index daec6104c..000000000 --- a/src/com/jsh/util/OpenSessionInViewFilterExtend.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.jsh.util; - -import org.hibernate.FlushMode; -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.springframework.dao.DataAccessResourceFailureException; -import org.springframework.orm.hibernate3.support.OpenSessionInViewFilter; - -public class OpenSessionInViewFilterExtend extends OpenSessionInViewFilter -{ - @Override - protected Session getSession(SessionFactory sessionFactory) - throws DataAccessResourceFailureException - { - this.setFlushMode(FlushMode.AUTO); - return super.getSession(sessionFactory); - } - @Override - protected void closeSession(Session session, SessionFactory sessionFactory) - { - session.flush(); - super.closeSession(session, sessionFactory); - } -} diff --git a/src/com/jsh/util/PageUtil.java b/src/com/jsh/util/PageUtil.java deleted file mode 100644 index 17a298541..000000000 --- a/src/com/jsh/util/PageUtil.java +++ /dev/null @@ -1,199 +0,0 @@ -package com.jsh.util; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Hashtable; -import java.util.List; -import java.util.Map; -/** - * 分页工具类，实现分页功能 - * @author jishenghua - * @qq 7 5 2 7 1 8 9 2 0 - * @version [版本号version01, 2014-2-21] - */ -@SuppressWarnings("serial") -public class PageUtil implements Serializable -{ - /** - * 总页数，根据总数和单页显示个数进行计算 - */ - private int totalPage = 0; - - /** - * 总个数 - */ - private int totalCount = 0 ; - - /** - * 当前页码 - */ - private int curPage = 1; - - /** - * 每页显示个数 - */ - private int pageSize = 10; - - /** - * 是否为第一页 - */ - private boolean isFirstPage = false; - /** - * 是否是最后一页 - */ - private boolean isLastPage = false; - - /** - * 是否有上一页 - */ - private boolean hasPrevious = false; - - /** - * 是否有下一页 - */ - private boolean hasNext = false; - - /** - * 返回页面list数组 - */ - private List pageList = new ArrayList(); - - /** - * 页面搜索条件，用map来实现 - */ - private Map advSearch = new Hashtable(); - - public PageUtil() - { - - } - - public PageUtil(int totalCount,int pageSize,int curPage,Map adv) - { - init(totalCount,pageSize,curPage,adv); - } - /** - * 初始化页面显示参数 - * @param totalCount 总数 - * @param pageSize 页面显示个数 - * @param curPage 当前页面 - */ - public void init(int totalCount,int pageSize,int curPage,Map adv) - { - this.totalCount = totalCount; - this.pageSize = pageSize ; - this.curPage = curPage; - this.advSearch = adv; - //计算总页数 - if(pageSize != 0) - { - this.totalPage = (totalCount+pageSize-1)/pageSize; - } - if(curPage <1) - { - this.curPage = 1; - } - if(curPage>this.totalPage) - { - this.curPage = this.totalPage; - } - if(curPage>0&&this.totalPage!=1&&curPage0&&this.totalPage!=1&&curPage>1&&curPage<=this.totalPage) - { - this.hasPrevious = true; - } - if(curPage == 1) - { - this.isFirstPage = true ; - } - if(curPage == this.totalPage) - { - this.isLastPage = true; - } - } - public int getTotalPage() - { - return totalPage; - } - public void setTotalPage(int totalPage) - { - this.totalPage = totalPage; - } - public int getTotalCount() - { - return totalCount; - } - public void setTotalCount(int totalCount) - { - this.totalCount = totalCount; - } - public int getCurPage() - { - return curPage; - } - public void setCurPage(int curPage) - { - this.curPage = curPage; - } - public int getPageSize() - { - return pageSize; - } - public void setPageSize(int pageSize) - { - this.pageSize = pageSize; - } - public boolean isFirstPage() - { - return isFirstPage; - } - public void setFirstPage(boolean isFirstPage) - { - this.isFirstPage = isFirstPage; - } - public boolean isLastPage() - { - return isLastPage; - } - public void setLastPage(boolean isLastPage) - { - this.isLastPage = isLastPage; - } - public boolean isHasPrevious() - { - return hasPrevious; - } - public void setHasPrevious(boolean hasPrevious) - { - this.hasPrevious = hasPrevious; - } - public boolean isHasNext() - { - return hasNext; - } - public void setHasNext(boolean hasNext) - { - this.hasNext = hasNext; - } - - public List getPageList() - { - return pageList; - } - public void setPageList(List pageList) - { - this.pageList = pageList; - } - - public Map getAdvSearch() - { - return advSearch; - } - public void setAdvSearch(Map advSearch) - { - this.advSearch = advSearch; - } -} diff --git a/src/com/jsh/util/PathTool.java b/src/com/jsh/util/PathTool.java deleted file mode 100644 index b3e1335a9..000000000 --- a/src/com/jsh/util/PathTool.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.jsh.util; - -import java.io.File; -import java.net.URISyntaxException; -import java.net.URL; - -import com.jsh.base.Log; - -/** - * 获取应用系统路径 - * @author jishenghua - * @qq 7 5 2 7 1 8 9 2 0 - */ -public class PathTool -{ - - /** - * 获取WEB-INF的绝对路径 - * @return - */ - public static String getWebinfPath() - { - String webinfPath = ""; - //获取URL对象 - URL url = PathTool.class.getClassLoader().getResource(""); - try - { - //获取路径 - webinfPath = url.toURI().getPath(); - //截取路径到WEB-INF结束 -// webinfPath = path.substring(0, path.indexOf("/WEB-INF") + 8); - } - catch (URISyntaxException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>>>>>路径获取异常", e); - } - return webinfPath; - } - - /** - * 获取webapp的绝对路径 - * @return - */ - public static String getWebappPath() - { - //先获取工程路径 - String projectPath = getProjectPath(); - //获取工程路径的上级路径 - File f = new File(projectPath); - //路径不存在就返回 - if (!f.exists()) - { - return projectPath; - } - else - { - //返回webapp路径 - return f.getParent(); - } - } - - /** - * 获取工程的绝对路径 - * @return - */ - public static String getProjectPath() - { - String projectPath = ""; - //获取URL对象 - URL url = PathTool.class.getClassLoader().getResource(""); - String path = null; - try - { - //获取路径 - path = url.toURI().getPath(); - //截取webapp路径 - projectPath = path.substring(0, path.indexOf("/WEB-INF")); - } - catch (URISyntaxException e) - { - Log.errorFileSync(">>>>>>>>>>>>>>>>>>>>>>>路径获取异常", e); - } - return projectPath; - } -} diff --git a/src/com/jsh/util/SearchConditionUtil.java b/src/com/jsh/util/SearchConditionUtil.java deleted file mode 100644 index b2bf40a9a..000000000 --- a/src/com/jsh/util/SearchConditionUtil.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.jsh.util; - -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -/** - * 根据搜索条件拼装成查询hql语句 - * @author jishenghua qq:752718920 - */ -public class SearchConditionUtil -{ - //拼接字符串的前缀空格字符串 - private static final String emptyPrefix = " and "; - - /** - * 根据搜索条件自动拼接成hql搜索语句 - * @param condition 搜索条件 规则： - * 1、类型 n--数字 s--字符串 - * 2、属性 eq--等于 neq--不等于 like--像'%XX%' llike--左像'%XX' rlike--右像'XX%' in--包含 gt--大于 gteq--大于等于 lt--小于 lteq--小于等于 - * order--value desc asc gy-- group by - * 示例: - * Map condition = new HashMap(); - * condition.put("supplier_s_like", "aaa"); - * condition.put("contacts_s_llike", "186"); - * condition.put("contacts_s_rlike", "186"); - * condition.put("phonenum_s_eq", null); - * condition.put("email_n_neq", 23); - * condition.put("description_s_order", "desc"); - * @return 封装后的字符串 - */ - public static String getCondition(Map condition) - { - StringBuffer hql = new StringBuffer(); - Set key = condition.keySet(); - String groupbyInfo = ""; - String orderInfo = ""; - for(String keyInfo:key) - { - /* - * 1、数组为三个 第一个为对象实例的字段 第二个为字段类型 第三个为属性 - * 2、根据分解后的数组拼接搜索条件 - */ - Object valueInfo = condition.get(keyInfo); - if(null != valueInfo &&valueInfo.toString().length()>0) - { - String[] searchCondition = keyInfo.split("_"); - if(searchCondition[1].equals("n")) - hql.append(emptyPrefix + searchCondition[0] + getType(searchCondition[2]) + valueInfo); - else if(searchCondition[1].equals("s")) - { - if(searchCondition[2].equals("like")) - hql.append(emptyPrefix + searchCondition[0] + getType(searchCondition[2]) + "'%" + valueInfo + "%'"); - else if(searchCondition[2].equals("llike")) - hql.append(emptyPrefix + searchCondition[0] + getType(searchCondition[2]) + "'%" + valueInfo + "'"); - else if(searchCondition[2].equals("rlike")) - hql.append(emptyPrefix + searchCondition[0] + getType(searchCondition[2]) + "'" + valueInfo + "%'"); - else if(searchCondition[2].equals("in")) - hql.append(emptyPrefix + searchCondition[0] + getType(searchCondition[2]) + "(" + valueInfo + ")"); - else if(searchCondition[2].equals("order")) - orderInfo = " order by " + searchCondition[0] + " " + valueInfo; - else if(searchCondition[2].equals("gb")) - groupbyInfo = " group by " + searchCondition[0]; - else - hql.append(emptyPrefix + searchCondition[0] + getType(searchCondition[2]) + "'" + valueInfo + "'"); - } - } - } - return hql.append(groupbyInfo).append(orderInfo).toString(); - } - - /** - * 获取指定类型的符号 - * 属性 eq--等于 neq--不等于 like--像 in--包含 gt--大于 gteq--大于等于 lt--小于 lteq--小于等于 order--value desc asc - * @param type - * @return 类型字符串 - */ - private static String getType(String type) - { - String typeStr = ""; - if(type.equals("eq")) - typeStr = " = "; - else if(type.equals("neq")) - typeStr = " != "; - else if(type.equals("like")) - typeStr = " like "; - else if(type.equals("llike")) - typeStr = " like "; - else if(type.equals("rlike")) - typeStr = " like "; - else if(type.equals("in")) - typeStr = " in "; - else if(type.equals("gt")) - typeStr = " > "; - else if(type.equals("gteq")) - typeStr = " >= "; - else if(type.equals("lt")) - typeStr = " < "; - else if(type.equals("lteq")) - typeStr = " <= "; - else if(type.equals("order")) - typeStr = " order "; - else if(type.equals("gy")) - typeStr = " group by "; - else - typeStr = "unknown"; - return typeStr; - } - - public static void main(String[] args) - { - /** - * 拼接搜索条件 - */ - Map condition = new HashMap(); - condition.put("supplier_s_like", "aaa"); - condition.put("contacts_s_llike", "186"); - condition.put("contacts_s_rlike", "186"); - condition.put("phonenum_s_eq", null); - condition.put("email_n_neq", 23); - condition.put("description_s_order", "desc"); - condition.put("description_s_gb", "aaa"); - - //获取搜索条件拼接 - System.out.println(getCondition(condition)); - } -} diff --git a/src/com/jsh/util/SessionFilter.java b/src/com/jsh/util/SessionFilter.java deleted file mode 100644 index 762a3c320..000000000 --- a/src/com/jsh/util/SessionFilter.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.jsh.util; - -import java.io.IOException; -import java.io.PrintWriter; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -/** - * 用户登录session处理类 - * 过滤session是否超时 - * @author jishenghua qq_752718920 - * @version [版本号, 2012-3-6] - * @see [相关类/方法] - * @since - */ -public class SessionFilter implements Filter -{ - /** - * 初始化过滤器 暂不处理 - * 重载方法 - * @param arg0 - * @throws ServletException - */ - - public void init(FilterConfig arg0) - throws ServletException - { - - } - /** - * 判断用户session是否存在 不存在则跳转到登录页面 - * 重载方法 - * @param srequest - * @param sresponse - * @param chain - * @throws IOException - * @throws ServletException - */ - public void doFilter(ServletRequest srequest, ServletResponse sresponse, FilterChain chain) - throws IOException, ServletException - { - HttpServletRequest request = (HttpServletRequest) srequest; - HttpServletResponse response = (HttpServletResponse) sresponse; - HttpSession session = request.getSession(); - - //获取工程路径 - String path = request.getContextPath(); - String requestURl = request.getRequestURI(); - - if(requestURl.contains("/pages") &&null != session.getAttribute("user")) - chain.doFilter(request, response); - else - response.sendRedirect(path + "/logout.jsp"); - } - - /** - * 销毁过滤器 - */ - public void destroy() - { - - } -} diff --git a/src/com/jsh/util/Tools.java b/src/com/jsh/util/Tools.java deleted file mode 100644 index 68e7daea5..000000000 --- a/src/com/jsh/util/Tools.java +++ /dev/null @@ -1,561 +0,0 @@ -package com.jsh.util; - -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.InetAddress; -import java.net.URLEncoder; -import java.net.UnknownHostException; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.Locale; -import java.util.UUID; -import java.util.regex.Pattern; -import java.math.BigInteger; -/** - * 工具类 - * @author jishenghua qq:7-5-2-7-1-8-9-2-0 - */ -public class Tools -{ - /** - * 获得32位唯一序列号 - * @return 32为ID字符串 - */ - public static String getUUID_32() - { - return UUID.randomUUID().toString().replaceAll("-", ""); - } - /** - * 获得当天时间，格式为yyyy-MM-dd - * @return 格式化后的日期格式 - */ - public static String getNow() - { - return new SimpleDateFormat("yyyy-MM-dd").format(new Date()); - } - - /** - * 获取当前月 yyyy-MM - * @return - */ - public static String getCurrentMonth() - { - return new SimpleDateFormat("yyyy-MM").format(new Date()); - } - - /** - * 获取指定日期格式 yyyy-MM - * @return - */ - public static String getCurrentMonth(Date date) - { - return new SimpleDateFormat("yyyy-MM-dd").format(date); - } - - /** - * 获得当天时间，格式为yyyyMMddHHmmss - * @return 格式化后的日期格式 - */ - public static String getNow2(Date date) - { - return new SimpleDateFormat("yyyyMMddHHmmss").format(date); - } - /** - * 获得当天时间，格式为yyyy-MM-dd HH:mm:ss - * @return 格式化后的日期格式 - */ - public static String getNow3() - { - return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - } - /** - * 获得指定时间，格式为yyyy-MM-dd HH:mm:ss - * @return 格式化后的日期格式 - */ - public static String getCenternTime(Date date) - { - return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date); - } - - /** - * 获得指定时间，格式为mm:ss - * @return 格式化后的日期格式 - */ - public static String getTimeInfo(Date date) - { - return new SimpleDateFormat("mm:ss").format(date); - } - /** - * 获取当前日期是星期几 - * return 星期几 - */ - public static String getWeekDay() - { - Calendar c = Calendar.getInstance(Locale.CHINA); - c.setTime(new Date()); - int day=c.get(Calendar.DAY_OF_WEEK); - String weekDay = ""; - switch (day) - { - case 1: - weekDay = "星期日"; - break; - case 2: - weekDay = "星期一"; - break; - case 3: - weekDay = "星期二"; - break; - case 4: - weekDay = "星期三"; - break; - case 5: - weekDay = "星期四"; - break; - case 6: - weekDay = "星期五"; - break; - case 7: - weekDay = "星期六"; - break; - default: - break; - } - return weekDay; - } - /** - * 判断字符串是否全部为数字 - * @param accountWaste - * @return boolean值 - */ - public static boolean checkStrIsNum(String checkStr) - { - if(checkStr == null || checkStr.length() ==0) - return false; - return Pattern.compile("^[0-9]*.{1}[0-9]*$").matcher(checkStr).matches(); -// return Pattern.compile("：^[0-9]+(.[0-9])*$").matcher(checkStr).matches(); - } - /** - * 获得前一天的时间 - * @return 前一天日期 - */ - public static String getPreviousDate() - { - Calendar cal = Calendar.getInstance(); - cal.add(Calendar.DATE, -1); - return new SimpleDateFormat("yyyy-MM").format(cal.getTime()); - } - - /** - * 截取字符串长度 - * @param beforeStr - * @param cutLeng - * @return 截取后的字符串 - */ - public static String subStr(String beforeStr,int cutLeng){ - if(beforeStr.length()>cutLeng) - return beforeStr.substring(0,cutLeng)+ "..." ; - return beforeStr ; - } - /** - * 生成随机字符串，字母和数字混合 - * @return 组合后的字符串 ^[0-9a-zA-Z] - */ - public static String getRandomChar(){ - //生成一个0、1、2的随机数字 - int rand = (int)Math.round(Math.random() * 1); - long itmp = 0; - char ctmp = '\u0000'; - switch (rand) - { - //生成大写字母 + 1000以内数字 - case 1: - itmp = Math.round(Math.random() * 25 + 65); - ctmp = (char)itmp; - return String.valueOf(ctmp) + (int)Math.random()*1000; - //生成小写字母 - case 2: - itmp = Math.round(Math.random() * 25 + 97); - ctmp = (char)itmp; - return String.valueOf(ctmp)+ (int)Math.random()*1000; - //生成数字 - default : - itmp = Math.round(Math.random() * 1000); - return itmp + ""; - } - } - - /** - * 判断首字母以数字开头,字符串包括数字、字母%以及空格 - * @param str 检查字符串 - * @return 是否以数字开头 - */ - public static boolean CheckIsStartWithNum(String str) - { - return Pattern.compile("^[0-9][a-zA-Z0-9%,\\s]*$").matcher(str).matches(); - } - /** - * 判断首字母以","开头,字符串包括数字、字母%以及空格 - * @param str 检查字符串 - * @return 是否以数字开头 - */ - public static boolean CheckIsStartWithSpec(String str) - { - return Pattern.compile("^[,][a-zA-Z0-9%,\\s]*$").matcher(str).matches(); - } - /** - * 字符转码 - * @param aValue - * @return - * @see 转码后的字符串 - */ - public static String encodeValue(String aValue) - { - if(aValue.trim().length() ==0) - { - return ""; - } - String valueAfterTransCode = null; - try - { - valueAfterTransCode = URLEncoder.encode(aValue, "UTF-8"); - } - catch (UnsupportedEncodingException e) - { - e.getMessage(); - } - return valueAfterTransCode; - } - /** - * 去除str中的' - * @param str - * @return 除去'后的字符串 - * @see [类、类#方法、类#成员] - */ - public static String afterDealStr(String str) - { - return str.replace("'", ""); - } - /** - * 获取用户IP地址 - * @return 用户IP - * @see [类、类#方法、类#成员] - */ - public static String getCurrentUserIP() - { - try - { - return InetAddress.getLocalHost().getHostAddress(); - } - catch (UnknownHostException e) - { - e.printStackTrace(); - return "127.0.0.1"; - } - } - - /** - * 转化前台批量传入的ID值 - * @param data - * @return 转化后的ID值数组 - */ - public static int[] changeDataForm(String data) - { - String[] dataStr = data.split(","); - int[] dataInt = new int[dataStr.length]; - for(int i = 0 ;i < dataStr.length;i ++) - dataInt[i] = Integer.parseInt(dataStr[i]); - return dataInt; - } - - /** - * 解决导出文件中文乱码问题firefox和ie下中文乱码 - */ - public static String changeUnicode(String fileName,String browserType) - { - String returnFileName = ""; - try - { - if(browserType.equalsIgnoreCase("MSIE")) - { - returnFileName = URLEncoder.encode(fileName, "ISO8859-1"); - returnFileName = returnFileName.replace(" ","%20"); - if (returnFileName.length() > 150) - { - returnFileName = new String(fileName.getBytes("GB2312"), "ISO8859-1"); - returnFileName = returnFileName.replace(" ", "%20"); - } - } - else if(browserType.equalsIgnoreCase("Firefox")) - { - returnFileName = new String(fileName.getBytes("ISO8859-1"),"ISO8859-1"); - returnFileName = returnFileName.replace(" ", "%20"); - } - else - { - returnFileName = URLEncoder.encode(fileName, "ISO8859-1"); - returnFileName = returnFileName.replace(" ","%20"); - if (returnFileName.length() > 150) - { - - returnFileName = new String(returnFileName.getBytes("GB2312"), "ISO8859-1"); - returnFileName = returnFileName.replace(" ", "%20"); - } - } - } - catch (UnsupportedEncodingException e) - { - e.printStackTrace(); - } - return returnFileName; - } - - /** - * 写理财日志内容转化特殊字符 - * @param str 需要转化的字符 - * @return 转化后的字符 - */ - public static String htmlspecialchars(String str) - { - str = str.replaceAll("&", "&"); - str = str.replaceAll("<", "<"); - str = str.replaceAll(">", ">"); - str = str.replaceAll("\"", """); - return str; - } - - /** - * 根据消费日期获取消费月 - * @param consumeDate 消费日期 - * @return 返回消费月信息 - */ - public static String getConsumeMonth(String consumeDate) - { - return consumeDate.substring(0,7); - } - - /** - * 获取当前日期的前XX个月 - * @param 之前的第几个月 - * @return 前XX个月字符串 - */ - public static String getBeforeMonth(int beforeMonth) - { - Calendar c = Calendar.getInstance(); - c.add(Calendar.MONTH, -beforeMonth); - return new SimpleDateFormat("yyyy-MM").format(c.getTime()); - } - - - /** - * 获取email用户姓名 - * @param args - */ - public static String getEmailUserName(String emailAddress) - { - return emailAddress.substring(0,emailAddress.lastIndexOf("@")); - } - - /** - * 获取中文编码，邮件附件乱码问题解决 - * @param str - * @return - */ - public static String getChineseString(String emailAttchmentTitle) - { - if(emailAttchmentTitle!=null&&!emailAttchmentTitle.equals("")) - { - try - { - return new String(emailAttchmentTitle.getBytes(),"ISO-8859-1"); - } - catch (UnsupportedEncodingException e) - { - e.printStackTrace(); - } - } - return emailAttchmentTitle; - } - - /** - * 判断userTel是否合法，userTel只能是数字 - * @param userTel - * @return true 合法 false不合法 - */ - public static boolean isTelNumber(String userTel) - { - String reg_phone="^(\\(\\d{3,4}\\)|\\d{3,4}-)?\\d{7,8}$"; - String reg_tel="^(1[0-9][0-9]|1[0-9][0|3|6|8|9])\\d{8}$"; - boolean b_phpne=Pattern.compile(reg_phone).matcher(userTel).matches(); - boolean b_tel=Pattern.compile(reg_tel).matcher(userTel).matches(); - return (b_phpne || b_tel); - } - - /** - * 模糊判断电话号码是否合法，只能是数字 - * @param macAddress - * @return - */ - public static boolean isTelNumberBySlur(String userTel) - { - return Pattern.compile("^([\\s0-9]{0,12}$)").matcher(userTel).matches(); - } - - /** - * 获取当前时间的字符串类型 - * @return 处理后的字符串类型 - */ - public static String getNowTime() - { - return new SimpleDateFormat("yyyyMMddHHmmss").format(Calendar.getInstance().getTime()); - } - - /** - * 开打指定文件 - * @param filePath 文件的绝对路径 - */ - public static void openFile(String filePath) - { - String viewFilePath = filePath.replace("\\", "/"); - // Runtime.getRuntime().exec("cmd /c start "+filePath); - // 解决路径中带空格问题 - Runtime r = Runtime.getRuntime(); - String[] cmdArray = new String[] { "cmd.exe", "/c", viewFilePath }; - try - { - r.exec(cmdArray); - } - catch (IOException e) - { - e.printStackTrace(); - } - } - - /** - * 判断字符串中是否含有中文 - * @author jishenghua - * @param str - * @return - */ - public static boolean isContainsChinese(String str) - { - return Pattern.compile("[\u4e00-\u9fa5]").matcher(str).matches(); - } - - /** - * 过滤html文件中的文本 - * @param content - * @return过滤后的文本 - */ - public static String filterText(String content) - { - return content.replace("/<(?:.|\\s)*?>/g",""); - } - - /** - * 去掉字符串中所有符号，不论是全角，还是半角的，或是货币符号或者空格等 - * @author jishenghua - * @param s - * @return - * - */ - public static String removeSymbolForString(String s) - { - StringBuffer buffer = new StringBuffer(); - char[] chars = s.toCharArray(); - for (int i = 0; i < chars.length; i++) - { - if ((chars[i] >= 19968 && chars[i] <= 40869) || (chars[i] >= 97 && chars[i] <= 122) || (chars[i] >= 65 && chars[i] <= 90)) - { - buffer.append(chars[i]); - } - } - return buffer.toString(); - } - - /** - * 获取一个字符串的MD5 - * @param msg - * @return 加密后的MD5字符串 - * @throws NoSuchAlgorithmException - */ - public static String md5Encryp(String msg) throws NoSuchAlgorithmException - { - // 生成一个MD5加密计算摘要 - MessageDigest md = MessageDigest.getInstance("MD5"); - // 计算md5函数 - md.update(msg.getBytes()); - return new BigInteger(1, md.digest()).toString(16); - } - - /** - * 处理字符串null值 - * @param beforeStr 处理前字符串 - * @return 处理后的字符串 - */ - public static String dealNullStr(String beforeStr) - { - if(null == beforeStr || beforeStr.length()==0) - return ""; - return beforeStr; - } - - /** - * 使用参数Format将字符串转为Date - * @author jishenghua - * @param strDate - * @param pattern - * @return - * @throws ParseException - * - */ - public static Date parse(String strDate, String pattern) - throws ParseException - { - return new SimpleDateFormat(pattern).parse(strDate); - } - -// /** -// * 过滤html文件中的图片文件 -// * @param content -// * @return -// */ -// public static String filterImg(String content) -// { -// return content.matches("//g"); -// } - - public static void main(String[] args) - { - String aa = "的付的反对法的发的说法"; - char[] bb = aa.toCharArray(); - for(char c : bb) - { - System.out.println(c); - } - System.out.println(getBeforeMonth(1)); - - try - { - System.out.println(md5Encryp("guest")); - System.out.println(md5Encryp("admin")); - } - catch (NoSuchAlgorithmException e) - { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - String value = "2333"; - System.out.println(checkStrIsNum(value)); - - for(int i = 0 ;i < 100;i ++) - { - System.out.print(getRandomChar() + " || "); - } - } -}