package com.tuoheng.admin.controller; | |||||
import com.tuoheng.admin.service.airport.AirportService; | |||||
import com.tuoheng.common.utils.JsonResult; | |||||
import lombok.extern.slf4j.Slf4j; | |||||
import org.springframework.beans.factory.annotation.Autowired; | |||||
import org.springframework.web.bind.annotation.GetMapping; | |||||
import org.springframework.web.bind.annotation.RequestMapping; | |||||
import org.springframework.web.bind.annotation.RestController; | |||||
/** | |||||
* 机场前端控制器 | |||||
* | |||||
* @author wanjing | |||||
* @team tuoheng | |||||
* @date 2023-02-10 | |||||
*/ | |||||
@Slf4j | |||||
@RestController | |||||
@RequestMapping("/airport") | |||||
public class AirPortController { | |||||
@Autowired | |||||
private AirportService airportService; | |||||
/** | |||||
* 获取巡检机场列表 | |||||
*/ | |||||
@GetMapping("/list") | |||||
public JsonResult getList() { | |||||
return airportService.getList(); | |||||
} | |||||
} |
package com.tuoheng.admin.controller; | package com.tuoheng.admin.controller; | ||||
import com.tuoheng.admin.entity.request.goods.QueryGoodsListRequest; | |||||
import com.tuoheng.admin.entity.request.goods.QueryGoodsListByWarehouseIdRequest; | |||||
import com.tuoheng.admin.service.goods.IGoodsService; | import com.tuoheng.admin.service.goods.IGoodsService; | ||||
import com.tuoheng.common.utils.JsonResult; | import com.tuoheng.common.utils.JsonResult; | ||||
import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
private IGoodsService goodsService; | private IGoodsService goodsService; | ||||
/** | /** | ||||
* 查询物资列表 | |||||
* 根据仓库ID查询物资列表 | |||||
*/ | */ | ||||
@GetMapping("/list") | |||||
public JsonResult getList(QueryGoodsListRequest request) { | |||||
return goodsService.getList(request); | |||||
@GetMapping("/list/by/warehouseid") | |||||
public JsonResult getListByWarehouseId(QueryGoodsListByWarehouseIdRequest request) { | |||||
return goodsService.getListByWarehouseId(request); | |||||
} | } | ||||
} | } |
package com.tuoheng.admin.controller; | package com.tuoheng.admin.controller; | ||||
import com.tuoheng.admin.entity.domain.Warehouse; | import com.tuoheng.admin.entity.domain.Warehouse; | ||||
import com.tuoheng.admin.entity.request.warehouse.QueryWarehouseListRequest; | |||||
import com.tuoheng.admin.entity.request.warehouse.QueryWarehousePageListRequest; | import com.tuoheng.admin.entity.request.warehouse.QueryWarehousePageListRequest; | ||||
import com.tuoheng.admin.service.warehouse.IWarehouseService; | import com.tuoheng.admin.service.warehouse.IWarehouseService; | ||||
import com.tuoheng.common.utils.JsonResult; | import com.tuoheng.common.utils.JsonResult; | ||||
/** | /** | ||||
* 查询仓库列表 | * 查询仓库列表 | ||||
*/ | */ | ||||
@GetMapping("/list") | |||||
public JsonResult getlist(QueryWarehouseListRequest request) { | |||||
return warehouseService.getList(request); | |||||
} | |||||
/** | |||||
* 查询仓库分页列表 | |||||
*/ | |||||
@GetMapping("/page/list") | @GetMapping("/page/list") | ||||
public JsonResult getPagelist(QueryWarehousePageListRequest request) { | public JsonResult getPagelist(QueryWarehousePageListRequest request) { | ||||
return warehouseService.getPagelist(request); | |||||
return warehouseService.getPageList(request); | |||||
} | } | ||||
/** | /** |
package com.tuoheng.admin.entity.request.goods; | |||||
import io.swagger.annotations.ApiModelProperty; | |||||
import lombok.Data; | |||||
import java.io.Serializable; | |||||
/** | |||||
* 查询摄像头列表请求实体 | |||||
* | |||||
* @author: qiujinyang | |||||
*/ | |||||
@Data | |||||
public class QueryGoodsListByWarehouseIdRequest implements Serializable { | |||||
private static final long serialVersionUID = 1L; | |||||
@ApiModelProperty(value = "租户Id", hidden = true) | |||||
private Integer tenantId; | |||||
/** | |||||
* 仓库ID | |||||
*/ | |||||
private Integer warehouseId; | |||||
} |
* @author: qiujinyang | * @author: qiujinyang | ||||
*/ | */ | ||||
@Data | @Data | ||||
public class QueryGoodsListRequest implements Serializable { | |||||
public class QueryGoodsPageListRequest implements Serializable { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
package com.tuoheng.admin.entity.request.warehouse; | |||||
import com.tuoheng.common.common.BaseQuery; | |||||
import io.swagger.annotations.ApiModelProperty; | |||||
import lombok.Data; | |||||
import java.io.Serializable; | |||||
/** | |||||
* 查询仓库列表请求实体 | |||||
* @author: qiujinyang | |||||
*/ | |||||
@Data | |||||
public class QueryWarehouseListRequest extends BaseQuery implements Serializable { | |||||
private static final long serialVersionUID = 1L; | |||||
@ApiModelProperty(value = "租户Id",hidden = true) | |||||
private Integer tenantId; | |||||
} |
import java.io.Serializable; | import java.io.Serializable; | ||||
/** | /** | ||||
* 查询仓库列表请求实体 | |||||
* 查询仓库分页列表请求实体 | |||||
* @author: qiujinyang | * @author: qiujinyang | ||||
*/ | */ | ||||
@Data | @Data |
import com.baomidou.mybatisplus.core.mapper.BaseMapper; | import com.baomidou.mybatisplus.core.mapper.BaseMapper; | ||||
import com.tuoheng.admin.entity.domain.Goods; | import com.tuoheng.admin.entity.domain.Goods; | ||||
import com.tuoheng.admin.entity.request.goods.QueryGoodsListRequest; | |||||
import com.tuoheng.admin.entity.request.goods.QueryGoodsListByWarehouseIdRequest; | |||||
/** | /** | ||||
* 物资Mapper接口 | * 物资Mapper接口 | ||||
* @param request 物资 | * @param request 物资 | ||||
* @return 物资集合 | * @return 物资集合 | ||||
*/ | */ | ||||
List<Goods> getList(QueryGoodsListRequest request); | |||||
List<Goods> getListByWarehouseId(QueryGoodsListByWarehouseIdRequest request); | |||||
/** | /** | ||||
* 查询物资 | * 查询物资 |
package com.tuoheng.admin.service.airport; | |||||
import com.tuoheng.common.utils.JsonResult; | |||||
public interface AirportService { | |||||
JsonResult getList(); | |||||
} |
package com.tuoheng.admin.service.airport; | |||||
import com.tuoheng.common.utils.JsonResult; | |||||
import org.springframework.stereotype.Service; | |||||
@Service | |||||
public class AirportServiceImpl implements AirportService { | |||||
@Override | |||||
public JsonResult getList() { | |||||
return JsonResult.success(); | |||||
} | |||||
} |
//新增 | //新增 | ||||
if (StringUtils.isNull(entity.getId())) { | if (StringUtils.isNull(entity.getId())) { | ||||
if (StringUtils.isEmpty(entity.getCameraName())) { | if (StringUtils.isEmpty(entity.getCameraName())) { | ||||
throw new ServiceException(0, "摄像头名称不能为空"); | |||||
throw new ServiceException(-1, "摄像头名称不能为空"); | |||||
} | } | ||||
if (ObjectUtil.isEmpty(entity.getCameraType())) { | if (ObjectUtil.isEmpty(entity.getCameraType())) { | ||||
throw new ServiceException(0, "设备类型不能为空"); | |||||
throw new ServiceException(-1, "设备类型不能为空"); | |||||
} | } | ||||
if (StringUtils.isEmpty(entity.getLongitude())) { | if (StringUtils.isEmpty(entity.getLongitude())) { | ||||
throw new ServiceException(0, "经度不能为空"); | |||||
throw new ServiceException(-1, "经度不能为空"); | |||||
} | } | ||||
if (StringUtils.isEmpty(entity.getLatitude())) { | if (StringUtils.isEmpty(entity.getLatitude())) { | ||||
throw new ServiceException(0, "纬度不能为空"); | |||||
throw new ServiceException(-1, "纬度不能为空"); | |||||
} | } | ||||
if (StringUtils.isEmpty(entity.getFlvUrl())) { | if (StringUtils.isEmpty(entity.getFlvUrl())) { | ||||
throw new ServiceException(0, "摄像头地址不能为空"); | |||||
throw new ServiceException(-1, "摄像头地址不能为空"); | |||||
} | } | ||||
} | } | ||||
if(StringUtils.isNotEmpty(entity.getLongitude()) && StringUtils.isNotEmpty(entity.getLatitude())){ | if(StringUtils.isNotEmpty(entity.getLongitude()) && StringUtils.isNotEmpty(entity.getLatitude())){ |
public JsonResult getList(QueryCameraListRequest request) { | public JsonResult getList(QueryCameraListRequest request) { | ||||
// log.info("进入查询监控列表业务"); | // log.info("进入查询监控列表业务"); | ||||
User user = ShiroUtils.getUserInfo(); | |||||
Integer tenantId = user.getTenantId(); | |||||
// User user = ShiroUtils.getUserInfo(); | |||||
// Integer tenantId = user.getTenantId(); | |||||
Integer tenantId = 1; | |||||
request.setTenantId(tenantId); | request.setTenantId(tenantId); | ||||
JsonResult result = this.check(tenantId, request); | JsonResult result = this.check(tenantId, request); |
package com.tuoheng.admin.service.goods; | package com.tuoheng.admin.service.goods; | ||||
import com.tuoheng.admin.entity.request.goods.QueryGoodsListRequest; | |||||
import com.tuoheng.admin.service.goods.query.QueryGoodsListService; | |||||
import com.tuoheng.admin.entity.request.goods.QueryGoodsListByWarehouseIdRequest; | |||||
import com.tuoheng.admin.service.goods.query.QueryGoodsListByWarehouseIdService; | |||||
import com.tuoheng.common.utils.JsonResult; | import com.tuoheng.common.utils.JsonResult; | ||||
import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
public class GoodsServiceImpl implements IGoodsService { | public class GoodsServiceImpl implements IGoodsService { | ||||
@Autowired | @Autowired | ||||
private QueryGoodsListService queryGoodsListService; | |||||
private QueryGoodsListByWarehouseIdService queryGoodsListService; | |||||
/** | /** | ||||
* 查询物资列表 | |||||
* 根据仓库Id查询物资列表 | |||||
* | * | ||||
* @param request 查询物资列表实体 | * @param request 查询物资列表实体 | ||||
* @return 摄像头集合 | * @return 摄像头集合 | ||||
*/ | */ | ||||
@Override | @Override | ||||
public JsonResult getList(QueryGoodsListRequest request) { | |||||
return queryGoodsListService.getList(request); | |||||
public JsonResult getListByWarehouseId(QueryGoodsListByWarehouseIdRequest request) { | |||||
return queryGoodsListService.getListByWarehouseId(request); | |||||
} | } | ||||
/** | /** |
package com.tuoheng.admin.service.goods; | package com.tuoheng.admin.service.goods; | ||||
import com.tuoheng.admin.entity.request.camera.QueryCameraListRequest; | |||||
import com.tuoheng.admin.entity.request.goods.QueryGoodsListRequest; | |||||
import com.tuoheng.admin.entity.request.goods.QueryGoodsListByWarehouseIdRequest; | |||||
import com.tuoheng.common.utils.JsonResult; | import com.tuoheng.common.utils.JsonResult; | ||||
/** | /** | ||||
/** | /** | ||||
* 查询物资列表 | |||||
* 根据仓库Id查询物资列表 | |||||
* | * | ||||
* @param request 查询物资列表实体 | * @param request 查询物资列表实体 | ||||
* @return 摄像头集合 | * @return 摄像头集合 | ||||
*/ | */ | ||||
JsonResult getList(QueryGoodsListRequest request); | |||||
JsonResult getListByWarehouseId(QueryGoodsListByWarehouseIdRequest request); | |||||
/** | /** | ||||
* 查询物资 | * 查询物资 |
package com.tuoheng.admin.service.goods.query; | |||||
import cn.hutool.core.collection.CollectionUtil; | |||||
import cn.hutool.core.util.ObjectUtil; | |||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | |||||
import com.tuoheng.admin.entity.domain.Goods; | |||||
import com.tuoheng.admin.entity.domain.Warehouse; | |||||
import com.tuoheng.admin.entity.request.goods.QueryGoodsListByWarehouseIdRequest; | |||||
import com.tuoheng.admin.mapper.GoodsMapper; | |||||
import com.tuoheng.admin.mapper.WarehouseMapper; | |||||
import com.tuoheng.common.exception.ServiceException; | |||||
import com.tuoheng.common.utils.JsonResult; | |||||
import com.tuoheng.system.entity.User; | |||||
import com.tuoheng.system.utils.ShiroUtils; | |||||
import lombok.extern.slf4j.Slf4j; | |||||
import org.springframework.beans.factory.annotation.Autowired; | |||||
import org.springframework.stereotype.Service; | |||||
import java.util.List; | |||||
/** | |||||
* 根据仓库ID查询物质表业务层处理 | |||||
* | |||||
* @author wanjing | |||||
* @team tuoheng | |||||
* @date 2022-11-22 | |||||
*/ | |||||
@Slf4j | |||||
@Service | |||||
public class QueryGoodsListByWarehouseIdService { | |||||
@Autowired | |||||
private GoodsMapper goodsMapper; | |||||
@Autowired | |||||
private WarehouseMapper warehouseMapper; | |||||
public JsonResult getListByWarehouseId(QueryGoodsListByWarehouseIdRequest request) { | |||||
// log.info("进入查询物质列表业务"); | |||||
User user = ShiroUtils.getUserInfo(); | |||||
Integer tenantId = user.getTenantId(); | |||||
request.setTenantId(tenantId); | |||||
JsonResult result = this.check(request); | |||||
if (0 != result.getCode()) { | |||||
log.info("进入查询物质列表业务:校验失败:{}", result.getMsg()); | |||||
return result; | |||||
} | |||||
List<Goods> cameraList = goodsMapper.getListByWarehouseId(request); | |||||
if (CollectionUtil.isEmpty(cameraList)) { | |||||
log.info("物质列表数据为空"); | |||||
} | |||||
return JsonResult.success(cameraList); | |||||
} | |||||
/** | |||||
* 检查参数 | |||||
* | |||||
* @param request | |||||
* @return | |||||
*/ | |||||
private JsonResult check(QueryGoodsListByWarehouseIdRequest request) { | |||||
if (ObjectUtil.isNull(request.getWarehouseId())) { | |||||
log.info("仓库ID为空, warehouseId:{}", request.getWarehouseId()); | |||||
throw new ServiceException(-1, "仓库ID为空"); | |||||
} | |||||
Warehouse warehouse = warehouseMapper.selectOne(new LambdaQueryWrapper<Warehouse>() | |||||
.eq(Warehouse::getTenantId, request.getTenantId()) | |||||
.eq(Warehouse::getId, request.getWarehouseId())); | |||||
if (ObjectUtil.isNull(warehouse)) { | |||||
log.info("仓库不存在, warehouseId:{}", request.getWarehouseId()); | |||||
throw new ServiceException(-1, "仓库不存在"); | |||||
} | |||||
return JsonResult.success(); | |||||
} | |||||
} |
package com.tuoheng.admin.service.goods.query; | |||||
import cn.hutool.core.collection.CollectionUtil; | |||||
import com.tuoheng.admin.entity.domain.Camera; | |||||
import com.tuoheng.admin.entity.domain.Goods; | |||||
import com.tuoheng.admin.entity.request.camera.QueryCameraListRequest; | |||||
import com.tuoheng.admin.entity.request.goods.QueryGoodsListRequest; | |||||
import com.tuoheng.admin.mapper.CameraMapper; | |||||
import com.tuoheng.admin.mapper.GoodsMapper; | |||||
import com.tuoheng.common.utils.JsonResult; | |||||
import com.tuoheng.system.entity.User; | |||||
import com.tuoheng.system.utils.ShiroUtils; | |||||
import lombok.extern.slf4j.Slf4j; | |||||
import org.springframework.beans.factory.annotation.Autowired; | |||||
import org.springframework.stereotype.Service; | |||||
import java.util.List; | |||||
/** | |||||
* 查询物质表业务层处理 | |||||
* | |||||
* @author wanjing | |||||
* @team tuoheng | |||||
* @date 2022-11-22 | |||||
*/ | |||||
@Slf4j | |||||
@Service | |||||
public class QueryGoodsListService { | |||||
@Autowired | |||||
private GoodsMapper goodsMapper; | |||||
public JsonResult getList(QueryGoodsListRequest request) { | |||||
// log.info("进入查询物质列表业务"); | |||||
User user = ShiroUtils.getUserInfo(); | |||||
Integer tenantId = user.getTenantId(); | |||||
request.setTenantId(tenantId); | |||||
JsonResult result = this.check(tenantId, request); | |||||
if (0 != result.getCode()) { | |||||
log.info("进入查询物质列表业务:校验失败:{}", result.getMsg()); | |||||
return result; | |||||
} | |||||
List<Goods> cameraList = goodsMapper.getList(request); | |||||
if (CollectionUtil.isEmpty(cameraList)) { | |||||
log.info("物质列表数据为空"); | |||||
} | |||||
return JsonResult.success(cameraList); | |||||
} | |||||
/** | |||||
* 检查参数 | |||||
* | |||||
* @param tenantId | |||||
* @param request | |||||
* @return | |||||
*/ | |||||
private JsonResult check(Integer tenantId, QueryGoodsListRequest request) { | |||||
return JsonResult.success(); | |||||
} | |||||
} |
.eq(User::getUsername, tenantDto.getUsername()) | .eq(User::getUsername, tenantDto.getUsername()) | ||||
.eq(User::getMark, 1)); | .eq(User::getMark, 1)); | ||||
if (count2 > 0) { | if (count2 > 0) { | ||||
throw new ServiceException(0, "系统中已经存在相同的账号信息"); | |||||
throw new ServiceException(-1, "系统中已经存在相同的账号信息"); | |||||
} | } | ||||
// 参数转换 | // 参数转换 | ||||
Tenant tenant = new Tenant(); | Tenant tenant = new Tenant(); | ||||
// 新建租户数据 | // 新建租户数据 | ||||
int count = tenantMapper.insert(tenant); | int count = tenantMapper.insert(tenant); | ||||
if (count == 0) { | if (count == 0) { | ||||
throw new ServiceException(0, "租户创建失败"); | |||||
throw new ServiceException(-1, "租户创建失败"); | |||||
} | } | ||||
// 创建租户账号 | // 创建租户账号 | ||||
User user = new User(); | User user = new User(); | ||||
user.setCreateTime(DateUtils.now()); | user.setCreateTime(DateUtils.now()); | ||||
int count3 = userMapper.insert(user); | int count3 = userMapper.insert(user); | ||||
if (count3 == 0) { | if (count3 == 0) { | ||||
throw new ServiceException(0, "租户登录账号创建失败"); | |||||
throw new ServiceException(-1, "租户登录账号创建失败"); | |||||
} | } | ||||
return true; | return true; | ||||
// 查询租户信息 | // 查询租户信息 | ||||
Tenant tenant = tenantMapper.selectById(tenantDto.getId()); | Tenant tenant = tenantMapper.selectById(tenantDto.getId()); | ||||
if (StringUtils.isNull(tenant)) { | if (StringUtils.isNull(tenant)) { | ||||
throw new ServiceException(0, "租户信息不存在"); | |||||
throw new ServiceException(-1, "租户信息不存在"); | |||||
} | } | ||||
BeanUtils.copyProperties(tenantDto, tenant); | BeanUtils.copyProperties(tenantDto, tenant); | ||||
// 租户头像 | // 租户头像 | ||||
// 更新租户信息 | // 更新租户信息 | ||||
int count = tenantMapper.updateById(tenant); | int count = tenantMapper.updateById(tenant); | ||||
if (count == 0) { | if (count == 0) { | ||||
throw new ServiceException(0, "更新租户信息失败"); | |||||
throw new ServiceException(-1, "更新租户信息失败"); | |||||
} | } | ||||
// 验证账号 | // 验证账号 | ||||
.eq(User::getUsername, tenantDto.getUsername()) | .eq(User::getUsername, tenantDto.getUsername()) | ||||
.eq(User::getMark, 1)); | .eq(User::getMark, 1)); | ||||
if (count2 > 0) { | if (count2 > 0) { | ||||
throw new ServiceException(0, "系统中已经存在相同的账号信息"); | |||||
throw new ServiceException(-1, "系统中已经存在相同的账号信息"); | |||||
} | } | ||||
// 查询租户账号信息 | // 查询租户账号信息 | ||||
User user = userMapper.selectOne(new LambdaQueryWrapper<User>().eq(User::getTenantId, tenant.getId()).eq(User::getMark, 1)); | User user = userMapper.selectOne(new LambdaQueryWrapper<User>().eq(User::getTenantId, tenant.getId()).eq(User::getMark, 1)); | ||||
if (StringUtils.isNull(user)) { | if (StringUtils.isNull(user)) { | ||||
throw new ServiceException(0, "租户账号信息不存在"); | |||||
throw new ServiceException(-1, "租户账号信息不存在"); | |||||
} | } | ||||
user.setRealname(tenantDto.getName()); | user.setRealname(tenantDto.getName()); | ||||
user.setNickname(tenantDto.getName()); | user.setNickname(tenantDto.getName()); | ||||
user.setUpdateTime(DateUtils.now()); | user.setUpdateTime(DateUtils.now()); | ||||
int count3 = userMapper.updateById(user); | int count3 = userMapper.updateById(user); | ||||
if (count3 == 0) { | if (count3 == 0) { | ||||
throw new ServiceException(0, "租户账号信息更新失败"); | |||||
throw new ServiceException(-1, "租户账号信息更新失败"); | |||||
} | } | ||||
return true; | return true; | ||||
} | } |
package com.tuoheng.admin.service.warehouse; | package com.tuoheng.admin.service.warehouse; | ||||
import com.tuoheng.admin.entity.domain.Warehouse; | import com.tuoheng.admin.entity.domain.Warehouse; | ||||
import com.tuoheng.admin.entity.request.warehouse.QueryWarehouseListRequest; | |||||
import com.tuoheng.admin.entity.request.warehouse.QueryWarehousePageListRequest; | import com.tuoheng.admin.entity.request.warehouse.QueryWarehousePageListRequest; | ||||
import com.tuoheng.common.common.IBaseService; | import com.tuoheng.common.common.IBaseService; | ||||
import com.tuoheng.common.utils.JsonResult; | import com.tuoheng.common.utils.JsonResult; | ||||
* @param request 仓库 | * @param request 仓库 | ||||
* @return 仓库集合 | * @return 仓库集合 | ||||
*/ | */ | ||||
JsonResult getPagelist(QueryWarehousePageListRequest request); | |||||
JsonResult getList(QueryWarehouseListRequest request); | |||||
/** | |||||
* 查询仓库分页列表 | |||||
* | |||||
* @param request 仓库 | |||||
* @return 仓库集合 | |||||
*/ | |||||
JsonResult getPageList(QueryWarehousePageListRequest request); | |||||
/** | /** | ||||
* 查询仓库 | * 查询仓库 |
package com.tuoheng.admin.service.warehouse; | package com.tuoheng.admin.service.warehouse; | ||||
import cn.hutool.core.util.ObjectUtil; | |||||
import com.tuoheng.admin.entity.domain.Warehouse; | import com.tuoheng.admin.entity.domain.Warehouse; | ||||
import com.tuoheng.admin.entity.request.warehouse.QueryWarehouseListRequest; | |||||
import com.tuoheng.admin.entity.request.warehouse.QueryWarehousePageListRequest; | import com.tuoheng.admin.entity.request.warehouse.QueryWarehousePageListRequest; | ||||
import com.tuoheng.admin.mapper.WarehouseMapper; | import com.tuoheng.admin.mapper.WarehouseMapper; | ||||
import com.tuoheng.admin.service.warehouse.query.QueryWarehouseListService; | |||||
import com.tuoheng.admin.service.warehouse.query.QueryWarehousePageListService; | import com.tuoheng.admin.service.warehouse.query.QueryWarehousePageListService; | ||||
import com.tuoheng.admin.utils.GaodeUtil; | import com.tuoheng.admin.utils.GaodeUtil; | ||||
import com.tuoheng.common.common.BaseServiceImpl; | import com.tuoheng.common.common.BaseServiceImpl; | ||||
@Service | @Service | ||||
public class WarehouseServiceImpl extends BaseServiceImpl<WarehouseMapper, Warehouse> implements IWarehouseService { | public class WarehouseServiceImpl extends BaseServiceImpl<WarehouseMapper, Warehouse> implements IWarehouseService { | ||||
@Autowired | |||||
private QueryWarehouseListService queryWarehouseListService; | |||||
@Autowired | @Autowired | ||||
private QueryWarehousePageListService queryWarehousePageListService; | private QueryWarehousePageListService queryWarehousePageListService; | ||||
* @return 仓库 | * @return 仓库 | ||||
*/ | */ | ||||
@Override | @Override | ||||
public JsonResult getPagelist(QueryWarehousePageListRequest request) { | |||||
public JsonResult getList(QueryWarehouseListRequest request) { | |||||
return queryWarehouseListService.getList(request); | |||||
} | |||||
/** | |||||
* 查询仓库分页列表 | |||||
* | |||||
* @param request 仓库 | |||||
* @return 仓库 | |||||
*/ | |||||
@Override | |||||
public JsonResult getPageList(QueryWarehousePageListRequest request) { | |||||
return queryWarehousePageListService.getPageList(request); | return queryWarehousePageListService.getPageList(request); | ||||
} | } | ||||
//新增 | //新增 | ||||
if (StringUtils.isNull(entity.getId())) { | if (StringUtils.isNull(entity.getId())) { | ||||
if (StringUtils.isEmpty(entity.getWarehouseName())) { | if (StringUtils.isEmpty(entity.getWarehouseName())) { | ||||
throw new ServiceException(0, "仓库名称不能为空"); | |||||
throw new ServiceException(-1, "仓库名称不能为空"); | |||||
} | } | ||||
} | } | ||||
if(StringUtils.isNotEmpty(entity.getLongitude()) && StringUtils.isNotEmpty(entity.getLatitude())){ | |||||
if (StringUtils.isNotEmpty(entity.getLongitude()) && StringUtils.isNotEmpty(entity.getLatitude())) { | |||||
String gaodeAddress = GaodeUtil.getGaodeAddress(entity.getLongitude(), entity.getLatitude()); | String gaodeAddress = GaodeUtil.getGaodeAddress(entity.getLongitude(), entity.getLatitude()); | ||||
entity.setLocation(gaodeAddress); | entity.setLocation(gaodeAddress); | ||||
} | } |
package com.tuoheng.admin.service.warehouse.query; | |||||
import cn.hutool.core.collection.CollectionUtil; | |||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | |||||
import com.tuoheng.admin.entity.domain.Warehouse; | |||||
import com.tuoheng.admin.entity.request.warehouse.QueryWarehouseListRequest; | |||||
import com.tuoheng.admin.mapper.WarehouseMapper; | |||||
import com.tuoheng.common.utils.JsonResult; | |||||
import com.tuoheng.system.entity.User; | |||||
import com.tuoheng.system.utils.ShiroUtils; | |||||
import lombok.extern.slf4j.Slf4j; | |||||
import org.springframework.beans.factory.annotation.Autowired; | |||||
import org.springframework.stereotype.Service; | |||||
import java.util.List; | |||||
/** | |||||
* 查询仓库列表业务层处理 | |||||
* | |||||
* @author wanjing | |||||
* @team tuoheng | |||||
* @date 2022-11-22 | |||||
*/ | |||||
@Slf4j | |||||
@Service | |||||
public class QueryWarehouseListService { | |||||
@Autowired | |||||
private WarehouseMapper warehouseMapper; | |||||
public JsonResult getList(QueryWarehouseListRequest request) { | |||||
// log.info("进入查询仓库列表业务"); | |||||
User user = ShiroUtils.getUserInfo(); | |||||
Integer tenantId = user.getTenantId(); | |||||
request.setTenantId(tenantId); | |||||
JsonResult result = this.check(tenantId, request); | |||||
if (0 != result.getCode()) { | |||||
log.info("进入查询仓库列表业务:校验失败:{}", result.getMsg()); | |||||
return result; | |||||
} | |||||
List<Warehouse> warehouseList = warehouseMapper.selectList(new LambdaQueryWrapper<Warehouse>() | |||||
.eq(Warehouse::getTenantId, request.getTenantId())); | |||||
if (CollectionUtil.isEmpty(warehouseList)) { | |||||
log.info("仓库列表数据为空"); | |||||
} | |||||
return JsonResult.success(warehouseList); | |||||
} | |||||
/** | |||||
* 检查参数 | |||||
* | |||||
* @param tenantId | |||||
* @param request | |||||
* @return | |||||
*/ | |||||
private JsonResult check(Integer tenantId, QueryWarehouseListRequest request) { | |||||
return JsonResult.success(); | |||||
} | |||||
} |
import java.util.List; | import java.util.List; | ||||
/** | /** | ||||
* 查询仓库分页业务层处理 | |||||
* 查询仓库分页列表业务层处理 | |||||
* | * | ||||
* @author wanjing | * @author wanjing | ||||
* @team tuoheng | * @team tuoheng |
private JsonResult check(Integer tenantId, WarningConfirmRequest request) { | private JsonResult check(Integer tenantId, WarningConfirmRequest request) { | ||||
// 判断预警id是否为空 | // 判断预警id是否为空 | ||||
if (ObjectUtil.isNotNull(request.getId())) { | if (ObjectUtil.isNotNull(request.getId())) { | ||||
throw new ServiceException(0, "预警ID为空"); | |||||
throw new ServiceException(-1, "预警ID为空"); | |||||
} | } | ||||
Warning warning = warningMapper.selectOne(new LambdaQueryWrapper<Warning>() | Warning warning = warningMapper.selectOne(new LambdaQueryWrapper<Warning>() | ||||
.eq(Warning::getId, request.getId()) | .eq(Warning::getId, request.getId()) | ||||
.eq(Warning::getTenantId, tenantId) | .eq(Warning::getTenantId, tenantId) | ||||
.eq(Warning::getMark, MarkEnum.VALID.getCode())); | .eq(Warning::getMark, MarkEnum.VALID.getCode())); | ||||
if (ObjectUtil.isNull(warning)) { | if (ObjectUtil.isNull(warning)) { | ||||
throw new ServiceException(0, "预警信息不存在"); | |||||
throw new ServiceException(-1, "预警信息不存在"); | |||||
} | } | ||||
if (!tenantId.equals(warning.getTenantId())) { | if (!tenantId.equals(warning.getTenantId())) { | ||||
throw new ServiceException(0, "该租户没有查询该预警信息的权限"); | |||||
throw new ServiceException(-1, "该租户没有查询该预警信息的权限"); | |||||
} | } | ||||
return JsonResult.success(warning); | return JsonResult.success(warning); | ||||
} | } | ||||
Integer rowCount = warningMapper.confirm(map); | Integer rowCount = warningMapper.confirm(map); | ||||
if (rowCount <= 0) { | if (rowCount <= 0) { | ||||
log.info("修改预警状态, 确认失败"); | log.info("修改预警状态, 确认失败"); | ||||
throw new ServiceException(0, "修改预警状态, 确认失败"); | |||||
throw new ServiceException(-1, "修改预警状态, 确认失败"); | |||||
} | } | ||||
return JsonResult.success(); | return JsonResult.success(); | ||||
} | } |
private JsonResult check(Integer tenantId, Integer id) { | private JsonResult check(Integer tenantId, Integer id) { | ||||
// 判断预警id是否为空 | // 判断预警id是否为空 | ||||
if (ObjectUtil.isNotNull(id)) { | if (ObjectUtil.isNotNull(id)) { | ||||
throw new ServiceException(0, "预警ID为空"); | |||||
throw new ServiceException(-1, "预警ID为空"); | |||||
} | } | ||||
Warning warning = warningMapper.selectOne(new LambdaQueryWrapper<Warning>() | Warning warning = warningMapper.selectOne(new LambdaQueryWrapper<Warning>() | ||||
.in(Warning::getId, id) | .in(Warning::getId, id) | ||||
.eq(Warning::getMark, MarkEnum.VALID.getCode())); | .eq(Warning::getMark, MarkEnum.VALID.getCode())); | ||||
if (ObjectUtil.isNull(warning)) { | if (ObjectUtil.isNull(warning)) { | ||||
throw new ServiceException(0, "预警信息不存在"); | |||||
throw new ServiceException(-1, "预警信息不存在"); | |||||
} | } | ||||
if (!tenantId.equals(warning.getTenantId())) { | if (!tenantId.equals(warning.getTenantId())) { | ||||
throw new ServiceException(0, "该租户没有查询该预警信息的权限"); | |||||
throw new ServiceException(-1, "该租户没有查询该预警信息的权限"); | |||||
} | } | ||||
return JsonResult.success(warning); | return JsonResult.success(warning); | ||||
} | } | ||||
Integer rowCount = warningMapper.confirm(map); | Integer rowCount = warningMapper.confirm(map); | ||||
if (rowCount <= 0) { | if (rowCount <= 0) { | ||||
log.info("修改预警状态, 确认失败"); | log.info("修改预警状态, 确认失败"); | ||||
throw new ServiceException(0, "修改预警状态, 确认失败"); | |||||
throw new ServiceException(-1, "修改预警状态, 确认失败"); | |||||
} | } | ||||
return JsonResult.success(); | return JsonResult.success(); | ||||
} | } |
private JsonResult check(Integer tenantId, Integer id) { | private JsonResult check(Integer tenantId, Integer id) { | ||||
// 判断预警id是否为空 | // 判断预警id是否为空 | ||||
if (ObjectUtil.isNotNull(id)) { | if (ObjectUtil.isNotNull(id)) { | ||||
throw new ServiceException(0, "预警ID为空"); | |||||
throw new ServiceException(-1, "预警ID为空"); | |||||
} | } | ||||
Warning warning = warningMapper.selectOne(new LambdaQueryWrapper<Warning>() | Warning warning = warningMapper.selectOne(new LambdaQueryWrapper<Warning>() | ||||
.eq(Warning::getId, id) | .eq(Warning::getId, id) | ||||
.eq(Warning::getTenantId, tenantId) | .eq(Warning::getTenantId, tenantId) | ||||
.eq(Warning::getMark, MarkEnum.VALID.getCode())); | .eq(Warning::getMark, MarkEnum.VALID.getCode())); | ||||
if (ObjectUtil.isNull(warning)) { | if (ObjectUtil.isNull(warning)) { | ||||
throw new ServiceException(0, "预警信息不存在"); | |||||
throw new ServiceException(-1, "预警信息不存在"); | |||||
} | } | ||||
if (!tenantId.equals(warning.getTenantId())) { | if (!tenantId.equals(warning.getTenantId())) { | ||||
throw new ServiceException(0, "该租户没有查询该预警信息的权限"); | |||||
throw new ServiceException(-1, "该租户没有查询该预警信息的权限"); | |||||
} | } | ||||
return JsonResult.success(warning); | return JsonResult.success(warning); | ||||
} | } |
import cn.hutool.core.collection.CollectionUtil; | import cn.hutool.core.collection.CollectionUtil; | ||||
import cn.hutool.core.util.ObjectUtil; | import cn.hutool.core.util.ObjectUtil; | ||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | ||||
import com.baomidou.mybatisplus.core.metadata.IPage; | |||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | |||||
import com.tuoheng.admin.conver.WarningConverMapper; | import com.tuoheng.admin.conver.WarningConverMapper; | ||||
import com.tuoheng.admin.entity.domain.Goods; | |||||
import com.tuoheng.admin.entity.domain.Question; | import com.tuoheng.admin.entity.domain.Question; | ||||
import com.tuoheng.admin.entity.domain.Warning; | import com.tuoheng.admin.entity.domain.Warning; | ||||
import com.tuoheng.admin.entity.request.goods.QueryGoodsListRequest; | |||||
import com.tuoheng.admin.entity.request.warning.QueryWarningListRequest; | import com.tuoheng.admin.entity.request.warning.QueryWarningListRequest; | ||||
import com.tuoheng.admin.entity.vo.warning.WarningListVo; | import com.tuoheng.admin.entity.vo.warning.WarningListVo; | ||||
import com.tuoheng.admin.enums.MarkEnum; | import com.tuoheng.admin.enums.MarkEnum; | ||||
import com.tuoheng.admin.mapper.GoodsMapper; | |||||
import com.tuoheng.admin.mapper.QuestionMapper; | import com.tuoheng.admin.mapper.QuestionMapper; | ||||
import com.tuoheng.admin.mapper.WarningMapper; | import com.tuoheng.admin.mapper.WarningMapper; | ||||
import com.tuoheng.common.utils.JsonResult; | import com.tuoheng.common.utils.JsonResult; |
select id, tenant_id, warehouse_id, goods_name, goods_type, goods_stock, goods_action, create_user, create_time, update_user, update_time, mark from th_goods | select id, tenant_id, warehouse_id, goods_name, goods_type, goods_stock, goods_action, create_user, create_time, update_user, update_time, mark from th_goods | ||||
</sql> | </sql> | ||||
<select id="getList" parameterType="com.tuoheng.admin.entity.request.goods.QueryGoodsListRequest" resultMap="GoodsResult"> | |||||
<select id="getListByWarehouseId" parameterType="com.tuoheng.admin.entity.request.goods.QueryGoodsListByWarehouseIdRequest" resultMap="GoodsResult"> | |||||
<include refid="selectGoodsVo"/> | <include refid="selectGoodsVo"/> | ||||
<where> | <where> | ||||
<if test="1 == 1"> and mark = 1 </if> | <if test="1 == 1"> and mark = 1 </if> | ||||
<if test="tenantId != null "> and tenant_id = #{tenantId}</if> | <if test="tenantId != null "> and tenant_id = #{tenantId}</if> | ||||
<if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if> | |||||
</where> | </where> | ||||
order by create_time desc | order by create_time desc | ||||
</select> | </select> |