Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-data-cloud into developer

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/FunctionModuleDTO.java

@@ -43,6 +43,8 @@ public class FunctionModuleDTO implements Serializable{
      */
     private String operationName;
 
+    private String logo;
+
     /**
      * 1：有效 0:无效
      */
@@ -138,4 +140,13 @@ public class FunctionModuleDTO implements Serializable{
         this.updateTime = updateTime;
         return this;
     }
+
+    public String getLogo() {
+        return logo;
+    }
+
+    public FunctionModuleDTO setLogo(String logo) {
+        this.logo = logo;
+        return this;
+    }
 }

gic-data-cloud-operation-web/src/main/java/com/gic/cloud/operation/web/controller/DataExplainController.java

@@ -32,7 +32,7 @@ public class DataExplainController {
     @Autowired
     private IndexLogApiService indexLogApiService;
 
-    @RequestMapping("/saveDataExplain")
+    @RequestMapping("/save-data-explain")
     public RestResponse saveDataExplain(DataExplainDTO dataExplainDTO) {
         if (StringUtils.isBlank(dataExplainDTO.getDataName()) || StringUtils.isBlank(dataExplainDTO.getIndexRemark())) {
             return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), ErrorCode.PARAMETER_ERROR.getMsg());
@@ -41,37 +41,37 @@ public class DataExplainController {
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
-    @RequestMapping("/updateDataExplain")
+    @RequestMapping("/update-data-explain")
     public RestResponse updateDataExplain(DataExplainDTO dataExplainDTO, Integer updateType, String reason) {
         ServiceResponse<Void> serviceResponse = dataExplainApiService.updateDataExplain(dataExplainDTO, updateType, reason);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
-    @RequestMapping("/getByDataExplainId")
+    @RequestMapping("/get-by-data-explain-id")
     public RestResponse getByDataExplainId(Integer dataExplainId) {
         ServiceResponse<DataExplainDTO> serviceResponse = dataExplainApiService.getByDataExplainId(dataExplainId);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
-    @RequestMapping("/listDataExplain")
+    @RequestMapping("/list-data-explain")
     public RestResponse listDataExplain(DataExplainQO dataExplainQO) {
         ServiceResponse<Page<DataExplainDTO>> serviceResponse = dataExplainApiService.listDataExplain(dataExplainQO);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
-    @RequestMapping("/dataExplainLog")
+    @RequestMapping("/data-explain-log")
     public RestResponse dataExplainLog(Integer dataExplainId) {
         ServiceResponse<List<IndexLogDTO>> serviceResponse = indexLogApiService.listDataExplainLog(dataExplainId);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
-    @RequestMapping("/deleteDataExplain")
+    @RequestMapping("/delete-data-explain")
     public RestResponse delete(Integer dataExplainId) {
         ServiceResponse<Void> serviceResponse = dataExplainApiService.delete(dataExplainId);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
-    @RequestMapping("/publishDataExplain")
+    @RequestMapping("/publish-data-explain")
     public RestResponse publishIndex(String dataExplainIds) {
         if (StringUtils.isBlank(dataExplainIds)) {
             return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), ErrorCode.PARAMETER_ERROR.getMsg());

gic-data-cloud-operation-web/src/main/java/com/gic/cloud/operation/web/controller/IndexController.java

@@ -39,7 +39,7 @@ public class IndexController {
     private IndexLogApiService indexLogApiService;
 
 
-    @RequestMapping("/saveIndex")
+    @RequestMapping("/save-index")
     public RestResponse saveIndex(IndexDTO indexDTO, String relModuleIds) {
         if (indexDTO.getClassifyType() == null ||
                 StringUtils.isBlank(indexDTO.getCode()) ||
@@ -58,7 +58,7 @@ public class IndexController {
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
-    @RequestMapping("/updateIndex")
+    @RequestMapping("/update-index")
     public RestResponse updateIndex(IndexDTO indexDTO, Integer updateType, String reason) {
         if (indexDTO.getIndexId() == null || updateType == null) {
             return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), ErrorCode.PARAMETER_ERROR.getMsg());
@@ -67,31 +67,31 @@ public class IndexController {
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
-    @RequestMapping("/getByIndexId")
+    @RequestMapping("/get-by-index-id")
     public RestResponse getByIndexId(Integer indexId) {
         ServiceResponse<IndexDTO> serviceResponse = indexApiService.getByIndexId(indexId);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
-    @RequestMapping("/listIndex")
+    @RequestMapping("/list-index")
     public RestResponse listIndex(IndexQO indexQO) {
         ServiceResponse<Page<IndexDTO>> serviceResponse = indexApiService.listIndex(indexQO);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
-    @RequestMapping("/indexLog")
+    @RequestMapping("/index-log")
     public RestResponse indexLog(Integer indexId) {
         ServiceResponse<List<IndexLogDTO>> serviceResponse = indexLogApiService.listIndexLog(indexId);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
-    @RequestMapping("/deleteIndex")
+    @RequestMapping("/delete-index")
     public RestResponse delete(Integer indexId) {
         ServiceResponse<Void> serviceResponse = indexApiService.delete(indexId);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
-    @RequestMapping("/publishIndex")
+    @RequestMapping("/publish-index")
     public RestResponse publishIndex(String indexIds) {
         if (StringUtils.isBlank(indexIds)) {
             return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), ErrorCode.PARAMETER_ERROR.getMsg());
@@ -100,7 +100,7 @@ public class IndexController {
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
-    @RequestMapping("/moduleList")
+    @RequestMapping("/module-list")
     public RestResponse moduleList() {
         Object cache = RedisUtil.getCache("enterprise:datacloud:moduleList");
         if (cache != null) {

gic-data-cloud-operation-web/src/main/java/com/gic/cloud/operation/web/vo/FunctionModuleVO.java

@@ -36,6 +36,8 @@ public class FunctionModuleVO implements Serializable{
      */
     private String operationName;
 
+    private String logo;
+
     /**
      * 1：有效 0:无效
      */
@@ -131,4 +133,13 @@ public class FunctionModuleVO implements Serializable{
         this.updateTime = updateTime;
         return this;
     }
+
+    public String getLogo() {
+        return logo;
+    }
+
+    public FunctionModuleVO setLogo(String logo) {
+        this.logo = logo;
+        return this;
+    }
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabSysFunctionModule.java

@@ -36,6 +36,8 @@ public class TabSysFunctionModule {
      */
     private String operationName;
 
+    private String logo;
+
     /**
      * 1：有效 0:无效
      */
@@ -131,4 +133,13 @@ public class TabSysFunctionModule {
         this.updateTime = updateTime;
         return this;
     }
+
+    public String getLogo() {
+        return logo;
+    }
+
+    public TabSysFunctionModule setLogo(String logo) {
+        this.logo = logo;
+        return this;
+    }
 }
\ No newline at end of file

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

@@ -77,7 +77,7 @@ public class IndexLogServiceImpl implements IndexLogService {
         indexLog.setStatus(1);
         indexLog.setCreateTime(new Date());
         indexLog.setUpdateTime(new Date());
-        indexLog.setType(LogAndUpdateTipsTypeEnum.INDEX.getCode());
+        indexLog.setType(LogAndUpdateTipsTypeEnum.DATA_EXPLAIN.getCode());
         tabIndexLogMapper.insert(indexLog);
     }
 }

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

@@ -8,13 +8,14 @@
     <result column="function_module_desc" jdbcType="VARCHAR" property="functionModuleDesc" />
     <result column="operation_id" jdbcType="VARCHAR" property="operationId" />
     <result column="operation_name" jdbcType="VARCHAR" property="operationName" />
+    <result column="logo" jdbcType="VARCHAR" property="logo" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
     function_module_id, function_module_name, function_module_code, function_module_desc, 
-    operation_id, operation_name, status, create_time, update_time
+    operation_id, operation_name, logo, status, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -29,11 +30,11 @@
   <insert id="insert" parameterType="com.gic.cloud.entity.TabSysFunctionModule" useGeneratedKeys="true" keyProperty="functionModuleId">
     insert into tab_sys_function_module (function_module_id, function_module_name, 
       function_module_code, function_module_desc, 
-      operation_id, operation_name, status, 
+      operation_id, operation_name, logo, status,
       create_time, update_time)
     values (#{functionModuleId,jdbcType=INTEGER}, #{functionModuleName,jdbcType=VARCHAR}, 
       #{functionModuleCode,jdbcType=VARCHAR}, #{functionModuleDesc,jdbcType=VARCHAR}, 
-      #{operationId,jdbcType=VARCHAR}, #{operationName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
+      #{operationId,jdbcType=VARCHAR}, #{operationName,jdbcType=VARCHAR}, #{logo,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.cloud.entity.TabSysFunctionModule">
@@ -57,6 +58,9 @@
       <if test="operationName != null">
         operation_name,
       </if>
+      <if test="logo != null">
+        logo,
+      </if>
       <if test="status != null">
         status,
       </if>
@@ -86,6 +90,9 @@
       <if test="operationName != null">
         #{operationName,jdbcType=VARCHAR},
       </if>
+      <if test="logo != null">
+        #{logo,jdbcType=VARCHAR},
+      </if>
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
@@ -115,6 +122,9 @@
       <if test="operationName != null">
         operation_name = #{operationName,jdbcType=VARCHAR},
       </if>
+      <if test="logo != null">
+        logo = #{logo,jdbcType=VARCHAR},
+      </if>
       <if test="status != null">
         status = #{status,jdbcType=INTEGER},
       </if>
@@ -134,6 +144,7 @@
       function_module_desc = #{functionModuleDesc,jdbcType=VARCHAR},
       operation_id = #{operationId,jdbcType=VARCHAR},
       operation_name = #{operationName,jdbcType=VARCHAR},
+      logo = #{logo,jdbcType=VARCHAR},
       status = #{status,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}

gic-data-cloud-web/src/main/java/com/gic/cloud/web/vo/FunctionModuleVO.java

@@ -22,6 +22,8 @@ public class FunctionModuleVO implements Serializable{
      */
     private String functionModuleDesc;
 
+    private String logo;
+
 
 
     public String getFunctionModuleName() {
@@ -51,4 +53,12 @@ public class FunctionModuleVO implements Serializable{
         return this;
     }
 
+    public String getLogo() {
+        return logo;
+    }
+
+    public FunctionModuleVO setLogo(String logo) {
+        this.logo = logo;
+        return this;
+    }
 }