bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

测试问题提交

This commit is contained in:
liang.chao 2024-06-25 10:21:46 +08:00
parent 2df173ba58
commit 50de01d74d
6 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java
View File

@ -33,22 +33,24 @@ public class MaTypeController extends BaseController {
/**
* 根据类型名称查询类型
*
* @return 结果
*/
@ApiOperation(value = "根据类型名称查询类型")
@GetMapping("/getMaTypeList")
public AjaxResult getMaTypeList(@RequestParam(required = false, defaultValue = "", value = "typeName") String typeName, @RequestParam(required = false, defaultValue = "", value = "parentId") String parentId){
public AjaxResult getMaTypeList(@RequestParam(required = false, defaultValue = "", value = "typeName") String typeName, @RequestParam(required = false, defaultValue = "", value = "parentId") String parentId) {
List<TreeSelect> maTypeList = iTypeService.getMaTypeList(typeName, parentId);
return AjaxResult.success(maTypeList);
}
/**
* 工机具类型下拉树
*
* @return 结果
*/
@ApiOperation(value = "工机具类型下拉树")
@GetMapping("/getMaTypeSelect")
public AjaxResult getMaTypeSelect(@RequestParam(required = false, defaultValue = "", value = "typeName") String typeName, @RequestParam(required = false, defaultValue = "", value = "parentId") String parentId){
public AjaxResult getMaTypeSelect(@RequestParam(required = false, defaultValue = "", value = "typeName") String typeName, @RequestParam(required = false, defaultValue = "", value = "parentId") String parentId) {
List<TreeSelect> maTypeList = iTypeService.getMaTypeSelect(typeName, parentId);
return AjaxResult.success(maTypeList);
}
@ -62,30 +64,34 @@ public class MaTypeController extends BaseController {
/**
* 根据左列表类型id查询右表格
*
* @param typeId
* @return
*/
@ApiOperation(value = "工器具类型")
@GetMapping("/equipmentType")
public AjaxResult equipmentType(@RequestParam(required = false) Long typeId,
@RequestParam(required = false) String typeName){
List<MaType> listByMaType = iTypeService.getEquipmentType(typeId,typeName);
@RequestParam(required = false) String typeName) {
List<MaType> listByMaType = iTypeService.getEquipmentType(typeId, typeName);
return success(listByMaType);
}
/**
* 获取规格层级为3的设备列表
*
* @return 结果
*/
@ApiOperation(value = "获取规格层级的设备列表")
@GetMapping("/selectMaTypeListByLevelIndex")
public AjaxResult selectMaTypeListByLevelIndex(@RequestParam(value = "level", required = false) Integer level, @RequestParam(value = "type") Integer type, @RequestParam(value = "parentId", required = false) Integer parentId, @RequestParam(value = "keyword", required = false) String keyword){
if (type == null) { return AjaxResult.error("参数错误,类型不能为空"); }
public AjaxResult selectMaTypeListByLevelIndex(@RequestParam(value = "level", required = false) Integer level, @RequestParam(value = "type") Integer type, @RequestParam(value = "parentId", required = false) Integer parentId, @RequestParam(value = "keyword", required = false) String keyword) {
if (type == null) {
return AjaxResult.error("参数错误,类型不能为空");
}
if (type == 0) {
// 查询全部机具类型
if (level == 0 || level == 1) {
// 查询全部等级、一级
List<TreeSelect> treeSelectList = iTypeService.buildDeptTreeSelect(maTypeMapper.selectMaTypeListByLevelNotFour(null,null));
List<TreeSelect> treeSelectList = iTypeService.buildDeptTreeSelect(maTypeMapper.selectMaTypeListByLevelNotFour(null, null));
List<TreeSelect> children = treeSelectList.get(0).getChildren();
TreeSelect zero = new TreeSelect();
zero.setLevel(2);
@ -97,11 +103,11 @@ public class MaTypeController extends BaseController {
}
if (level == 2) {
// 查询二级
if (parentId == 0){
if (parentId == 0) {
List<MaType> maTypes = maTypeMapper.selectMaTypeListByLevelNotFour(null, keyword);
return AjaxResult.success(maTypes);
}else {
return AjaxResult.success(maTypeMapper.selectMaTypeListByLevelNotFour(parentId.toString(),keyword));
} else {
return AjaxResult.success(maTypeMapper.selectMaTypeListByLevelNotFour(parentId.toString(), keyword));
}
@ -126,12 +132,12 @@ public class MaTypeController extends BaseController {
// 查询施工机具
List<TreeSelect> treeSelectList;
if (level != 2) {
treeSelectList = iTypeService.buildDeptTreeSelect(maTypeMapper.selectMaTypeListByLevelNotFour(null,null));
treeSelectList = iTypeService.buildDeptTreeSelect(maTypeMapper.selectMaTypeListByLevelNotFour(null, null));
// treeSelectList.removeIf(item -> item.getId() == 1L);
//List<TreeSelect> treeSelectList1 = treeSelectList.stream().filter(item -> Objects.equals(item.getId(), 1L)).collect(Collectors.toList());
return AjaxResult.success(treeSelectList);
} else {
return AjaxResult.success(maTypeMapper.selectMaTypeListByLevelNotFour(parentId.toString(),keyword));
return AjaxResult.success(maTypeMapper.selectMaTypeListByLevelNotFour(parentId.toString(), keyword));
// treeSelectList = iTypeService.buildDeptTreeSelect(maTypeMapper.selectMaTypeListByLevelNotFour(parentId.toString()));
// // 先过滤出施工机具
// treeSelectList = treeSelectList.stream().filter(item -> Objects.equals(item.getId(), 1L)).collect(Collectors.toList());
@ -154,11 +160,11 @@ public class MaTypeController extends BaseController {
}
}
if (type == 2) {
List<TreeSelect> treeSelectList = iTypeService.buildDeptTreeSelect(maTypeMapper.selectMaTypeListByLevelNotFour(null,null));
List<TreeSelect> treeSelectList = iTypeService.buildDeptTreeSelect(maTypeMapper.selectMaTypeListByLevelNotFour(null, null));
//treeSelectList = treeSelectList.stream().filter(item -> Objects.equals(item.getId(), 2L)).collect(Collectors.toList());
// 查询安全工器具
if (level == 2) {
return AjaxResult.success(maTypeMapper.selectMaTypeListByLevelNotFour(parentId.toString(),keyword));
return AjaxResult.success(maTypeMapper.selectMaTypeListByLevelNotFour(parentId.toString(), keyword));
// if (!treeSelectList.isEmpty()) {
// for (TreeSelect treeSelect : treeSelectList) {
// List<TreeSelect> children = treeSelect.getChildren();
@ -175,19 +181,20 @@ public class MaTypeController extends BaseController {
}
return AjaxResult.success(treeSelectList);
}
return AjaxResult.success(maTypeMapper.selectMaTypeListByLevelNotFour(null,null));
return AjaxResult.success(maTypeMapper.selectMaTypeListByLevelNotFour(null, null));
}
/**
* 根据左列表类型id查询右表格
*
* @param typeId
* @return
*/
@ApiOperation(value = "根据左列表类型id查询右表格")
@GetMapping("/getListByMaType")
public AjaxResult getListByMaType(@RequestParam(required = false) Long typeId,
@RequestParam(required = false) String typeName){
List<MaType> listByMaType = iTypeService.getListByParentId(typeId,typeName);
@RequestParam(required = false) String typeName) {
List<MaType> listByMaType = iTypeService.getListByParentId(typeId, typeName);
return success(listByMaType);
}
@ -221,8 +228,7 @@ public class MaTypeController extends BaseController {
*/
@ApiOperation(value = "获取机具类型管理ma_type详细信息")
@GetMapping(value = "/{typeId}")
public AjaxResult getInfo(@PathVariable("typeId") Long typeId)
{
public AjaxResult getInfo(@PathVariable("typeId") Long typeId) {
return success(iTypeService.selectMaTypeByTypeId(typeId));
}
@ -232,8 +238,7 @@ public class MaTypeController extends BaseController {
@ApiOperation(value = "新增机具类型管理ma_type")
@Log(title = "机具类型管理ma_type", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody MaType maType)
{
public AjaxResult add(@RequestBody MaType maType) {
return toAjax(iTypeService.insertMaType(maType));
}
@ -243,8 +248,7 @@ public class MaTypeController extends BaseController {
@ApiOperation(value = "修改机具类型管理ma_type")
@Log(title = "机具类型管理ma_type", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody MaType maType)
{
public AjaxResult edit(@RequestBody MaType maType) {
return toAjax(iTypeService.updateMaType(maType));
}

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java
View File

@ -82,5 +82,5 @@ public interface MaTypeMapper {
int deletePropSetByTypeId(Long typeId);
MaType getMaType(MaType maType);
int getMaType(MaType maType);
}

16
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java
View File

@ -55,7 +55,6 @@ public class MaTypeServiceImpl implements ITypeService {
}
/**
* 新增机具类型管理ma_type
*
@ -72,8 +71,8 @@ public class MaTypeServiceImpl implements ITypeService {
maType.setCreateTime(DateUtils.getNowDate());
//根据类型名称判重
if (maType.getTypeName() != null && maType.getParentId() != null) {
MaType mapperMaType = maTypeMapper.getMaType(maType);
if (mapperMaType != null) {
int num = maTypeMapper.getMaType(maType);
if (num > 1) {
throw new ServiceException("机具类型名称与库中重复，请修改后重新提交！");
}
}
@ -127,17 +126,20 @@ public class MaTypeServiceImpl implements ITypeService {
* @return 结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int updateMaType(MaType maType) {
int i = 0;
Long typeId = maType.getTypeId();
maType.setUpdateTime(DateUtils.getNowDate());
i = maTypeMapper.updateType(maType);
//根据类型名称判重
if (maType.getTypeName() != null && maType.getParentId() != null) {
MaType mapperMaType = maTypeMapper.getMaType(maType);
if (mapperMaType != null && mapperMaType.getTypeId() != null && !mapperMaType.getTypeId().equals(maType.getTypeId())) {
throw new ServiceException("机具类型名称与库中重复，请修改后重新提交！");
int num = maTypeMapper.getMaType(maType);
if (num > 1) {
throw new RuntimeException("机具类型名称与库中重复，请修改后重新提交！");
}
}
int i = maTypeMapper.updateType(maType);
// 图片路径保存
if (StringUtils.isNotEmpty(maType.getPhotoName()) && StringUtils.isNotEmpty(maType.getPhotoUrl())) {
typeFileMapper.deleteMaTypeFileByTypeId(typeId, "1");

7
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
View File

@ -416,16 +416,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
</where>
</select>
<select id="getMaType" resultType="com.bonus.sgzb.base.api.domain.MaType">
<select id="getMaType" resultType="java.lang.Integer">
SELECT
type_id AS typeId,
type_name AS typeName,
parent_id AS parentId
count(1)
FROM
ma_type
WHERE
parent_id = #{parentId} and type_name = #{typeName}
</select>
</mapper>

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaWholeVo.java
View File

@ -27,6 +27,10 @@ public class MaWholeVo {
@ApiModelProperty(value = "规格型号")
private String typeModelName;
/** 配套名称 */
@ApiModelProperty(value = "配套名称")
private String wholeTypeName;
/** 套装所需配件数量 */
@ApiModelProperty(value = "套装所需配件数量")
private Integer totalNum;

1
sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml
View File

@ -74,6 +74,7 @@
<select id="selectList" resultType="com.bonus.sgzb.material.domain.MaWholeVo">
SELECT
mws.parent_id AS id,
mws.whole_type_name AS wholeTypeName,
mt2.type_name AS typeName,
mt.type_name AS typeModelName,
SUM(mws.part_num) AS totalNum