修改人车管理

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;

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;

securitycontrol-model/securitycontrol-background/pom.xml

@@ -89,6 +89,10 @@
             <groupId>net.logstash.logback</groupId>
             <artifactId>logstash-logback-encoder</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.securitycontrol</groupId>
+            <artifactId>securitycontrol-commons-entity</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <finalName>${project.artifactId}</finalName>

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;
 

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;
 
 /**

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<HumanManageVo> getHumanLists(HumanManageVo vo);
+
+    /**
+     *新增
+     * @param vo
+     * @return
+     */
     int addHuman(HumanManageVo vo);
+
+    /**
+     *
+     * @param vo
+     * @return
+     */
     int updateHuman(HumanManageVo vo);
 }

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<TeamManageVo> getTeamLists(TeamManageVo vo);
+
+    /**
+     * DD
+     * @param vo
+     * @return
+     */
     int addTeam(TeamManageVo vo);
+
+    /**
+     * sssd
+     * @param vo
+     * @return
+     */
     int updateTeam(TeamManageVo vo);
 }

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<HumanManageVo> 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);
 }

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;
 

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;

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;
 

securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.securitycontrol.background.humanvehiclemanage.dao.HumanManageMapper">
+<mapper namespace="com.securitycontrol.background.mapper.HumanManageMapper">
     <!--新增/修改 工程-->
     <insert id="addHuman" useGeneratedKeys="true" keyProperty="userId">
         INSERT INTO t_team_people
@@ -32,7 +32,7 @@
         WHERE  user_id= #{userId}
     </update>
     <!--获取人员列表-->
-    <select id="getHumanLists" resultType="com.securitycontrol.background.humanvehiclemanage.entity.HumanManageVo">
+    <select id="getHumanLists" resultType="com.securitycontrol.entity.background.vo.HumanManageVo">
         SELECT
         user_name as userName,
         id_number as idnumber,

securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TeamManageMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.securitycontrol.background.humanvehiclemanage.dao.TeamManageMapper">
+<mapper namespace="com.securitycontrol.background.mapper.TeamManageMapper">
     <!--新增/修改 工程-->
     <insert id="addTeam">
         INSERT INTO tb_work_team
@@ -35,7 +35,7 @@
         WHERE  team_id= #{teamId}
     </update>
     <!--获取人员列表-->
-    <select id="getTeamLists" resultType="com.securitycontrol.background.humanvehiclemanage.entity.TeamManageVo">
+    <select id="getTeamLists" resultType="com.securitycontrol.entity.background.vo.TeamManageVo">
         SELECT
         team_name as teamname,
         team_leader as teamleader,