weizhiqiang1995/erp-pro
1
1
Fork 0
mirror of https://github.com/weizhiqiang1995/erp-pro.git synced 2025-03-02 02:13:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

feat:添加版权，修改了参数是否必填，添加了地点模糊搜索

Browse source
This commit is contained in:
lqy 2024-11-24 10:04:58 +08:00
parent fa68a440d3
commit 4a583f8a7f
15 changed files with 140 additions and 66 deletions

13
skyeye-school/school-pro/src/main/java/com/skyeye/eve/controller/SchoolController.java
View file

@ -84,4 +84,17 @@ public class SchoolController {
schoolService.queryAllSchoolList(inputObject, outputObject);
}
/**
* 位置覆盖
*
* @param inputObject 入参以及用户信息等获取对象
* @param outputObject 出参以及提示信息的返回值对象
*/
@ApiOperation(id = "coverBackground", value = "学校背景图位置覆盖", method = "POST", allUse = "2")
@ApiImplicitParams(classBean = School.class)
@RequestMapping("/post/SchoolController/coverBackground")
public void coverBackground(InputObject inputObject, OutputObject outputObject) {
schoolService.updateEntity(inputObject, outputObject);
}
}

20
skyeye-school/school-pro/src/main/java/com/skyeye/eve/entity/School.java
View file

@ -40,4 +40,24 @@ public class School extends AreaGeneralInfo {
@ApiModelProperty(value = "数据权限 1.查看所有 2.查看本校", required = "required,num")
private String power;
@TableField(value = "ne_longitude")
@ApiModelProperty(value = "东北经度")
private Float neLongitude;
@TableField(value = "ne_latitude")
@ApiModelProperty(value = "东北纬度")
private Float neLatitude;
@TableField(value = "sw_longitude")
@ApiModelProperty(value = "西南经度")
private Float swLongitude;
@TableField(value = "sw_latitude")
@ApiModelProperty(value = "西南纬度")
private Float swLatitude;
@TableField(value = "background")
@ApiModelProperty(value = "学校背景图")
private String background;
}

11
skyeye-school/school-pro/src/main/java/com/skyeye/school/building/controller/FloorInfoController.java
View file

