对接修改

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsLotoStationController.java

@@ -84,7 +84,7 @@ public class IsLotoStationController extends BaseController
     @GetMapping(value = "/selectIsLotoStationById")
     public CommonResult<IsLotoStation> selectIsLotoStationById(Long lotoId)
     {
-        return CommonResult.success(isLotoStationService.getById(lotoId));
+        return CommonResult.success(isLotoStationService.selectIsLotoStationById(lotoId));
     }
 
     /**

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsMapController.java

@@ -20,13 +20,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 import java.util.Arrays;
-
-
-
-
-import com.ktg.common.core.page.TableDataInfo;
+import java.util.List;
 
 /**
  * 地图参数Controller
@@ -77,7 +72,7 @@ public class IsMapController extends BaseController
     @GetMapping(value = "/selectIsMapById")
     public CommonResult<IsMap> selectIsMapById(Long id)
     {
-        return CommonResult.success(isMapService.getById(id));
+        return CommonResult.success(isMapService.selectIsMapById(id));
     }
 
     @ApiOperation("新增地图参数")

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsLotoStation.java

@@ -1,6 +1,7 @@
 package com.ktg.iscs.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.BaseEntity;
@@ -43,6 +44,10 @@ public class IsLotoStation extends BaseEntity
     @ApiModelProperty(value = "地图id")
     private Long mapId;
 
+    @ApiModelProperty(value = "地图name")
+    @TableField(exist = false)
+    private String mapName;
+
     @ApiModelProperty(value = "状态")
     @Excel(name = "状态")
     private String status;

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsMap.java

@@ -1,5 +1,6 @@
 package com.ktg.iscs.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +9,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
 
+import java.util.List;
+
 /**
  * 地图参数对象 is_map
  *
@@ -40,8 +43,20 @@ public class IsMap extends BaseBean
     @Excel(name = "图⽚⾼度")
     private String height;
 
+    @ApiModelProperty(value = "x坐标")
+    @Excel(name = "x坐标")
+    private String x;
+
+    @ApiModelProperty(value = "y坐标")
+    @Excel(name = "y坐标")
+    private String y;
+
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
+    @ApiModelProperty(value = "地图下的点位信息")
+    @TableField(exist = false)
+    private List<IsMapPoint> pointList;
+
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/loto/IsLotoStationVO.java

@@ -43,6 +43,12 @@ public class IsLotoStationVO extends BaseBean
     @Excel(name = "点位信息")
     private String map;
 
+    @ApiModelProperty(value = "地图id")
+    private Long mapId;
+
+    @ApiModelProperty(value = "地图name")
+    private String mapName;
+
     @ApiModelProperty(value = "状态")
     @Excel(name = "状态")
     private String status;

ktg-iscs/src/main/java/com/ktg/iscs/service/IIsLotoStationService.java

@@ -27,4 +27,6 @@ public interface IIsLotoStationService extends IService<IsLotoStation> {
 
     Boolean insertIsLotoStation(IsLotoStation isLotoStation);
 
+    IsLotoStation selectIsLotoStationById(Long lotoId);
+
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/IIsMapService.java

@@ -1,8 +1,7 @@
 package com.ktg.iscs.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ktg.iscs.domain.IsMap;
 
 /**
@@ -15,4 +14,6 @@ public interface IIsMapService extends IService<IsMap> {
 
     Page<IsMap> getIsMapPage(Page<IsMap> page, IsMap isMap);
 
+    IsMap selectIsMapById(Long id);
+
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsLotoStationServiceImpl.java

@@ -8,19 +8,13 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ktg.common.annotation.MarsDataScope;
 import com.ktg.common.utils.StringUtils;
-import com.ktg.iscs.domain.IsIsolationPoint;
-import com.ktg.iscs.domain.IsJobTicketPoints;
-import com.ktg.iscs.domain.IsLotoStation;
-import com.ktg.iscs.domain.IsSopPoints;
+import com.ktg.iscs.domain.*;
 import com.ktg.iscs.domain.dto.point.BindingPointDTO;
 import com.ktg.iscs.domain.vo.loto.IsLotoStationVO;
 import com.ktg.iscs.domain.vo.points.PointDetailVO;
 import com.ktg.iscs.domain.vo.workarea.PointsMapVO;
 import com.ktg.iscs.mapper.IsLotoStationMapper;
-import com.ktg.iscs.service.IIsIsolationPointService;
-import com.ktg.iscs.service.IIsJobTicketPointsService;
-import com.ktg.iscs.service.IIsLotoStationService;
-import com.ktg.iscs.service.IIsSopPointsService;
+import com.ktg.iscs.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -46,6 +40,8 @@ public class IsLotoStationServiceImpl extends ServiceImpl<IsLotoStationMapper, I
     private IIsSopPointsService iIsSopPointsService;
     @Autowired
     private IIsJobTicketPointsService iIsJobTicketPointsService;
+    @Autowired
+    private IIsMapService isMapService;
 
     @Override
     @MarsDataScope(workstationAlias = "w", userAlias = "u")
@@ -164,6 +160,7 @@ public class IsLotoStationServiceImpl extends ServiceImpl<IsLotoStationMapper, I
                 .eq(IsLotoStation::getLotoId, isLotoStation.getLotoId())
                 .set(IsLotoStation::getLotoName, isLotoStation.getLotoName())
                 .set(IsLotoStation::getOrderNum, isLotoStation.getOrderNum())
+                .set(IsLotoStation::getMapId, isLotoStation.getMapId() != null ? isLotoStation.getMapId() : null)
                 .set(IsLotoStation::getWorkstationId, isLotoStation.getWorkstationId() != null ? isLotoStation.getWorkstationId() : null)
                 .set(IsLotoStation::getMap, StringUtils.isNotBlank(isLotoStation.getMap()) ? isLotoStation.getMap() : null));
         return true;
@@ -178,4 +175,16 @@ public class IsLotoStationServiceImpl extends ServiceImpl<IsLotoStationMapper, I
         Assert.isTrue(list.isEmpty(), "该名称已被使用，请重新填写！");
         return save(isLotoStation);
     }
+
+    @Override
+    public IsLotoStation selectIsLotoStationById(Long lotoId) {
+        IsLotoStation byId = getById(lotoId);
+        if (byId != null && byId.getMapId() != null) {
+            IsMap map = isMapService.getById(byId.getMapId());
+            if (map != null) {
+                byId.setMapName(map.getName());
+            }
+        }
+        return byId;
+    }
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsMapServiceImpl.java

@@ -3,12 +3,17 @@ package com.ktg.iscs.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ktg.common.utils.StringUtils;
 import com.ktg.iscs.domain.IsMap;
+import com.ktg.iscs.domain.IsMapPoint;
 import com.ktg.iscs.mapper.IsMapMapper;
+import com.ktg.iscs.service.IIsMapPointService;
 import com.ktg.iscs.service.IIsMapService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 地图参数Service业务层处理
  *
@@ -20,12 +25,24 @@ public class IsMapServiceImpl extends ServiceImpl<IsMapMapper, IsMap> implements
 
     @Autowired
     private IsMapMapper isMapMapper;
+    @Autowired
+    private IIsMapPointService iIsMapPointService;
 
     @Override
     public Page<IsMap> getIsMapPage(Page<IsMap> page, IsMap isMap) {
         Page<IsMap> result = page(page, Wrappers.<IsMap>lambdaQuery()
+                .like(StringUtils.isNotBlank(isMap.getName()), IsMap::getName, isMap.getName())
                 .orderByDesc(IsMap::getId));
         return result;
     }
 
+    @Override
+    public IsMap selectIsMapById(Long id) {
+        IsMap map = getById(id);
+        List<IsMapPoint> list = iIsMapPointService.list(Wrappers.<IsMapPoint>lambdaQuery()
+                .eq(IsMapPoint::getMapId, id));
+        map.setPointList(list);
+        return map;
+    }
+
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsSystemAttributeServiceImpl.java

@@ -3,6 +3,7 @@ package com.ktg.iscs.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ktg.common.utils.StringUtils;
 import com.ktg.iscs.domain.IsSystemAttribute;
 import com.ktg.iscs.mapper.IsSystemAttributeMapper;
 import com.ktg.iscs.service.IIsSystemAttributeService;
@@ -24,6 +25,9 @@ public class IsSystemAttributeServiceImpl extends ServiceImpl<IsSystemAttributeM
     @Override
     public Page<IsSystemAttribute> getIsSystemAttributePage(Page<IsSystemAttribute> page, IsSystemAttribute isSystemAttribute) {
         Page<IsSystemAttribute> result = page(page, Wrappers.<IsSystemAttribute>lambdaQuery()
+                .like(StringUtils.isNotBlank(isSystemAttribute.getSysAttrName()), IsSystemAttribute::getSysAttrName, isSystemAttribute.getSysAttrName())
+                .like(StringUtils.isNotBlank(isSystemAttribute.getSysAttrKey()), IsSystemAttribute::getSysAttrKey, isSystemAttribute.getSysAttrKey())
+                .like(StringUtils.isNotBlank(isSystemAttribute.getSysAttrValue()), IsSystemAttribute::getSysAttrValue, isSystemAttribute.getSysAttrValue())
                 .orderByDesc(IsSystemAttribute::getSysAttrId));
         return result;
     }

ktg-iscs/src/main/resources/mapper/IsLotoStationMapper.xml

@@ -7,11 +7,13 @@
     <select id="getIsLotoStationPage" resultType="com.ktg.iscs.domain.vo.loto.IsLotoStationVO">
         SELECT
         l.*,
-        w.workstation_name
+        w.workstation_name,
+        m.name as map_name
         FROM
         is_loto_station l
         LEFT JOIN is_workstation w ON w.workstation_id = l.workstation_id
         LEFT JOIN sys_user u ON u.user_id = l.create_by
+        LEFT JOIN is_map m ON m.id = l.map_id
         where
             l.del_flag = '0'
             <if test="isLotoStation.lotoName != null and isLotoStation.lotoName.trim != ''">