社会组织更换表名

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/SocietyOrgDTO.java → epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java

@@ -29,7 +29,7 @@ import lombok.Data;
  * @since v1.0.0 2021-11-18
  */
 @Data
-public class SocietyOrgDTO implements Serializable {
+public class IcSocietyOrgDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/SocietyOrgController.java → epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java

@@ -25,7 +25,7 @@ import com.epmet.dto.form.AddSocietyOrgFormDTO;
 import com.epmet.dto.form.EditSocietyOrgFormDTO;
 import com.epmet.dto.form.GetListSocietyOrgFormDTO;
 import com.epmet.dto.result.GetListSocietyOrgResultDTO;
-import com.epmet.service.SocietyOrgService;
+import com.epmet.service.IcSocietyOrgService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -41,10 +41,10 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("societyorg")
-public class SocietyOrgController {
+public class IcSocietyOrgController {
 
     @Autowired
-    private SocietyOrgService societyOrgService;
+    private IcSocietyOrgService societyOrgService;
 
     /**
      * @Author sun

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/SocietyOrgDao.java → epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcSocietyOrgDao.java

@@ -20,7 +20,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.GetListSocietyOrgFormDTO;
 import com.epmet.dto.result.GetListSocietyOrgResultDTO;
-import com.epmet.entity.SocietyOrgEntity;
+import com.epmet.entity.IcSocietyOrgEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -32,7 +32,7 @@ import java.util.List;
  * @since v1.0.0 2021-11-18
  */
 @Mapper
-public interface SocietyOrgDao extends BaseDao<SocietyOrgEntity> {
+public interface IcSocietyOrgDao extends BaseDao<IcSocietyOrgEntity> {
 
     /**
      * @Author sun

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/SocietyOrgEntity.java → epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java

@@ -34,7 +34,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper=false)
 @TableName("society_org")
-public class SocietyOrgEntity extends BaseEpmetEntity {
+public class IcSocietyOrgEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/SocietyOrgExcel.java → epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcSocietyOrgExcel.java

@@ -29,7 +29,7 @@ import java.util.Date;
  * @since v1.0.0 2021-11-18
  */
 @Data
-public class SocietyOrgExcel {
+public class IcSocietyOrgExcel {
 
     @Excel(name = "唯一标识")
     private String id;

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/SocietyOrgService.java → epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcSocietyOrgService.java

@@ -22,7 +22,7 @@ import com.epmet.dto.form.AddSocietyOrgFormDTO;
 import com.epmet.dto.form.EditSocietyOrgFormDTO;
 import com.epmet.dto.form.GetListSocietyOrgFormDTO;
 import com.epmet.dto.result.GetListSocietyOrgResultDTO;
-import com.epmet.entity.SocietyOrgEntity;
+import com.epmet.entity.IcSocietyOrgEntity;
 
 /**
  * 社会组织管理
@@ -30,7 +30,7 @@ import com.epmet.entity.SocietyOrgEntity;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-11-18
  */
-public interface SocietyOrgService extends BaseService<SocietyOrgEntity> {
+public interface IcSocietyOrgService extends BaseService<IcSocietyOrgEntity> {
 
     /**
      * @Author sun

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/SocietyOrgServiceImpl.java → epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java

@@ -24,16 +24,16 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dao.SocietyOrgDao;
+import com.epmet.dao.IcSocietyOrgDao;
 import com.epmet.dto.form.AddSocietyOrgFormDTO;
 import com.epmet.dto.form.EditSocietyOrgFormDTO;
 import com.epmet.dto.form.GetListSocietyOrgFormDTO;
 import com.epmet.dto.form.UserIdsFormDTO;
 import com.epmet.dto.result.GetListSocietyOrgResultDTO;
 import com.epmet.dto.result.StaffSinGridResultDTO;
-import com.epmet.entity.SocietyOrgEntity;
+import com.epmet.entity.IcSocietyOrgEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
-import com.epmet.service.SocietyOrgService;
+import com.epmet.service.IcSocietyOrgService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.slf4j.Logger;
@@ -53,8 +53,8 @@ import java.util.stream.Collectors;
  * @since v1.0.0 2021-11-18
  */
 @Service
-public class SocietyOrgServiceImpl extends BaseServiceImpl<SocietyOrgDao, SocietyOrgEntity> implements SocietyOrgService {
+public class IcSocietyOrgServiceImpl extends BaseServiceImpl<IcSocietyOrgDao, IcSocietyOrgEntity> implements IcSocietyOrgService {
-    private static final Logger log = LoggerFactory.getLogger(SocietyOrgServiceImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(IcSocietyOrgServiceImpl.class);
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
@@ -66,7 +66,7 @@ public class SocietyOrgServiceImpl extends BaseServiceImpl<SocietyOrgDao, Societ
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void add(AddSocietyOrgFormDTO dto) {
-        SocietyOrgEntity entity = ConvertUtils.sourceToTarget(dto, SocietyOrgEntity.class);
+        IcSocietyOrgEntity entity = ConvertUtils.sourceToTarget(dto, IcSocietyOrgEntity.class);
         CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getStaffId());
         entity.setAgencyId(staffInfoCache.getAgencyId());
         entity.setPids(staffInfoCache.getAgencyPIds());
@@ -79,11 +79,11 @@ public class SocietyOrgServiceImpl extends BaseServiceImpl<SocietyOrgDao, Societ
      **/
     @Override
     public void edit(EditSocietyOrgFormDTO formDTO) {
-        SocietyOrgEntity entity = baseDao.selectById(formDTO.getSocietyId());
+        IcSocietyOrgEntity entity = baseDao.selectById(formDTO.getSocietyId());
         if (null == entity) {
             throw new RenException(String.format("修改社会组织信息失败，社会组织信息不存在，组织Id->%s", formDTO.getSocietyId()));
         }
-        entity = ConvertUtils.sourceToTarget(formDTO, SocietyOrgEntity.class);
+        entity = ConvertUtils.sourceToTarget(formDTO, IcSocietyOrgEntity.class);
         baseDao.updateById(entity);
     }
 

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/SocietyOrgDao.xml → epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml

@@ -1,7 +1,7 @@
 <?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.epmet.dao.SocietyOrgDao">
+<mapper namespace="com.epmet.dao.IcSocietyOrgDao">
 
     <select id="getList" resultType="com.epmet.dto.result.GetListSocietyOrgResultDTO$SocietyOrgList">
         SELECT
@@ -18,7 +18,7 @@
             longitude longitude,
             dimension dimension
         FROM
-            society_org
+            ic_society_org
         WHERE
             del_flag = '0'
         <if test="customerId != null and customerId.trim() != ''">