Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -370,4 +370,23 @@ public interface GovOrgOpenFeignClient {
      */
     @PostMapping("/gov/org/staff/mine")
     Result<MineResultDTO> queryStaffProfile(@RequestBody StaffInfoFromDTO fromDTO);
+
+    /**
+     * @Description  查询工作人员名字 【xx组织-章三】
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/4 4:23 下午
+     */
+    @PostMapping("/gov/org/staff/staffname")
+    Result<String> staffName(@RequestParam("userId")String userId);
+
+    /**
+     * @Description  查询网格名字
+     * @Param gridName
+     * @author zxc
+     * @date 2021/8/4 4:26 下午
+     */
+    @PostMapping("/gov/org/customergrid/selectgridname")
+    Result<String> gridName(@RequestParam("gridId")String gridId);
+
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -215,6 +215,16 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "mine", fromDTO);
     }
 
+    @Override
+    public Result<String> staffName(String userId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "staffName", userId);
+    }
+
+    @Override
+    public Result<String> gridName(String gridId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "gridName", gridId);
+    }
+
     @Override
     public Result<String> selectPidsByGridId(String gridId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectPidsByGridId", gridId);

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java

@@ -252,4 +252,15 @@ public class CustomerGridController {
     public Result<String> selectPidsByGridId(@RequestParam("gridId") String gridId){
         return new Result<String>().ok(customerGridService.selectPidsByGridId(gridId));
     }
+
+    /**
+     * @Description  查询网格名字
+     * @Param gridId
+     * @author zxc
+     * @date 2021/8/4 4:26 下午
+     */
+    @PostMapping("selectgridname")
+    Result<String> gridName(@RequestParam("gridId")String gridId){
+        return new Result<String>().ok(customerGridService.gridName(gridId));
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java

@@ -12,10 +12,7 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.service.StaffService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -157,4 +154,15 @@ public class StaffController {
         ValidatorUtils.validateEntity(fromDTO, StaffBasicInfoFromDTO.AddUserInternalGroup.class);
         return staffService.staffBasicInfo(fromDTO);
     }
+
+	/**
+	 * @Description  查询工作人员名字
+	 * @Param userId
+	 * @author zxc
+	 * @date 2021/8/4 3:38 下午
+	 */
+    @PostMapping("staffname")
+	public Result<String> staffName(@RequestParam("userId")String userId){
+    	return new Result<String>().ok(staffService.staffName(userId));
+	}
 }

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

@@ -276,4 +276,12 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @date 2021/7/16 9:52 上午
      */
     String selectPidsByGridId(@Param("gridId")String gridId);
+
+    /**
+     * @Description  查询网格名字
+     * @Param gridId
+     * @author zxc
+     * @date 2021/8/4 4:30 下午
+     */
+    String gridName(String gridId);
 }

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

@@ -108,4 +108,12 @@ public interface CustomerStaffAgencyDao extends BaseDao<CustomerStaffAgencyEntit
 	 * @date 2020/8/17 10:19 上午
 	 */
 	List<String> getAgencyStaffList(@Param("agencyId")String agencyId);
+
+	/**
+	 * @Description  查询工作人员所属组织名字
+	 * @Param staffId
+	 * @author zxc
+	 * @date 2021/8/4 3:54 下午
+	 */
+	String selectStaffBelongAgency(@Param("staffId")String staffId);
 }

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

@@ -295,4 +295,12 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      * @date 2021/7/16 9:52 上午
      */
     String selectPidsByGridId(String gridId);
+
+    /**
+     * @Description  查询网格名字
+     * @Param gridId
+     * @author zxc
+     * @date 2021/8/4 4:26 下午
+     */
+    String gridName(String gridId);
 }

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

@@ -105,4 +105,12 @@ public interface StaffService {
 	 * @author sun
 	 */
     Result<BasicInfoResultDTO> staffBasicInfo(StaffBasicInfoFromDTO fromDTO);
+
+    /**
+     * @Description  查询工作人员名字
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/4 3:38 下午
+     */
+	String staffName(String userId);
 }

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

@@ -721,4 +721,15 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         }
         return "";
     }
+
+    /**
+     * @Description  查询网格名字
+     * @Param gridId
+     * @author zxc
+     * @date 2021/8/4 4:26 下午
+     */
+    @Override
+    public String gridName(String gridId) {
+        return baseDao.gridName(gridId);
+    }
 }

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

@@ -7,6 +7,7 @@ import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dao.CustomerStaffAgencyDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -14,6 +15,7 @@ import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.CustomerStaffAgencyEntity;
 import com.epmet.feign.*;
 import com.epmet.service.*;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -51,6 +53,8 @@ public class StaffServiceImpl implements StaffService {
 	private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 	@Autowired
 	private RedisUtils redisUtils;
+	@Autowired
+	private CustomerStaffAgencyDao customerStaffAgencyDao;
 
 	@Override
 	public Result<StaffsInAgencyResultDTO> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO) {
@@ -274,4 +278,27 @@ public class StaffServiceImpl implements StaffService {
 	public Result<BasicInfoResultDTO> staffBasicInfo(StaffBasicInfoFromDTO fromDTO) {
 		return epmetUserOpenFeignClient.getStaffBasicInfo(fromDTO);
 	}
+
+	/**
+	 * @Description  查询工作人员名字
+	 * @Param userId
+	 * @author zxc
+	 * @date 2021/8/4 3:38 下午
+	 */
+    @Override
+    public String staffName(String userId) {
+    	// 查询所属组织名字
+		String agencyName = customerStaffAgencyDao.selectStaffBelongAgency(userId);
+		if (StringUtils.isEmpty(agencyName)){
+			throw new RenException("查询工作人员所属组织名称为空");
+		}
+		StaffBasicInfoFromDTO formDTO = new StaffBasicInfoFromDTO();
+		formDTO.setStaffId(userId);
+		Result<BasicInfoResultDTO> staffBasicInfo = epmetUserOpenFeignClient.getStaffBasicInfo(formDTO);
+		if (!staffBasicInfo.success()){
+			throw new RenException("查询工作人员姓名失败");
+		}
+		String result = agencyName.concat(staffBasicInfo.getData().getRealName());
+		return result;
+    }
 }

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

@@ -584,4 +584,14 @@
     <select id="selectPidsByGridId" resultType="java.lang.String">
         SELECT PIDS FROM customer_grid WHERE DEL_FLAG = '0' AND ID = #{gridId}
     </select>
+
+    <!-- 查询网格名字 -->
+    <select id="gridName" resultType="java.lang.String">
+        SELECT
+            CONCAT(ca.ORGANIZATION_NAME,'-',cg.GRID_NAME) AS gridName
+        FROM customer_grid cg
+        LEFT JOIN customer_agency ca ON (ca.id = cg.PID AND ca.DEL_FLAG = '0')
+        WHERE cg.DEL_FLAG = 0
+          AND cg.ID = #{gridId}
+    </select>
 </mapper>

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

@@ -152,4 +152,14 @@
             del_flag = '0'
             AND agency_id = #{agencyId}
     </select>
+
+    <!-- 查询工作人员所属组织名字 -->
+    <select id="selectStaffBelongAgency" resultType="java.lang.String">
+        SELECT
+            CONCAT(ca.ORGANIZATION_NAME,'-') AS agencyName
+        FROM customer_staff_agency sa
+        LEFT JOIN customer_agency ca ON (ca.ID = sa.AGENCY_ID AND ca.DEL_FLAG = '0')
+        WHERE sa.DEL_FLAG = 0
+          AND sa.USER_ID = #{staffId}
+    </select>
 </mapper>