From 481dac01739cbc28a25110fb175f997c22000923 Mon Sep 17 00:00:00 2001 From: TimSpan Date: Fri, 13 Sep 2024 14:45:56 +0800 Subject: [PATCH 1/4] ... --- .DS_Store | Bin 8196 -> 8196 bytes .../pages/policeDetails/index.config.ts | 0 .../subPages/pages/policeDetails/index.scss | 0 .../subPages/pages/policeDetails/index.vue | 0 .../subPages/pages/policeManager/index.vue | 12 +++++++++++- 5 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 collect_information/src/subPages/pages/policeDetails/index.config.ts create mode 100644 collect_information/src/subPages/pages/policeDetails/index.scss create mode 100644 collect_information/src/subPages/pages/policeDetails/index.vue diff --git a/.DS_Store b/.DS_Store index 78de2980e1212242d7c191d55842f41621754d53..70e93d6fe30dad502ef8ca724c95d94ccd9bdc06 100644 GIT binary patch delta 162 zcmZp1XmQw}DiEjak;A~iz`~%%kj{|FP?DSP;*yk;p9B=+SXjRH!$;3!j;Qh}c;yQ+ z41<&Na|?ia7#QLYY;G1f#>D)P<jVe@<8ct)n*)sq86 R*D-$B{9n|c9ht|<1OP-7H4Xp( delta 171 zcmZp1XmQw}DiEi*bsqx*0}F#5LpnnyLrHGFi%U{YeiBfO!z%m0qMaVc98u*{@X8lt z7zQWj=N16D*KY4_w0!YY#sgk3m3bi5G`azEw>7I+}c$GBkgd*OIS XrrYI{14P#`9@zX})Sn%h$I1i%?_4*} diff --git a/collect_information/src/subPages/pages/policeDetails/index.config.ts b/collect_information/src/subPages/pages/policeDetails/index.config.ts new file mode 100644 index 0000000..e69de29 diff --git a/collect_information/src/subPages/pages/policeDetails/index.scss b/collect_information/src/subPages/pages/policeDetails/index.scss new file mode 100644 index 0000000..e69de29 diff --git a/collect_information/src/subPages/pages/policeDetails/index.vue b/collect_information/src/subPages/pages/policeDetails/index.vue new file mode 100644 index 0000000..e69de29 diff --git a/collect_information/src/subPages/pages/policeManager/index.vue b/collect_information/src/subPages/pages/policeManager/index.vue index f299bd0..93b8ae2 100644 --- a/collect_information/src/subPages/pages/policeManager/index.vue +++ b/collect_information/src/subPages/pages/policeManager/index.vue @@ -13,7 +13,9 @@ 电话：{{ item?.contactPersonInfo.telephone }} - {{ items.name }} + + {{ items.name }} + @@ -35,6 +37,14 @@ const getMyServiceProject = async () => { myProjectList.value = resp.data console.log(resp.data) } + +const projectClick = (items: ServiceProjectList, name: string) => { + console.log(name, JSON.stringify(items)) + Taro.navigateTo({ + + url: `/subPages/pages/projectDetails/projectDetails?name=${name}&item=${JSON.stringify(items)}`, + }) +} onMounted(async () => { await getMyServiceProject() }) From 2a9aecffc3856c08d2e832b2b15331cf5e28e69a Mon Sep 17 00:00:00 2001 From: TimSpan Date: Fri, 13 Sep 2024 14:59:59 +0800 Subject: [PATCH 2/4] ... --- collect_information/src/app.config.ts | 2 + .../pages/policeDetails/index.config.ts | 4 + .../subPages/pages/policeDetails/index.scss | 53 +++++++ .../subPages/pages/policeDetails/index.vue | 139 ++++++++++++++++++ .../subPages/pages/policeManager/index.vue | 2 +- 5 files changed, 199 insertions(+), 1 deletion(-) diff --git a/collect_information/src/app.config.ts b/collect_information/src/app.config.ts index 84fbadb..52ab2a9 100644 --- a/collect_information/src/app.config.ts +++ b/collect_information/src/app.config.ts @@ -19,6 +19,8 @@ export default defineAppConfig({ root: "subPages", pages: [ 'pages/policeManager/index', + 'pages/policeDetails/index', + 'pages/myProject/myProject', 'pages/projectDetails/projectDetails', 'pages/form/form' diff --git a/collect_information/src/subPages/pages/policeDetails/index.config.ts b/collect_information/src/subPages/pages/policeDetails/index.config.ts index e69de29..c155561 100644 --- a/collect_information/src/subPages/pages/policeDetails/index.config.ts +++ b/collect_information/src/subPages/pages/policeDetails/index.config.ts @@ -0,0 +1,4 @@ +export default definePageConfig({ + navigationBarTitleText: '项目详情', + +}) diff --git a/collect_information/src/subPages/pages/policeDetails/index.scss b/collect_information/src/subPages/pages/policeDetails/index.scss index e69de29..b495b04 100644 --- a/collect_information/src/subPages/pages/policeDetails/index.scss +++ b/collect_information/src/subPages/pages/policeDetails/index.scss @@ -0,0 +1,53 @@ +.projectDetails{ + height: 100vh; + overflow: hidden; + background: #f1f1f1; + display: flex; + flex-direction: column; + .projectDetailsItem{ + height: 18%; + margin: 20px; + border-radius: 10px; + background: #ffffff; + padding: 15px; + font-size: 28px; + line-height: 65px; + color: #333333; + .projectDetailsIndex{ + .content{ + color: #9b9b9f; + } + } + } + .projectDetailsTableDrop{ + height: 80%; + .projectDetailsTable{ + margin: 20px; + border-radius: 10px; + background: #ffffff; + padding: 15px; + font-size: 28px; + line-height: 50px; + color: #333333; + .projectDetailsTableItem{ + //display: flex; + justify-content: space-between; + align-items: center; + flex-wrap: wrap; + font-size: 24px; + margin-bottom: 15px + } + } + } + .projectDetailsButton{ + position: fixed; + bottom: 19px; + display: flex; + -webkit-justify-content: space-around; + margin-bottom: 10rpx; + right: 0; + width: 100%; + } +} + + diff --git a/collect_information/src/subPages/pages/policeDetails/index.vue b/collect_information/src/subPages/pages/policeDetails/index.vue index e69de29..c01f8af 100644 --- a/collect_information/src/subPages/pages/policeDetails/index.vue +++ b/collect_information/src/subPages/pages/policeDetails/index.vue @@ -0,0 +1,139 @@ + + + diff --git a/collect_information/src/subPages/pages/policeManager/index.vue b/collect_information/src/subPages/pages/policeManager/index.vue index 4abe0cf..f48865c 100644 --- a/collect_information/src/subPages/pages/policeManager/index.vue +++ b/collect_information/src/subPages/pages/policeManager/index.vue @@ -42,7 +42,7 @@ const projectClick = (items: ServiceProjectList, name: string) => { console.log(name, JSON.stringify(items)) Taro.navigateTo({ - url: `/subPages/pages/projectDetails/projectDetails?name=${name}&item=${JSON.stringify(items)}`, + url: `/subPages/pages/policeDetails/index?name=${name}&item=${JSON.stringify(items)}`, }) } onMounted(async () => { From a2da7db75748d320d3ea8eeb0bc8af7df9a8b698 Mon Sep 17 00:00:00 2001 From: TimSpan Date: Fri, 13 Sep 2024 15:13:16 +0800 Subject: [PATCH 3/4] ... --- collect_information/src/app.config.ts | 1 - .../src/subPages/pages/policeDetails/index.vue | 6 ------ 2 files changed, 7 deletions(-) diff --git a/collect_information/src/app.config.ts b/collect_information/src/app.config.ts index 52ab2a9..32cd338 100644 --- a/collect_information/src/app.config.ts +++ b/collect_information/src/app.config.ts @@ -12,7 +12,6 @@ export default defineAppConfig({ navigationBarBackgroundColor: '#4e87ff', navigationBarTitleText: '', navigationBarTextStyle:'white', - backgroundColor: "#008080" }, subpackages: [ { diff --git a/collect_information/src/subPages/pages/policeDetails/index.vue b/collect_information/src/subPages/pages/policeDetails/index.vue index c01f8af..fd91676 100644 --- a/collect_information/src/subPages/pages/policeDetails/index.vue +++ b/collect_information/src/subPages/pages/policeDetails/index.vue @@ -59,7 +59,6 @@ - @@ -120,8 +119,6 @@ const lower = (e) => { current.value = current.value + 1 projectDetailsTable() } - - } // 自定义下拉刷新被触发 const onRefresherRefresh = (e) => { @@ -133,7 +130,4 @@ const onRefresherRefresh = (e) => { projectDetailsTable() } - From 366adf8e02f095c1df8f5f81f970501f09bb0e6b Mon Sep 17 00:00:00 2001 From: luozhun <2025254074@qq.com> Date: Fri, 13 Sep 2024 15:19:16 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MiniProgramUserController.java | 10 ++ .../ProjectManageIndexController.java | 17 +++- .../mapper/SecurityUserMapper.java | 27 ++++++ .../miniProgram/pojo/entity/SecurityUser.java | 92 +++++++++++++++++++ .../SaveOrUpdateSecurityUserParams.java | 62 +++++++++++++ ...ceProjectSecurityUserPagerQueryParams.java | 15 +++ .../vo/ServiceProjectSecurityUserPagerVo.java | 60 ++++++++++++ .../service/MiniProgramUserService.java | 12 +++ .../service/ProjectManageIndexService.java | 15 +++ .../service/SecurityUserService.java | 13 +++ .../impl/MiniProgramUserServiceImpl.java | 14 +++ .../impl/ProjectManageIndexServiceImpl.java | 50 ++++++++++ .../service/impl/SecurityUserServiceImpl.java | 17 ++++ .../resources/mapper/SecurityUserMapper.xml | 14 +++ 14 files changed, 416 insertions(+), 2 deletions(-) create mode 100644 policeSecurityServer/src/main/java/com/changhu/module/miniProgram/mapper/SecurityUserMapper.java create mode 100644 policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/entity/SecurityUser.java create mode 100644 policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/params/SaveOrUpdateSecurityUserParams.java create mode 100644 policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/queryParams/ServiceProjectSecurityUserPagerQueryParams.java create mode 100644 policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/vo/ServiceProjectSecurityUserPagerVo.java create mode 100644 policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/SecurityUserService.java create mode 100644 policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/SecurityUserServiceImpl.java create mode 100644 policeSecurityServer/src/main/resources/mapper/SecurityUserMapper.xml diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/controller/MiniProgramUserController.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/controller/MiniProgramUserController.java index c540f55..93e67d8 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/controller/MiniProgramUserController.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/controller/MiniProgramUserController.java @@ -1,8 +1,12 @@ package com.changhu.module.miniProgram.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.changhu.common.annotation.JsonBody; import com.changhu.module.miniProgram.pojo.params.MiniProgramUserRegisterParams; +import com.changhu.module.miniProgram.pojo.queryParams.ServiceProjectSecurityUserPagerQueryParams; +import com.changhu.module.miniProgram.pojo.vo.ServiceProjectSecurityUserPagerVo; import com.changhu.module.miniProgram.service.MiniProgramUserService; +import com.changhu.support.mybatisplus.pojo.params.PageParams; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; @@ -29,4 +33,10 @@ public class MiniProgramUserController { public void register(@RequestBody @Valid MiniProgramUserRegisterParams params) { miniProgramUserService.register(params); } + + @Operation(summary = "服务项目保安人员分页") + @PostMapping("/securityUserPager") + public Page securityUserPager(@RequestBody PageParams queryParams) { + return miniProgramUserService.securityUserPager(queryParams); + } } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/controller/ProjectManageIndexController.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/controller/ProjectManageIndexController.java index 9be9dea..9419b3a 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/controller/ProjectManageIndexController.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/controller/ProjectManageIndexController.java @@ -3,13 +3,14 @@ package com.changhu.module.miniProgram.controller; import com.changhu.common.annotation.CheckUserType; import com.changhu.common.annotation.JsonBody; import com.changhu.common.annotation.UserType; +import com.changhu.module.miniProgram.pojo.params.SaveOrUpdateSecurityUserParams; import com.changhu.module.miniProgram.pojo.vo.IndexServiceProjectListVo; import com.changhu.module.miniProgram.service.ProjectManageIndexService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; 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.*; import java.util.List; @@ -32,4 +33,16 @@ public class ProjectManageIndexController { public List getMyServiceProjectList() { return projectManageIndexService.getMyServiceProjectList(); } + + @Operation(summary = "根据id删除保安人员") + @DeleteMapping("/deleteSecurityUserByServiceProjectId") + public void deleteSecurityUserById(@RequestParam @Schema(description = "保安人员id") Long securityUserId) { + projectManageIndexService.deleteSecurityUserByServiceProjectId(securityUserId); + } + + @Operation(summary = "保存或更新保安人员") + @PostMapping("/saveOrUpdateSecurityUser") + public void saveOrUpdateSecurityUser(@RequestBody SaveOrUpdateSecurityUserParams params) { + projectManageIndexService.saveOrUpdateSecurityUser(params); + } } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/mapper/SecurityUserMapper.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/mapper/SecurityUserMapper.java new file mode 100644 index 0000000..52472a8 --- /dev/null +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/mapper/SecurityUserMapper.java @@ -0,0 +1,27 @@ +package com.changhu.module.miniProgram.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.changhu.module.miniProgram.pojo.entity.SecurityUser; +import com.changhu.module.miniProgram.pojo.queryParams.ServiceProjectSecurityUserPagerQueryParams; +import com.changhu.module.miniProgram.pojo.vo.ServiceProjectSecurityUserPagerVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * security_user (保安人员) 固化类 + * author: luozhun + * desc 由groovy脚本自动生成 + */ +@Mapper +public interface SecurityUserMapper extends BaseMapper { + /** + * 服务项目内的保安人员分页 + * + * @param page 分页对象 + * @param params 查询参数 + * @return 人员 + */ + Page securityUserPager(@Param("page") Page page, + @Param("params") ServiceProjectSecurityUserPagerQueryParams params); +} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/entity/SecurityUser.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/entity/SecurityUser.java new file mode 100644 index 0000000..76e5d91 --- /dev/null +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/entity/SecurityUser.java @@ -0,0 +1,92 @@ +package com.changhu.module.miniProgram.pojo.entity; + +import java.io.Serial; +import java.io.Serializable; + +import com.changhu.support.mybatisplus.pojo.entity.BaseEntity; +import lombok.Data; +import lombok.AllArgsConstructor; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import lombok.EqualsAndHashCode; +import com.baomidou.mybatisplus.annotation.TableName; + + +/** + * 保安人员 实体类 + * author: luozhun + * desc 由groovy脚本自动生成 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +@EqualsAndHashCode(callSuper = true) +@TableName(autoResultMap = true) +public class SecurityUser extends BaseEntity implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 所属保安单位id + */ + private Long securityUnitId; + + /** + * 服务项目id + */ + private Long serviceProjectId; + + /** + * 名称 + */ + private String name; + + /** + * 手机号 + */ + private String telephone; + + /** + * 工作岗位 + */ + private String workPost; + + /** + * 性别 + */ + private Integer sex; + + /** + * 籍贯 + */ + private String nativePlace; + + /** + * 身份证 + */ + private String idCard; + + /** + * 出生日期 + */ + private java.time.LocalDate dateOfBirth; + + /** + * 保安证号 + */ + private String securityNumber; + + /** + * 家庭住址 + */ + private String homeAddress; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/params/SaveOrUpdateSecurityUserParams.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/params/SaveOrUpdateSecurityUserParams.java new file mode 100644 index 0000000..34ef398 --- /dev/null +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/params/SaveOrUpdateSecurityUserParams.java @@ -0,0 +1,62 @@ +package com.changhu.module.miniProgram.pojo.params; + +import com.changhu.common.db.enums.Sex; +import com.changhu.common.validator.annotation.IdCard; +import com.changhu.common.validator.annotation.IsMobile; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + + +/** + * @author 20252 + * @createTime 2024/9/12 上午9:57 + * @desc SaveOrUpdateSecurityUserParams... + */ +@Data +public class SaveOrUpdateSecurityUserParams { + @Schema(description = "id") + private Long snowFlakeId; + + @NotNull(message = "服务项目不能为空") + @Schema(description = "服务项目id") + private Long serviceProjectId; + + @NotBlank(message = "名字不能为空") + @Schema(description = "名称") + private String name; + + @NotBlank(message = "手机号不能为空") + @IsMobile + @Schema(description = "手机号") + private String telephone; + + @Schema(description = "工作岗位") + private String workPost; + + @NotNull(message = "性别不能为空") + @Schema(description = "性别") + private Sex sex; + + @Schema(description = "籍贯") + private String nativePlace; + + @NotBlank(message = "身份证不能为空") + @IdCard + @Schema(description = "身份证") + private String idCard; + + @Schema(description = "出生日期") + private java.time.LocalDate dateOfBirth; + + @Schema(description = "保安证号") + private String securityNumber; + + @Schema(description = "家庭住址") + private String homeAddress; + + @Schema(description = "备注") + private String remark; + +} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/queryParams/ServiceProjectSecurityUserPagerQueryParams.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/queryParams/ServiceProjectSecurityUserPagerQueryParams.java new file mode 100644 index 0000000..eecba3c --- /dev/null +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/queryParams/ServiceProjectSecurityUserPagerQueryParams.java @@ -0,0 +1,15 @@ +package com.changhu.module.miniProgram.pojo.queryParams; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * @author 20252 + * @createTime 2024/9/12 上午9:41 + * @desc ServiceProjectSecurityUserPagerQueryParams... + */ +@Data +public class ServiceProjectSecurityUserPagerQueryParams { + @Schema(description = "服务项目id") + private Long serviceProjectId; +} 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 new file mode 100644 index 0000000..0dc1a84 --- /dev/null +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/vo/ServiceProjectSecurityUserPagerVo.java @@ -0,0 +1,60 @@ +package com.changhu.module.miniProgram.pojo.vo; + +import com.changhu.common.db.enums.Sex; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * @author 20252 + * @createTime 2024/9/12 上午9:41 + * @desc ServiceProjectSecurityUserPagerVo... + */ +@Data +public class ServiceProjectSecurityUserPagerVo { + @Schema(description = "id") + private Long snowFlakeId; + + @Schema(description = "所属保安单位id") + private Long securityUnitId; + @Schema(description = "保安单位名字") + private String securityUnitName; + + @Schema(description = "服务项目id") + private Long serviceProjectId; + + @Schema(description = "名称") + private String name; + + @Schema(description = "手机号") + private String telephone; + ; + + @Schema(description = "工作岗位") + private String workPost; + + @Schema(description = "性别") + private Sex sex; + + @Schema(description = "籍贯") + private String nativePlace; + + @Schema(description = "身份证") + private String idCard; + + @Schema(description = "出生日期") + private java.time.LocalDate dateOfBirth; + + @Schema(description = "保安证号") + private String securityNumber; + + @Schema(description = "家庭住址") + private String homeAddress; + + @Schema(description = "备注") + private String remark; + + @Schema(description = "创建时间") + private LocalDateTime createTime; +} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/MiniProgramUserService.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/MiniProgramUserService.java index 454c4ed..536d1ed 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/MiniProgramUserService.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/MiniProgramUserService.java @@ -1,8 +1,12 @@ package com.changhu.module.miniProgram.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.changhu.module.miniProgram.pojo.entity.MiniProgramUser; import com.changhu.module.miniProgram.pojo.params.MiniProgramUserRegisterParams; +import com.changhu.module.miniProgram.pojo.queryParams.ServiceProjectSecurityUserPagerQueryParams; +import com.changhu.module.miniProgram.pojo.vo.ServiceProjectSecurityUserPagerVo; +import com.changhu.support.mybatisplus.pojo.params.PageParams; /** * mini_program_user (小程序用户) 服务类 @@ -17,4 +21,12 @@ public interface MiniProgramUserService extends IService { * @param params 参数 */ void register(MiniProgramUserRegisterParams params); + + /** + * 服务项目内的保安人员分页 + * + * @param queryParams 查询参数 + * @return 保安人员 + */ + Page securityUserPager(PageParams queryParams); } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/ProjectManageIndexService.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/ProjectManageIndexService.java index 158ef7c..ca365ee 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/ProjectManageIndexService.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/ProjectManageIndexService.java @@ -1,5 +1,6 @@ package com.changhu.module.miniProgram.service; +import com.changhu.module.miniProgram.pojo.params.SaveOrUpdateSecurityUserParams; import com.changhu.module.miniProgram.pojo.vo.IndexServiceProjectListVo; import java.util.List; @@ -16,4 +17,18 @@ public interface ProjectManageIndexService { * @return 服务项目列表 */ List getMyServiceProjectList(); + + /** + * 根据id删除保安人员 + * + * @param securityUserId 保安人员id + */ + void deleteSecurityUserByServiceProjectId(Long securityUserId); + + /** + * 保存或更新保安人员 + * + * @param params 保安人员参数 + */ + void saveOrUpdateSecurityUser(SaveOrUpdateSecurityUserParams params); } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/SecurityUserService.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/SecurityUserService.java new file mode 100644 index 0000000..208698b --- /dev/null +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/SecurityUserService.java @@ -0,0 +1,13 @@ +package com.changhu.module.miniProgram.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.changhu.module.miniProgram.pojo.entity.SecurityUser; + +/** + * security_user (保安人员) 服务类 + * author: luozhun + * desc 由groovy脚本自动生成 + */ +public interface SecurityUserService extends IService { + +} diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/MiniProgramUserServiceImpl.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/MiniProgramUserServiceImpl.java index 28efb2d..0c9b091 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/MiniProgramUserServiceImpl.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/MiniProgramUserServiceImpl.java @@ -4,13 +4,19 @@ import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.changhu.common.exception.MessageException; import com.changhu.common.utils.SnowFlakeIdUtil; import com.changhu.module.miniProgram.mapper.MiniProgramUserMapper; +import com.changhu.module.miniProgram.mapper.SecurityUserMapper; import com.changhu.module.miniProgram.pojo.entity.MiniProgramUser; +import com.changhu.module.miniProgram.pojo.entity.SecurityUser; import com.changhu.module.miniProgram.pojo.params.MiniProgramUserRegisterParams; +import com.changhu.module.miniProgram.pojo.queryParams.ServiceProjectSecurityUserPagerQueryParams; +import com.changhu.module.miniProgram.pojo.vo.ServiceProjectSecurityUserPagerVo; import com.changhu.module.miniProgram.service.MiniProgramUserService; +import com.changhu.support.mybatisplus.pojo.params.PageParams; import me.chanjar.weixin.common.error.WxErrorException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,6 +32,9 @@ public class MiniProgramUserServiceImpl extends ServiceImpl securityUserPager(PageParams queryParams) { + return securityUserMapper.securityUserPager(queryParams.getPage(), queryParams.getParams()); + } } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/ProjectManageIndexServiceImpl.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/ProjectManageIndexServiceImpl.java index 65231c1..50f784e 100644 --- a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/ProjectManageIndexServiceImpl.java +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/ProjectManageIndexServiceImpl.java @@ -1,13 +1,20 @@ package com.changhu.module.miniProgram.service.impl; +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.extension.toolkit.Db; +import com.changhu.common.exception.MessageException; import com.changhu.common.utils.UserUtil; import com.changhu.module.management.mapper.ServiceProjectMapper; +import com.changhu.module.miniProgram.pojo.entity.SecurityUser; +import com.changhu.module.miniProgram.pojo.params.SaveOrUpdateSecurityUserParams; import com.changhu.module.miniProgram.pojo.vo.IndexServiceProjectListVo; import com.changhu.module.miniProgram.service.ProjectManageIndexService; +import com.changhu.support.mybatisplus.pojo.entity.BaseEntity; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Optional; /** * @author 20252 @@ -24,4 +31,47 @@ public class ProjectManageIndexServiceImpl implements ProjectManageIndexService public List getMyServiceProjectList() { return serviceProjectMapper.getServiceProjectList(null, UserUtil.getUserId()); } + + @Override + public void deleteSecurityUserByServiceProjectId(Long securityUserId) { + boolean b = Db.removeById(securityUserId, SecurityUser.class); + if (!b) { + throw new MessageException(); + } + } + + @Override + public void saveOrUpdateSecurityUser(SaveOrUpdateSecurityUserParams params) { + SecurityUser securityUser = BeanUtil.copyProperties(params, SecurityUser.class); + //填充保安单位 + securityUser.setSecurityUnitId(UserUtil.getUnitId()); + //新增的情况 + Long snowFlakeId = securityUser.getSnowFlakeId(); + if (snowFlakeId == null) { + //判断是否已经存在 + boolean exists = Db.lambdaQuery(SecurityUser.class) + .eq(SecurityUser::getServiceProjectId, securityUser.getServiceProjectId()) + .eq(SecurityUser::getIdCard, securityUser.getIdCard()) + .exists(); + if (exists) { + throw new MessageException("服务项目下已经存在该人员"); + } + } else { + //如果修改了身份证 需要查重 + SecurityUser byId = Db.getById(snowFlakeId, SecurityUser.class); + if (!securityUser.getIdCard().equals(byId.getIdCard())) { + boolean exists = Db.lambdaQuery(SecurityUser.class) + .eq(SecurityUser::getServiceProjectId, securityUser.getServiceProjectId()) + .eq(SecurityUser::getIdCard, securityUser.getIdCard()) + .exists(); + if (exists) { + throw new MessageException("服务项目下已经存在该人员"); + } + } + } + boolean b = Db.saveOrUpdate(securityUser); + if (!b) { + throw new MessageException(); + } + } } diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/SecurityUserServiceImpl.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/SecurityUserServiceImpl.java new file mode 100644 index 0000000..e7c7be0 --- /dev/null +++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/SecurityUserServiceImpl.java @@ -0,0 +1,17 @@ +package com.changhu.module.miniProgram.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.changhu.module.miniProgram.mapper.SecurityUserMapper; +import com.changhu.module.miniProgram.pojo.entity.SecurityUser; +import com.changhu.module.miniProgram.service.SecurityUserService; +import org.springframework.stereotype.Service; + +/** + * security_user (保安人员) 服务实现类 + * author: luozhun + * desc 由groovy脚本自动生成 + */ +@Service +public class SecurityUserServiceImpl extends ServiceImpl implements SecurityUserService { + +} diff --git a/policeSecurityServer/src/main/resources/mapper/SecurityUserMapper.xml b/policeSecurityServer/src/main/resources/mapper/SecurityUserMapper.xml new file mode 100644 index 0000000..81f0f8e --- /dev/null +++ b/policeSecurityServer/src/main/resources/mapper/SecurityUserMapper.xml @@ -0,0 +1,14 @@ + + + + +