修改接入基本准备接口

liutongyi-admin/src/main/java/com/citygis/web/controller/TabAccessReadyController.java

@@ -43,7 +43,7 @@ public class TabAccessReadyController {
         return tabAccessReadyService.insertTabAccessReady(tabAccessReady);
     }
 
-    @Log(title = "修改接入基本准备接入方列表", businessType = BusinessType.UPDATE)
+    @Log(title = "修改接入基本准备", businessType = BusinessType.UPDATE)
     @ApiOperation("修改接入基本准备接入方列表")
     @PostMapping("/updateTabAccessReadyById")
     public AjaxResult updateTabAccessReadyById(@RequestBody TabAccessReady tabAccessReady) {

liutongyi-admin/src/main/java/com/citygis/web/controller/TabSystemMsgController.java

@@ -32,8 +32,8 @@ public class TabSystemMsgController extends BaseController {
     @Resource
     ITabSystemMsgService tabSystemMsgService;
 
-    @Log(title = "统计分析管理-统一接入统计结果", businessType = BusinessType.SELECT)
-    @ApiOperation("统一接入统计结果")
+    @Log(title = "统计分析管理-统一接入同步结果", businessType = BusinessType.SELECT)
+    @ApiOperation("统一接入同步结果")
     @GetMapping("/getTabSystemMsgList")
     public TableDataInfo getTabSystemMsgList(TabSystemMsg tabSystemMsg) {
         startPage();

liutongyi-admin/src/main/java/com/citygis/web/domain/TabAccessAndReady.java

@@ -1,6 +1,8 @@
 package com.citygis.web.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -28,6 +30,7 @@ public class TabAccessAndReady implements Serializable {
 
     @ApiModelProperty(value = "id")
     @TableField("ID")
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     @ApiModelProperty(value = "接入方id")
@@ -70,5 +73,21 @@ public class TabAccessAndReady implements Serializable {
     @TableField("ACCESS_ONLY_ID")
     private Long accessOnlyId;
 
+    @ApiModelProperty(value = "所属部门名称")
+    @TableField("DEPT")
+    private String dept;
+
+    @ApiModelProperty(value = "系统名称")
+    @TableField("SYSTEM")
+    private String system;
+
+    @ApiModelProperty(value = "ip")
+    @TableField("READY_IP")
+    private String readyIp;
+
+    @ApiModelProperty(value = "端口")
+    @TableField("READY_PORT")
+    private String readyPort;
+
 
 }

liutongyi-admin/src/main/java/com/citygis/web/domain/TabAccessReady.java

@@ -1,6 +1,8 @@
 package com.citygis.web.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.citygis.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -31,6 +33,7 @@ public class TabAccessReady extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "id")
     @TableField("ID")
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Long id;
 
     @ApiModelProperty(value = "标识符")

liutongyi-admin/src/main/java/com/citygis/web/service/impl/TabAccessReadyServiceImpl.java

@@ -107,11 +107,14 @@ public class TabAccessReadyServiceImpl extends ServiceImpl<TabAccessReadyMapper,
         List<TabAccessAndReady> accessList = tabAccessReady.getAccess();
         List<TabAccessAndReady> offersList = tabAccessReady.getOffers();
 
+
         accessList.forEach(access -> {
             TabAccessAndReady byId = tabAccessAndReadyService.getById(access.getId());
             if(byId == null){
                 access.setAccessOnlyId(tabAccessReady.getId());
                 tabAccessAndReadyService.save(access);
+            }else{
+                tabAccessAndReadyService.updateById(access);
             }
         });
 
@@ -120,6 +123,8 @@ public class TabAccessReadyServiceImpl extends ServiceImpl<TabAccessReadyMapper,
             if(byId == null){
                 offer.setAccessOnlyId(tabAccessReady.getId());
                 tabAccessAndReadyService.save(offer);
+            }else{
+                tabAccessAndReadyService.updateById(offer);
             }
         });