Merge branch 'developer' into 'master'

Developer

See merge request !3

gic-data-cloud-api/src/main/java/com/gic/cloud/service/IndexDescApiService.java

@@ -124,4 +124,6 @@ public interface IndexDescApiService {
      * @throws
      */
     ServiceResponse<List<IndexDescDTO>> listAllUnRel(String moduleIds);
+
+    ServiceResponse<Void> init(Integer enterpriseId);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabIndexDescMapper.java

@@ -61,6 +61,8 @@ public interface TabIndexDescMapper {
 
 //    List<IndexDescDTO> listRecycle(@Param("enterpriseId") Integer enterpriseId, @Param("moduleId") String moduleId, @Param("indexGroupName") String indexGroupName, @Param("userId") Integer userId);
 
+    List<TabIndexDesc> listAll();
+
     List<TabIndexDesc> listAllUnRel(@Param("ids") List<Integer> relIndexDescIdList);
 
     List<TabIndexDesc> listByIds(@Param("ids") List<Integer> indexDescIdList);

gic-data-cloud-service/src/main/java/com/gic/cloud/service/IndexDescEnterpriseService.java

 package com.gic.cloud.service;
 
 import com.gic.cloud.dto.IndexDescDTO;
+import com.gic.cloud.entity.TabIndexDescEnterprise;
 
 import java.util.List;
 
@@ -19,4 +20,6 @@ public interface IndexDescEnterpriseService {
     void batchUpdate(String[] idsArr);
 
     void deleteList(List<Integer> deleteList);
+
+    void insert(TabIndexDescEnterprise indexDescEnterprise);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/IndexDescService.java

@@ -28,4 +28,6 @@ public interface IndexDescService {
     List<TabIndexDesc> listByIds(List<Integer> indexDescIdList);
 
     TabIndexDesc getIndexDesc(String moduleId, String indexCode);
+
+    void init(Integer enterpriseId);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/IndexDescEnterpriseServiceImpl.java

@@ -67,4 +67,9 @@ public class IndexDescEnterpriseServiceImpl implements IndexDescEnterpriseServic
     public void deleteList(List<Integer> deleteList) {
         tabIndexDescEnterpriseMapper.deleteList(deleteList);
     }
+
+    @Override
+    public void insert(TabIndexDescEnterprise indexDescEnterprise) {
+        tabIndexDescEnterpriseMapper.insertSelective(indexDescEnterprise);
+    }
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/IndexDescServiceImpl.java

@@ -3,6 +3,7 @@ package com.gic.cloud.service.impl;
 import com.gic.cloud.dao.mapper.TabIndexDescMapper;
 import com.gic.cloud.dto.IndexDescDTO;
 import com.gic.cloud.entity.TabIndexDesc;
+import com.gic.cloud.entity.TabIndexDescEnterprise;
 import com.gic.cloud.service.IndexDescEnterpriseService;
 import com.gic.cloud.service.IndexDescService;
 import com.github.pagehelper.PageHelper;
@@ -66,4 +67,18 @@ public class IndexDescServiceImpl implements IndexDescService {
     public TabIndexDesc getIndexDesc(String moduleId, String indexCode) {
         return tabIndexDescMapper.getIndexDescByIndexCode(moduleId, indexCode);
     }
+
+    @Override
+    public void init(Integer enterpriseId) {
+        List<TabIndexDesc> indexDescDTOList = tabIndexDescMapper.listAll();
+        for (TabIndexDesc indexDescDTO : indexDescDTOList) {
+            TabIndexDescEnterprise indexDescEnterprise = new TabIndexDescEnterprise();
+            indexDescEnterprise.setIndexDescId(indexDescDTO.getIndexDescId());
+            indexDescEnterprise.setEnterpriseId(enterpriseId);
+            indexDescEnterprise.setIndexStatus(1);
+            indexDescEnterprise.setSort(0);
+            indexDescEnterprise.setStatus(1);
+            indexDescEnterpriseService.insert(indexDescEnterprise);
+        }
+    }
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/outer/impl/IndexDescApiServiceImpl.java

@@ -131,4 +131,10 @@ public class IndexDescApiServiceImpl implements IndexDescApiService {
         List<IndexDescDTO> indexDescDTOList = EntityUtil.changeEntityListByJSON(IndexDescDTO.class, indexDescList);
         return EnterpriseServiceResponse.success(indexDescDTOList);
     }
+
+    @Override
+    public ServiceResponse<Void> init(Integer enterpriseId) {
+        this.indexDescService.init(enterpriseId);
+        return ServiceResponse.success();
+    }
 }

gic-data-cloud-service/src/main/resources/mapper/TabIndexDescEnterpriseMapper.xml

@@ -63,7 +63,7 @@
         update_time,
       </if>
     </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
+    <trim prefix="select " suffix="" suffixOverrides=",">
       <if test="indexDescEnterpriseId != null">
         #{indexDescEnterpriseId,jdbcType=INTEGER},
       </if>
@@ -89,6 +89,17 @@
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
     </trim>
+    FROM DUAL
+    WHERE NOT EXISTS (
+    SELECT
+    1
+    FROM
+    tab_index_desc_enterprise
+    WHERE
+    tab_index_desc_enterprise.enterprise_id = #{enterpriseId}
+    AND tab_index_desc_enterprise.index_desc_id = #{indexDescId}
+    AND tab_index_desc_enterprise.status = 1
+    )
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.cloud.entity.TabIndexDescEnterprise">
     update tab_index_desc_enterprise

gic-data-cloud-service/src/main/resources/mapper/TabIndexDescMapper.xml

@@ -203,10 +203,15 @@
     and t2.index_status = 0
   </select>-->
 <!--  List<IndexDescDTO> listAll();-->
-  <select id="listAllUnRel" resultMap="BaseResultMap">
+  <select id="listAll" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from tab_index_desc where status = 1 
+  </select>
+  <select id="listAllUnRel" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_index_desc where status = 1
     <if test="null != ids and ids.size > 0">
       and index_desc_id not in
       <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">