数据库合并

auc/src/main/java/cn/hobbystocks/auc/web/DiamondPositionController.java

@@ -11,10 +11,7 @@ import cn.hobbystocks.auc.common.user.UserUtils;
 import cn.hobbystocks.auc.common.utils.DateUtils;
 import cn.hobbystocks.auc.convert.DiamondPositionConvert;
 import cn.hobbystocks.auc.domain.DiamondPosition;
-import cn.hobbystocks.auc.request.DiamondPositionPageRequest;
-import cn.hobbystocks.auc.request.DiamondPositionQueryRequest;
-import cn.hobbystocks.auc.request.DiamondPositionRequest;
-import cn.hobbystocks.auc.request.DiamondPositionSaveRequest;
+import cn.hobbystocks.auc.request.*;
 import cn.hobbystocks.auc.response.DiamondPositionResponse;
 import cn.hobbystocks.auc.service.IDiamondPositionService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -51,10 +48,10 @@ public class DiamondPositionController extends AdminBaseController {
             @ApiResponse(code = 0, message = "请求成功", response = DiamondPositionResponse.class)
     })
     public AjaxResult page(@RequestBody DiamondPositionPageRequest request) {
-//        UserInfo userInfo = UserUtils.getSimpleUserInfo();
-//        if (Objects.isNull(userInfo)) {
-//            return AjaxResult.error("请先登录");
-//        }
+        UserInfo userInfo = UserUtils.getSimpleUserInfo();
+        if (Objects.isNull(userInfo)) {
+            return AjaxResult.error("请先登录");
+        }
 
         DiamondPosition diamondPosition = new DiamondPosition();
         BeanUtils.copyProperties(request, diamondPosition);
@@ -63,6 +60,23 @@ public class DiamondPositionController extends AdminBaseController {
         return AjaxResult.successPage(list);
     }
 
+
+    /**
+     * 新增金刚位\修改金刚位
+     */
+    @ApiOperation(value = "新增金刚位/修改金刚位", notes = "新增金刚位", response = AjaxResult.class, responseContainer = "AjaxResult.success")
+    @PostMapping("/saveOrUpdate")
+    public AjaxResult saveOrUpdate(@RequestBody DiamondPositionSaveRequest request) {
+        UserInfo userInfo = UserUtils.getSimpleUserInfo();
+        if (Objects.isNull(userInfo)) {
+            return AjaxResult.error("请先登录");
+        }
+
+        int result = diamondPositionService.saveOrUpdate(request);
+        return result > 0 ? AjaxResult.success("操作成功") : AjaxResult.error("操作失败");
+    }
+
+
     /**
      * 获取金刚位详细信息
      */
@@ -72,10 +86,10 @@ public class DiamondPositionController extends AdminBaseController {
             @ApiResponse(code = 0, message = "请求成功", response = DiamondPositionResponse.class)
     })
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-//        UserInfo userInfo = UserUtils.getSimpleUserInfo();
-//        if (Objects.isNull(userInfo)) {
-//            return AjaxResult.error("请先登录");
-//        }
+        UserInfo userInfo = UserUtils.getSimpleUserInfo();
+        if (Objects.isNull(userInfo)) {
+            return AjaxResult.error("请先登录");
+        }
 
         DiamondPosition diamondPosition = diamondPositionService.selectDiamondPositionById(id);
         if (diamondPosition == null) {
@@ -85,20 +99,7 @@ public class DiamondPositionController extends AdminBaseController {
         return AjaxResult.success(diamondPositionResponse);
     }
 
-    /**
-     * 新增金刚位\修改金刚位
-     */
-    @ApiOperation(value = "新增金刚位/修改金刚位", notes = "新增金刚位", response = AjaxResult.class)
-    @PostMapping("/saveOrUpdate")
-    public AjaxResult saveOrUpdate(@RequestBody DiamondPositionSaveRequest request) {
-//        UserInfo userInfo = UserUtils.getSimpleUserInfo();
-//        if (Objects.isNull(userInfo)) {
-//            return AjaxResult.error("请先登录");
-//        }
 
-        int result = diamondPositionService.saveOrUpdate(request);
-        return result > 0 ? AjaxResult.success("操作成功") : AjaxResult.error("操作失败");
-    }
 
 
     /**
@@ -107,10 +108,10 @@ public class DiamondPositionController extends AdminBaseController {
     @ApiOperation(value = "删除金刚位", notes = "逻辑删除金刚位", response = AjaxResult.class)
     @GetMapping("/delete/{id}")
     public AjaxResult remove(@PathVariable("id") Long id) {
-//        UserInfo userInfo = UserUtils.getSimpleUserInfo();
-//        if (Objects.isNull(userInfo)) {
-//            return AjaxResult.error("请先登录");
-//        }
+        UserInfo userInfo = UserUtils.getSimpleUserInfo();
+        if (Objects.isNull(userInfo)) {
+            return AjaxResult.error("请先登录");
+        }
 
         int result = diamondPositionService.deleteDiamondPositionById(id, getUsername());
         return result > 0 ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");

auc/src/main/resources/application.yml

@@ -4,7 +4,7 @@ spring:
   application:
     name: auction-ahx
   datasource:
-    url: ${DB_URL:jdbc:postgresql://192.168.50.8:5432/ahx_auction}
+    url: ${DB_URL:jdbc:postgresql://192.168.50.8:5432/ahx_app}
     username: ${DB_USERNAME:postgres}
     password: ${DB_PASSWORD:123456}
   mvc:

bid/src/main/resources/application.yml

@@ -4,7 +4,7 @@ spring:
   application:
     name: bid-hk
   datasource:
-    url: ${DB_URL:jdbc:postgresql://192.168.50.8:5432/ahx_auction}
+    url: ${DB_URL:jdbc:postgresql://192.168.50.8:5432/ahx_app}
     username: ${DB_USERNAME:postgres}
     password: ${DB_PASSWORD:123456}