对接修改

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

@@ -51,7 +51,7 @@ public class IsMotorController extends BaseController
     @GetMapping(value = "/selectIsMotorById")
     public CommonResult<IsMotor> selectIsMotorById(Long motorId)
     {
-        return CommonResult.success(isMotorService.getById(motorId));
+        return CommonResult.success(isMotorService.selectIsMotorById(motorId));
     }
 
     @ApiOperation("新增电机")

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

@@ -29,6 +29,9 @@ public class IsMotor extends BaseBean
     @Excel(name = "隔离点id(一个隔离点对应多个电机)")
     private Long pointId;
 
+    @ApiModelProperty(value = "编号")
+    private String motorCode;
+
     @ApiModelProperty(value = "隔离点id(一个隔离点对应多个电机)")
     @Excel(name = "隔离点id(一个隔离点对应多个电机)")
     @TableField(exist = false)
@@ -44,6 +47,9 @@ public class IsMotor extends BaseBean
     @ApiModelProperty(value = "状态（0-关闭 1-开启）")
     private String status;
 
+    @ApiModelProperty(value = "类型（SZ散装 GS高空运输线 MS码垛）")
+    private String motorType;
+
     @ApiModelProperty(value = "x")
     @TableField(exist = false)
     private String x;

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

@@ -25,4 +25,6 @@ public interface IIsMotorService extends IService<IsMotor> {
 
     Boolean updateIsMotor(IsMotor isMotor);
 
+    IsMotor selectIsMotorById(Long motorId);
+
 }

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

@@ -132,9 +132,11 @@ public class IsMotorServiceImpl extends ServiceImpl<IsMotorMapper, IsMotor> impl
         update(Wrappers.<IsMotor>lambdaUpdate()
                 .eq(IsMotor::getMotorId, isMotor.getMotorId())
                 .set(IsMotor::getMotorName, isMotor.getMotorName())
+                .set(IsMotor::getMotorType, isMotor.getMotorType())
+                .set(IsMotor::getMotorCode, isMotor.getMotorCode())
                 .set(IsMotor::getPointId, isMotor.getPointId() != null ? isMotor.getPointId() : null));
         // 开始执行删除is_map_point数据
-        if (!byId.getPointId().equals(isMotor.getPointId()) || isMotor.getPointId() == null) {
+        if (isMotor.getPointId() == null || !byId.getPointId().equals(isMotor.getPointId())) {
             isMapPointService.remove(Wrappers.<IsMapPoint>lambdaQuery()
                     .eq(IsMapPoint::getMapType, "4")
                     .eq(IsMapPoint::getEntityId, byId.getMotorId()));
@@ -142,4 +144,17 @@ public class IsMotorServiceImpl extends ServiceImpl<IsMotorMapper, IsMotor> impl
         return true;
     }
 
+    @Override
+    public IsMotor selectIsMotorById(Long motorId) {
+        IsMotor byId = getById(motorId);
+        if (byId != null && byId.getPointId() != null) {
+            IsIsolationPoint point = iIsIsolationPointService.getById(motorId);
+            if (point != null) {
+                byId.setPointName(point.getPointName());
+            }
+        }
+        return byId;
+    }
+
 }
+

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

@@ -13,12 +13,15 @@
                     w.workstation_name
                 WHEN p.map_type = '2' or p.map_type = '3' THEN
                     ip.point_name
+                WHEN p.map_type = '4' THEN
+                    mo.motor_name
                 END AS entity_name
         FROM
             is_map_point p
                 LEFT JOIN is_map m ON m.id = p.map_id
                 LEFT JOIN is_workstation w ON w.workstation_id = p.entity_id
                 LEFT JOIN is_isolation_point ip ON ip.point_id = p.entity_id
+                LEFT JOIN is_motor mo ON mo.motor_id = p.entity_id
         <where>
             <if test="isMapPoint.mapId != null">
             and p.map_id = #{isMapPoint.mapId}