Merge branch 'feature-2023-01-9-addlog' into 'developer'

Feature 2023 01 9 addlog

See merge request !60

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

@@ -4,6 +4,8 @@ package com.gic.cloud.data.hook.api.service;
 import com.gic.cloud.common.api.base.Page;
 import com.gic.cloud.data.hook.api.dto.MyFlatQuery;
 
+import java.util.List;
+
 /** 自定义指标查询服务
  * @author Sam
  */
@@ -43,5 +45,9 @@ public interface IMyFlatQueryService {
 	public Page<MyFlatQuery> queryMyFlatQueryPage(String userId, String fuzzy, int pageNum, int pageSize);
 
 
+	/** 请求自定义指标查询数据分页
+	 * @return
+	 */
+	public void delMyFields(String tableId, List<String> delFields);
 
 }

gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/dao/MyFlatQueryDao.java

@@ -43,5 +43,13 @@ public interface MyFlatQueryDao {
 	 */
 	List<MyFlatQuery> getMyFlatQueryList(@Param("userId") String userId, @Param("fuzzy") String fuzzy);
 
+	/**
+	 * 查询列表
+	 * @param tableId
+	 * @return
+	 */
+	List<MyFlatQuery> getMyFlatQueryListByTableId(@Param("tableId") String tableId);
+
+
 
 }

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

 package com.gic.cloud.data.hook.service.impl;
 
 import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.gic.cloud.common.api.base.Page;
 import com.gic.cloud.data.hook.api.dto.MyFlatQuery;
 import com.gic.cloud.data.hook.api.service.IMyFlatQueryService;
@@ -9,6 +11,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -70,8 +73,22 @@ public class MyFlatQueryServiceImpl implements IMyFlatQueryService {
 		return result;
 	}
 
-
-
-
-
+	@Override
+	public void delMyFields(String tableId, List<String> delFields) {
+		List<MyFlatQuery> lists = myFlatQueryDao.getMyFlatQueryListByTableId(tableId);
+		for (MyFlatQuery myFlatQuery : lists) {
+			String conditionsText = myFlatQuery.getConditionsText();
+			List<JSONObject> midList = new ArrayList<>();
+			JSONArray objects = JSONArray.parseArray(conditionsText);
+			for (int i = 0; i < objects.size(); i++) {
+				JSONObject jsonObject = objects.getJSONObject(i);
+				if (delFields.contains(jsonObject.getString("fieldName"))){
+					continue;
+				}
+				midList.add(jsonObject);
+			}
+			myFlatQuery.setConditionsText(JSONObject.toJSONString(midList));
+			myFlatQueryDao.updateMyFlatQuery(myFlatQuery);
+		}
+	}
 }

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

@@ -97,4 +97,13 @@
 			q.update_time DESC
 	</select>
 
+	<select id="getMyFlatQueryListByTableId" resultType="MyFlatQuery">
+		SELECT
+		<include refid="queryColumns"/>
+		FROM
+		<include refid="queryTables"/>
+		WHERE
+		table_id =
+	</select>
+
 </mapper>
\ No newline at end of file

gic-cloud-data-hook/src/main/java/com/gic/cloud/data/hook/web/FlatQueryController.java

@@ -426,5 +426,20 @@ public class FlatQueryController {
 	}
 
 
+	/** 删除指定的自定义指标查询
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	@RequestMapping("/deal-my-flat-query")
+	public GeneralResult dealMyFlatQuery(HttpServletRequest request, HttpServletResponse response) {
+		GeneralResult result = new GeneralResult();
+		String tableId = request.getParameter("tableId");
+		String fields = request.getParameter("fields");
+		String[] split = fields.split(",");
+		List<String> fieldArr = Arrays.asList(split);
+		myFlatQueryService.delMyFields(tableId,fieldArr);
+		return result;
+	}
 
 }