阶段性提交

src/main/java/com/template/api/SmartDataSourceControllerAPI.java

@@ -24,11 +24,11 @@ public interface SmartDataSourceControllerAPI {
 
     @PostMapping(value = "/updateSmartDataSourceById")
     @ApiOperation(value = "编辑数据源数据", notes = "编辑数据源数据", httpMethod = "POST")
-    CommonResult updateSmartDataSourceById(@Validated @RequestBody SmartDataSource ra, BindingResult bindingResult);
+    CommonResult updateSmartDataSourceById(@Validated @RequestBody SmartDataSource smartDataSource, BindingResult bindingResult);
 
     @GetMapping(value = "/queryPageSmartDataSource")
     @ApiOperation(value = "数据源分页数据", notes = "数据源分页数据", httpMethod = "GET")
-    CommonResult queryPageSmartDataSources(@RequestParam int currentPage, @RequestParam int pageCount, String name);
+    CommonResult queryPageSmartDataSources(@RequestParam int currentPage, @RequestParam int pageCount, SmartDataSource smartDataSource);
 
     @GetMapping(value = "/deleteSmartDataSourceById")
     @ApiOperation(value = "根据ID删除指定数据源", notes = "根据ID删除指定数据源", httpMethod = "GET")

src/main/java/com/template/common/utils/CommonUtil.java

@@ -17,6 +17,19 @@ import java.util.*;
 @Slf4j
 public class CommonUtil {
     /**
+     * 检测客户端参数
+     * @param code 状态码
+     * @param msg 信息
+     * @return 返回类型
+     */
+    public static Map<String, String> getReturnMap(String code, String msg) {
+        Map<String, String> returnMap = new HashMap<>();
+        returnMap.put("code", code);
+        returnMap.put("msg", msg);
+        return returnMap;
+    }
+
+    /**
      * 获取ip
      *
      * @param request
@@ -26,18 +39,18 @@ public class CommonUtil {
         String ipAddress = null;
         try {
             ipAddress = request.getHeader("x-forwarded-for");
-            System.out.println("x-forwarded-for="+ipAddress);
+            System.out.println("x-forwarded-for=" + ipAddress);
             if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
                 ipAddress = request.getHeader("Proxy-Client-IP");
-                System.out.println("Proxy-Client-IP="+ipAddress);
+                System.out.println("Proxy-Client-IP=" + ipAddress);
             }
             if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
                 ipAddress = request.getHeader("WL-Proxy-Client-IP");
-                System.out.println("WL-Proxy-Client-IP="+ipAddress);
+                System.out.println("WL-Proxy-Client-IP=" + ipAddress);
             }
             if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
                 ipAddress = request.getRemoteAddr();
-                System.out.println("getRemoteAddr="+ipAddress);
+                System.out.println("getRemoteAddr=" + ipAddress);
                 if (ipAddress.equals("127.0.0.1")) {
                     // 根据网卡取本机配置的IP
                     InetAddress inet = null;
@@ -47,7 +60,7 @@ public class CommonUtil {
                         e.printStackTrace();
                     }
                     ipAddress = inet.getHostAddress();
-                    System.out.println("getHostAddress="+ipAddress);
+                    System.out.println("getHostAddress=" + ipAddress);
                 }
             }
             // 对于通过多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割
@@ -161,8 +174,9 @@ public class CommonUtil {
 
     /**
      * LocalDate 拼接时间转成 LocalDateTime
+     *
      * @param localDate
-     * @param timeStr HH:mm:ss
+     * @param timeStr   HH:mm:ss
      * @return
      */
     public static LocalDateTime localDateToTime(LocalDate localDate, String timeStr) {

src/main/java/com/template/controller/SmartDataSourceController.java

@@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 /**
  * <p>
  * 数据源配置 前端控制器
@@ -27,50 +29,50 @@ public class SmartDataSourceController implements SmartDataSourceControllerAPI {
     private SmartDataSourceService smartDataSourceService;
 
     /**
-     * 新增楼栋
-     * @param smartApply 楼栋数据
+     * 新增数据源
+     * @param smartDataSource 数据源
      * @param bindingResult
      * @return
      */
     @Override
-    public CommonResult insertSmartDataSource(SmartDataSource smartApply, BindingResult bindingResult) {
+    public CommonResult insertSmartDataSource(SmartDataSource smartDataSource, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
         }
 
-        int result = smartDataSourceService.insertSmartDataSource(smartApply);
+        Map<String, String> result = smartDataSourceService.insertSmartDataSource(smartDataSource);
 
-        return result > 0 ? CommonResult.ok("添加成功") : CommonResult.fail("添加失败");
+        return Integer.parseInt(result.get("code")) > 0 ? CommonResult.ok(result.get("msg")) : CommonResult.fail(result.get("msg"));
     }
 
     /**
-     * 更新楼栋
-     * @param sa 楼栋数据
+     * 更新数据源
+     * @param smartDataSource
      * @param bindingResult
      * @return
      */
     @Override
-    public CommonResult updateSmartDataSourceById(SmartDataSource sa, BindingResult bindingResult) {
+    public CommonResult updateSmartDataSourceById(SmartDataSource smartDataSource, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
         }
 
-        int result = smartDataSourceService.updateSmartDataSource(sa);
+        int result = smartDataSourceService.updateSmartDataSource(smartDataSource);
         return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
     }
 
     /**
-     * 楼栋分页数据查询
+     * 数据源分页数据查询
      * @param currentPage 当前页数
      * @param pageCount 一页数据条数
-     * @param name 查询名称
+     * @param smartDataSource 查询数据源实体
      * @return
      */
     @Override
-    public CommonResult queryPageSmartDataSources(int currentPage, int pageCount, String name) {
-        PageUtils<SmartDataSource> result = smartDataSourceService.queryPageSmartDataSources(currentPage, pageCount, name);
+    public CommonResult queryPageSmartDataSources(int currentPage, int pageCount, SmartDataSource smartDataSource) {
+        PageUtils<SmartDataSource> result = smartDataSourceService.queryPageSmartDataSources(currentPage, pageCount, smartDataSource);
 
         return CommonResult.ok(result);
     }

src/main/java/com/template/model/pojo/SmartDataClass.java

@@ -5,6 +5,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -34,9 +36,11 @@ public class SmartDataClass implements Serializable {
     @ApiModelProperty(value = "数据源类别名称")
     private String dsClsName;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "创建时间")
     private Date dsClsCreateTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "更新时间")
     private Date dsClsUpdateTime;
 

src/main/java/com/template/model/pojo/SmartDataSource.java

@@ -5,6 +5,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -41,7 +43,7 @@ public class SmartDataSource implements Serializable {
     private String dsUrl;
 
     @ApiModelProperty(value = "数据源状态：0异常，1正常")
-    private String dsStatus;
+    private Integer dsStatus;
 
     @ApiModelProperty(value = "数据源SQL语言")
     private String dsSql;
@@ -55,9 +57,11 @@ public class SmartDataSource implements Serializable {
     @ApiModelProperty(value = "目的数据库使用次数")
     private Integer dsTarget;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "创建时间")
     private Date dsCreateTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "更新时间")
     private Date dsUpdateTime;
 

src/main/java/com/template/services/SmartDataSourceService.java

@@ -5,6 +5,8 @@ import com.template.model.pojo.SmartDataSource;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.result.PageUtils;
 
+import java.util.Map;
+
 /**
  * <p>
  * 数据源配置 服务类
@@ -14,11 +16,11 @@ import com.template.model.result.PageUtils;
  * @since 2023-12-05
  */
 public interface SmartDataSourceService extends IService<SmartDataSource> {
-    int insertSmartDataSource(SmartDataSource rns);
+    Map<String, String> insertSmartDataSource(SmartDataSource rns);
 
     int updateSmartDataSource(SmartDataSource rns);
 
-    PageUtils<SmartDataSource> queryPageSmartDataSources(int currentPage, int pageCount, String name);
+    PageUtils<SmartDataSource> queryPageSmartDataSources(int currentPage, int pageCount, SmartDataSource smartDataSource);
 
     int deleteSmartDataSourceById(int id);
 

src/main/java/com/template/services/impl/SmartDataSourceServiceImpl.java

@@ -3,15 +3,24 @@ package com.template.services.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.template.common.utils.CommonUtil;
 import com.template.mapper.SmartDataSourceMapper;
 import com.template.model.pojo.SmartDataSource;
 import com.template.model.pojo.SmartDataSource;
 import com.template.mapper.SmartDataSourceMapper;
+import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.services.SmartDataSourceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -27,9 +36,30 @@ public class SmartDataSourceServiceImpl extends ServiceImpl<SmartDataSourceMappe
     private SmartDataSourceMapper smartDataSourceMapper;
 
     @Override
-    public int insertSmartDataSource(SmartDataSource sa) {
-        int result = smartDataSourceMapper.insert(sa);
-        return result;
+    public Map<String, String> insertSmartDataSource(SmartDataSource smartDataSource) {
+        // 检测必要参数是否为null
+        if (smartDataSource.getDsClsId() == null) {
+            return CommonUtil.getReturnMap("0", "【数据源类型id】不能为空！");
+        }
+        if (smartDataSource.getDsName() == null) {
+            return CommonUtil.getReturnMap("0", "【数据源名称】不能为空！");
+        }
+        if (smartDataSource.getDsUrl() == null) {
+            return CommonUtil.getReturnMap("0", "【数据源连接地址】不能为空！");
+        }
+        if (smartDataSource.getDsSql() == null) {
+            return CommonUtil.getReturnMap("0", "【数据源SQL语言】不能为空！");
+        }
+        if (smartDataSource.getDsDescrition() == null) {
+            return CommonUtil.getReturnMap("0", "【数据源描述】不能为空！");
+        }
+        // 必填的参数不为null，则进行新增操作
+        int result = smartDataSourceMapper.insert(smartDataSource);
+        if (result > 0) {
+            return CommonUtil.getReturnMap(String.valueOf(result), "数据源添加成功！");
+        } else {
+            return CommonUtil.getReturnMap(String.valueOf(result), "数据源添加失败！");
+        }
     }
 
     @Override
@@ -39,11 +69,14 @@ public class SmartDataSourceServiceImpl extends ServiceImpl<SmartDataSourceMappe
     }
 
     @Override
-    public PageUtils<SmartDataSource> queryPageSmartDataSources(int currentPage, int pageCount, String name) {
+    public PageUtils<SmartDataSource> queryPageSmartDataSources(int currentPage, int pageCount, SmartDataSource smartDataSource) {
         Page<SmartDataSource> page = new Page<>(currentPage, pageCount);
         QueryWrapper<SmartDataSource> queryWrapper = new QueryWrapper<>();
-        //queryWrapper.like(StringUtils.hasText(name), "name", name);
-        IPage<SmartDataSource> result = smartDataSourceMapper.selectPage(page,queryWrapper);
+        queryWrapper.like(StringUtils.hasText(smartDataSource.getDsName()), "ds_name", smartDataSource.getDsName());
+        queryWrapper.like(StringUtils.hasText(smartDataSource.getDsUrl()), "ds_url", smartDataSource.getDsUrl());
+        queryWrapper.like(smartDataSource.getDsStatus() != null, "ds_status", smartDataSource.getDsStatus());
+        queryWrapper.like(StringUtils.hasText(smartDataSource.getDsDescrition()), "ds_descrition", smartDataSource.getDsDescrition());
+        IPage<SmartDataSource> result = smartDataSourceMapper.selectPage(page, queryWrapper);
         return new PageUtils<>(result);
     }