diff --git a/src/main/java/com/dc/dc_project/controller/bigScreen/LaboratoryBigScreenController.java b/src/main/java/com/dc/dc_project/controller/bigScreen/LaboratoryBigScreenController.java index fc4d5f7..b385d1d 100644 --- a/src/main/java/com/dc/dc_project/controller/bigScreen/LaboratoryBigScreenController.java +++ b/src/main/java/com/dc/dc_project/controller/bigScreen/LaboratoryBigScreenController.java @@ -29,7 +29,7 @@ public class LaboratoryBigScreenController { } @PostMapping("/statistics") - @Operation(summary = "大屏统计信息——总数统计") + @Operation(summary = "大屏统计信息——试验室、设备等总数统计") public ResponseResult getStatistics() { return bigScreenService.getPigStatistics(); } diff --git a/src/main/java/com/dc/dc_project/mapper/PositionMapper.java b/src/main/java/com/dc/dc_project/mapper/PositionMapper.java new file mode 100644 index 0000000..c9c5207 --- /dev/null +++ b/src/main/java/com/dc/dc_project/mapper/PositionMapper.java @@ -0,0 +1,22 @@ +package com.dc.dc_project.mapper; + +import com.dc.dc_project.model.pojo.Position; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dc.dc_project.model.vo.PositionVo; + +import java.util.List; + +/** +* @author ADMIN +* @description 针对表【sys_position(岗位信息表)】的数据库操作Mapper +* @createDate 2025-11-14 16:39:29 +* @Entity com.dc.dc_project.model.pojo.Position +*/ +public interface PositionMapper extends BaseMapper { + + List getPositionsByPId(Long id); +} + + + + diff --git a/src/main/java/com/dc/dc_project/model/pojo/Position.java b/src/main/java/com/dc/dc_project/model/pojo/Position.java new file mode 100644 index 0000000..20ad46f --- /dev/null +++ b/src/main/java/com/dc/dc_project/model/pojo/Position.java @@ -0,0 +1,110 @@ +package com.dc.dc_project.model.pojo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.time.LocalDateTime; +import lombok.Data; + +/** + * 岗位信息表 + * @TableName sys_position + */ +@TableName(value ="sys_position") +@Data +public class Position { + /** + * + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 岗位名 + */ + @TableField(value = "name") + private String name; + + /** + * 岗位所属站点 + */ + @TableField(value = "org_id") + private Long orgId; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + /** + * 创建时间 + */ + @TableField(value = "created_at") + private LocalDateTime createdAt; + + /** + * 更新时间 + */ + @TableField(value = "updated_at") + private LocalDateTime updatedAt; + + /** + * 逻辑删除标志（0=正常，1=删除） + */ + @TableField(value = "is_deleted") + private Integer isDeleted; + + @Override + public boolean equals(Object that) { + if (this == that) { + return true; + } + if (that == null) { + return false; + } + if (getClass() != that.getClass()) { + return false; + } + Position other = (Position) that; + return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())) + && (this.getOrgId() == null ? other.getOrgId() == null : this.getOrgId().equals(other.getOrgId())) + && (this.getRemark() == null ? other.getRemark() == null : this.getRemark().equals(other.getRemark())) + && (this.getCreatedAt() == null ? other.getCreatedAt() == null : this.getCreatedAt().equals(other.getCreatedAt())) + && (this.getUpdatedAt() == null ? other.getUpdatedAt() == null : this.getUpdatedAt().equals(other.getUpdatedAt())) + && (this.getIsDeleted() == null ? other.getIsDeleted() == null : this.getIsDeleted().equals(other.getIsDeleted())); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); + result = prime * result + ((getOrgId() == null) ? 0 : getOrgId().hashCode()); + result = prime * result + ((getRemark() == null) ? 0 : getRemark().hashCode()); + result = prime * result + ((getCreatedAt() == null) ? 0 : getCreatedAt().hashCode()); + result = prime * result + ((getUpdatedAt() == null) ? 0 : getUpdatedAt().hashCode()); + result = prime * result + ((getIsDeleted() == null) ? 0 : getIsDeleted().hashCode()); + return result; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", name=").append(name); + sb.append(", orgId=").append(orgId); + sb.append(", remark=").append(remark); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", isDeleted=").append(isDeleted); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/src/main/java/com/dc/dc_project/model/pojo/RecordEntrust.java b/src/main/java/com/dc/dc_project/model/pojo/RecordEntrust.java index 84f450a..7f55a65 100644 --- a/src/main/java/com/dc/dc_project/model/pojo/RecordEntrust.java +++ b/src/main/java/com/dc/dc_project/model/pojo/RecordEntrust.java @@ -39,6 +39,12 @@ public class RecordEntrust { @TableField(value = "client_name") private String clientName; + /** + * 委托类型（1=现场，2=室内） + */ + @TableField(value = "entrust_type") + private Integer entrustType; + /** * 创建时间 */ diff --git a/src/main/java/com/dc/dc_project/model/vo/PositionVo.java b/src/main/java/com/dc/dc_project/model/vo/PositionVo.java new file mode 100644 index 0000000..5318e9a --- /dev/null +++ b/src/main/java/com/dc/dc_project/model/vo/PositionVo.java @@ -0,0 +1,51 @@ +package com.dc.dc_project.model.vo; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 岗位信息表 + * @TableName sys_position + */ +@TableName(value ="sys_position") +@Data +public class PositionVo { + + private Long id; + + /** + * 岗位名 + */ + private String name; + + /** + * 岗位所属站点 + */ + private Long orgId; + + private String orgName; + + /** + * 备注 + */ + private String remark; + + /** + * 创建时间 + */ + private LocalDateTime createdAt; + + /** + * 更新时间 + */ + private LocalDateTime updatedAt; + + /** + * 逻辑删除标志（0=正常，1=删除） + */ + private Integer isDeleted; + + +} \ No newline at end of file diff --git a/src/main/java/com/dc/dc_project/model/vo/UserInfoVo.java b/src/main/java/com/dc/dc_project/model/vo/UserInfoVo.java index 9044b91..7a6a352 100644 --- a/src/main/java/com/dc/dc_project/model/vo/UserInfoVo.java +++ b/src/main/java/com/dc/dc_project/model/vo/UserInfoVo.java @@ -30,5 +30,5 @@ public class UserInfoVo { private List roles; - private OrgVo orgVo; + private List positionVos; } diff --git a/src/main/java/com/dc/dc_project/service/PositionService.java b/src/main/java/com/dc/dc_project/service/PositionService.java new file mode 100644 index 0000000..08cb0d6 --- /dev/null +++ b/src/main/java/com/dc/dc_project/service/PositionService.java @@ -0,0 +1,13 @@ +package com.dc.dc_project.service; + +import com.dc.dc_project.model.pojo.Position; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author ADMIN +* @description 针对表【sys_position(岗位信息表)】的数据库操作Service +* @createDate 2025-11-14 16:39:29 +*/ +public interface PositionService extends IService { + +} diff --git a/src/main/java/com/dc/dc_project/service/PositionServiceImpl.java b/src/main/java/com/dc/dc_project/service/PositionServiceImpl.java new file mode 100644 index 0000000..7a3da6b --- /dev/null +++ b/src/main/java/com/dc/dc_project/service/PositionServiceImpl.java @@ -0,0 +1,21 @@ +package com.dc.dc_project.service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.dc.dc_project.model.pojo.Position; +import com.dc.dc_project.mapper.PositionMapper; +import org.springframework.stereotype.Service; + +/** +* @author ADMIN +* @description 针对表【sys_position(岗位信息表)】的数据库操作Service实现 +* @createDate 2025-11-14 16:39:29 +*/ +@Service +public class PositionServiceImpl extends ServiceImpl + implements PositionService{ + +} + + + + diff --git a/src/main/java/com/dc/dc_project/service/impl/BigScreenServiceImpl.java b/src/main/java/com/dc/dc_project/service/impl/BigScreenServiceImpl.java index 8a904a6..afafcfb 100644 --- a/src/main/java/com/dc/dc_project/service/impl/BigScreenServiceImpl.java +++ b/src/main/java/com/dc/dc_project/service/impl/BigScreenServiceImpl.java @@ -40,8 +40,11 @@ public class BigScreenServiceImpl implements BigScreenService { BigScreenStatistics bigScreenStatistics = new BigScreenStatistics(); //试验室 bigScreenStatistics.setLaboratoryCount(laboratoryService.count()); + //设备 bigScreenStatistics.setDeviceCount(equipmentService.count()); + //人员 bigScreenStatistics.setPersonCount(personnelService.count()); + //工程数 bigScreenStatistics.setProjectCount(standardService.count()); bigScreenStatistics.setProjectBuildingCount(standardService.count()); bigScreenStatistics.setProjectCompletedCount(standardService.count()); diff --git a/src/main/java/com/dc/dc_project/service/impl/PersonnelOrgServiceImpl.java b/src/main/java/com/dc/dc_project/service/impl/PersonnelOrgServiceImpl.java new file mode 100644 index 0000000..66ad063 --- /dev/null +++ b/src/main/java/com/dc/dc_project/service/impl/PersonnelOrgServiceImpl.java @@ -0,0 +1,22 @@ +package com.dc.dc_project.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.dc.dc_project.mapper.PersonnelOrgMapper; +import com.dc.dc_project.model.pojo.PersonnelOrg; +import com.dc.dc_project.service.PersonnelOrgService; +import org.springframework.stereotype.Service; + +/** +* @author ADMIN +* @description 针对表【sys_personnel_org(角色-组织关系表)】的数据库操作Service实现 +* @createDate 2025-11-14 16:34:55 +*/ +@Service +public class PersonnelOrgServiceImpl extends ServiceImpl + implements PersonnelOrgService { + +} + + + + diff --git a/src/main/java/com/dc/dc_project/service/impl/UserServiceImpl.java b/src/main/java/com/dc/dc_project/service/impl/UserServiceImpl.java index 7a4a9d8..3184ca4 100644 --- a/src/main/java/com/dc/dc_project/service/impl/UserServiceImpl.java +++ b/src/main/java/com/dc/dc_project/service/impl/UserServiceImpl.java @@ -5,19 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dc.dc_project.common.ResponseResult; import com.dc.dc_project.common.ResultCode; -import com.dc.dc_project.mapper.OrgMapper; -import com.dc.dc_project.mapper.PersonnelMapper; -import com.dc.dc_project.mapper.RoleMapper; +import com.dc.dc_project.mapper.*; import com.dc.dc_project.model.dto.user.LoginDto; -import com.dc.dc_project.model.pojo.Personnel; -import com.dc.dc_project.model.pojo.RecordResult; -import com.dc.dc_project.model.pojo.Role; -import com.dc.dc_project.model.pojo.User; +import com.dc.dc_project.model.pojo.*; import com.dc.dc_project.model.vo.PersonnelVo; +import com.dc.dc_project.model.vo.PositionVo; import com.dc.dc_project.model.vo.UserInfoVo; import com.dc.dc_project.service.PersonnelService; import com.dc.dc_project.service.UserService; -import com.dc.dc_project.mapper.UserMapper; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -42,6 +37,7 @@ public class UserServiceImpl extends ServiceImpl private final PersonnelService personnelService; private final OrgMapper orgMapper; private final RoleMapper roleMapper; + private final PositionMapper positionMapper; @Override public ResponseResult login(LoginDto loginDto) { @@ -86,6 +82,7 @@ public class UserServiceImpl extends ServiceImpl User user = baseMapper.selectOne(queryWrapper); Personnel personnel = personnelMapper.selectOne(new LambdaQueryWrapper().eq(Personnel::getUserId, user.getId())); List roles = roleMapper.getRolesByUserId(user.getId()); + List positions = positionMapper.getPositionsByPId(personnel.getId()); UserInfoVo userInfoVo = new UserInfoVo(); diff --git a/src/main/resources/mapper/PersonnelOrgMapper.xml b/src/main/resources/mapper/PersonnelOrgMapper.xml index fa269bb..cbf9a52 100644 --- a/src/main/resources/mapper/PersonnelOrgMapper.xml +++ b/src/main/resources/mapper/PersonnelOrgMapper.xml @@ -4,8 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - id,role_id,org_id,created_at,created_by + id,personnel_id,org_id,created_at,created_by diff --git a/src/main/resources/mapper/PositionMapper.xml b/src/main/resources/mapper/PositionMapper.xml new file mode 100644 index 0000000..f408459 --- /dev/null +++ b/src/main/resources/mapper/PositionMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + id,name,org_id,remark,created_at,updated_at, + is_deleted + + +