diff --git a/policeSecurityServer/src/main/java/com/changhu/common/db/enums/EducationLevel.java b/policeSecurityServer/src/main/java/com/changhu/common/db/enums/EducationLevel.java new file mode 100644 index 0000000..d10f2a8 --- /dev/null +++ b/policeSecurityServer/src/main/java/com/changhu/common/db/enums/EducationLevel.java @@ -0,0 +1,25 @@ +package com.changhu.common.db.enums; + +import com.baomidou.mybatisplus.annotation.IEnum; +import com.changhu.common.db.BaseEnum; +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @author 20252 + * @createTime 2024/12/19 上午9:31 + * @desc EducationLevel... + */ +@Getter +@AllArgsConstructor +public enum EducationLevel implements BaseEnum, IEnum { + PRIMARY_SCHOOL("primary_school", "小学"), + JUNIOR_SCHOOL("junior_school", "初中"), + HIGH_SCHOOL("high_school", "高中"), + COLLEGE("college", "大专"), + UNDERGRADUATE("undergraduate", "本科"), + UNDERGRADUATE_MORE("undergraduate_more", "本科以上"), + ; + private final String value; + private final String label; +} diff --git a/policeSecurityServer/src/main/java/com/changhu/controller/OpenController.java b/policeSecurityServer/src/main/java/com/changhu/controller/OpenController.java index 9deb25a..84b017f 100644 --- a/policeSecurityServer/src/main/java/com/changhu/controller/OpenController.java +++ b/policeSecurityServer/src/main/java/com/changhu/controller/OpenController.java @@ -68,4 +68,11 @@ public class OpenController { return openApiService.securityUserRoster(id, type); } + @Operation(summary = "单位下的安保人员花名册") + @GetMapping("/unitSecurityUserRoster") + public List unitSecurityUserRoster(@Schema(description = "代码") @RequestParam String code, + @Schema(description = "等级") @RequestParam Integer level) { + return openApiService.unitSecurityUserRoster(code, level); + } + } diff --git a/policeSecurityServer/src/main/java/com/changhu/mapper/OpenApiMapper.java b/policeSecurityServer/src/main/java/com/changhu/mapper/OpenApiMapper.java index 863abb5..2af7abe 100644 --- a/policeSecurityServer/src/main/java/com/changhu/mapper/OpenApiMapper.java +++ b/policeSecurityServer/src/main/java/com/changhu/mapper/OpenApiMapper.java @@ -51,4 +51,9 @@ public interface OpenApiMapper { */ List securityUserRoster(@Param("id") Long id, @Param("type") EnterprisesUnitOrServiceProjectType type); + + /** + * 单位下的服务人员花名册 + */ + List unitSecurityUserRoster(String code, Integer level); } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/params/SecurityUserSaveOrUpdateParams.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/params/SecurityUserSaveOrUpdateParams.java index ca6da0b..3f5f559 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/params/SecurityUserSaveOrUpdateParams.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/params/SecurityUserSaveOrUpdateParams.java @@ -1,5 +1,6 @@ package com.changhu.module.miniProgram.pojo.params; +import com.changhu.common.db.enums.EducationLevel; import com.changhu.common.db.enums.Sex; import com.changhu.common.validator.annotation.IdCard; import io.swagger.v3.oas.annotations.media.Schema; @@ -66,4 +67,8 @@ public class SecurityUserSaveOrUpdateParams { @Schema(description = "备注") private String remark; + @NotNull(message = "文化程度为必选") + @Schema(description = "文化程度") + private EducationLevel educationLevel; + } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/vo/ServiceProjectSecurityUserPagerVo.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/vo/ServiceProjectSecurityUserPagerVo.java index ba17501..f0ed815 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/vo/ServiceProjectSecurityUserPagerVo.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/vo/ServiceProjectSecurityUserPagerVo.java @@ -2,6 +2,7 @@ package com.changhu.module.miniProgram.pojo.vo; import cn.hutool.core.util.DesensitizedUtil; import com.changhu.common.annotation.Desensitized; +import com.changhu.common.db.enums.EducationLevel; import com.changhu.common.db.enums.Sex; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -63,6 +64,9 @@ public class ServiceProjectSecurityUserPagerVo { @Schema(description = "备注") private String remark; + @Schema(description = "文化程度") + private EducationLevel educationLevel; + @Schema(description = "创建时间") private LocalDateTime createTime; } diff --git a/policeSecurityServer/src/main/java/com/changhu/pojo/dto/SecurityUserRosterDTO.java b/policeSecurityServer/src/main/java/com/changhu/pojo/dto/SecurityUserRosterDTO.java index 1f5ad27..d1346c7 100644 --- a/policeSecurityServer/src/main/java/com/changhu/pojo/dto/SecurityUserRosterDTO.java +++ b/policeSecurityServer/src/main/java/com/changhu/pojo/dto/SecurityUserRosterDTO.java @@ -1,8 +1,11 @@ package com.changhu.pojo.dto; import cn.hutool.core.util.DesensitizedUtil; +import com.alibaba.fastjson2.annotation.JSONField; import com.changhu.common.annotation.Desensitized; +import com.changhu.common.db.enums.EducationLevel; import com.changhu.common.db.enums.Sex; +import com.changhu.support.fastjson2.serializer.MinioPrefixSerializer; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -15,6 +18,9 @@ import lombok.Data; public class SecurityUserRosterDTO { @Schema(description = "id") private Long snowFlakeId; + @Schema(description = "照片") + @JSONField(serializeUsing = MinioPrefixSerializer.class) + private String photo; @Schema(description = "名称") private String name; @Schema(description = "性别") @@ -33,4 +39,6 @@ public class SecurityUserRosterDTO { private String securityUnitName; @Schema(description = "保安证号") private String securityNumber; + @Schema(description = "文化程度") + private EducationLevel educationLevel; } diff --git a/policeSecurityServer/src/main/java/com/changhu/pojo/entity/SecurityUser.java b/policeSecurityServer/src/main/java/com/changhu/pojo/entity/SecurityUser.java index 9b64cfc..18d0b3c 100644 --- a/policeSecurityServer/src/main/java/com/changhu/pojo/entity/SecurityUser.java +++ b/policeSecurityServer/src/main/java/com/changhu/pojo/entity/SecurityUser.java @@ -1,6 +1,7 @@ package com.changhu.pojo.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.changhu.common.db.enums.EducationLevel; import com.changhu.common.db.enums.Sex; import com.changhu.support.mybatisplus.pojo.entity.BaseEntity; import lombok.AllArgsConstructor; @@ -99,5 +100,9 @@ public class SecurityUser extends BaseEntity implements Serializable { */ private String remark; + /** + * 文化程度 + */ + private EducationLevel educationLevel; } diff --git a/policeSecurityServer/src/main/java/com/changhu/service/OpenApiService.java b/policeSecurityServer/src/main/java/com/changhu/service/OpenApiService.java index 41b8be9..b98b0af 100644 --- a/policeSecurityServer/src/main/java/com/changhu/service/OpenApiService.java +++ b/policeSecurityServer/src/main/java/com/changhu/service/OpenApiService.java @@ -56,4 +56,9 @@ public interface OpenApiService { * @return 花名册 */ List securityUserRoster(Long id, EnterprisesUnitOrServiceProjectType type); + + /** + * 单位下的安保人员花名册 + */ + List unitSecurityUserRoster(String code, Integer level); } diff --git a/policeSecurityServer/src/main/java/com/changhu/service/impl/OpenApiServiceImpl.java b/policeSecurityServer/src/main/java/com/changhu/service/impl/OpenApiServiceImpl.java index 83663cb..4633f45 100644 --- a/policeSecurityServer/src/main/java/com/changhu/service/impl/OpenApiServiceImpl.java +++ b/policeSecurityServer/src/main/java/com/changhu/service/impl/OpenApiServiceImpl.java @@ -123,4 +123,10 @@ public class OpenApiServiceImpl implements OpenApiService { public List securityUserRoster(Long id, EnterprisesUnitOrServiceProjectType type) { return openApiMapper.securityUserRoster(id, type); } + + @Override + public List unitSecurityUserRoster(String code, Integer level) { + return openApiMapper.unitSecurityUserRoster(code, level); + + } } diff --git a/policeSecurityServer/src/main/resources/mapper/OpenApiMapper.xml b/policeSecurityServer/src/main/resources/mapper/OpenApiMapper.xml index 96b6cba..450b185 100644 --- a/policeSecurityServer/src/main/resources/mapper/OpenApiMapper.xml +++ b/policeSecurityServer/src/main/resources/mapper/OpenApiMapper.xml @@ -166,6 +166,7 @@ select su.snow_flake_id, su.name, su.sex, + su.photo, TIMESTAMPDIFF(YEAR, su.date_of_birth, CURDATE()) AS 'age', su.id_card, su.telephone, @@ -190,4 +191,40 @@ order by su.create_time desc + \ No newline at end of file