Browse Source

添加施工单位创建功能

lwx_dev
erdanergou 3 years ago
parent
commit
4c9615f4c3
  1. 24
      src/main/java/com/dreamchaser/depository_manage/controller/CompanyController.java
  2. 7
      src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java
  3. 26
      src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
  4. 28
      src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java
  5. 10
      src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
  6. 8
      src/main/java/com/dreamchaser/depository_manage/controller/MaterialTypeController.java
  7. 11
      src/main/java/com/dreamchaser/depository_manage/controller/NoticeController.java
  8. 5
      src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
  9. 15
      src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java
  10. 4
      src/main/java/com/dreamchaser/depository_manage/controller/SplitController.java
  11. 14
      src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java
  12. 24
      src/main/java/com/dreamchaser/depository_manage/controller/UserController.java
  13. 41
      src/main/java/com/dreamchaser/depository_manage/entity/ConstructionUnit.java
  14. 90
      src/main/java/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.java
  15. 129
      src/main/java/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.xml
  16. 85
      src/main/java/com/dreamchaser/depository_manage/service/ConstructionUnitService.java
  17. 148
      src/main/java/com/dreamchaser/depository_manage/service/impl/ConstructionUnitServiceImpl.java
  18. 4
      src/main/java/com/dreamchaser/depository_manage/utils/CrudUtil.java
  19. 121
      src/main/resources/templates/pages/constructionunit/constructionunit_add.html
  20. 50
      src/test/java/com/dreamchaser/depository_manage/TestForOther.java

