Merge branch 'dev_govorg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -32,7 +32,9 @@ public enum EpmetErrorCode {
 	NOT_DEL_AGENCY_PER(8205, "该机关存在工作人员，不允许删除"),
 	NOT_DEL_DEPARTMENT(8206, "该部门存在工作人员，不允许删除"),
 
-	REQUIRE_PERMISSION(8301, "没有足够的操作权限");
+	REQUIRE_PERMISSION(8301, "没有足够的操作权限"),
+
+	NOT_ADD_GRID(8401,"您当前的网格名称已存在，请重新修改");
 
 
 	private int code;

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java

@@ -18,6 +18,11 @@ public class EditGridFormDTO implements Serializable {
      */
     private String gridId;
 
+    /**
+     * pid 当前机关id
+     */
+    private String agencyId;
+
     /**
      * 网格名称
      */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
+import com.epmet.dto.UserIdDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.DeleteGridFormDTO;
 import com.epmet.dto.form.ListCustomerGridFormDTO;
@@ -109,7 +110,7 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @param gridName
      * @return
      */
-    String selectGridIdByGridName(@Param("gridName")String gridName);
+    String selectGridIdByGridName(@Param("gridName")String gridName,@Param("agencyId")String pid);
 
     /**
      * 编辑网格信息
@@ -123,5 +124,13 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      */
     void deleteGrid(DeleteGridFormDTO deleteGridFormDTO);
 
+    /**
+     *
+     * @Description 根据gridId查询userId
+     * @Author zxc
+     * @CreatedTime 2020/4/26 10:08
+     */
+    List<UserIdDTO> selectUserIdByGrid(@Param("gridId")String gridId);
+
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@@ -62,7 +62,7 @@ public interface EpmetUserFeignClient {
 	 * @return
 	 */
     @PostMapping(value = "/epmetuser/customerstaff/selectgridstaffcountbyuserid")
-	Result<GridStaffCountDTO> selectGridStaffCountByUserId(@RequestBody UserIdDTO userIdDTO);
+	Result<GridStaffCountDTO> selectGridStaffCountByUserId(@RequestBody List<UserIdDTO> userIdDTO);
 
 	/**
 	 * 工作人员列表

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java

@@ -42,7 +42,7 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
     }
 
     @Override
-    public Result<GridStaffCountDTO> selectGridStaffCountByUserId(UserIdDTO userIdDTO) {
+    public Result<GridStaffCountDTO> selectGridStaffCountByUserId(List<UserIdDTO> userIdDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectGridStaffCountByUserId", userIdDTO);
     }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@@ -186,6 +186,10 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result<AddGridResultDTO> addGrid(TokenDto tokenDto, AddGridFormDTO addGridFormDTO) {
+        String checkGridName = baseDao.selectGridIdByGridName(addGridFormDTO.getGridName(),addGridFormDTO.getAgencyId());
+        if (checkGridName!=null){
+            return new Result().error(EpmetErrorCode.NOT_ADD_GRID.getCode());
+        }
         CustomerGridEntity customerGridEntity = new CustomerGridEntity();
         customerGridEntity.setCustomerId(baseDao.selectCustomerIdByUserId(tokenDto.getUserId()));
         customerGridEntity.setGridName(addGridFormDTO.getGridName());
@@ -197,7 +201,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         customerGridEntity.setPid(addGridFormDTO.getAgencyId());
         customerGridEntity.setPids(baseDao.selectPidsByPid(addGridFormDTO.getAgencyId()));
         baseDao.insert(customerGridEntity);
-        String gridId = baseDao.selectGridIdByGridName(addGridFormDTO.getGridName());
+        String gridId = baseDao.selectGridIdByGridName(addGridFormDTO.getGridName(),addGridFormDTO.getAgencyId());
         AddGridResultDTO addGridResultDTO = new AddGridResultDTO();
         addGridResultDTO.setGridId(gridId);
         return new Result<AddGridResultDTO>().ok(addGridResultDTO);
@@ -211,6 +215,10 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result editGrid(TokenDto tokenDto, EditGridFormDTO editGridFormDTO) {
+        String checkGridName = baseDao.selectGridIdByGridName(editGridFormDTO.getGridName(),editGridFormDTO.getAgencyId());
+        if (checkGridName!=null){
+            return new Result().error(EpmetErrorCode.NOT_ADD_GRID.getCode());
+        }
         CustomerGridDTO customerGridDTO = new CustomerGridDTO();
         customerGridDTO.setManageDistrict(editGridFormDTO.getManageDistrict());
         customerGridDTO.setGridName(editGridFormDTO.getGridName());
@@ -223,10 +231,9 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result deleteGrid(TokenDto tokenDto,DeleteGridFormDTO deleteGridFormDTO) {
-        UserIdDTO userIdDTO = new UserIdDTO();
-        userIdDTO.setUserId(tokenDto.getUserId());
+        List<UserIdDTO> userIdDTOS = baseDao.selectUserIdByGrid(deleteGridFormDTO.getGridId());
         deleteGridFormDTO.setUserId(tokenDto.getUserId());
-        Result<GridStaffCountDTO> gridStaffCountDTOResult = epmetUserFeignClient.selectGridStaffCountByUserId(userIdDTO);
+        Result<GridStaffCountDTO> gridStaffCountDTOResult = epmetUserFeignClient.selectGridStaffCountByUserId(userIdDTOS);
         if (gridStaffCountDTOResult.getData().getEnableCount()==0){
             baseDao.deleteGrid(deleteGridFormDTO);
         }else {

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -24,8 +24,8 @@
     <!-- 查询客户对应的根级组织 -->
     <select id="selectStaffOrgList" parameterType="map" resultType="com.epmet.dto.result.StaffOrgsResultDTO">
         SELECT
-            ca.pid AS agencyId,
-            ca.ORGANIZATION_NAME AS agencyName,
+            ca.id AS rootAgencyId,
+            ca.ORGANIZATION_NAME AS rootAgencyName,
             ca.CUSTOMER_ID AS customerId
         FROM
             customer_agency ca

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -168,6 +168,7 @@
             customer_grid
         WHERE
             grid_name = #{gridName}
+            AND pid = #{agencyId}
             AND del_flag = 0
     </select>
 
@@ -194,4 +195,15 @@
             id = #{gridId}
     </update>
 
+    <!-- 根据gridId查询网格下的人员userId -->
+    <select id="selectUserIdByGrid" resultType="com.epmet.dto.UserIdDTO">
+        SELECT
+            user_id
+        FROM
+            customer_staff_grid
+        WHERE
+            grid_id = #{gridId}
+            AND del_flag = 0
+    </select>
+
 </mapper>

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java

@@ -175,7 +175,7 @@ public class CustomerStaffController {
      * @auther zxc
      */
     @PostMapping(value = "selectgridstaffcountbyuserid")
-    public Result<GridStaffCountDTO> selectGridStaffCountByUserId(@RequestBody UserIdDTO userIdDTO){
+    public Result<GridStaffCountDTO> selectGridStaffCountByUserId(@RequestBody List<UserIdDTO> userIdDTO){
         return customerStaffService.selectGridStaffCountByUserId(userIdDTO);
     }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java

@@ -62,7 +62,7 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
      * @param userIdDTO
      * @return
      */
-    GridStaffCountDTO selectGridStaffCountByUserId(UserIdDTO userIdDTO);
+    GridStaffCountDTO selectGridStaffCountByUserId(List<UserIdDTO> userIdDTO);
 	/**
 	 * 根据userId查询查询网格下的用户信息
 	 *

epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java

@@ -204,7 +204,7 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 * @param userIdDTO
 	 * @return
 	 */
-	Result<GridStaffCountDTO> selectGridStaffCountByUserId(UserIdDTO userIdDTO);
+	Result<GridStaffCountDTO> selectGridStaffCountByUserId(List<UserIdDTO> userIdDTO);
 
 	/**
 	 * @param fromDTO

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -340,7 +340,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
      * @return
      */
     @Override
-    public Result<GridStaffCountDTO> selectGridStaffCountByUserId(UserIdDTO userIdDTO) {
+    public Result<GridStaffCountDTO> selectGridStaffCountByUserId(List<UserIdDTO> userIdDTO) {
         Result<GridStaffCountDTO> gridStaffCountDTOResult = new Result<GridStaffCountDTO>();
         GridStaffCountDTO gridStaffCountDTO = baseDao.selectGridStaffCountByUserId(userIdDTO);
         gridStaffCountDTOResult.setData(gridStaffCountDTO);

epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml

@@ -44,13 +44,16 @@
     </select>
 
     <!-- 根据userId查询网格下未被禁用的人员数量 -->
-    <select id="selectGridStaffCountByUserId" parameterType="com.epmet.dto.UserIdDTO" resultType="com.epmet.dto.GridStaffCountDTO">
+    <select id="selectGridStaffCountByUserId" resultType="com.epmet.dto.GridStaffCountDTO">
         SELECT
             count(*) AS enableCount
         FROM
             customer_staff
         WHERE
-            user_id = #{userId}
+            user_id in
+            <foreach collection="list" item="staff" open="(" separator="," close=")">
+                #{staff.userId}
+            </foreach>
             AND del_flag = 0
             AND enable_flag = 'enable'
     </select>