From 5fd33a98f062ee8a7a0fea8b242380be8393fc5b Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Wed, 20 Mar 2024 13:36:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E8=BD=A6=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/background/vo}/HumanManageVo.java | 2 +- .../entity/background/vo}/TeamManageVo.java | 2 +- .../securitycontrol-background/pom.xml | 4 +++ .../controller/HumanManageController.java | 7 ++--- .../controller/TeamManageController.java | 7 ++--- .../mapper/HumanManageMapper.java | 24 ++++++++++++++-- .../mapper/TeamManageMapper.java | 21 ++++++++++++-- .../service/HumanService.java | 28 +++++++++++++++++-- .../service/TeamService.java | 4 +-- .../service/impl/HumanServiceImpl.java | 8 +++--- .../service/impl/TeamServiceImpl.java | 8 +++--- .../resources/mapper/HumanManageMapper.xml | 4 +-- .../resources/mapper/TeamManageMapper.xml | 4 +-- 13 files changed, 93 insertions(+), 30 deletions(-) rename {securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/entity => securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo}/HumanManageVo.java (92%) rename {securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/entity => securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo}/TeamManageVo.java (93%) rename securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/{humanvehiclemanage => }/controller/HumanManageController.java (89%) rename securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/{humanvehiclemanage => }/controller/TeamManageController.java (90%) rename securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/{humanvehiclemanage => }/mapper/HumanManageMapper.java (52%) rename securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/{humanvehiclemanage => }/mapper/TeamManageMapper.java (53%) rename securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/{humanvehiclemanage => }/service/HumanService.java (51%) rename securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/{humanvehiclemanage => }/service/TeamService.java (67%) rename securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/{humanvehiclemanage => }/service/impl/HumanServiceImpl.java (81%) rename securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/{humanvehiclemanage => }/service/impl/TeamServiceImpl.java (80%) diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/entity/HumanManageVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/HumanManageVo.java similarity index 92% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/entity/HumanManageVo.java rename to securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/HumanManageVo.java index 53f7852..5be6031 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/entity/HumanManageVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/HumanManageVo.java @@ -1,4 +1,4 @@ -package com.securitycontrol.background.humanvehiclemanage.entity; +package com.securitycontrol.entity.background.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/entity/TeamManageVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/TeamManageVo.java similarity index 93% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/entity/TeamManageVo.java rename to securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/TeamManageVo.java index 88f042b..d95d0e0 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/entity/TeamManageVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/TeamManageVo.java @@ -1,4 +1,4 @@ -package com.securitycontrol.background.humanvehiclemanage.entity; +package com.securitycontrol.entity.background.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/securitycontrol-model/securitycontrol-background/pom.xml b/securitycontrol-model/securitycontrol-background/pom.xml index 5f9084c..8adf2d9 100644 --- a/securitycontrol-model/securitycontrol-background/pom.xml +++ b/securitycontrol-model/securitycontrol-background/pom.xml @@ -89,6 +89,10 @@ net.logstash.logback logstash-logback-encoder + + com.securitycontrol + securitycontrol-commons-entity + ${project.artifactId} diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/controller/HumanManageController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/HumanManageController.java similarity index 89% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/controller/HumanManageController.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/HumanManageController.java index 57e34ee..e4cc69a 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/controller/HumanManageController.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/HumanManageController.java @@ -1,18 +1,17 @@ -package com.securitycontrol.background.humanvehiclemanage.controller; +package com.securitycontrol.background.controller; -import com.securitycontrol.background.humanvehiclemanage.entity.HumanManageVo; -import com.securitycontrol.background.humanvehiclemanage.service.HumanService; +import com.securitycontrol.background.service.HumanService; import com.securitycontrol.common.core.web.controller.BaseController; import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.common.core.web.page.TableDataInfo; import com.securitycontrol.common.log.annotation.Log; import com.securitycontrol.common.log.enums.OperationType; +import com.securitycontrol.entity.background.vo.HumanManageVo; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/controller/TeamManageController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/TeamManageController.java similarity index 90% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/controller/TeamManageController.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/TeamManageController.java index ac83051..4d35a8c 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/controller/TeamManageController.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/TeamManageController.java @@ -1,12 +1,12 @@ -package com.securitycontrol.background.humanvehiclemanage.controller; +package com.securitycontrol.background.controller; -import com.securitycontrol.background.humanvehiclemanage.entity.TeamManageVo; -import com.securitycontrol.background.humanvehiclemanage.service.TeamService; +import com.securitycontrol.background.service.TeamService; import com.securitycontrol.common.core.web.controller.BaseController; import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.common.core.web.page.TableDataInfo; import com.securitycontrol.common.log.annotation.Log; import com.securitycontrol.common.log.enums.OperationType; +import com.securitycontrol.entity.background.vo.TeamManageVo; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.List; /** diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/mapper/HumanManageMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/HumanManageMapper.java similarity index 52% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/mapper/HumanManageMapper.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/HumanManageMapper.java index 0fdf41f..feb56fb 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/mapper/HumanManageMapper.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/HumanManageMapper.java @@ -1,14 +1,34 @@ -package com.securitycontrol.background.humanvehiclemanage.mapper; +package com.securitycontrol.background.mapper; -import com.securitycontrol.background.humanvehiclemanage.entity.HumanManageVo; +import com.securitycontrol.entity.background.vo.HumanManageVo; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; import java.util.List; +/** + * @author 黑子 + */ @Mapper @Repository(value = "HumanManageMapper") public interface HumanManageMapper { + /** + * + * @param vo + * @return + */ List getHumanLists(HumanManageVo vo); + + /** + *新增 + * @param vo + * @return + */ int addHuman(HumanManageVo vo); + + /** + * + * @param vo + * @return + */ int updateHuman(HumanManageVo vo); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/mapper/TeamManageMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/TeamManageMapper.java similarity index 53% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/mapper/TeamManageMapper.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/TeamManageMapper.java index b0be560..ebc1d14 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/mapper/TeamManageMapper.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/TeamManageMapper.java @@ -1,6 +1,6 @@ -package com.securitycontrol.background.humanvehiclemanage.mapper; +package com.securitycontrol.background.mapper; -import com.securitycontrol.background.humanvehiclemanage.entity.TeamManageVo; +import com.securitycontrol.entity.background.vo.TeamManageVo; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; @@ -8,7 +8,24 @@ import java.util.List; @Mapper @Repository(value = "TeamManageMapper") public interface TeamManageMapper { + /** + * ss + * @param vo + * @return + */ List getTeamLists(TeamManageVo vo); + + /** + * DD + * @param vo + * @return + */ int addTeam(TeamManageVo vo); + + /** + * sssd + * @param vo + * @return + */ int updateTeam(TeamManageVo vo); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/service/HumanService.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/HumanService.java similarity index 51% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/service/HumanService.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/HumanService.java index a51991f..b62a640 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/service/HumanService.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/HumanService.java @@ -1,14 +1,38 @@ -package com.securitycontrol.background.humanvehiclemanage.service; +package com.securitycontrol.background.service; -import com.securitycontrol.background.humanvehiclemanage.entity.HumanManageVo; import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.entity.background.vo.HumanManageVo; import org.springframework.web.multipart.MultipartFile; import java.util.List; public interface HumanService { + /** + *ss + * @param vo + * @return + */ List getHumanLists(HumanManageVo vo); + + /** + *ss + * @param vo + * @param files + * @return + */ AjaxResult addHuman(HumanManageVo vo,MultipartFile[] files); + + /** + * ss + * @param vo + * @return + */ AjaxResult updateHuman(HumanManageVo vo); + + /** + * ssss + * @param vo + * @return + */ AjaxResult delHuman(HumanManageVo vo); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/service/TeamService.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/TeamService.java similarity index 67% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/service/TeamService.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/TeamService.java index a6ce461..1cf7c59 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/service/TeamService.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/TeamService.java @@ -1,7 +1,7 @@ -package com.securitycontrol.background.humanvehiclemanage.service; +package com.securitycontrol.background.service; -import com.securitycontrol.background.humanvehiclemanage.entity.TeamManageVo; import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.entity.background.vo.TeamManageVo; import java.util.List; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/service/impl/HumanServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/HumanServiceImpl.java similarity index 81% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/service/impl/HumanServiceImpl.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/HumanServiceImpl.java index d849574..67a53a9 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/service/impl/HumanServiceImpl.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/HumanServiceImpl.java @@ -1,9 +1,9 @@ -package com.securitycontrol.background.humanvehiclemanage.service.impl; +package com.securitycontrol.background.service.impl; -import com.securitycontrol.background.humanvehiclemanage.mapper.HumanManageMapper; -import com.securitycontrol.background.humanvehiclemanage.entity.HumanManageVo; -import com.securitycontrol.background.humanvehiclemanage.service.HumanService; +import com.securitycontrol.background.mapper.HumanManageMapper; +import com.securitycontrol.background.service.HumanService; import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.entity.background.vo.HumanManageVo; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/service/impl/TeamServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TeamServiceImpl.java similarity index 80% rename from securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/service/impl/TeamServiceImpl.java rename to securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TeamServiceImpl.java index 0e7adf4..21d53a6 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/humanvehiclemanage/service/impl/TeamServiceImpl.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TeamServiceImpl.java @@ -1,9 +1,9 @@ -package com.securitycontrol.background.humanvehiclemanage.service.impl; +package com.securitycontrol.background.service.impl; -import com.securitycontrol.background.humanvehiclemanage.mapper.TeamManageMapper; -import com.securitycontrol.background.humanvehiclemanage.entity.TeamManageVo; -import com.securitycontrol.background.humanvehiclemanage.service.TeamService; +import com.securitycontrol.background.mapper.TeamManageMapper; +import com.securitycontrol.background.service.TeamService; import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.entity.background.vo.TeamManageVo; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml index 11aed25..737a8c4 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml @@ -1,6 +1,6 @@ - + INSERT INTO t_team_people @@ -32,7 +32,7 @@ WHERE user_id= #{userId} - SELECT user_name as userName, id_number as idnumber, diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TeamManageMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TeamManageMapper.xml index 8ce3b53..4d8e9fc 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TeamManageMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TeamManageMapper.xml @@ -1,6 +1,6 @@ - + INSERT INTO tb_work_team @@ -35,7 +35,7 @@ WHERE team_id= #{teamId} - SELECT team_name as teamname, team_leader as teamleader,