24
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.pojo.*;
import com.dreamchaser.depository_manage.security.pool.AuthenticationTokenPool; import com.dreamchaser.depository_manage.security.pool.AuthenticationTokenPool;
import com.dreamchaser.depository_manage.service.CompanyService; 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.DepositoryService;
import com.dreamchaser.depository_manage.service.RoleService; import com.dreamchaser.depository_manage.service.RoleService;
import com.dreamchaser.depository_manage.utils.*; import com.dreamchaser.depository_manage.utils.*;
@ -35,6 +36,9 @@ public class CompanyController {
@Autowired @Autowired
DepositoryService depositoryService; DepositoryService depositoryService;
@Autowired
ConstructionUnitService constructionUnitService;
/** /**
* 查询组织架构 * 查询组织架构
* *
@ -51,7 +55,7 @@ public class CompanyController {
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
String url = PortConfig.external_url + "/org/govlist"; String url = PortConfig.external_url + "/org/govlist";
Object page = map.get("page"); Object page = map.get("page");
Object pagesize = map.get("pagesize"); Object pagesize = map.get("size");
String superior = (String) map.get("superior"); String superior = (String) map.get("superior");
Integer level = ObjectFormatUtil.toInteger(map.get("level")); Integer level = ObjectFormatUtil.toInteger(map.get("level"));
if ("".equals(superior)) { if ("".equals(superior)) {
@ -105,7 +109,7 @@ public class CompanyController {
map.put("state", ObjectFormatUtil.toInteger(state)); map.put("state", ObjectFormatUtil.toInteger(state));
} }
Object page = map.get("page"); Object page = map.get("page");
Object pagesize = map.get("pagesize"); Object pagesize = map.get("size");
map.put("page", ObjectFormatUtil.toInteger(page)); map.put("page", ObjectFormatUtil.toInteger(page));
map.put("pagesize", ObjectFormatUtil.toInteger(pagesize)); map.put("pagesize", ObjectFormatUtil.toInteger(pagesize));
String jsonString = JSONObject.toJSONString(map); String jsonString = JSONObject.toJSONString(map);
@ -147,7 +151,7 @@ public class CompanyController {
UserByPort userByPort = AuthenticationTokenPool.getUserToken(token); UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
String url = PortConfig.external_url + "/org/positionlist"; String url = PortConfig.external_url + "/org/positionlist";
Object page = map.get("page"); Object page = map.get("page");
Object pagesize = map.get("pagesize"); Object pagesize = map.get("size");
map.put("page", ObjectFormatUtil.toInteger(page)); map.put("page", ObjectFormatUtil.toInteger(page));
map.put("pagesize", ObjectFormatUtil.toInteger(pagesize)); map.put("pagesize", ObjectFormatUtil.toInteger(pagesize));
String jsonString = JSONObject.toJSONString(map); 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); update.put("classes", 2);
success += roleService.UpdateRoleAndDepositoryById(update); 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) { for (RoleAndDepository roleAndDepository : roleAndDepositoryByCondition) {
success += roleService.deleteRoleAndDepositoryById(roleAndDepository.getId()); success += roleService.deleteRoleAndDepositoryById(roleAndDepository.getId());
} }
return CrudUtil.postHandle(success, roleAndDepositoryByCondition.size()); return CrudUtil.insertHandle(success, roleAndDepositoryByCondition.size());
} else if (map.containsKey("depositoryIds")) { } else if (map.containsKey("depositoryIds")) {
Integer num = 0; Integer num = 0;
List<Integer> depositoryIds = (List<Integer>) map.get("depositoryIds"); List<Integer> depositoryIds = (List<Integer>) map.get("depositoryIds");
@ -307,7 +311,7 @@ public class CompanyController {
success += roleService.deleteRoleAndDepositoryById(roleAndDepository.getId()); success += roleService.deleteRoleAndDepositoryById(roleAndDepository.getId());
} }
} }
return CrudUtil.postHandle(success, total); return CrudUtil.insertHandle(success, total);
} else { } else {
throw new MyException("所需请求参数缺失!"); throw new MyException("所需请求参数缺失!");
} }
@ -388,4 +392,10 @@ public class CompanyController {
return new RestResponse(list); return new RestResponse(list);
} }
@PostMapping("/constructionUnitAdd")
public RestResponse constructionUnitAdd(@RequestBody Map<String,Object> map){
return CrudUtil.insertHandle(constructionUnitService.addConstructionUnit(map),1);
}
} }

7
src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java

@ -1,6 +1,5 @@
package com.dreamchaser.depository_manage.controller; package com.dreamchaser.depository_manage.controller;
import cn.hutool.core.lang.Snowflake;
import com.dreamchaser.depository_manage.entity.*; import com.dreamchaser.depository_manage.entity.*;
import com.dreamchaser.depository_manage.exception.MyException; import com.dreamchaser.depository_manage.exception.MyException;
import com.dreamchaser.depository_manage.pojo.*; import com.dreamchaser.depository_manage.pojo.*;
@ -519,7 +518,7 @@ public class DepositoryController {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); 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 { } else {
map.put("state", 2); 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(); }).start();
} }
} }
return CrudUtil.postHandle(depositoryService.updateDepository(map), 1); return CrudUtil.insertHandle(depositoryService.updateDepository(map), 1);
} }
/** /**

26
src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java

@ -207,7 +207,7 @@ public class DepositoryRecordController {
map.put("applicantId", userToken.getId()); map.put("applicantId", userToken.getId());
Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId"));
Depository depository = depositoryService.findDepositoryById(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(); }).start();
if (integer != 0 && params.size() < 1 && integer != -1) { 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) { } else if (integer != 0 && params.size() > 0) {
if (integer == params.size() + 1) { if (integer == params.size() + 1) {
return CrudUtil.postHandle(integer, params.size() + 1); return CrudUtil.insertHandle(integer, params.size() + 1);
} else { } else {
return new RestResponse(result, 666, new StatusInfo("错误", "含有错误信息")); return new RestResponse(result, 666, new StatusInfo("错误", "含有错误信息"));
} }
@ -578,9 +578,9 @@ public class DepositoryRecordController {
} }
} }
if (integer != 0 && params.size() < 1) { if (integer != 0 && params.size() < 1) {
return CrudUtil.postHandle(integer, 1); return CrudUtil.insertHandle(integer, 1);
} else if (integer != 0 && params.size() >= 1) { } else if (integer != 0 && params.size() >= 1) {
return CrudUtil.postHandle(integer, params.size() + 1); return CrudUtil.insertHandle(integer, params.size() + 1);
} else { } else {
return new RestResponse("", 666, new StatusInfo("出库失败", "请联系管理员进行操作")); 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("mids" + userToken.getId(), 24 * 60 * 60, TimeUnit.SECONDS);
redisTemplateForHash.expire("depositoryIds" + 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); 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++) { for (int i = 0; i < placeCodes.size(); i++) {
redisTemplateForHash.opsForList().remove("placeCodes" + userToken.getId(), 1, placeCodes.get(i).toString()); 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); String crypt = Md5.crypt(header);
Integer review = depositoryRecordService.review(map, userToken.getId(), userToken, crypt); Integer review = depositoryRecordService.review(map, userToken.getId(), userToken, crypt);
if (review != -1) { if (review != -1) {
return CrudUtil.postHandle(review, 1); return CrudUtil.insertHandle(review, 1);
} else { } else {
return new RestResponse("", 666, new StatusInfo("出库失败", "当前存储位库存不足,请重新选择")); return new RestResponse("", 666, new StatusInfo("出库失败", "当前存储位库存不足,请重新选择"));
} }
@ -897,7 +897,7 @@ public class DepositoryRecordController {
String crypt = Md5.crypt(header); String crypt = Md5.crypt(header);
Integer review = depositoryRecordService.reviewIn(map, userToken.getId(), userToken, crypt); Integer review = depositoryRecordService.reviewIn(map, userToken.getId(), userToken, crypt);
if (review != -1) { if (review != -1) {
return CrudUtil.postHandle(review, 1); return CrudUtil.insertHandle(review, 1);
} else { } else {
return new RestResponse("", 666, new StatusInfo("出库失败", "当前存储位库存不足,请重新选择")); return new RestResponse("", 666, new StatusInfo("出库失败", "当前存储位库存不足,请重新选择"));
} }
@ -1018,9 +1018,9 @@ public class DepositoryRecordController {
} }
if (params.size() < 1) { if (params.size() < 1) {
return CrudUtil.postHandle(integer, 1); return CrudUtil.insertHandle(integer, 1);
} else if (params.size() > 0) { } else if (params.size() > 0) {
return CrudUtil.postHandle(integer, params.size() + 1); return CrudUtil.insertHandle(integer, params.size() + 1);
} else { } else {
return new RestResponse("", 666, new StatusInfo("转移失败", "请联系管理员进行操作")); return new RestResponse("", 666, new StatusInfo("转移失败", "请联系管理员进行操作"));
} }
@ -1261,7 +1261,7 @@ public class DepositoryRecordController {
if (success == 0) { if (success == 0) {
return new RestResponse("", 666, new StatusInfo("申请失败", "超出最大存储容量")); 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 new RestResponse(errMsg.toString(), 1234, new StatusInfo("出库失败", "数量不足"));
} }
return CrudUtil.postHandle(success, mids.size()); return CrudUtil.insertHandle(success, mids.size());
} }
// 确认将物料出库 // 确认将物料出库

28
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 len = ObjectFormatUtil.toInteger(map.get("len"));
// 获取添加成功的数量 // 获取添加成功的数量
Integer integer = groupService.addGroup(map); Integer integer = groupService.addGroup(map);
return CrudUtil.postHandle(len, integer); return CrudUtil.insertHandle(len, integer);
} }
@PostMapping("/findGroupByCodeForIn") @PostMapping("/findGroupByCodeForIn")
@ -170,7 +170,7 @@ public class GroupController {
Integer len = ObjectFormatUtil.toInteger(map.get("len")); Integer len = ObjectFormatUtil.toInteger(map.get("len"));
Integer integer = groupService.addMaterialForGroup(map); Integer integer = groupService.addMaterialForGroup(map);
return CrudUtil.postHandle(len, integer); return CrudUtil.insertHandle(len, integer);
} else { } else {
throw new MyException("缺少必要参数"); throw new MyException("缺少必要参数");
} }
@ -253,7 +253,7 @@ public class GroupController {
public RestResponse materialForGroupEdit(@RequestBody Map<String, Object> map) { public RestResponse materialForGroupEdit(@RequestBody Map<String, Object> map) {
if (map.containsKey("id")) { if (map.containsKey("id")) {
Integer integer = groupService.updateMaterialForGroup(map); Integer integer = groupService.updateMaterialForGroup(map);
return CrudUtil.putHandle(1, integer); return CrudUtil.updateHandle(1, integer);
} else { } else {
throw new MyException("缺少必要参数!"); throw new MyException("缺少必要参数!");
} }
@ -292,7 +292,7 @@ public class GroupController {
public RestResponse changeGroupState(@RequestBody Map<String, Object> map) { public RestResponse changeGroupState(@RequestBody Map<String, Object> map) {
if (map.containsKey("id")) { if (map.containsKey("id")) {
Integer integer = groupService.updateGroupState(map); Integer integer = groupService.updateGroupState(map);
return CrudUtil.putHandle(1, integer); return CrudUtil.updateHandle(1, integer);
} else { } else {
throw new MyException("缺少必要参数"); throw new MyException("缺少必要参数");
} }
@ -309,7 +309,7 @@ public class GroupController {
public RestResponse editGroupInfo(@RequestBody Map<String, Object> map) { public RestResponse editGroupInfo(@RequestBody Map<String, Object> map) {
if (map.containsKey("id")) { if (map.containsKey("id")) {
Integer integer = groupService.updateGroupInfo(map); Integer integer = groupService.updateGroupInfo(map);
return CrudUtil.putHandle(1, integer); return CrudUtil.updateHandle(1, integer);
} else { } else {
throw new MyException("缺少必要参数"); throw new MyException("缺少必要参数");
} }
@ -327,7 +327,7 @@ public class GroupController {
if (map.containsKey("id")) { if (map.containsKey("id")) {
map.put("state", 3); map.put("state", 3);
Integer integer = groupService.updateGroupState(map); Integer integer = groupService.updateGroupState(map);
return CrudUtil.putHandle(1, integer); return CrudUtil.updateHandle(1, integer);
} else if (map.containsKey("ids")) { } else if (map.containsKey("ids")) {
List<Integer> ids = (List<Integer>) map.get("ids"); List<Integer> ids = (List<Integer>) map.get("ids");
Integer integer = 0; Integer integer = 0;
@ -336,7 +336,7 @@ public class GroupController {
map.put("state", 3); map.put("state", 3);
integer += groupService.updateGroupState(map); integer += groupService.updateGroupState(map);
} }
return CrudUtil.putHandle(ids.size(), integer); return CrudUtil.updateHandle(ids.size(), integer);
} else { } else {
throw new MyException("缺少必要参数"); throw new MyException("缺少必要参数");
} }
@ -466,7 +466,7 @@ public class GroupController {
} }
// 设置过期时间为1天 // 设置过期时间为1天
redisTemplateForHash.expire("wms_gids" + userToken.getId(), 24 * 60 * 60, TimeUnit.SECONDS); 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++) { for (int i = 0; i < gids.size(); i++) {
redisTemplateForHash.opsForList().remove("wms_gids" + userToken.getId(), 1, gids.get(i).toString()); 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) { } catch (Exception e) {
return new RestResponse("", 666, new StatusInfo("出库失败", e.getMessage())); return new RestResponse("", 666, new StatusInfo("出库失败", e.getMessage()));
} }
return CrudUtil.putHandle(result, integer); return CrudUtil.updateHandle(result, integer);
} }
@PutMapping("/reviewIn") @PutMapping("/reviewIn")
@ -582,7 +582,7 @@ public class GroupController {
String crypt = Md5.crypt(header); String crypt = Md5.crypt(header);
Integer review = groupService.reviewIn(map, userToken.getId(), userToken, crypt); Integer review = groupService.reviewIn(map, userToken.getId(), userToken, crypt);
if (review != -1) { if (review != -1) {
return CrudUtil.postHandle(review, 1); return CrudUtil.insertHandle(review, 1);
} else { } else {
return new RestResponse("", 666, new StatusInfo("出库失败", "当前存储位库存不足,请重新选择")); return new RestResponse("", 666, new StatusInfo("出库失败", "当前存储位库存不足,请重新选择"));
} }
@ -659,9 +659,9 @@ public class GroupController {
}).start(); }).start();
if (integer != 0 && params.size() < 1) { if (integer != 0 && params.size() < 1) {
return CrudUtil.postHandle(integer, result); return CrudUtil.insertHandle(integer, result);
} else if (integer != 0 && params.size() >= 1) { } else if (integer != 0 && params.size() >= 1) {
return CrudUtil.postHandle(integer, result); return CrudUtil.insertHandle(integer, result);
} else { } else {
return new RestResponse("", 666, new StatusInfo("出库失败", "请联系管理员进行操作")); return new RestResponse("", 666, new StatusInfo("出库失败", "请联系管理员进行操作"));
} }
@ -864,7 +864,7 @@ public class GroupController {
redisTemplateForHash.expire(sp_no, 7, TimeUnit.DAYS); redisTemplateForHash.expire(sp_no, 7, TimeUnit.DAYS);
} }
}).start(); }).start();
return CrudUtil.postHandle(integer, result); return CrudUtil.insertHandle(integer, result);
} }

10
src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java

@ -253,7 +253,7 @@ public class MaterialController {
*/ */
@PostMapping("/material_add") @PostMapping("/material_add")
public RestResponse materialAdd(@RequestBody Map<String, Object> map) { public RestResponse materialAdd(@RequestBody Map<String, Object> map) {
return CrudUtil.postHandle(materialService.insertMaterial(map), 1); return CrudUtil.insertHandle(materialService.insertMaterial(map), 1);
} }
/** /**
@ -288,7 +288,7 @@ public class MaterialController {
} else { } else {
map.put("state", 2); map.put("state", 2);
} }
return CrudUtil.postHandle(materialService.updateMaterial(map), 1); return CrudUtil.insertHandle(materialService.updateMaterial(map), 1);
} }
@PostMapping("realDeleteMaterial") @PostMapping("realDeleteMaterial")
@ -1592,7 +1592,7 @@ public class MaterialController {
@PostMapping("/addBarCodeByMaterial") @PostMapping("/addBarCodeByMaterial")
public RestResponse addBarCodeByMaterial(@RequestBody Map<String, Object> map, HttpServletRequest request) { public RestResponse addBarCodeByMaterial(@RequestBody Map<String, Object> map, HttpServletRequest request) {
Integer integer = materialService.addBarCodeByMaterial(map); 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) { if (Integer.compare(-1, integer) == 0) {
return new RestResponse("", -1, new StatusInfo("转移失败", "转入位置无法存放当前数量的库存")); return new RestResponse("", -1, new StatusInfo("转移失败", "转入位置无法存放当前数量的库存"));
} else { } 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);
} }

8
src/main/java/com/dreamchaser/depository_manage/controller/MaterialTypeController.java

@ -1,7 +1,5 @@
package com.dreamchaser.depository_manage.controller; 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.entity.MaterialType;
import com.dreamchaser.depository_manage.exception.MyException; import com.dreamchaser.depository_manage.exception.MyException;
import com.dreamchaser.depository_manage.pojo.MaterialP; import com.dreamchaser.depository_manage.pojo.MaterialP;
@ -46,7 +44,7 @@ public class MaterialTypeController {
materialService.RefreshInitTreeMenus(); materialService.RefreshInitTreeMenus();
} }
}).start(); }).start();
return CrudUtil.postHandle(integer,1); return CrudUtil.insertHandle(integer,1);
} }
/** /**
@ -251,7 +249,7 @@ public class MaterialTypeController {
materialService.RefreshInitTreeMenus(); materialService.RefreshInitTreeMenus();
} }
}).start(); }).start();
return CrudUtil.postHandle(integer,1); return CrudUtil.insertHandle(integer,1);
} }
/** /**
@ -366,7 +364,7 @@ public class MaterialTypeController {
} }
}).start(); }).start();
return CrudUtil.postHandle(integer, 1); return CrudUtil.insertHandle(integer, 1);
} }
/** /**

11
src/main/java/com/dreamchaser/depository_manage/controller/NoticeController.java

@ -1,10 +1,6 @@
package com.dreamchaser.depository_manage.controller; 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.UserByPort;
import com.dreamchaser.depository_manage.entity.qywxDepartment;
import com.dreamchaser.depository_manage.exception.MyException; import com.dreamchaser.depository_manage.exception.MyException;
import com.dreamchaser.depository_manage.pojo.NoticeP; import com.dreamchaser.depository_manage.pojo.NoticeP;
import com.dreamchaser.depository_manage.pojo.RestResponse; 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.NoticeService;
import com.dreamchaser.depository_manage.service.impl.QyWxOperationService; import com.dreamchaser.depository_manage.service.impl.QyWxOperationService;
import com.dreamchaser.depository_manage.utils.CrudUtil; 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.Md5;
import com.dreamchaser.depository_manage.utils.ObjectFormatUtil; import com.dreamchaser.depository_manage.utils.ObjectFormatUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -62,7 +57,7 @@ public class NoticeController {
}).start();*/ }).start();*/
} }
return CrudUtil.postHandle(integer, 1); return CrudUtil.insertHandle(integer, 1);
} }
@GetMapping("/findAllNotices") @GetMapping("/findAllNotices")
@ -100,7 +95,7 @@ public class NoticeController {
public RestResponse noticeEdit(@RequestBody Map<String, Object> map, HttpServletRequest request) { public RestResponse noticeEdit(@RequestBody Map<String, Object> map, HttpServletRequest request) {
if (map.containsKey("id")) { if (map.containsKey("id")) {
Integer integer = noticeService.updateNotice(map); Integer integer = noticeService.updateNotice(map);
return CrudUtil.putHandle(integer,1); return CrudUtil.updateHandle(integer,1);
} else { } else {
throw new MyException("缺少必要参数"); throw new MyException("缺少必要参数");
} }
@ -121,7 +116,7 @@ public class NoticeController {
public RestResponse EditNoticeState(@RequestBody Map<String,Object> map){ public RestResponse EditNoticeState(@RequestBody Map<String,Object> map){
if(map.containsKey("id")){ if(map.containsKey("id")){
Integer integer = noticeService.updateNoticeState(map); Integer integer = noticeService.updateNoticeState(map);
return CrudUtil.putHandle(integer,1); return CrudUtil.updateHandle(integer,1);
}else{ }else{
throw new MyException("缺少必要参数"); throw new MyException("缺少必要参数");
} }

5
src/main/java/com/dreamchaser/depository_manage/controller/PageController.java

@ -2906,4 +2906,9 @@ public class PageController {
return mv; return mv;
} }
@GetMapping("/constructionUnitAdd")
public String constructionUnitAdd(){
return "pages/constructionunit/constructionunit_add";
}
} }

15
src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java

@ -1,6 +1,5 @@
package com.dreamchaser.depository_manage.controller; package com.dreamchaser.depository_manage.controller;
import cn.hutool.core.lang.Snowflake;
import com.dreamchaser.depository_manage.entity.*; import com.dreamchaser.depository_manage.entity.*;
import com.dreamchaser.depository_manage.entity.MaterialAndPlace; import com.dreamchaser.depository_manage.entity.MaterialAndPlace;
import com.dreamchaser.depository_manage.exception.MyException; import com.dreamchaser.depository_manage.exception.MyException;
@ -157,9 +156,9 @@ public class PlaceController {
} }
if ("one".equals(type)) { if ("one".equals(type)) {
return CrudUtil.postHandle(success, 1); return CrudUtil.insertHandle(success, 1);
} else if("list".equals(type)){ } else if("list".equals(type)){
return CrudUtil.postHandle(success,total); return CrudUtil.insertHandle(success,total);
}else{ }else{
throw new MyException("请求参数错误!"); throw new MyException("请求参数错误!");
} }
@ -209,9 +208,9 @@ public class PlaceController {
} }
} }
if ("one".equals(type)) { if ("one".equals(type)) {
return CrudUtil.postHandle(success, 1); return CrudUtil.insertHandle(success, 1);
} else if("list".equals(type)){ } else if("list".equals(type)){
return CrudUtil.postHandle(success,total); return CrudUtil.insertHandle(success,total);
}else{ }else{
throw new MyException("请求参数错误!"); throw new MyException("请求参数错误!");
} }
@ -290,7 +289,7 @@ public class PlaceController {
update.put("max", 500); update.put("max", 500);
} }
update.put("id", id); update.put("id", id);
return CrudUtil.postHandle(placeService.UpdatePlace(update),1); return CrudUtil.insertHandle(placeService.UpdatePlace(update),1);
} }
@PostMapping("/tray_edit") @PostMapping("/tray_edit")
@ -321,7 +320,7 @@ public class PlaceController {
} }
update.put("code",code); update.put("code",code);
update.put("id", map.get("id")); update.put("id", map.get("id"));
return CrudUtil.postHandle(placeService.UpdatePlace(update),1); } return CrudUtil.insertHandle(placeService.UpdatePlace(update),1); }
@PostMapping("/editPlaceState") @PostMapping("/editPlaceState")
@ -331,7 +330,7 @@ public class PlaceController {
} else { } else {
map.put("state", 2); map.put("state", 2);
} }
return CrudUtil.postHandle(placeService.editPlaceState(map),1); return CrudUtil.insertHandle(placeService.editPlaceState(map),1);
} }
// 根据物料编号获取库位 // 根据物料编号获取库位

