From 4c9615f4c3821cd40ac0f8b973d5b47a45285945 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Wed, 15 Mar 2023 11:26:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=BD=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E5=88=9B=E5=BB=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CompanyController.java | 24 ++- .../controller/DepositoryController.java | 7 +- .../DepositoryRecordController.java | 26 +-- .../controller/GroupController.java | 28 +-- .../controller/MaterialController.java | 10 +- .../controller/MaterialTypeController.java | 8 +- .../controller/NoticeController.java | 11 +- .../controller/PageController.java | 5 + .../controller/PlaceController.java | 15 +- .../controller/SplitController.java | 4 +- .../controller/StockTakingController.java | 14 +- .../controller/UserController.java | 24 +-- .../entity/ConstructionUnit.java | 41 ++++ .../mapper/ConstructionUnitMapper.java | 90 +++++++++ .../mapper/ConstructionUnitMapper.xml | 129 ++++++++++++ .../service/ConstructionUnitService.java | 85 ++++++++ .../impl/ConstructionUnitServiceImpl.java | 148 ++++++++++++++ .../depository_manage/utils/CrudUtil.java | 4 +- .../constructionunit_add.html | 189 +++++------------- .../depository_manage/TestForOther.java | 50 ----- 20 files changed, 638 insertions(+), 274 deletions(-) create mode 100644 src/main/java/com/dreamchaser/depository_manage/entity/ConstructionUnit.java create mode 100644 src/main/java/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.java create mode 100644 src/main/java/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.xml create mode 100644 src/main/java/com/dreamchaser/depository_manage/service/ConstructionUnitService.java create mode 100644 src/main/java/com/dreamchaser/depository_manage/service/impl/ConstructionUnitServiceImpl.java diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/CompanyController.java b/src/main/java/com/dreamchaser/depository_manage/controller/CompanyController.java index 14780612..165f382d 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/CompanyController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/CompanyController.java @@ -8,6 +8,7 @@ import com.dreamchaser.depository_manage.exception.MyException; import com.dreamchaser.depository_manage.pojo.*; import com.dreamchaser.depository_manage.security.pool.AuthenticationTokenPool; import com.dreamchaser.depository_manage.service.CompanyService; +import com.dreamchaser.depository_manage.service.ConstructionUnitService; import com.dreamchaser.depository_manage.service.DepositoryService; import com.dreamchaser.depository_manage.service.RoleService; import com.dreamchaser.depository_manage.utils.*; @@ -35,6 +36,9 @@ public class CompanyController { @Autowired DepositoryService depositoryService; + @Autowired + ConstructionUnitService constructionUnitService; + /** * 查询组织架构 * @@ -51,7 +55,7 @@ public class CompanyController { UserByPort userToken = AuthenticationTokenPool.getUserToken(token); String url = PortConfig.external_url + "/org/govlist"; Object page = map.get("page"); - Object pagesize = map.get("pagesize"); + Object pagesize = map.get("size"); String superior = (String) map.get("superior"); Integer level = ObjectFormatUtil.toInteger(map.get("level")); if ("".equals(superior)) { @@ -105,7 +109,7 @@ public class CompanyController { map.put("state", ObjectFormatUtil.toInteger(state)); } Object page = map.get("page"); - Object pagesize = map.get("pagesize"); + Object pagesize = map.get("size"); map.put("page", ObjectFormatUtil.toInteger(page)); map.put("pagesize", ObjectFormatUtil.toInteger(pagesize)); String jsonString = JSONObject.toJSONString(map); @@ -147,7 +151,7 @@ public class CompanyController { UserByPort userByPort = AuthenticationTokenPool.getUserToken(token); String url = PortConfig.external_url + "/org/positionlist"; Object page = map.get("page"); - Object pagesize = map.get("pagesize"); + Object pagesize = map.get("size"); map.put("page", ObjectFormatUtil.toInteger(page)); map.put("pagesize", ObjectFormatUtil.toInteger(pagesize)); String jsonString = JSONObject.toJSONString(map); @@ -242,7 +246,7 @@ public class CompanyController { } } } - return CrudUtil.postHandle(success, success); + return CrudUtil.insertHandle(success, success); } /** @@ -270,7 +274,7 @@ public class CompanyController { update.put("classes", 2); success += roleService.UpdateRoleAndDepositoryById(update); } - return CrudUtil.postHandle(success, roleAndDepositoryByCondition.size()); + return CrudUtil.insertHandle(success, roleAndDepositoryByCondition.size()); } /** @@ -291,7 +295,7 @@ public class CompanyController { for (RoleAndDepository roleAndDepository : roleAndDepositoryByCondition) { success += roleService.deleteRoleAndDepositoryById(roleAndDepository.getId()); } - return CrudUtil.postHandle(success, roleAndDepositoryByCondition.size()); + return CrudUtil.insertHandle(success, roleAndDepositoryByCondition.size()); } else if (map.containsKey("depositoryIds")) { Integer num = 0; List depositoryIds = (List) map.get("depositoryIds"); @@ -307,7 +311,7 @@ public class CompanyController { success += roleService.deleteRoleAndDepositoryById(roleAndDepository.getId()); } } - return CrudUtil.postHandle(success, total); + return CrudUtil.insertHandle(success, total); } else { throw new MyException("所需请求参数缺失！"); } @@ -388,4 +392,10 @@ public class CompanyController { return new RestResponse(list); } + + + @PostMapping("/constructionUnitAdd") + public RestResponse constructionUnitAdd(@RequestBody Map map){ + return CrudUtil.insertHandle(constructionUnitService.addConstructionUnit(map),1); + } } diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java index 68f2e66c..1a6683eb 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java @@ -1,6 +1,5 @@ package com.dreamchaser.depository_manage.controller; -import cn.hutool.core.lang.Snowflake; import com.dreamchaser.depository_manage.entity.*; import com.dreamchaser.depository_manage.exception.MyException; import com.dreamchaser.depository_manage.pojo.*; @@ -519,7 +518,7 @@ public class DepositoryController { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - return CrudUtil.postHandle(depositoryService.insertDepository(map, userToken), 1); + return CrudUtil.insertHandle(depositoryService.insertDepository(map, userToken), 1); } /** @@ -576,7 +575,7 @@ public class DepositoryController { } else { map.put("state", 2); } - return CrudUtil.postHandle(depositoryService.updateDepository(map), 1); + return CrudUtil.insertHandle(depositoryService.updateDepository(map), 1); } /** @@ -618,7 +617,7 @@ public class DepositoryController { }).start(); } } - return CrudUtil.postHandle(depositoryService.updateDepository(map), 1); + return CrudUtil.insertHandle(depositoryService.updateDepository(map), 1); } /** diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index 231c4d83..2eeed749 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -207,7 +207,7 @@ public class DepositoryRecordController { map.put("applicantId", userToken.getId()); Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); Depository depository = depositoryService.findDepositoryById(depositoryId); - return CrudUtil.postHandle(depositoryRecordService.apply(map), 1); + return CrudUtil.insertHandle(depositoryRecordService.apply(map), 1); } @@ -421,10 +421,10 @@ public class DepositoryRecordController { } }).start(); if (integer != 0 && params.size() < 1 && integer != -1) { - return CrudUtil.postHandle(integer, 1); + return CrudUtil.insertHandle(integer, 1); } else if (integer != 0 && params.size() > 0) { if (integer == params.size() + 1) { - return CrudUtil.postHandle(integer, params.size() + 1); + return CrudUtil.insertHandle(integer, params.size() + 1); } else { return new RestResponse(result, 666, new StatusInfo("错误", "含有错误信息")); } @@ -578,9 +578,9 @@ public class DepositoryRecordController { } } if (integer != 0 && params.size() < 1) { - return CrudUtil.postHandle(integer, 1); + return CrudUtil.insertHandle(integer, 1); } else if (integer != 0 && params.size() >= 1) { - return CrudUtil.postHandle(integer, params.size() + 1); + return CrudUtil.insertHandle(integer, params.size() + 1); } else { return new RestResponse("", 666, new StatusInfo("出库失败", "请联系管理员进行操作")); } @@ -836,7 +836,7 @@ public class DepositoryRecordController { redisTemplateForHash.expire("mids" + userToken.getId(), 24 * 60 * 60, TimeUnit.SECONDS); redisTemplateForHash.expire("depositoryIds" + userToken.getId(), 24 * 60 * 60, TimeUnit.SECONDS); redisTemplateForHash.expire("placeCodes" + userToken.getId(), 24 * 60 * 60, TimeUnit.SECONDS); - return CrudUtil.postHandle(1, 1); + return CrudUtil.insertHandle(1, 1); } /** @@ -865,7 +865,7 @@ public class DepositoryRecordController { for (int i = 0; i < placeCodes.size(); i++) { redisTemplateForHash.opsForList().remove("placeCodes" + userToken.getId(), 1, placeCodes.get(i).toString()); } - return CrudUtil.postHandle(1, 1); + return CrudUtil.insertHandle(1, 1); } // 出库审核 @@ -880,7 +880,7 @@ public class DepositoryRecordController { String crypt = Md5.crypt(header); Integer review = depositoryRecordService.review(map, userToken.getId(), userToken, crypt); if (review != -1) { - return CrudUtil.postHandle(review, 1); + return CrudUtil.insertHandle(review, 1); } else { return new RestResponse("", 666, new StatusInfo("出库失败", "当前存储位库存不足，请重新选择")); } @@ -897,7 +897,7 @@ public class DepositoryRecordController { String crypt = Md5.crypt(header); Integer review = depositoryRecordService.reviewIn(map, userToken.getId(), userToken, crypt); if (review != -1) { - return CrudUtil.postHandle(review, 1); + return CrudUtil.insertHandle(review, 1); } else { return new RestResponse("", 666, new StatusInfo("出库失败", "当前存储位库存不足，请重新选择")); } @@ -1018,9 +1018,9 @@ public class DepositoryRecordController { } if (params.size() < 1) { - return CrudUtil.postHandle(integer, 1); + return CrudUtil.insertHandle(integer, 1); } else if (params.size() > 0) { - return CrudUtil.postHandle(integer, params.size() + 1); + return CrudUtil.insertHandle(integer, params.size() + 1); } else { return new RestResponse("", 666, new StatusInfo("转移失败", "请联系管理员进行操作")); } @@ -1261,7 +1261,7 @@ public class DepositoryRecordController { if (success == 0) { return new RestResponse("", 666, new StatusInfo("申请失败", "超出最大存储容量")); } - return CrudUtil.postHandle(success, 1); + return CrudUtil.insertHandle(success, 1); } /** @@ -1462,7 +1462,7 @@ public class DepositoryRecordController { // 如果申请成功数量小于申请数量 return new RestResponse(errMsg.toString(), 1234, new StatusInfo("出库失败", "数量不足")); } - return CrudUtil.postHandle(success, mids.size()); + return CrudUtil.insertHandle(success, mids.size()); } // 确认将物料出库 diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java index cca6df6b..13bd73c3 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java @@ -60,7 +60,7 @@ public class GroupController { Integer len = ObjectFormatUtil.toInteger(map.get("len")); // 获取添加成功的数量 Integer integer = groupService.addGroup(map); - return CrudUtil.postHandle(len, integer); + return CrudUtil.insertHandle(len, integer); } @PostMapping("/findGroupByCodeForIn") @@ -170,7 +170,7 @@ public class GroupController { Integer len = ObjectFormatUtil.toInteger(map.get("len")); Integer integer = groupService.addMaterialForGroup(map); - return CrudUtil.postHandle(len, integer); + return CrudUtil.insertHandle(len, integer); } else { throw new MyException("缺少必要参数"); } @@ -253,7 +253,7 @@ public class GroupController { public RestResponse materialForGroupEdit(@RequestBody Map map) { if (map.containsKey("id")) { Integer integer = groupService.updateMaterialForGroup(map); - return CrudUtil.putHandle(1, integer); + return CrudUtil.updateHandle(1, integer); } else { throw new MyException("缺少必要参数!"); } @@ -292,7 +292,7 @@ public class GroupController { public RestResponse changeGroupState(@RequestBody Map map) { if (map.containsKey("id")) { Integer integer = groupService.updateGroupState(map); - return CrudUtil.putHandle(1, integer); + return CrudUtil.updateHandle(1, integer); } else { throw new MyException("缺少必要参数"); } @@ -309,7 +309,7 @@ public class GroupController { public RestResponse editGroupInfo(@RequestBody Map map) { if (map.containsKey("id")) { Integer integer = groupService.updateGroupInfo(map); - return CrudUtil.putHandle(1, integer); + return CrudUtil.updateHandle(1, integer); } else { throw new MyException("缺少必要参数"); } @@ -327,7 +327,7 @@ public class GroupController { if (map.containsKey("id")) { map.put("state", 3); Integer integer = groupService.updateGroupState(map); - return CrudUtil.putHandle(1, integer); + return CrudUtil.updateHandle(1, integer); } else if (map.containsKey("ids")) { List ids = (List) map.get("ids"); Integer integer = 0; @@ -336,7 +336,7 @@ public class GroupController { map.put("state", 3); integer += groupService.updateGroupState(map); } - return CrudUtil.putHandle(ids.size(), integer); + return CrudUtil.updateHandle(ids.size(), integer); } else { throw new MyException("缺少必要参数"); } @@ -466,7 +466,7 @@ public class GroupController { } // 设置过期时间为1天 redisTemplateForHash.expire("wms_gids" + userToken.getId(), 24 * 60 * 60, TimeUnit.SECONDS); - return CrudUtil.postHandle(1, 1); + return CrudUtil.insertHandle(1, 1); } /** @@ -525,7 +525,7 @@ public class GroupController { for (int i = 0; i < gids.size(); i++) { redisTemplateForHash.opsForList().remove("wms_gids" + userToken.getId(), 1, gids.get(i).toString()); } - return CrudUtil.postHandle(1, 1); + return CrudUtil.insertHandle(1, 1); } @@ -568,7 +568,7 @@ public class GroupController { } catch (Exception e) { return new RestResponse("", 666, new StatusInfo("出库失败", e.getMessage())); } - return CrudUtil.putHandle(result, integer); + return CrudUtil.updateHandle(result, integer); } @PutMapping("/reviewIn") @@ -582,7 +582,7 @@ public class GroupController { String crypt = Md5.crypt(header); Integer review = groupService.reviewIn(map, userToken.getId(), userToken, crypt); if (review != -1) { - return CrudUtil.postHandle(review, 1); + return CrudUtil.insertHandle(review, 1); } else { return new RestResponse("", 666, new StatusInfo("出库失败", "当前存储位库存不足，请重新选择")); } @@ -659,9 +659,9 @@ public class GroupController { }).start(); if (integer != 0 && params.size() < 1) { - return CrudUtil.postHandle(integer, result); + return CrudUtil.insertHandle(integer, result); } else if (integer != 0 && params.size() >= 1) { - return CrudUtil.postHandle(integer, result); + return CrudUtil.insertHandle(integer, result); } else { return new RestResponse("", 666, new StatusInfo("出库失败", "请联系管理员进行操作")); } @@ -864,7 +864,7 @@ public class GroupController { redisTemplateForHash.expire(sp_no, 7, TimeUnit.DAYS); } }).start(); - return CrudUtil.postHandle(integer, result); + return CrudUtil.insertHandle(integer, result); } diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java index cdb66a17..da2bc0a7 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java @@ -253,7 +253,7 @@ public class MaterialController { */ @PostMapping("/material_add") public RestResponse materialAdd(@RequestBody Map map) { - return CrudUtil.postHandle(materialService.insertMaterial(map), 1); + return CrudUtil.insertHandle(materialService.insertMaterial(map), 1); } /** @@ -288,7 +288,7 @@ public class MaterialController { } else { map.put("state", 2); } - return CrudUtil.postHandle(materialService.updateMaterial(map), 1); + return CrudUtil.insertHandle(materialService.updateMaterial(map), 1); } @PostMapping("realDeleteMaterial") @@ -1592,7 +1592,7 @@ public class MaterialController { @PostMapping("/addBarCodeByMaterial") public RestResponse addBarCodeByMaterial(@RequestBody Map map, HttpServletRequest request) { Integer integer = materialService.addBarCodeByMaterial(map); - return CrudUtil.postHandle(integer, 1); + return CrudUtil.insertHandle(integer, 1); } // 删除条形码与物料编码的对应关系 @@ -1912,7 +1912,7 @@ public class MaterialController { if (Integer.compare(-1, integer) == 0) { return new RestResponse("", -1, new StatusInfo("转移失败", "转入位置无法存放当前数量的库存")); } else { - return CrudUtil.putHandle(1, integer); + return CrudUtil.updateHandle(1, integer); } } @@ -2025,7 +2025,7 @@ public class MaterialController { } } - return CrudUtil.putHandle(1, result); + return CrudUtil.updateHandle(1, result); } diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialTypeController.java b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialTypeController.java index f7195367..63c7106e 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialTypeController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialTypeController.java @@ -1,7 +1,5 @@ package com.dreamchaser.depository_manage.controller; -import com.alibaba.fastjson.JSONObject; -import com.dreamchaser.depository_manage.entity.Depository; import com.dreamchaser.depository_manage.entity.MaterialType; import com.dreamchaser.depository_manage.exception.MyException; import com.dreamchaser.depository_manage.pojo.MaterialP; @@ -46,7 +44,7 @@ public class MaterialTypeController { materialService.RefreshInitTreeMenus(); } }).start(); - return CrudUtil.postHandle(integer,1); + return CrudUtil.insertHandle(integer,1); } /** @@ -251,7 +249,7 @@ public class MaterialTypeController { materialService.RefreshInitTreeMenus(); } }).start(); - return CrudUtil.postHandle(integer,1); + return CrudUtil.insertHandle(integer,1); } /** @@ -366,7 +364,7 @@ public class MaterialTypeController { } }).start(); - return CrudUtil.postHandle(integer, 1); + return CrudUtil.insertHandle(integer, 1); } /** diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/NoticeController.java b/src/main/java/com/dreamchaser/depository_manage/controller/NoticeController.java index b0a89d1e..0e8a40b8 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/NoticeController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/NoticeController.java @@ -1,10 +1,6 @@ package com.dreamchaser.depository_manage.controller; -import com.alibaba.fastjson.JSONObject; -import com.dreamchaser.depository_manage.config.PortConfig; -import com.dreamchaser.depository_manage.config.QyWxConfig; import com.dreamchaser.depository_manage.entity.UserByPort; -import com.dreamchaser.depository_manage.entity.qywxDepartment; import com.dreamchaser.depository_manage.exception.MyException; import com.dreamchaser.depository_manage.pojo.NoticeP; import com.dreamchaser.depository_manage.pojo.RestResponse; @@ -12,7 +8,6 @@ import com.dreamchaser.depository_manage.security.pool.AuthenticationTokenPool; import com.dreamchaser.depository_manage.service.NoticeService; import com.dreamchaser.depository_manage.service.impl.QyWxOperationService; import com.dreamchaser.depository_manage.utils.CrudUtil; -import com.dreamchaser.depository_manage.utils.LinkInterfaceUtil; import com.dreamchaser.depository_manage.utils.Md5; import com.dreamchaser.depository_manage.utils.ObjectFormatUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -62,7 +57,7 @@ public class NoticeController { }).start();*/ } - return CrudUtil.postHandle(integer, 1); + return CrudUtil.insertHandle(integer, 1); } @GetMapping("/findAllNotices") @@ -100,7 +95,7 @@ public class NoticeController { public RestResponse noticeEdit(@RequestBody Map map, HttpServletRequest request) { if (map.containsKey("id")) { Integer integer = noticeService.updateNotice(map); - return CrudUtil.putHandle(integer,1); + return CrudUtil.updateHandle(integer,1); } else { throw new MyException("缺少必要参数"); } @@ -121,7 +116,7 @@ public class NoticeController { public RestResponse EditNoticeState(@RequestBody Map map){ if(map.containsKey("id")){ Integer integer = noticeService.updateNoticeState(map); - return CrudUtil.putHandle(integer,1); + return CrudUtil.updateHandle(integer,1); }else{ throw new MyException("缺少必要参数"); } diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index ada2bf2a..600a3415 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -2906,4 +2906,9 @@ public class PageController { return mv; } + @GetMapping("/constructionUnitAdd") + public String constructionUnitAdd(){ + return "pages/constructionunit/constructionunit_add"; + } + } diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java index 985d1f53..7d39304a 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java @@ -1,6 +1,5 @@ package com.dreamchaser.depository_manage.controller; -import cn.hutool.core.lang.Snowflake; import com.dreamchaser.depository_manage.entity.*; import com.dreamchaser.depository_manage.entity.MaterialAndPlace; import com.dreamchaser.depository_manage.exception.MyException; @@ -157,9 +156,9 @@ public class PlaceController { } if ("one".equals(type)) { - return CrudUtil.postHandle(success, 1); + return CrudUtil.insertHandle(success, 1); } else if("list".equals(type)){ - return CrudUtil.postHandle(success,total); + return CrudUtil.insertHandle(success,total); }else{ throw new MyException("请求参数错误！"); } @@ -209,9 +208,9 @@ public class PlaceController { } } if ("one".equals(type)) { - return CrudUtil.postHandle(success, 1); + return CrudUtil.insertHandle(success, 1); } else if("list".equals(type)){ - return CrudUtil.postHandle(success,total); + return CrudUtil.insertHandle(success,total); }else{ throw new MyException("请求参数错误！"); } @@ -290,7 +289,7 @@ public class PlaceController { update.put("max", 500); } update.put("id", id); - return CrudUtil.postHandle(placeService.UpdatePlace(update),1); + return CrudUtil.insertHandle(placeService.UpdatePlace(update),1); } @PostMapping("/tray_edit") @@ -321,7 +320,7 @@ public class PlaceController { } update.put("code",code); update.put("id", map.get("id")); - return CrudUtil.postHandle(placeService.UpdatePlace(update),1); } + return CrudUtil.insertHandle(placeService.UpdatePlace(update),1); } @PostMapping("/editPlaceState") @@ -331,7 +330,7 @@ public class PlaceController { } else { map.put("state", 2); } - return CrudUtil.postHandle(placeService.editPlaceState(map),1); + return CrudUtil.insertHandle(placeService.editPlaceState(map),1); } // 根据物料编号获取库位 diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/SplitController.java b/src/main/java/com/dreamchaser/depository_manage/controller/SplitController.java index 7ab2b3c5..de104825 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/SplitController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/SplitController.java @@ -40,7 +40,7 @@ public class SplitController { @PostMapping("/splitAdd") public RestResponse splitAdd(@RequestBody Map map, HttpServletRequest request) { if (map.containsKey("quantity") && map.containsKey("newUnit")) { - return CrudUtil.postHandle(1, splitUnitService.addSplitInfo(map)); + return CrudUtil.insertHandle(1, splitUnitService.addSplitInfo(map)); } else { throw new MyException("缺少必要参数"); } @@ -129,7 +129,7 @@ public class SplitController { public RestResponse splitEdit(@RequestBody Map map) { if (map.containsKey("id")) { Integer integer = splitUnitService.updateSplitInfo(map); - return CrudUtil.putHandle(1, integer); + return CrudUtil.updateHandle(1, integer); } else { throw new MyException("缺少必要参数"); } diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java b/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java index 2e290d12..e2a5897f 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java @@ -3,7 +3,6 @@ package com.dreamchaser.depository_manage.controller; import com.alibaba.fastjson.JSONObject; import com.dreamchaser.depository_manage.config.PortConfig; -import com.dreamchaser.depository_manage.entity.Inventory; import com.dreamchaser.depository_manage.entity.MaterialAndPlace; import com.dreamchaser.depository_manage.entity.Place; import com.dreamchaser.depository_manage.entity.UserByPort; @@ -20,7 +19,6 @@ import com.dreamchaser.depository_manage.utils.CrudUtil; import com.dreamchaser.depository_manage.utils.DateUtil; import com.dreamchaser.depository_manage.utils.Md5; import com.dreamchaser.depository_manage.utils.ObjectFormatUtil; -import org.apache.ibatis.jdbc.Null; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.bind.annotation.*; @@ -198,9 +196,9 @@ public class StockTakingController { } if (params.size() > 0) { - return CrudUtil.postHandle(success, params.size() + 1); + return CrudUtil.insertHandle(success, params.size() + 1); } else { - return CrudUtil.postHandle(success, 1); + return CrudUtil.insertHandle(success, 1); } } @@ -234,7 +232,7 @@ public class StockTakingController { // 如果有出错情况 return new RestResponse(review, 666, new StatusInfo("有错误", "发现错误")); } else { - return CrudUtil.postHandle(1, 1); + return CrudUtil.insertHandle(1, 1); } } @@ -254,7 +252,7 @@ public class StockTakingController { // 如果有出错情况 return new RestResponse(complete, 666, new StatusInfo("有错误", "发现错误")); } else { - return CrudUtil.postHandle(1, 1); + return CrudUtil.insertHandle(1, 1); } } @@ -314,7 +312,7 @@ public class StockTakingController { map.put("minIds", minIdList); Integer transfer = stockTakingService.stockTakingTransfer(map, userToken, crypt); - return CrudUtil.postHandle(transfer, minIdList.size()); + return CrudUtil.insertHandle(transfer, minIdList.size()); } @PostMapping("/temporaryStorageForTakingResult") @@ -461,6 +459,6 @@ public class StockTakingController { } - return CrudUtil.putHandle(success, size); + return CrudUtil.updateHandle(success, size); } } diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/UserController.java b/src/main/java/com/dreamchaser/depository_manage/controller/UserController.java index 72a8b418..880eb4b9 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/UserController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/UserController.java @@ -252,7 +252,7 @@ public class UserController { map.put("adminorg", ObjectFormatUtil.toInteger(map.get("adminorg"))); } Object page = map.get("page"); - Object pagesize = map.get("pagesize"); + Object pagesize = map.get("size"); map.put("page", ObjectFormatUtil.toInteger(page)); map.put("pagesize", ObjectFormatUtil.toInteger(pagesize)); String jsonString = JSONObject.toJSONString(map); @@ -307,10 +307,10 @@ public class UserController { param.put("depositoryId", map.get("depositoryId")); List roleAndDepositoryByCondition = roleService.findRoleAndDepositoryByCondition(param); if (roleAndDepositoryByCondition.size() > 0) { - return CrudUtil.postHandle(-1, -1); + return CrudUtil.insertHandle(-1, -1); } else { Integer integer = roleService.addUserOrPostRoleAndDepository(map); - return CrudUtil.postHandle(integer, integer); + return CrudUtil.insertHandle(integer, integer); } } else { List depositoryAll = depositoryService.findDepositoryAll(); @@ -323,7 +323,7 @@ public class UserController { success += roleService.addUserOrPostRoleAndDepository(map); } } - return CrudUtil.postHandle(success, depositoryAll.size()); + return CrudUtil.insertHandle(success, depositoryAll.size()); } } @@ -342,21 +342,21 @@ public class UserController { param.put("mtid", map.get("mtid")); List roleAndMaterialTypeByCondition = roleService.findRoleAndMaterialTypeByCondition(param); if (roleAndMaterialTypeByCondition.size() > 0) { - return CrudUtil.postHandle(-1, -1); + return CrudUtil.insertHandle(-1, -1); } else { Integer integer = roleService.addUserOrPostRoleAndMaterialType(map); - return CrudUtil.postHandle(integer, integer); + return CrudUtil.insertHandle(integer, integer); } } @PostMapping("/sys/userRole_edit") public RestResponse editUserRole(@RequestBody Map map) { - return CrudUtil.postHandle(roleService.UpdateRoleAndDepositoryById(map), 1); + return CrudUtil.insertHandle(roleService.UpdateRoleAndDepositoryById(map), 1); } @PostMapping("/sys/userRole_editForIn") public RestResponse editUserRoleForIn(@RequestBody Map map) { - return CrudUtil.postHandle(roleService.UpdateRoleAndMaterialTypeById(map), 1); + return CrudUtil.insertHandle(roleService.UpdateRoleAndMaterialTypeById(map), 1); } @PostMapping("/sys/user_detail") @@ -370,7 +370,7 @@ public class UserController { } else { map.put("state", 2); } - return CrudUtil.postHandle(userService.updateUser(map), 1); + return CrudUtil.insertHandle(userService.updateUser(map), 1); } @DeleteMapping("/sys/user") @@ -439,7 +439,7 @@ public class UserController { public RestResponse updateSelf(@RequestBody Map map, HttpServletRequest request) { UserToken userToken = (UserToken) request.getAttribute("userToken"); map.put("id", userToken.getUser().getId()); - return CrudUtil.postHandle(userService.updateUserNoSensitive(map), 1); + return CrudUtil.insertHandle(userService.updateUserNoSensitive(map), 1); } @PutMapping("/checkOldEmail") @@ -467,7 +467,7 @@ public class UserController { if (checkCode(userToken.getPrincipal(), map.get("oldCode").toString()) && checkCode(map.get("email").toString(), map.get("code").toString())) { map.put("id", userToken.getUser().getId()); - return CrudUtil.putHandle(userService.updateUser(map), 1); + return CrudUtil.updateHandle(userService.updateUser(map), 1); } else { //验证码错误 return CrudUtil.CODE_ERROR; @@ -513,7 +513,7 @@ public class UserController { String new_password = Md5.crypt(String.valueOf(map.get("new_password"))); map.put("new_password", new_password); map.put("id", userByEmail.getId()); - return CrudUtil.postHandle(userService.updateUserPasswordById(map), 1); + return CrudUtil.insertHandle(userService.updateUserPasswordById(map), 1); } /** diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/ConstructionUnit.java b/src/main/java/com/dreamchaser/depository_manage/entity/ConstructionUnit.java new file mode 100644 index 00000000..73eee7d4 --- /dev/null +++ b/src/main/java/com/dreamchaser/depository_manage/entity/ConstructionUnit.java @@ -0,0 +1,41 @@ +package com.dreamchaser.depository_manage.entity; + +import lombok.Data; + +/** + * 施工单位 + */ +@Data +public class ConstructionUnit { + /** + * id + */ + private Integer id; + /** + * 状态 1启用2禁用3删除 + */ + private Integer state; + /** + * 创建时间 + */ + private Long createTime; + + + + /** + * 创建时间(展示) + */ + private String showCreateTime; + /** + * 施工单位名称 + */ + private String name; + /** + * 施工单位介绍 + */ + private String introduce; + /** + * 施工单位地址 + */ + private String address; +} diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.java b/src/main/java/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.java new file mode 100644 index 00000000..afb50d28 --- /dev/null +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.java @@ -0,0 +1,90 @@ +package com.dreamchaser.depository_manage.mapper; + +import com.dreamchaser.depository_manage.entity.ConstructionUnit; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Map; + +@Mapper +@Repository +public interface ConstructionUnitMapper { + + /** + * 创建施工单位 + * + * @param map 待创建数据 + * @return + */ + Integer addConstructionUnit(Map map); + + /** + * 查询所有施工单位 + * + * @return + */ + List findConstructionUnitAll(); + + + /** + * 根据条件查询施工单位 + * + * @param map 查询条件 + * @return + */ + List findConstructionUnitByCondition(Map map); + + + /** + * 根据条件查询施工单位数量 + * + * @param map 查询条件 + * @return + */ + Integer findConstructionUnitCountByCondition(Map map); + + /** + * 通过主键查询施工单位 + * + * @param id 待查询主键 + * @return + */ + ConstructionUnit findConstructionUnitById(Integer id); + + /** + * 修改施工单位状态 + * + * @param map 修改条件 + * @return + */ + Integer updateConstructionUnitState(Map map); + + + /** + * 修改施工单位信息 + * + * @param map 修改数据 + * @return + */ + Integer updateConstructionUnit(Map map); + + + /** + * 根据主键id删除施工单位 + * + * @param id 待删除id + * @return + */ + Integer deleteConstructionUnitById(Integer id); + + /** + * 根据主键id批量删除施工单位 + * + * @param list 待删除id列表 + * @return + */ + Integer deleteConstructionUnitByIds(List list); + + +} diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.xml new file mode 100644 index 00000000..6fbda929 --- /dev/null +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.xml @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + id,`name`,state,introduce,address,createTime + + + + insert into constructionunit(id,`name`,state,introduce,address,createTime) + values ( + #{id}, + #{name}, + #{state}, + #{introduce}, + #{address}, + #{createTime} + ) + + + + + + + + + + + + + + update constructionunit + + + namd = #{name}, + + + state = #{state}, + + + introduce = #{introduce}, + + + address = #{address} + + + where id = #{id} + + + + + update constructionunit + + + state = #{state}, + + + where id = #{id} + + + + delete from constructionunit where id = #{id} + + + + delete from constructionunit where id in + + #{id} + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/dreamchaser/depository_manage/service/ConstructionUnitService.java b/src/main/java/com/dreamchaser/depository_manage/service/ConstructionUnitService.java new file mode 100644 index 00000000..d8a68e31 --- /dev/null +++ b/src/main/java/com/dreamchaser/depository_manage/service/ConstructionUnitService.java @@ -0,0 +1,85 @@ +package com.dreamchaser.depository_manage.service; + + +import com.dreamchaser.depository_manage.entity.ConstructionUnit; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +public interface ConstructionUnitService { + /** + * 创建施工单位 + * + * @param map 待创建数据 + * @return + */ + Integer addConstructionUnit(Map map); + + /** + * 查询所有施工单位 + * + * @return + */ + List findConstructionUnitAll(); + + + /** + * 根据条件查询施工单位 + * + * @param map 查询条件 + * @return + */ + List findConstructionUnitByCondition(Map map); + + + /** + * 根据条件查询施工单位数量 + * + * @param map 查询条件 + * @return + */ + Integer findConstructionUnitCountByCondition(Map map); + + /** + * 通过主键查询施工单位 + * + * @param id 待查询主键 + * @return + */ + ConstructionUnit findConstructionUnitById(Integer id); + + /** + * 修改施工单位状态 + * + * @param map 修改条件 + * @return + */ + Integer updateConstructionUnitState(Map map); + + + /** + * 修改施工单位信息 + * + * @param map 修改数据 + * @return + */ + Integer updateConstructionUnit(Map map); + + + /** + * 根据主键id删除施工单位 + * + * @param id 待删除id + * @return + */ + Integer deleteConstructionUnitById(Integer id); + + /** + * 根据主键id批量删除施工单位 + * + * @param list 待删除id列表 + * @return + */ + Integer deleteConstructionUnitByIds(List list); +} diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/ConstructionUnitServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/ConstructionUnitServiceImpl.java new file mode 100644 index 00000000..bd5d586a --- /dev/null +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/ConstructionUnitServiceImpl.java @@ -0,0 +1,148 @@ +package com.dreamchaser.depository_manage.service.impl; + +import com.dreamchaser.depository_manage.entity.ConstructionUnit; +import com.dreamchaser.depository_manage.mapper.ConstructionUnitMapper; +import com.dreamchaser.depository_manage.service.ConstructionUnitService; +import com.dreamchaser.depository_manage.utils.DateUtil; +import com.dreamchaser.depository_manage.utils.ObjectFormatUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +@Service +public class ConstructionUnitServiceImpl implements ConstructionUnitService { + + @Autowired + ConstructionUnitMapper constructionUnitMapper; + + /** + * 创建施工单位 + * @param map 待创建数据 + * @return + */ + @Override + public Integer addConstructionUnit(Map map) { + map.put("createTime",System.currentTimeMillis()); + map.put("state",1); + return constructionUnitMapper.addConstructionUnit(map); + } + + /** + * 查询所有施工单位 + * @return + */ + @Override + public List findConstructionUnitAll() { + List constructionUnitAll = constructionUnitMapper.findConstructionUnitAll(); + for (ConstructionUnit constructionUnit: constructionUnitAll + ) { + constructionUnit.setShowCreateTime(DateUtil.TimeStampToDateTime(constructionUnit.getCreateTime())); + } + return constructionUnitAll; + } + + /** + * 根据条件查询施工单位 + * + * @param map 查询条件 + * @return + */ + @Override + public List findConstructionUnitByCondition(Map map) { + Integer size = 10, page = 1; + if (map.containsKey("size")) { + size = ObjectFormatUtil.toInteger(map.get("size")); + map.put("size", size); + } + if (map.containsKey("page")) { + page = ObjectFormatUtil.toInteger(map.get("page")); + map.put("begin", (page - 1) * size); + } + Object state = 1; + if (map.containsKey("state")) { + state = map.get("state"); + } + map.put("state", state); + List constructionUnitByCondition = constructionUnitMapper.findConstructionUnitByCondition(map); + for (ConstructionUnit constructionUnit:constructionUnitByCondition + ) { + constructionUnit.setShowCreateTime(DateUtil.TimeStampToDateTime(constructionUnit.getCreateTime())); + + } + return constructionUnitByCondition; + } + + /** + * 根据条件查询施工单位数量 + * + * @param map 查询条件 + * @return + */ + @Override + public Integer findConstructionUnitCountByCondition(Map map) { + Object state = 1; + if (map.containsKey("state")) { + state = map.get("state"); + } + map.put("state", state); + return constructionUnitMapper.findConstructionUnitCountByCondition(map); + } + + /** + * 通过主键查询施工单位 + * @param id 待查询主键 + * @return + */ + @Override + public ConstructionUnit findConstructionUnitById(Integer id) { + ConstructionUnit constructionUnitById = constructionUnitMapper.findConstructionUnitById(id); + constructionUnitById.setShowCreateTime(DateUtil.TimeStampToDateTime(constructionUnitById.getCreateTime())); + return constructionUnitById; + } + + /** + * 修改施工单位状态 + * + * @param map 修改条件 + * @return + */ + @Override + public Integer updateConstructionUnitState(Map map) { + return constructionUnitMapper.updateConstructionUnitState(map); + } + + /** + * 修改施工单位信息 + * + * @param map 修改数据 + * @return + */ + @Override + public Integer updateConstructionUnit(Map map) { + return constructionUnitMapper.updateConstructionUnit(map); + } + + /** + * 根据主键id删除施工单位 + * + * @param id 待删除id + * @return + */ + @Override + public Integer deleteConstructionUnitById(Integer id) { + return constructionUnitMapper.deleteConstructionUnitById(id); + } + + /** + * 根据主键id批量删除施工单位 + * + * @param list 待删除id列表 + * @return + */ + @Override + public Integer deleteConstructionUnitByIds(List list) { + return constructionUnitMapper.deleteConstructionUnitByIds(list); + } +} diff --git a/src/main/java/com/dreamchaser/depository_manage/utils/CrudUtil.java b/src/main/java/com/dreamchaser/depository_manage/utils/CrudUtil.java index c4e4593e..04f77493 100644 --- a/src/main/java/com/dreamchaser/depository_manage/utils/CrudUtil.java +++ b/src/main/java/com/dreamchaser/depository_manage/utils/CrudUtil.java @@ -29,7 +29,7 @@ public class CrudUtil { * @param standard 正常执行所影响的数据行数 * @return 处理后的RestResponse */ - public static RestResponse postHandle(Integer result,Integer standard){ + public static RestResponse insertHandle(Integer result, Integer standard){ if (result.equals(standard) && result != -1){ return RESPONSE201; }else if(result == -1 && standard == -1){ @@ -59,7 +59,7 @@ public class CrudUtil { * @param standard 正常执行所影响的数据行数 * @return 处理后的RestResponse */ - public static RestResponse putHandle( Integer result,Integer standard){ + public static RestResponse updateHandle(Integer result, Integer standard){ if (result.equals(standard) ){ return RESPONSE205; }else { diff --git a/src/main/resources/templates/pages/constructionunit/constructionunit_add.html b/src/main/resources/templates/pages/constructionunit/constructionunit_add.html index 13522072..aca93b10 100644 --- a/src/main/resources/templates/pages/constructionunit/constructionunit_add.html +++ b/src/main/resources/templates/pages/constructionunit/constructionunit_add.html @@ -13,77 +13,40 @@
- 仓库创建 + 施工单位创建
+ style="margin: 0 auto;max-width: 700px;padding-top: 100px; padding-bottom: 200px" + lay-filter="form1">
- +
- -
-
-
- -
- -
-
-
- - -
- -
- -
-
- -
- - +
- -
-
-
- -
- -
-
-
- -
- +
- +
- +
@@ -97,97 +60,51 @@
- - + + + }); + \ No newline at end of file diff --git a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java b/src/test/java/com/dreamchaser/depository_manage/TestForOther.java index 02eb151e..3bfaa281 100644 --- a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java +++ b/src/test/java/com/dreamchaser/depository_manage/TestForOther.java @@ -33,59 +33,9 @@ import java.util.Set; public class TestForOther { - @Autowired - DepositoryService depositoryService; - - @Autowired - PlaceService placeService; @Test public void run() { - String fatherPath = "\\"; - List deleteFileList = new ArrayList<>(); - try { - // 获取当前仓库下的下的所有仓库 - List childForDepositoryByParent = new ArrayList<>(); - childForDepositoryByParent.add(48); - // 获取所有仓库 - List depositoryByIds = depositoryService.findDepositoryByIds(childForDepositoryByParent); - for (Depository depository : depositoryByIds - ) { - List placeByDid = placeService.findPlaceByDid(depository.getId()); - List qrCodeListForPlaces = new ArrayList<>(); - for (Place place : placeByDid - ) { - String qrCodeByDepository = placeService.findQrCodeByPlace(place.getId()); - String qrCode = CreateQrCodeUtil.CreateBarCode128(qrCodeByDepository, depository.getDname() + "-" + place.getCode(), 60, 200); - try { - File file = RestResponse.base64ToFile(qrCode); - qrCodeListForPlaces.add(file); - deleteFileList.add(file); - } catch (Exception e) { - e.printStackTrace(); - } - } - String qrCodeByDepository = depositoryService.findQrCodeByDepository(depository.getId()); - String qrCode = CreateQrCodeUtil.CreateBarCode128(qrCodeByDepository, depository.getDname(), 60, 200); - // 将其暂存到本地 - try { - File file = RestResponse.base64ToFile(qrCode); - qrCodeListForPlaces.add(file); - deleteFileList.add(file); - } catch (Exception e) { - e.printStackTrace(); - } -// ZipMultiFileUtil.zipDownload(); - } - } catch (Exception e) { - e.printStackTrace(); - } finally { -// try { -// ZipMultiFileUtil.deleteFile(deleteFileList); -// } catch (IOException e) { -// e.printStackTrace(); -// } - } }