@ -13,6 +13,15 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @ClassName: FloorInfoController
* @Description: 楼层教室服务管理控制层
* @author: skyeye云系列--lqy
* @date: 2023/9/5 17:12
* @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
* 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
*/
@RestController
@Api(value = "楼层教室服务管理", tags = "楼层教室服务管理", modelName = "楼层教室服务管理")
public class FloorInfoController {
@ -39,7 +48,7 @@ public class FloorInfoController {
@ApiOperation(id = "queryFloorInfosByLocationId", value = "根据地点id获取楼层所有信息", method = "POST", allUse = "2")
@ApiImplicitParams({
@ApiImplicitParam(id= "locationId",name = "locationId", value = "地点id", required = "required"),
@ApiImplicitParam(id= "locationId",name = "locationId", value = "地点id"),
@ApiImplicitParam(id= "keyword",name = "keyword", value = "关键字查询")
})
@RequestMapping("/post/FloorInfoController/queryFloorInfosByLocationId")

3
skyeye-school/school-pro/src/main/java/com/skyeye/school/building/controller/LocationRangeController.java
View file

@ -8,10 +8,7 @@ import com.skyeye.common.entity.search.CommonPageInfo;
import com.skyeye.common.object.InputObject;
import com.skyeye.common.object.OutputObject;
import com.skyeye.school.building.entity.LocationRange;
import com.skyeye.school.building.entity.TeachBuilding;
import com.skyeye.school.building.service.LocationRangeService;
import com.skyeye.school.building.service.RangeVertexService;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

11
skyeye-school/school-pro/src/main/java/com/skyeye/school/building/controller/TeachBuildingController.java
View file

@ -67,7 +67,7 @@ public class TeachBuildingController {
*/
@ApiOperation(id = "queryTeachBuildingBySchoolId", value = "根据学校schoolId获取地点信息", method = "GET", allUse = "2")
@ApiImplicitParams({
@ApiImplicitParam(id = "schoolId", name = "schoolId", value = "学校id", required = "required")
@ApiImplicitParam(id = "schoolId", name = "schoolId", value = "学校id")
})
@RequestMapping("/post/TeachBuildingController/queryTeachBuildingBySchoolId")
public void queryTeachBuildingBySchoolId(InputObject inputObject, OutputObject outputObject) {
@ -75,13 +75,16 @@ public class TeachBuildingController {
}
/**
* 根据地点类型typeId获取分页获取地点列表
* 根据schoolId和地点类型typeId获取取地点列表
*
* @param inputObject 入参以及用户信息等获取对象
* @param outputObject 出参以及提示信息的返回值对象
*/
@ApiOperation(id = "queryTeachBuildingByHolderId", value = "根据holderId(typeId地点类型id)获取地点列表,默认分页，当isPaging=false不分页", method = "POST", allUse = "2")
@ApiImplicitParams(classBean = CommonPageInfo.class)
@ApiOperation(id = "queryTeachBuildingByHolderId", value = "根据schoolId和地点类型typeId获取取地点列表", method = "POST", allUse = "2")
@ApiImplicitParams({
@ApiImplicitParam(id = "schoolId", name = "schoolId", value = "学校id", required = "required"),
@ApiImplicitParam(id = "typeId", name = "typeId", value = "地点类型id", required = "required")
})
@RequestMapping("/post/TeachBuildingController/queryTeachBuildingByHolderId")
public void queryTeachBuildingByHolderId(InputObject inputObject, OutputObject outputObject) {
teachBuildingService.queryTeachBuildingByHolderId(inputObject, outputObject);

8
skyeye-school/school-pro/src/main/java/com/skyeye/school/building/dao/FloorInfoDao.java
View file

@ -3,5 +3,13 @@ package com.skyeye.school.building.dao;
import com.skyeye.eve.dao.SkyeyeBaseMapper;
import com.skyeye.school.building.entity.FloorInfo;
/**
* @ClassName: FloorInfoDao
* @Description: 楼层教室服务数据层
* @author: lqu
* @date: 2023/9/5 17:16
* @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
* 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
*/
public interface FloorInfoDao extends SkyeyeBaseMapper<FloorInfo> {
}

4
skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/Classroom.java
View file

@ -9,10 +9,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.skyeye.annotation.api.ApiModel;
import com.skyeye.annotation.api.ApiModelProperty;
import com.skyeye.annotation.api.Property;
import com.skyeye.annotation.cache.RedisCacheField;
import com.skyeye.annotation.unique.UniqueField;
import com.skyeye.common.entity.features.BaseGeneralInfo;
import com.skyeye.common.entity.features.OperatorUserInfo;
import lombok.Data;

9
skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/FloorInfo.java
View file

@ -8,7 +8,14 @@ import com.skyeye.annotation.api.ApiModelProperty;
import com.skyeye.common.entity.features.OperatorUserInfo;
import lombok.Data;
/**
* @ClassName: FloorInfo
* @Description: 楼层教室服务管理实体层
* @author: lqu
* @date: 2023/9/5 17:16
* @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
* 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
*/
@Data
@TableName("school_floor_info")

1
skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/LocationRange.java
View file

@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.skyeye.annotation.api.ApiModel;
import com.skyeye.annotation.api.ApiModelProperty;
import com.skyeye.annotation.api.Property;
import com.skyeye.common.entity.features.OperatorUserInfo;
import lombok.Data;

8
skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/TeachBuilding.java
View file

@ -12,14 +12,10 @@ import com.skyeye.annotation.api.ApiModelProperty;
import com.skyeye.annotation.api.Property;
import com.skyeye.annotation.cache.RedisCacheField;
import com.skyeye.annotation.unique.UniqueField;
import com.skyeye.common.entity.features.BaseGeneralInfo;
import com.skyeye.common.entity.features.OperatorUserInfo;
import com.skyeye.common.entity.features.AreaGeneralInfo;
import com.skyeye.eve.entity.School;
import lombok.Data;
import java.util.List;
import java.util.Map;
/**
* @ClassName: TeachBuilding
* @Description: 教学楼信息实体类
@ -33,7 +29,7 @@ import java.util.Map;
@RedisCacheField(name = "school:teachBuilding")
@TableName(value = "school_teach_building")
@ApiModel(value = "教学楼信息实体类")
public class TeachBuilding extends OperatorUserInfo {
public class TeachBuilding extends AreaGeneralInfo {
@TableId("id")
@ApiModelProperty(value = "主键id。为空时新增，不为空时编辑")

11
skyeye-school/school-pro/src/main/java/com/skyeye/school/building/floorenum/FloorInfoEnum.java
View file

@ -5,13 +5,22 @@ import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
/**
* @ClassName: FloorInfoEnum
* @Description: 楼层教室服务管理枚举类
* @author: lqu
* @date: 2023/9/5 17:16
* @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
* 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
*/
@Getter
@NoArgsConstructor
@AllArgsConstructor
public enum FloorInfoEnum implements SkyeyeEnumClass {
FLOOR_INFO_ENUM(1, "楼层", true, true),
ClASS_INFO_ENUM(2, "教室", true, false),
ClASS_INFO_ENUM(2, "房间", true, false),
SERVICE_INFO_ENUM(3, "服务", true, false),;
private Integer key;

9
skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/FloorInfoService.java
View file

@ -5,6 +5,15 @@ import com.skyeye.common.object.InputObject;
import com.skyeye.common.object.OutputObject;
import com.skyeye.school.building.entity.FloorInfo;
/**
* @ClassName: FloorInfoService
* @Description: 楼层教室服务管理接口层
* @author: skyeye云系列--lqy
* @date: 2023/9/5 17:12
* @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
* 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
*/
public interface FloorInfoService extends SkyeyeBusinessService<FloorInfo> {
void queryFloorInfosByLocationId(InputObject inputObject, OutputObject outputObject);
}

8
skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/impl/ClassroomServiceImpl.java
View file

@ -4,18 +4,10 @@
package com.skyeye.school.building.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.skyeye.annotation.service.SkyeyeService;
import com.skyeye.base.business.service.impl.SkyeyeBusinessServiceImpl;
import com.skyeye.common.entity.search.CommonPageInfo;
import com.skyeye.common.object.InputObject;
import com.skyeye.common.object.OutputObject;
import com.skyeye.common.util.mybatisplus.MybatisPlusUtil;
import com.skyeye.eve.service.SchoolService;
import com.skyeye.exception.CustomException;
import com.skyeye.school.building.dao.ClassroomDao;
import com.skyeye.school.building.entity.Classroom;
import com.skyeye.school.building.service.ClassroomService;

41
skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/impl/FloorInfoServiceImpl.java
View file

@ -19,6 +19,14 @@ import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* @ClassName: FloorInfoServiceImpl
* @Description: 楼层教室服务管理控制层
* @author: skyeye云系列--lqy
* @date: 2023/8/8 14:55
* @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
* 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
*/
@Service
@SkyeyeService(name = "楼层教室服务管理", groupName = "楼层教室服务管理")
public class FloorInfoServiceImpl extends SkyeyeBusinessServiceImpl<FloorInfoDao, FloorInfo> implements FloorInfoService {
@ -46,17 +54,29 @@ public class FloorInfoServiceImpl extends SkyeyeBusinessServiceImpl<FloorInfoDao
QueryWrapper<FloorInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(MybatisPlusUtil.toColumns(FloorInfo::getLocationId), floorInfo.getLocationId());
if(nodeType == CommonNumConstants.NUM_ONE){
// 更新漏测
queryWrapper.eq(MybatisPlusUtil.toColumns(FloorInfo::getName), name);// 确定为哪一层
if(count(queryWrapper) > 0){
throw new CustomException("该楼层教室名已存在");
// 新增、更新楼层
queryWrapper.eq(MybatisPlusUtil.toColumns(FloorInfo::getName), name);
if(StrUtil.isEmpty(floorInfo.getId())&& count(queryWrapper) > 0){
throw new CustomException("楼层名称已存在");
}
if(StrUtil.isNotEmpty(floorInfo.getId())){
FloorInfo floor = selectById(floorInfo.getId());
if(!name.equals(floor.getName()) && count(queryWrapper) > 0){
throw new CustomException("楼层名称已存在1");
}
}
}else if(nodeType == CommonNumConstants.NUM_TWO){
// 更新教室
queryWrapper.eq(MybatisPlusUtil.toColumns(FloorInfo::getParentId), floorInfo.getParentId());// 确定那一层
queryWrapper.eq(MybatisPlusUtil.toColumns(FloorInfo::getName), name);// 确定教室名
if(count(queryWrapper) > 0){
throw new CustomException("该教室名已存在");
// 新增、更新教室
queryWrapper.eq(MybatisPlusUtil.toColumns(FloorInfo::getParentId), floorInfo.getParentId());
queryWrapper.eq(MybatisPlusUtil.toColumns(FloorInfo::getName), name);
if(StrUtil.isEmpty(floorInfo.getId())&& count(queryWrapper) > 0){
throw new CustomException("教室名已存在");
}
if(StrUtil.isNotEmpty(floorInfo.getId())){
FloorInfo floor = selectById(floorInfo.getId());
if(!name.equals(floor.getName()) && count(queryWrapper) > 0){
throw new CustomException("教室名已存在1");
}
}
}
}
@ -92,6 +112,9 @@ public class FloorInfoServiceImpl extends SkyeyeBusinessServiceImpl<FloorInfoDao
public void queryFloorInfosByLocationId(InputObject inputObject, OutputObject outputObject) {
Map<String, Object> map = inputObject.getParams();
String locationId = map.get("locationId").toString();
if(StrUtil.isEmpty(locationId)){
return;
}
String keyword = map.get("keyword").toString();
QueryWrapper<FloorInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(MybatisPlusUtil.toColumns(FloorInfo::getLocationId), locationId);

49
skyeye-school/school-pro/src/main/java/com/skyeye/school/building/service/impl/TeachBuildingServiceImpl.java
View file

@ -4,10 +4,8 @@
package com.skyeye.school.building.service.impl;
import com.alibaba.cloud.commons.lang.StringUtils;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.skyeye.annotation.service.SkyeyeService;
import com.skyeye.base.business.service.impl.SkyeyeBusinessServiceImpl;
import com.skyeye.common.entity.search.CommonPageInfo;
@ -16,19 +14,15 @@ import com.skyeye.common.object.OutputObject;
import com.skyeye.common.util.mybatisplus.MybatisPlusUtil;
import com.skyeye.eve.service.IAuthUserService;
import com.skyeye.eve.service.SchoolService;
import com.skyeye.exception.CustomException;
import com.skyeye.school.building.dao.TeachBuildingDao;
import com.skyeye.school.building.entity.Classroom;
import com.skyeye.school.building.entity.FloorInfo;
import com.skyeye.school.building.entity.TeachBuilding;
import com.skyeye.school.building.service.ClassroomService;
import com.skyeye.school.building.service.FloorInfoService;
import com.skyeye.school.building.service.TeachBuildingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@ -56,6 +50,17 @@ public class TeachBuildingServiceImpl extends SkyeyeBusinessServiceImpl<TeachBui
@Override
public List<Map<String, Object>> queryPageDataList(InputObject inputObject) {
CommonPageInfo commonPageInfo = inputObject.getParams(CommonPageInfo.class);
String keyword = commonPageInfo.getKeyword();
if (StrUtil.isNotEmpty(keyword)) {
QueryWrapper<TeachBuilding> queryWrapper = new QueryWrapper<>();
queryWrapper.like(MybatisPlusUtil.toColumns(TeachBuilding::getName), keyword);
List<TeachBuilding> list = list(queryWrapper);
list.stream().map(item->{
item.setSchoolMation(schoolService.selectById(item.getSchoolId()));
return item;
});
}
List<Map<String, Object>> bean = super.queryPageDataList(inputObject);
schoolService.setMationForMap(bean, "schoolId", "schoolMation");
return bean;
@ -73,6 +78,9 @@ public class TeachBuildingServiceImpl extends SkyeyeBusinessServiceImpl<TeachBui
@Override
public void queryTeachBuildingBySchoolId(InputObject inputObject, OutputObject outputObject) {
String schoolId = inputObject.getParams().get("schoolId").toString();
if(StrUtil.isEmpty(schoolId)){
return;
}
QueryWrapper<TeachBuilding> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(MybatisPlusUtil.toColumns(TeachBuilding::getSchoolId), schoolId);
List<TeachBuilding> teachBuildingList = list(queryWrapper);
@ -86,30 +94,15 @@ public class TeachBuildingServiceImpl extends SkyeyeBusinessServiceImpl<TeachBui
@Override
public void queryTeachBuildingByHolderId(InputObject inputObject, OutputObject outputObject) {
CommonPageInfo commonPageInfo = inputObject.getParams(CommonPageInfo.class);
String typeId = commonPageInfo.getHolderId();
if(StringUtils.isEmpty(typeId)){
throw new CustomException("地点分类id不能为空");
}
if(commonPageInfo.getIsPaging()){
Page page = PageHelper.startPage(commonPageInfo.getPage(), commonPageInfo.getLimit());
List<TeachBuilding> teachBuildingList = getTeachBuildings(typeId);
outputObject.setBeans(teachBuildingList);
outputObject.settotal(page.getTotal());
}else {
List<TeachBuilding> teachBuildingList = getTeachBuildings(typeId);
outputObject.setBeans(teachBuildingList);
outputObject.settotal(teachBuildingList.size());
}
}
private List<TeachBuilding> getTeachBuildings(String typeId) {
Map params = inputObject.getParams();
String schoolId = params.get("schoolId").toString();
String typeId = params.get("typeId").toString();
QueryWrapper<TeachBuilding> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(MybatisPlusUtil.toColumns(TeachBuilding::getSchoolId), schoolId);
queryWrapper.eq(MybatisPlusUtil.toColumns(TeachBuilding::getTypeId), typeId);
List<TeachBuilding> teachBuildingList = list(queryWrapper);
schoolService.setDataMation(teachBuildingList,TeachBuilding::getSchoolId);
return teachBuildingList;
outputObject.setBeans(teachBuildingList);
outputObject.settotal(teachBuildingList.size());
}
@Transactional