4
src/main/java/com/dreamchaser/depository_manage/controller/SplitController.java

@ -40,7 +40,7 @@ public class SplitController {
@PostMapping("/splitAdd") @PostMapping("/splitAdd")
public RestResponse splitAdd(@RequestBody Map<String, Object> map, HttpServletRequest request) { public RestResponse splitAdd(@RequestBody Map<String, Object> map, HttpServletRequest request) {
if (map.containsKey("quantity") && map.containsKey("newUnit")) { if (map.containsKey("quantity") && map.containsKey("newUnit")) {
return CrudUtil.postHandle(1, splitUnitService.addSplitInfo(map)); return CrudUtil.insertHandle(1, splitUnitService.addSplitInfo(map));
} else { } else {
throw new MyException("缺少必要参数"); throw new MyException("缺少必要参数");
} }
@ -129,7 +129,7 @@ public class SplitController {
public RestResponse splitEdit(@RequestBody Map<String, Object> map) { public RestResponse splitEdit(@RequestBody Map<String, Object> map) {
if (map.containsKey("id")) { if (map.containsKey("id")) {
Integer integer = splitUnitService.updateSplitInfo(map); Integer integer = splitUnitService.updateSplitInfo(map);
return CrudUtil.putHandle(1, integer); return CrudUtil.updateHandle(1, integer);
} else { } else {
throw new MyException("缺少必要参数"); throw new MyException("缺少必要参数");
} }

14
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.alibaba.fastjson.JSONObject;
import com.dreamchaser.depository_manage.config.PortConfig; 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.MaterialAndPlace;
import com.dreamchaser.depository_manage.entity.Place; import com.dreamchaser.depository_manage.entity.Place;
import com.dreamchaser.depository_manage.entity.UserByPort; 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.DateUtil;
import com.dreamchaser.depository_manage.utils.Md5; import com.dreamchaser.depository_manage.utils.Md5;
import com.dreamchaser.depository_manage.utils.ObjectFormatUtil; import com.dreamchaser.depository_manage.utils.ObjectFormatUtil;
import org.apache.ibatis.jdbc.Null;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -198,9 +196,9 @@ public class StockTakingController {
} }
if (params.size() > 0) { if (params.size() > 0) {
return CrudUtil.postHandle(success, params.size() + 1); return CrudUtil.insertHandle(success, params.size() + 1);
} else { } 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("有错误", "发现错误")); return new RestResponse(review, 666, new StatusInfo("有错误", "发现错误"));
} else { } 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("有错误", "发现错误")); return new RestResponse(complete, 666, new StatusInfo("有错误", "发现错误"));
} else { } else {
return CrudUtil.postHandle(1, 1); return CrudUtil.insertHandle(1, 1);
} }
} }
@ -314,7 +312,7 @@ public class StockTakingController {
map.put("minIds", minIdList); map.put("minIds", minIdList);
Integer transfer = stockTakingService.stockTakingTransfer(map, userToken, crypt); Integer transfer = stockTakingService.stockTakingTransfer(map, userToken, crypt);
return CrudUtil.postHandle(transfer, minIdList.size()); return CrudUtil.insertHandle(transfer, minIdList.size());
} }
@PostMapping("/temporaryStorageForTakingResult") @PostMapping("/temporaryStorageForTakingResult")
@ -461,6 +459,6 @@ public class StockTakingController {
} }
return CrudUtil.putHandle(success, size); return CrudUtil.updateHandle(success, size);
} }
} }

