From b6cec9be5a055f9c254e2158b6556acb9700bc90 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 10 四月 2025 08:17:43 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/mapper/ApiConfigMapper.java | 14 +++++++
src/main/java/com/zy/asrs/service/ApiConfigService.java | 8 ++++
src/main/resources/mapper/ApiConfigMapper.xml | 23 +++++++++++
src/main/java/com/zy/asrs/entity/ApiConfig.java | 4 +-
src/main/java/com/zy/asrs/controller/ApiConfigController.java | 41 ++++++++++++++++++--
src/main/java/com/zy/asrs/service/impl/ApiConfigServiceImpl.java | 17 ++++++++
6 files changed, 100 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ApiConfigController.java b/src/main/java/com/zy/asrs/controller/ApiConfigController.java
index 41e40ad..8fd4bbb 100644
--- a/src/main/java/com/zy/asrs/controller/ApiConfigController.java
+++ b/src/main/java/com/zy/asrs/controller/ApiConfigController.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.ApiConfig;
+import com.zy.asrs.entity.WrkDetlLog;
import com.zy.asrs.service.ApiConfigService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -30,6 +31,20 @@
return R.ok(apiConfigService.selectById(String.valueOf(id)));
}
+// @RequestMapping(value = "/apiConfig/list/auth")
+//// @ManagerAuth
+// public R list(@RequestParam(defaultValue = "1")Integer curr,
+// @RequestParam(defaultValue = "10")Integer limit,
+// @RequestParam(required = false)String orderByField,
+// @RequestParam(required = false)String orderByType,
+// @RequestParam Map<String, Object> param){
+// EntityWrapper<ApiConfig> wrapper = new EntityWrapper<>();
+// excludeTrash(param);
+// convert(param, wrapper);
+// if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+// return R.ok(apiConfigService.selectPage(new Page<>(curr, limit), wrapper));
+// }
+
@RequestMapping(value = "/apiConfig/list/auth")
// @ManagerAuth
public R list(@RequestParam(defaultValue = "1")Integer curr,
@@ -37,11 +52,27 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
- EntityWrapper<ApiConfig> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(apiConfigService.selectPage(new Page<>(curr, limit), wrapper));
+ try {
+ long id = 0;
+ String url = null;
+ for (Map.Entry<String, Object> entry : param.entrySet()) {
+ String val = String.valueOf(entry.getValue());
+ if (Cools.isEmpty(val)) {
+ continue;
+ }
+ if (entry.getKey().equals("id")) {
+ id = Long.getLong(val);
+ }else if (entry.getKey().equals("url")) {
+ url = val;
+ }
+ }
+ List<ApiConfig> apiConfigList = apiConfigService.selectApiConfigList(id,url, curr, limit);
+ Page<ApiConfig> page1 = new Page<ApiConfig>(curr, limit).setRecords(apiConfigList);
+ page1.setTotal(apiConfigService.selectApiConfigListTotal(id,url));
+ return R.ok(page1);
+ } catch (Exception e) {
+ return R.error("寮傚父" + e);
+ }
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
diff --git a/src/main/java/com/zy/asrs/entity/ApiConfig.java b/src/main/java/com/zy/asrs/entity/ApiConfig.java
index 41a77c1..996e6aa 100644
--- a/src/main/java/com/zy/asrs/entity/ApiConfig.java
+++ b/src/main/java/com/zy/asrs/entity/ApiConfig.java
@@ -83,7 +83,7 @@
public ApiConfig() {}
- public ApiConfig(String url,Integer status,String memo,Date createTime,Date updateTime,Long createBy,Long updateBy) {
+ public ApiConfig(String url, Integer status, String memo, Date createTime, Date updateTime, Long createBy, Long updateBy) {
this.url = url;
this.status = status;
this.memo = memo;
@@ -93,7 +93,7 @@
this.updateBy = updateBy;
}
-// ApiConfig apiConfig = new ApiConfig(
+ // ApiConfig apiConfig = new ApiConfig(
// null, // api鍦板潃
// null, // 鐘舵��
// null, // 澶囨敞
diff --git a/src/main/java/com/zy/asrs/mapper/ApiConfigMapper.java b/src/main/java/com/zy/asrs/mapper/ApiConfigMapper.java
index 80beb1d..e098f44 100644
--- a/src/main/java/com/zy/asrs/mapper/ApiConfigMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ApiConfigMapper.java
@@ -3,7 +3,10 @@
import com.zy.asrs.entity.ApiConfig;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
+
+import java.util.List;
@Mapper
@Repository
@@ -11,4 +14,15 @@
ApiConfig selectByUrl(String url);
+ List<ApiConfig> selectApiConfigList(
+ @Param("id") Long id,
+ @Param("url") String url,
+ @Param("pageNumber") Integer curr,
+ @Param("pageSize") Integer limit
+ );
+ Long selectApiConfigListTotal(
+ @Param("id") Long id,
+ @Param("url") String url
+ );
+
}
diff --git a/src/main/java/com/zy/asrs/service/ApiConfigService.java b/src/main/java/com/zy/asrs/service/ApiConfigService.java
index fc269ff..02f0f7b 100644
--- a/src/main/java/com/zy/asrs/service/ApiConfigService.java
+++ b/src/main/java/com/zy/asrs/service/ApiConfigService.java
@@ -3,8 +3,16 @@
import com.zy.asrs.entity.ApiConfig;
import com.baomidou.mybatisplus.service.IService;
+import java.util.List;
+
public interface ApiConfigService extends IService<ApiConfig> {
ApiConfig selectByUrl(String url);
+ List<ApiConfig> selectApiConfigList(Integer curr, Integer limit);
+
+ List<ApiConfig> selectApiConfigList(Long id,String url, Integer curr, Integer limit);
+
+ Long selectApiConfigListTotal(Long id,String url);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/ApiConfigServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ApiConfigServiceImpl.java
index f96f797..5b704f5 100644
--- a/src/main/java/com/zy/asrs/service/impl/ApiConfigServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ApiConfigServiceImpl.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+import java.util.List;
+
@Service("apiConfigService")
public class ApiConfigServiceImpl extends ServiceImpl<ApiConfigMapper, ApiConfig> implements ApiConfigService {
@@ -13,4 +15,19 @@
public ApiConfig selectByUrl(String url) {
return this.baseMapper.selectByUrl(url);
}
+
+ @Override
+ public List<ApiConfig> selectApiConfigList(Integer curr, Integer limit) {
+ return this.baseMapper.selectApiConfigList(null,null,curr, limit);
+ }
+
+ @Override
+ public List<ApiConfig> selectApiConfigList(Long id,String url,Integer curr, Integer limit) {
+ return this.baseMapper.selectApiConfigList(id,url, curr, limit);
+ }
+
+ @Override
+ public Long selectApiConfigListTotal(Long id,String url) {
+ return this.baseMapper.selectApiConfigListTotal(id,url);
+ }
}
diff --git a/src/main/resources/mapper/ApiConfigMapper.xml b/src/main/resources/mapper/ApiConfigMapper.xml
index cac57ff..d6d9747 100644
--- a/src/main/resources/mapper/ApiConfigMapper.xml
+++ b/src/main/resources/mapper/ApiConfigMapper.xml
@@ -15,10 +15,33 @@
</resultMap>
+ <sql id="batchSeq">
+ <if test="id != null and id != 0">
+ and a.ID = #{id}
+ </if>
+ <if test="url != null and url != ''">
+ and a.URL = #{url}
+ </if>
+ </sql>
+
<select id="selectByUrl" resultMap="BaseResultMap">
select top 1 * from "SOURCE"."wcs_api_config"
where "URL" = #{url}
order by "CREATE_TIME" desc
</select>
+ <select id="selectApiConfigList" resultMap="BaseResultMap">
+ SELECT * FROM "SOURCE"."wcs_api_config"
+ WHERE 1=1
+ <include refid="batchSeq"></include>
+ ORDER BY CREATE_TIME DESC
+ LIMIT #{pageSize} OFFSET ((#{pageNumber} - 1) * #{pageSize});
+ </select>
+
+ <select id="selectApiConfigListTotal" resultType="Long">
+ SELECT count(1) FROM "SOURCE"."wcs_api_config"
+ WHERE 1=1
+ <include refid="batchSeq"></include>
+ </select>
+
</mapper>
--
Gitblit v1.9.1