24
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"))); map.put("adminorg", ObjectFormatUtil.toInteger(map.get("adminorg")));
} }
Object page = map.get("page"); Object page = map.get("page");
Object pagesize = map.get("pagesize"); Object pagesize = map.get("size");
map.put("page", ObjectFormatUtil.toInteger(page)); map.put("page", ObjectFormatUtil.toInteger(page));
map.put("pagesize", ObjectFormatUtil.toInteger(pagesize)); map.put("pagesize", ObjectFormatUtil.toInteger(pagesize));
String jsonString = JSONObject.toJSONString(map); String jsonString = JSONObject.toJSONString(map);
@ -307,10 +307,10 @@ public class UserController {
param.put("depositoryId", map.get("depositoryId")); param.put("depositoryId", map.get("depositoryId"));
List<RoleAndDepository> roleAndDepositoryByCondition = roleService.findRoleAndDepositoryByCondition(param); List<RoleAndDepository> roleAndDepositoryByCondition = roleService.findRoleAndDepositoryByCondition(param);
if (roleAndDepositoryByCondition.size() > 0) { if (roleAndDepositoryByCondition.size() > 0) {
return CrudUtil.postHandle(-1, -1); return CrudUtil.insertHandle(-1, -1);
} else { } else {
Integer integer = roleService.addUserOrPostRoleAndDepository(map); Integer integer = roleService.addUserOrPostRoleAndDepository(map);
return CrudUtil.postHandle(integer, integer); return CrudUtil.insertHandle(integer, integer);
} }
} else { } else {
List<Depository> depositoryAll = depositoryService.findDepositoryAll(); List<Depository> depositoryAll = depositoryService.findDepositoryAll();
@ -323,7 +323,7 @@ public class UserController {
success += roleService.addUserOrPostRoleAndDepository(map); 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")); param.put("mtid", map.get("mtid"));
List<RoleAndMaterialType> roleAndMaterialTypeByCondition = roleService.findRoleAndMaterialTypeByCondition(param); List<RoleAndMaterialType> roleAndMaterialTypeByCondition = roleService.findRoleAndMaterialTypeByCondition(param);
if (roleAndMaterialTypeByCondition.size() > 0) { if (roleAndMaterialTypeByCondition.size() > 0) {
return CrudUtil.postHandle(-1, -1); return CrudUtil.insertHandle(-1, -1);
} else { } else {
Integer integer = roleService.addUserOrPostRoleAndMaterialType(map); Integer integer = roleService.addUserOrPostRoleAndMaterialType(map);
return CrudUtil.postHandle(integer, integer); return CrudUtil.insertHandle(integer, integer);
} }
} }
@PostMapping("/sys/userRole_edit") @PostMapping("/sys/userRole_edit")
public RestResponse editUserRole(@RequestBody Map<String, Object> map) { public RestResponse editUserRole(@RequestBody Map<String, Object> map) {
return CrudUtil.postHandle(roleService.UpdateRoleAndDepositoryById(map), 1); return CrudUtil.insertHandle(roleService.UpdateRoleAndDepositoryById(map), 1);
} }
@PostMapping("/sys/userRole_editForIn") @PostMapping("/sys/userRole_editForIn")
public RestResponse editUserRoleForIn(@RequestBody Map<String, Object> map) { public RestResponse editUserRoleForIn(@RequestBody Map<String, Object> map) {
return CrudUtil.postHandle(roleService.UpdateRoleAndMaterialTypeById(map), 1); return CrudUtil.insertHandle(roleService.UpdateRoleAndMaterialTypeById(map), 1);
} }
@PostMapping("/sys/user_detail") @PostMapping("/sys/user_detail")
@ -370,7 +370,7 @@ public class UserController {
} else { } else {
map.put("state", 2); map.put("state", 2);
} }
return CrudUtil.postHandle(userService.updateUser(map), 1); return CrudUtil.insertHandle(userService.updateUser(map), 1);
} }
@DeleteMapping("/sys/user") @DeleteMapping("/sys/user")
@ -439,7 +439,7 @@ public class UserController {
public RestResponse updateSelf(@RequestBody Map<String, Object> map, HttpServletRequest request) { public RestResponse updateSelf(@RequestBody Map<String, Object> map, HttpServletRequest request) {
UserToken userToken = (UserToken) request.getAttribute("userToken"); UserToken userToken = (UserToken) request.getAttribute("userToken");
map.put("id", userToken.getUser().getId()); map.put("id", userToken.getUser().getId());
return CrudUtil.postHandle(userService.updateUserNoSensitive(map), 1); return CrudUtil.insertHandle(userService.updateUserNoSensitive(map), 1);
} }
@PutMapping("/checkOldEmail") @PutMapping("/checkOldEmail")
@ -467,7 +467,7 @@ public class UserController {
if (checkCode(userToken.getPrincipal(), map.get("oldCode").toString()) if (checkCode(userToken.getPrincipal(), map.get("oldCode").toString())
&& checkCode(map.get("email").toString(), map.get("code").toString())) { && checkCode(map.get("email").toString(), map.get("code").toString())) {
map.put("id", userToken.getUser().getId()); map.put("id", userToken.getUser().getId());
return CrudUtil.putHandle(userService.updateUser(map), 1); return CrudUtil.updateHandle(userService.updateUser(map), 1);
} else { } else {
//验证码错误 //验证码错误
return CrudUtil.CODE_ERROR; return CrudUtil.CODE_ERROR;
@ -513,7 +513,7 @@ public class UserController {
String new_password = Md5.crypt(String.valueOf(map.get("new_password"))); String new_password = Md5.crypt(String.valueOf(map.get("new_password")));
map.put("new_password", new_password); map.put("new_password", new_password);
map.put("id", userByEmail.getId()); map.put("id", userByEmail.getId());
return CrudUtil.postHandle(userService.updateUserPasswordById(map), 1); return CrudUtil.insertHandle(userService.updateUserPasswordById(map), 1);
} }
/** /**

41
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;
}

90
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<String, Object> map);
/**
* 查询所有施工单位
*
* @return
*/
List<ConstructionUnit> findConstructionUnitAll();
/**
* 根据条件查询施工单位
*
* @param map 查询条件
* @return
*/
List<ConstructionUnit> findConstructionUnitByCondition(Map<String, Object> map);
/**
* 根据条件查询施工单位数量
*
* @param map 查询条件
* @return
*/
Integer findConstructionUnitCountByCondition(Map<String, Object> map);
/**
* 通过主键查询施工单位
*
* @param id 待查询主键
* @return
*/
ConstructionUnit findConstructionUnitById(Integer id);
/**
* 修改施工单位状态
*
* @param map 修改条件
* @return
*/
Integer updateConstructionUnitState(Map<String, Object> map);
/**
* 修改施工单位信息
*
* @param map 修改数据
* @return
*/
Integer updateConstructionUnit(Map<String, Object> map);
/**
* 根据主键id删除施工单位
*
* @param id 待删除id
* @return
*/
Integer deleteConstructionUnitById(Integer id);
/**
* 根据主键id批量删除施工单位
*
* @param list 待删除id列表
* @return
*/
Integer deleteConstructionUnitByIds(List<Integer> list);
}

129
src/main/java/com/dreamchaser/depository_manage/mapper/ConstructionUnitMapper.xml

@ -0,0 +1,129 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dreamchaser.depository_manage.mapper.ConstructionUnitMapper">
<resultMap id="constructionUnitMap" type="com.dreamchaser.depository_manage.entity.ConstructionUnit">
<id column="id" property="id" jdbcType="INTEGER" />
<result column="name" property="name" jdbcType="VARCHAR" />
<result column="state" property="state" jdbcType="INTEGER" />
<result column="introduce" property="introduce" jdbcType="VARCHAR" />
<result column="address" property="address" jdbcType="VARCHAR" />
<result column="createTime" property="createTime" jdbcType="INTEGER" />
</resultMap>
<sql id="allColumns">
id,`name`,state,introduce,address,createTime
</sql>
<insert id="addConstructionUnit">
insert into constructionunit(id,`name`,state,introduce,address,createTime)
values (
#{id},
#{name},
#{state},
#{introduce},
#{address},
#{createTime}
)
</insert>
<select id="findConstructionUnitAll" resultMap="constructionUnitMap">
select
<include refid="allColumns"/>
from constructionunit
</select>
<select id="findConstructionUnitByCondition" parameterType="map" resultMap="constructionUnitMap">
select
<include refid="allColumns"/>
from constructionunit
where 1 = 1
<if test="name != null and name != ''">
and `name` like CONCAT('%',#{name},'%')
</if>
<if test="state != null and state != ''">
and state = #{state}
</if>
<if test="introduce != null and introduce != ''">
and introduce like concat('%',#{introduce},'%')
</if>
<if test="address != null and address != ''">
and address like concat('%',#{address},'%')
</if>
<if test="begin != null and size != null">
LIMIT #{begin},#{size}
</if>
</select>
<select id="findConstructionUnitCountByCondition" parameterType="map" resultType="int">
select
COUNT(*)
from constructionunit
where 1 = 1
<if test="name != null and name != ''">
and `name` like CONCAT('%',#{name},'%')
</if>
<if test="state != null and state != ''">
and state = #{state}
</if>
<if test="introduce != null and introduce != ''">
and introduce like concat('%',#{introduce},'%')
</if>
<if test="address != null and address != ''">
and address like concat('%',#{address},'%')
</if>
</select>
<select id="findConstructionUnitById" resultMap="constructionUnitMap" parameterType="int">
select
<include refid="allColumns"/>
from constructionunit
where id = #{id}
</select>
<update id="updateConstructionUnit">
update constructionunit
<set>
<if test="name != null and name != ''">
namd = #{name},
</if>
<if test="state != null and state != ''">
state = #{state},
</if>
<if test="introduce != null and introduce != ''">
introduce = #{introduce},
</if>
<if test="address != null and address != ''">
address = #{address}
</if>
</set>
where id = #{id}
</update>
<update id="updateConstructionUnitState">
update constructionunit
<set>
<if test="state != null and state != ''">
state = #{state},
</if>
</set>
where id = #{id}
</update>
<delete id="deleteConstructionUnitById" parameterType="int">
delete from constructionunit where id = #{id}
</delete>
<delete id="deleteConstructionUnitByIds" parameterType="list">
delete from constructionunit where id in
<foreach collection="list" item="id" index="index" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

85
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<String, Object> map);
/**
* 查询所有施工单位
*
* @return
*/
List<ConstructionUnit> findConstructionUnitAll();
/**
* 根据条件查询施工单位
*
* @param map 查询条件
* @return
*/
List<ConstructionUnit> findConstructionUnitByCondition(Map<String, Object> map);
/**
* 根据条件查询施工单位数量
*
* @param map 查询条件
* @return
*/
Integer findConstructionUnitCountByCondition(Map<String, Object> map);
/**
* 通过主键查询施工单位
*
* @param id 待查询主键
* @return
*/
ConstructionUnit findConstructionUnitById(Integer id);
/**
* 修改施工单位状态
*
* @param map 修改条件
* @return
*/
Integer updateConstructionUnitState(Map<String, Object> map);
/**
* 修改施工单位信息
*
* @param map 修改数据
* @return
*/
Integer updateConstructionUnit(Map<String, Object> map);
/**
* 根据主键id删除施工单位
*
* @param id 待删除id
* @return
*/
Integer deleteConstructionUnitById(Integer id);
/**
* 根据主键id批量删除施工单位
*
* @param list 待删除id列表
* @return
*/
Integer deleteConstructionUnitByIds(List<Integer> list);
}

148
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<String, Object> map) {
map.put("createTime",System.currentTimeMillis());
map.put("state",1);
return constructionUnitMapper.addConstructionUnit(map);
}
/**
* 查询所有施工单位
* @return
*/
@Override
public List<ConstructionUnit> findConstructionUnitAll() {
List<ConstructionUnit> constructionUnitAll = constructionUnitMapper.findConstructionUnitAll();
for (ConstructionUnit constructionUnit: constructionUnitAll
) {
constructionUnit.setShowCreateTime(DateUtil.TimeStampToDateTime(constructionUnit.getCreateTime()));
}
return constructionUnitAll;
}
/**
* 根据条件查询施工单位
*
* @param map 查询条件
* @return
*/
@Override
public List<ConstructionUnit> findConstructionUnitByCondition(Map<String, Object> 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<ConstructionUnit> constructionUnitByCondition = constructionUnitMapper.findConstructionUnitByCondition(map);
for (ConstructionUnit constructionUnit:constructionUnitByCondition
) {
constructionUnit.setShowCreateTime(DateUtil.TimeStampToDateTime(constructionUnit.getCreateTime()));
}
return constructionUnitByCondition;
}
/**
* 根据条件查询施工单位数量
*
* @param map 查询条件
* @return
*/
@Override
public Integer findConstructionUnitCountByCondition(Map<String, Object> 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<String, Object> map) {
return constructionUnitMapper.updateConstructionUnitState(map);
}
/**
* 修改施工单位信息
*
* @param map 修改数据
* @return
*/
@Override
public Integer updateConstructionUnit(Map<String, Object> 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<Integer> list) {
return constructionUnitMapper.deleteConstructionUnitByIds(list);
}
}

4
src/main/java/com/dreamchaser/depository_manage/utils/CrudUtil.java

@ -29,7 +29,7 @@ public class CrudUtil {
* @param standard 正常执行所影响的数据行数 * @param standard 正常执行所影响的数据行数
* @return 处理后的RestResponse * @return 处理后的RestResponse
*/ */
public static RestResponse postHandle(Integer result,Integer standard){ public static RestResponse insertHandle(Integer result, Integer standard){
if (result.equals(standard) && result != -1){ if (result.equals(standard) && result != -1){
return RESPONSE201; return RESPONSE201;
}else if(result == -1 && standard == -1){ }else if(result == -1 && standard == -1){
@ -59,7 +59,7 @@ public class CrudUtil {
* @param standard 正常执行所影响的数据行数 * @param standard 正常执行所影响的数据行数
* @return 处理后的RestResponse * @return 处理后的RestResponse
*/ */
public static RestResponse putHandle( Integer result,Integer standard){ public static RestResponse updateHandle(Integer result, Integer standard){
if (result.equals(standard) ){ if (result.equals(standard) ){
return RESPONSE205; return RESPONSE205;
}else { }else {

121
src/main/resources/templates/pages/constructionunit/constructionunit_add.html

@ -13,77 +13,40 @@
<div class="layuimini-container"> <div class="layuimini-container">
<div class="layuimini-main"> <div class="layuimini-main">
<fieldset class="table-search-fieldset"> <fieldset class="table-search-fieldset">
<legend>仓库创建</legend> <legend>施工单位创建</legend>
<div class="layui-fluid"> <div class="layui-fluid">
<div class="layui-card"> <div class="layui-card">
<div class="layui-card-body" style="padding-top: 40px;"> <div class="layui-card-body" style="padding-top: 40px;">
<div> <div>
<form class="layui-form layui-form-pane" <form class="layui-form layui-form-pane"
style="margin: 0 auto;max-width: 700px;padding-top: 100px; padding-bottom: 200px" lay-filter="form1"> style="margin: 0 auto;max-width: 700px;padding-top: 100px; padding-bottom: 200px"
lay-filter="form1">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">仓库名称:</label> <label class="layui-form-label">单位名称:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" placeholder="请填写仓库名称" class="layui-input" <input type="text" placeholder="请填写施工单位名称" class="layui-input"
name="dname" lay-verify="required"/> name="name" lay-verify="required"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">所处公司:</label>
<div class="layui-input-block">
<select name="cid" lay-filter="company" lay-verify="required" >
<option value="" selected>请选择公司</option>
<option th:each="administrationP,iterStar:${administrationPList}" th:value="${administrationP?.getId()}" th:text="${administrationP?.getName()}" >外芯仓库</option>
</select>
</div>
</div>
<div class="layui-form-item" >
<label class="layui-form-label">部门</label>
<div class="layui-input-block">
<select name="adminorg" id="adminorg" lay-verify="required"></select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">父级仓库:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择仓库" class="layui-input" id="openSonByDepository" readonly />
<input type="text" name="depositoryId" class="layui-input" id="depositoryId" style="display: none" />
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">地址:</label> <label class="layui-form-label">地址:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" placeholder="请填写仓库地址" class="layui-input" <input type="text" placeholder="请填写施工地址" class="layui-input"
name="address" /> name="address"/>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">仓库介绍:</label> <label class="layui-form-label">介绍:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input name="introduce" placeholder="请填写仓库介绍..." <input name="introduce" placeholder="请填写施工单位介绍..."
class="layui-input"/> class="layui-input"/>
</div> </div>
</div> </div>
<div class="layui-form-item">
<label class="layui-form-label">最大存储量:</label>
<div class="layui-input-block">
<input name="maxNumber" placeholder="请填写最大存储量..."
class="layui-input" value="5000"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">最小存储量:</label>
<div class="layui-input-block">
<input name="minNumber" placeholder="请填写最小存储量..."
class="layui-input" value="0"/>
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-input-block"> <div class="layui-input-block">
<button class="layui-btn" lay-submit lay-filter="formStep"> <button class="layui-btn" lay-submit lay-filter="formStep">
&emsp;创建仓库&emsp; &emsp;创建&emsp;
</button> </button>
</div> </div>
</div> </div>
@ -97,62 +60,16 @@
</div> </div>
</div> </div>
<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script> <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
<script> <script>
var data; var data;
layui.use(['form', 'layer'], function () { layui.use(['form', 'layer'], function () {
var $ = layui.jquery, var $ = layui.jquery,
form = layui.form, form = layui.form,
layer = layui.layer; layer = layui.layer;
form.on('select(company)',function (data){
$.ajax({
url:"/repository/findPostByCompany?company=0"+data.value,
type:'get',
dataType:'json',
contentType: "application/json;charset=utf-8",
success:function(d){
if(data.value !== "") {
$('#adminorg').empty();
$('#adminorg').append(new Option("请选择部门", ""));
$.each(d.data, function (index, item) {
$('#adminorg').append(new Option(item.name, item.id));//往下拉菜单里添加元素
});
form.render();
}else{
$('#adminorg').empty();
form.render();
}
}
})
});
$('#openSonByDepository').on('click', function(){
layer.open({
type: 2,
title: '弹窗内容',
skin: 'layui-layer-rim',
maxmin: true,
shadeClose: true, //点击遮罩关闭层
area: ['70%', '70%'],
move : '.layui-layer-title',
fixed:false,
content: '/selectDepository?type=2',
success: function(layero, index){
var children = layero.children();
var content = $(children[1]);
var iframeChildren = $(content.children());
content.css('height','100%');
iframeChildren.css('height','100%');
}
});
});
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
$.ajax({ $.ajax({
url: "/repository/depository", url: "/company/constructionUnitAdd",
type: 'post', type: 'post',
dataType: 'json', dataType: 'json',
contentType: "application/json;charset=utf-8", contentType: "application/json;charset=utf-8",
@ -169,25 +86,25 @@
layer.msg("添加成功!", { layer.msg("添加成功!", {
icon: 6,//成功的表情 icon: 6,//成功的表情
time: 1000 //1秒关闭(如果不配置,默认是3秒) time: 1000 //1秒关闭(如果不配置,默认是3秒)
},function () { }, function () {
window.location="/depository_add" window.location = "/constructionUnitAdd"
}); });
} }
}, },
complete: function () { complete: function () {
form.val("form1", { form.val("form1", {
"dname": "",// "name": "value" "name": "",// "name": "value"
"address": "", "address": "",
"introduce": "" "introduce": ""
}) })
} }
}) });
return false; return false;
}); });
}); });
</script> </script>
</body> </body>
</html> </html>

50
src/test/java/com/dreamchaser/depository_manage/TestForOther.java

@ -33,59 +33,9 @@ import java.util.Set;
public class TestForOther { public class TestForOther {
@Autowired
DepositoryService depositoryService;
@Autowired
PlaceService placeService;
@Test @Test
public void run() { public void run() {
String fatherPath = "\\";
List<File> deleteFileList = new ArrayList<>();
try {
// 获取当前仓库下的下的所有仓库
List<Integer> childForDepositoryByParent = new ArrayList<>();
childForDepositoryByParent.add(48);
// 获取所有仓库
List<Depository> depositoryByIds = depositoryService.findDepositoryByIds(childForDepositoryByParent);
for (Depository depository : depositoryByIds
) {
List<Place> placeByDid = placeService.findPlaceByDid(depository.getId());
List<File> 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();
// }
}
} }

Loading…
Cancel
Save