新增电柜管理

ktg-framework/src/main/java/com/ktg/framework/aspectj/DataScopeAspect.java

@@ -19,8 +19,7 @@ import com.ktg.common.utils.SecurityUtils;
  */
 @Aspect
 @Component
-public class DataScopeAspect
-{
+public class DataScopeAspect {
     /**
      * 全部数据权限
      */
@@ -52,22 +51,18 @@ public class DataScopeAspect
     public static final String DATA_SCOPE = "dataScope";
 
     @Before("@annotation(controllerDataScope)")
-    public void doBefore(JoinPoint point, DataScope controllerDataScope) throws Throwable
-    {
+    public void doBefore(JoinPoint point, DataScope controllerDataScope) throws Throwable {
         clearDataScope(point);
         handleDataScope(point, controllerDataScope);
     }
 
-    protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope)
-    {
+    protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope) {
         // 获取当前的用户
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (StringUtils.isNotNull(loginUser))
-        {
+        if (StringUtils.isNotNull(loginUser)) {
             SysUser currentUser = loginUser.getUser();
             // 如果是超级管理员，则不过滤数据
-            if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
-            {
+            if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) {
                 dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
                         controllerDataScope.userAlias());
             }
@@ -78,56 +73,40 @@ public class DataScopeAspect
      * 数据范围过滤
      *
      * @param joinPoint 切点
-     * @param user 用户
+     * @param user      用户
      * @param userAlias 别名
      */
-    public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias)
-    {
+    public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias) {
         StringBuilder sqlString = new StringBuilder();
 
-        for (SysRole role : user.getRoles())
-        {
+        for (SysRole role : user.getRoles()) {
             String dataScope = role.getDataScope();
-            if (DATA_SCOPE_ALL.equals(dataScope))
-            {
+            if (DATA_SCOPE_ALL.equals(dataScope)) {
                 sqlString = new StringBuilder();
                 break;
-            }
-            else if (DATA_SCOPE_CUSTOM.equals(dataScope))
-            {
+            } else if (DATA_SCOPE_CUSTOM.equals(dataScope)) {
                 sqlString.append(StringUtils.format(
                         " OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias,
                         role.getRoleId()));
-            }
-            else if (DATA_SCOPE_DEPT.equals(dataScope))
-            {
+            } else if (DATA_SCOPE_DEPT.equals(dataScope)) {
                 sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
-            }
-            else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
-            {
+            } else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) {
                 sqlString.append(StringUtils.format(
                         " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
                         deptAlias, user.getDeptId(), user.getDeptId()));
-            }
-            else if (DATA_SCOPE_SELF.equals(dataScope))
-            {
-                if (StringUtils.isNotBlank(userAlias))
-                {
+            } else if (DATA_SCOPE_SELF.equals(dataScope)) {
+                if (StringUtils.isNotBlank(userAlias)) {
                     sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
-                }
-                else
-                {
+                } else {
                     // 数据权限为仅本人且没有userAlias别名不查询任何数据
                     sqlString.append(" OR 1=0 ");
                 }
             }
         }
 
-        if (StringUtils.isNotBlank(sqlString.toString()))
-        {
+        if (StringUtils.isNotBlank(sqlString.toString())) {
             Object params = joinPoint.getArgs()[0];
-            if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
-            {
+            if (StringUtils.isNotNull(params) && params instanceof BaseEntity) {
                 BaseEntity baseEntity = (BaseEntity) params;
                 baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
             }
@@ -137,11 +116,9 @@ public class DataScopeAspect
     /**
      * 拼接权限sql前先清空params.dataScope参数防止注入
      */
-    private void clearDataScope(final JoinPoint joinPoint)
-    {
+    private void clearDataScope(final JoinPoint joinPoint) {
         Object params = joinPoint.getArgs()[0];
-        if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
-        {
+        if (StringUtils.isNotNull(params) && params instanceof BaseEntity) {
             BaseEntity baseEntity = (BaseEntity) params;
             baseEntity.getParams().put(DATA_SCOPE, "");
         }

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

@@ -1,117 +0,0 @@
-package com.ktg.iscs.controller;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ktg.common.annotation.Log;
-import com.ktg.common.core.controller.BaseController;
-import com.ktg.common.enums.BusinessType;
-import com.ktg.common.pojo.CommonResult;
-import com.ktg.common.utils.poi.ExcelUtil;
-import com.ktg.iscs.domain.IsDeviceTechnology;
-import com.ktg.iscs.domain.vo.technology.IsDeviceTechnologyVO;
-import com.ktg.iscs.service.IIsDeviceTechnologyService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-import com.ktg.common.core.page.TableDataInfo;
-
-/**
- * 设备工艺Controller
- *
- * @author cgj
- * @date 2024-12-17
- */
-@Api(tags = "设备工艺")
-@RestController
-@RequestMapping("/iscs/technology")
-public class IsDeviceTechnologyController extends BaseController
-{
-    @Autowired
-    private IIsDeviceTechnologyService isDeviceTechnologyService;
-
-    /**
-     * 查询设备工艺分页
-     */
-    @ApiOperation("查询设备工艺-分页")
-    @Parameters({
-            @Parameter(name = "page", description = "Page"),
-            @Parameter(name = "isDeviceTechnology", description = "实体参数")
-    })
-    @PreAuthorize("@ss.hasPermi('iscs:technology:list')")
-    @GetMapping("/getIsDeviceTechnologyPage")
-    public CommonResult<Page<IsDeviceTechnologyVO>> getIsDeviceTechnologyPage(Page<IsDeviceTechnology> page, IsDeviceTechnology isDeviceTechnology)
-    {
-        Page<IsDeviceTechnologyVO> result = isDeviceTechnologyService.getIsDeviceTechnologyPage(page, isDeviceTechnology);
-        return CommonResult.success(result);
-    }
-
-    /**
-     * 导出设备工艺列表
-     */
-    @ApiOperation("导出设备工艺列表")
-    @Parameter(name = "isDeviceTechnology", description = "实体参数")
-    @PreAuthorize("@ss.hasPermi('iscs:technology:export')")
-    @Log(title = "设备工艺", businessType = BusinessType.EXPORT)
-    @PostMapping("/exportIsDeviceTechnology")
-    public void exportIsDeviceTechnology(HttpServletResponse response, IsDeviceTechnology isDeviceTechnology)
-    {
-        List<IsDeviceTechnology> list = isDeviceTechnologyService.selectIsDeviceTechnologyList(isDeviceTechnology);
-        ExcelUtil<IsDeviceTechnology> util = new ExcelUtil<IsDeviceTechnology>(IsDeviceTechnology.class);
-        util.exportExcel(response, list, "设备工艺数据");
-    }
-
-    /**
-     * 获取设备工艺详细信息
-     */
-    @ApiOperation("获取设备工艺详细信息")
-    @Parameter(name = "technologyId", description = "technologyId")
-    @PreAuthorize("@ss.hasPermi('iscs:technology:query')")
-    @GetMapping(value = "/selectIsDeviceTechnologyById")
-    public CommonResult<IsDeviceTechnology> selectIsDeviceTechnologyById(Long technologyId)
-    {
-        return CommonResult.success(isDeviceTechnologyService.selectIsDeviceTechnologyByTechnologyId(technologyId));
-    }
-
-    /**
-     * 新增设备工艺
-     */
-    @ApiOperation("新增设备工艺")
-    @PreAuthorize("@ss.hasPermi('iscs:technology:add')")
-    @Log(title = "设备工艺", businessType = BusinessType.INSERT)
-    @PostMapping("/insertIsDeviceTechnology")
-    public CommonResult<Boolean> insertIsDeviceTechnology(@RequestBody @Parameter(name = "isDeviceTechnology", description = "新增数据类,放到body") IsDeviceTechnology isDeviceTechnology)
-    {
-        return CommonResult.success(isDeviceTechnologyService.insertIsDeviceTechnology(isDeviceTechnology) == 1);
-    }
-
-    /**
-     * 修改设备工艺
-     */
-    @ApiOperation("修改设备工艺")
-    @PreAuthorize("@ss.hasPermi('iscs:technology:edit')")
-    @Log(title = "设备工艺", businessType = BusinessType.UPDATE)
-    @PostMapping("/updateIsDeviceTechnology")
-    public CommonResult<Boolean> updateIsDeviceTechnology(@RequestBody @Parameter(name = "isDeviceTechnology", description = "修改数据类,放到body") IsDeviceTechnology isDeviceTechnology)
-    {
-        return CommonResult.success(isDeviceTechnologyService.updateIsDeviceTechnology(isDeviceTechnology) == 1);
-    }
-
-    /**
-     * 删除设备工艺
-     */
-    @ApiOperation("删除设备工艺")
-    @PreAuthorize("@ss.hasPermi('iscs:technology:remove')")
-    @Log(title = "设备工艺", businessType = BusinessType.DELETE)
-	@PostMapping("/deleteIsDeviceTechnologyByTechnologyIds")
-    public CommonResult<Boolean> deleteIsDeviceTechnologyByTechnologyIds(String technologyIds)
-    {
-        return CommonResult.success(isDeviceTechnologyService.deleteIsDeviceTechnologyByTechnologyIds(technologyIds) != 0);
-    }
-}

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

@@ -0,0 +1,125 @@
+package com.ktg.iscs.controller;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ktg.common.annotation.Log;
+import com.ktg.common.core.controller.BaseController;
+import com.ktg.common.enums.BusinessType;
+import com.ktg.common.pojo.CommonResult;
+import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.iscs.domain.IsLotoStation;
+import com.ktg.iscs.service.IIsLotoStationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 电柜Controller
+ *
+ * @author cgj
+ * @date 2024-12-19
+ */
+@Api(tags = "电柜")
+@RestController
+@RequestMapping("/iscs/station")
+public class IsLotoStationController extends BaseController
+{
+    @Autowired
+    private IIsLotoStationService isLotoStationService;
+
+    /**
+     * 查询电柜分页
+     */
+    @ApiOperation("查询电柜-分页")
+    @Parameters({
+            @Parameter(name = "page", description = "Page"),
+            @Parameter(name = "isLotoStation", description = "实体参数")
+    })
+    @PreAuthorize("@ss.hasPermi('iscs:station:list')")
+    @GetMapping("/getIsLotoStationPage")
+    public CommonResult<Page<IsLotoStation>> getIsLotoStationPage(Page<IsLotoStation> page, IsLotoStation isLotoStation)
+    {
+        Page<IsLotoStation> result = isLotoStationService.page(page, Wrappers.<IsLotoStation>lambdaQuery()
+                .orderByDesc(IsLotoStation::getLotoId));
+        return CommonResult.success(result);
+    }
+
+    /**
+     * 导出电柜列表
+     */
+    @ApiOperation("导出电柜列表")
+    @Parameter(name = "isLotoStation", description = "实体参数")
+    @PreAuthorize("@ss.hasPermi('iscs:station:export')")
+    @Log(title = "电柜", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportIsLotoStation")
+    public void exportIsLotoStation(HttpServletResponse response, IsLotoStation isLotoStation)
+    {
+        Page<IsLotoStation> page = new Page<>();
+        page.setSize(-1);
+        page.setCurrent(1);
+        List<IsLotoStation> list = isLotoStationService.page(page, Wrappers.<IsLotoStation>lambdaQuery()
+                .orderByDesc(IsLotoStation::getLotoId)).getRecords();
+        ExcelUtil<IsLotoStation> util = new ExcelUtil<IsLotoStation>(IsLotoStation.class);
+        util.exportExcel(response, list, "电柜数据");
+    }
+
+    /**
+     * 获取电柜详细信息
+     */
+    @ApiOperation("获取电柜详细信息")
+    @Parameter(name = "lotoId", description = "lotoId")
+    @PreAuthorize("@ss.hasPermi('iscs:station:query')")
+    @GetMapping(value = "/selectIsLotoStationById")
+    public CommonResult<IsLotoStation> selectIsLotoStationById(Long lotoId)
+    {
+        return CommonResult.success(isLotoStationService.getById(lotoId));
+    }
+
+    /**
+     * 新增电柜
+     */
+    @ApiOperation("新增电柜")
+    @PreAuthorize("@ss.hasPermi('iscs:station:add')")
+    @Log(title = "电柜", businessType = BusinessType.INSERT)
+    @PostMapping("/insertIsLotoStation")
+    public CommonResult<Boolean> insertIsLotoStation(@RequestBody @Parameter(name = "isLotoStation", description = "新增数据类,放到body") IsLotoStation isLotoStation)
+    {
+        return CommonResult.success(isLotoStationService.save(isLotoStation));
+    }
+
+    /**
+     * 修改电柜
+     */
+    @ApiOperation("修改电柜")
+    @PreAuthorize("@ss.hasPermi('iscs:station:edit')")
+    @Log(title = "电柜", businessType = BusinessType.UPDATE)
+    @PostMapping("/updateIsLotoStation")
+    public CommonResult<Boolean> updateIsLotoStation(@RequestBody @Parameter(name = "isLotoStation", description = "修改数据类,放到body") IsLotoStation isLotoStation)
+    {
+        return CommonResult.success(isLotoStationService.updateById(isLotoStation));
+    }
+
+    /**
+     * 删除电柜
+     */
+    @ApiOperation("删除电柜")
+    @PreAuthorize("@ss.hasPermi('iscs:station:remove')")
+    @Log(title = "电柜", businessType = BusinessType.DELETE)
+	@PostMapping("/deleteIsLotoStationByLotoIds")
+    public CommonResult<Boolean> deleteIsLotoStationByLotoIds(String lotoIds)
+    {
+        Assert.notBlank(lotoIds, "请选择需要删除的数据!");
+        Long[] longIds = Convert.toLongArray(lotoIds);
+        return CommonResult.success(isLotoStationService.removeBatchByIds(Arrays.asList(longIds)));
+    }
+}

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

@@ -0,0 +1,136 @@
+package com.ktg.iscs.controller;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ktg.common.annotation.Log;
+import com.ktg.common.core.controller.BaseController;
+import com.ktg.common.enums.BusinessType;
+import com.ktg.common.pojo.CommonResult;
+import com.ktg.common.utils.StringUtils;
+import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.iscs.domain.IsMachinery;
+import com.ktg.iscs.domain.vo.machinery.IsMachineryVO;
+import com.ktg.iscs.service.IIsMachineryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 设备工艺Controller
+ *
+ * @author cgj
+ * @date 2024-12-19
+ */
+@Api(tags = "设备工艺")
+@RestController
+@RequestMapping("/iscs/machinery")
+public class IsMachineryController extends BaseController
+{
+    @Autowired
+    private IIsMachineryService isMachineryService;
+
+    /**
+     * 查询设备工艺分页
+     */
+    @ApiOperation("查询设备工艺-分页")
+    @Parameters({
+            @Parameter(name = "page", description = "Page"),
+            @Parameter(name = "isMachinery", description = "实体参数")
+    })
+    @PreAuthorize("@ss.hasPermi('iscs:machinery:list')")
+    @GetMapping("/getIsMachineryPage")
+    public CommonResult<Page<IsMachineryVO>> getIsMachineryPage(Page<IsMachinery> page, IsMachinery isMachinery)
+    {
+        Page<IsMachineryVO> result = isMachineryService.getIsMachineryPage(page, isMachinery);
+        return CommonResult.success(result);
+    }
+
+    /**
+     * 导出设备工艺列表
+     */
+    @ApiOperation("导出设备工艺列表")
+    @Parameter(name = "isMachinery", description = "实体参数")
+    @PreAuthorize("@ss.hasPermi('iscs:machinery:export')")
+    @Log(title = "设备工艺", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportIsMachinery")
+    public void exportIsMachinery(HttpServletResponse response, IsMachinery isMachinery)
+    {
+        Page<IsMachinery> page = new Page<>();
+        page.setSize(-1);
+        page.setCurrent(1);
+        List<IsMachinery> list = isMachineryService.page(page, Wrappers.<IsMachinery>lambdaQuery()
+                .orderByDesc(IsMachinery::getMachineryId)).getRecords();
+        ExcelUtil<IsMachinery> util = new ExcelUtil<IsMachinery>(IsMachinery.class);
+        util.exportExcel(response, list, "设备工艺数据");
+    }
+
+    /**
+     * 获取设备工艺详细信息
+     */
+    @ApiOperation("获取设备工艺详细信息")
+    @Parameter(name = "technologyId", description = "technologyId")
+    @PreAuthorize("@ss.hasPermi('iscs:machinery:query')")
+    @GetMapping(value = "/selectIsMachineryById")
+    public CommonResult<IsMachinery> selectIsMachineryById(Long technologyId)
+    {
+        return CommonResult.success(isMachineryService.getById(technologyId));
+    }
+
+    /**
+     * 新增设备工艺
+     */
+    @ApiOperation("新增设备工艺")
+    @PreAuthorize("@ss.hasPermi('iscs:machinery:add')")
+    @Log(title = "设备工艺", businessType = BusinessType.INSERT)
+    @PostMapping("/insertIsMachinery")
+    public CommonResult<Boolean> insertIsMachinery(@RequestBody @Parameter(name = "isMachinery", description = "新增数据类,放到body") IsMachinery isMachinery)
+    {
+        // 断言校验
+        Assert.isTrue(StringUtils.isNotBlank(isMachinery.getMachineryName()), "名称不可为空!");
+        IsMachinery one =isMachineryService.getById(isMachinery.getParentId());
+        String ancestors;
+        if (one != null) {
+            ancestors = one.getAncestors() + "," + isMachinery.getParentId();
+        } else {
+            ancestors = "0";
+        }
+        isMachinery.setAncestors(ancestors);
+        return CommonResult.success(isMachineryService.save(isMachinery));
+    }
+
+    /**
+     * 修改设备工艺
+     */
+    @ApiOperation("修改设备工艺")
+    @PreAuthorize("@ss.hasPermi('iscs:machinery:edit')")
+    @Log(title = "设备工艺", businessType = BusinessType.UPDATE)
+    @PostMapping("/updateIsMachinery")
+    public CommonResult<Boolean> updateIsMachinery(@RequestBody @Parameter(name = "isMachinery", description = "修改数据类,放到body") IsMachinery isMachinery)
+    {
+        return CommonResult.success(isMachineryService.updateById(isMachinery));
+    }
+
+    /**
+     * 删除设备工艺
+     */
+    @ApiOperation("删除设备工艺")
+    @PreAuthorize("@ss.hasPermi('iscs:machinery:remove')")
+    @Log(title = "设备工艺", businessType = BusinessType.DELETE)
+	@PostMapping("/deleteIsMachineryByTechnologyIds")
+    public CommonResult<Boolean> deleteIsMachineryByTechnologyIds(String technologyIds)
+    {
+        Assert.notBlank(technologyIds, "请选择需要删除的数据!");
+        Long[] longIds = Convert.toLongArray(technologyIds);
+        return CommonResult.success(isMachineryService.removeBatchByIds(Arrays.asList(longIds)));
+    }
+}

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

@@ -0,0 +1,51 @@
+package com.ktg.iscs.domain;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.ktg.common.annotation.Excel;
+import com.ktg.common.core.domain.model.BaseBean;
+
+/**
+ * 电柜对象 is_loto_station
+ *
+ * @author cgj
+ * @date 2024-12-19
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class IsLotoStation extends BaseBean
+{
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "电柜ID")
+    @TableId(type = IdType.AUTO)
+    private Long lotoId;
+
+    @ApiModelProperty(value = "电柜编号")
+    @Excel(name = "电柜编号")
+    private String lotoCode;
+
+    @ApiModelProperty(value = "电柜名称")
+    @Excel(name = "电柜名称")
+    private String lotoName;
+
+    @ApiModelProperty(value = "所属岗位ID")
+    @Excel(name = "所属岗位ID")
+    private Long workstationId;
+
+    @ApiModelProperty(value = "点位信息")
+    @Excel(name = "点位信息")
+    private String map;
+
+    @ApiModelProperty(value = "状态")
+    @Excel(name = "状态")
+    private String status;
+
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+
+}

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsDeviceTechnology.java → ktg-iscs/src/main/java/com/ktg/iscs/domain/IsMachinery.java

@@ -9,32 +9,32 @@ import com.ktg.common.annotation.Excel;
 import com.ktg.common.core.domain.model.BaseBean;
 
 /**
- * 设备工艺对象 is_device_technology
+ * 设备工艺对象 is_machinery
  *
  * @author cgj
- * @date 2024-12-17
+ * @date 2024-12-19
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class IsDeviceTechnology extends BaseBean
+public class IsMachinery extends BaseBean
 {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "设备工艺ID")
     @TableId(type = IdType.AUTO)
-    private Long technologyId;
+    private Long machineryId;
 
     @ApiModelProperty(value = "设备工艺编号")
     @Excel(name = "设备工艺编号")
-    private String technologyCode;
+    private String machineryCode;
 
     @ApiModelProperty(value = "设备工艺名称")
     @Excel(name = "设备工艺名称")
-    private String technologyName;
+    private String machineryName;
 
     @ApiModelProperty(value = "设备工艺类型")
     @Excel(name = "设备工艺类型")
-    private String technologyType;
+    private String machineryType;
 
     @ApiModelProperty(value = "所属mars岗位ID")
     @Excel(name = "所属mars岗位ID")
@@ -42,7 +42,7 @@ public class IsDeviceTechnology extends BaseBean
 
     @ApiModelProperty(value = "工艺图")
     @Excel(name = "工艺图")
-    private String technologyImg;
+    private String machineryImg;
 
     @ApiModelProperty(value = "父部门id")
     @Excel(name = "父部门id")

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

@@ -71,6 +71,6 @@ public class IsSop extends BaseBean
     private Long workstationId;
 
     @ApiModelProperty(value = "设备工艺ID")
-    private Long technologyId;
+    private Long machineryId;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/sop/PageSopDTO.java

@@ -43,6 +43,6 @@ public class PageSopDTO implements Serializable {
     private Long workstationId;
 
     @ApiModelProperty(value = "设备工艺ID")
-    private Long technologyId;
+    private Long machineryId;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/technology/IsDeviceTechnologyVO.java → ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/machinery/IsMachineryVO.java

@@ -1,4 +1,4 @@
-package com.ktg.iscs.domain.vo.technology;
+package com.ktg.iscs.domain.vo.machinery;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -9,43 +9,44 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 设备工艺对象 is_device_technology
+ * 设备工艺对象 is_machinery
  *
  * @author cgj
- * @date 2024-12-17
+ * @date 2024-12-19
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class IsDeviceTechnologyVO extends BaseBean
+public class IsMachineryVO extends BaseBean
 {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "设备工艺ID")
     @TableId(type = IdType.AUTO)
-    private Long technologyId;
+    private Long machineryId;
 
     @ApiModelProperty(value = "设备工艺编号")
     @Excel(name = "设备工艺编号")
-    private String technologyCode;
+    private String machineryCode;
 
     @ApiModelProperty(value = "设备工艺名称")
     @Excel(name = "设备工艺名称")
-    private String technologyName;
+    private String machineryName;
 
     @ApiModelProperty(value = "设备工艺类型")
     @Excel(name = "设备工艺类型")
-    private String technologyType;
+    private String machineryType;
 
     @ApiModelProperty(value = "所属mars岗位ID")
+    @Excel(name = "所属mars岗位ID")
     private Long workstationId;
 
-    @ApiModelProperty(value = "所属mars岗位name")
-    @Excel(name = "所属mars岗位name")
+    @ApiModelProperty(value = "所属mars岗位Name")
+    @Excel(name = "所属mars岗位Name")
     private String workstationName;
 
     @ApiModelProperty(value = "工艺图")
     @Excel(name = "工艺图")
-    private String technologyImg;
+    private String machineryImg;
 
     @ApiModelProperty(value = "父部门id")
     @Excel(name = "父部门id")

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/sop/SopPageVO.java

@@ -63,9 +63,9 @@ public class SopPageVO extends BaseBean
     private String workstationName;
 
     @ApiModelProperty(value = "设备工艺ID")
-    private Long technologyId;
+    private Long machineryId;
 
     @ApiModelProperty(value = "设备工艺Name")
-    private String technologyName;
+    private String machineryName;
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/mapper/IsDeviceTechnologyMapper.java

@@ -1,70 +0,0 @@
-package com.ktg.iscs.mapper;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ktg.iscs.domain.vo.technology.IsDeviceTechnologyVO;
-import org.apache.ibatis.annotations.Mapper;
-import com.ktg.common.mapper.BaseMapperX;
-import com.ktg.iscs.domain.IsDeviceTechnology;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * 设备工艺Mapper接口
- *
- * @author cgj
- * @date 2024-12-17
- */
-@Mapper
-public interface IsDeviceTechnologyMapper extends BaseMapperX<IsDeviceTechnology>
-{
-    /**
-     * 查询设备工艺
-     *
-     * @param technologyId 设备工艺主键
-     * @return 设备工艺
-     */
-    IsDeviceTechnology selectIsDeviceTechnologyByTechnologyId(Long technologyId);
-
-    /**
-     * 查询设备工艺列表
-     *
-     * @param isDeviceTechnology 设备工艺
-     * @return 设备工艺集合
-     */
-    List<IsDeviceTechnology> selectIsDeviceTechnologyList(IsDeviceTechnology isDeviceTechnology);
-
-    /**
-     * 新增设备工艺
-     *
-     * @param isDeviceTechnology 设备工艺
-     * @return 结果
-     */
-    int insertIsDeviceTechnology(IsDeviceTechnology isDeviceTechnology);
-
-    /**
-     * 修改设备工艺
-     *
-     * @param isDeviceTechnology 设备工艺
-     * @return 结果
-     */
-    int updateIsDeviceTechnology(IsDeviceTechnology isDeviceTechnology);
-
-    /**
-     * 删除设备工艺
-     *
-     * @param technologyId 设备工艺主键
-     * @return 结果
-     */
-    int deleteIsDeviceTechnologyByTechnologyId(Long technologyId);
-
-    /**
-     * 批量删除设备工艺
-     *
-     * @param technologyIds 需要删除的数据主键集合
-     * @return 结果
-     */
-    int deleteIsDeviceTechnologyByTechnologyIds(Long[] technologyIds);
-
-    Page<IsDeviceTechnologyVO> getIsDeviceTechnologyPage(Page<IsDeviceTechnology> page, @Param(value = "isDeviceTechnology") IsDeviceTechnology isDeviceTechnology);
-}

ktg-iscs/src/main/java/com/ktg/iscs/mapper/IsLotoStationMapper.java

@@ -0,0 +1,16 @@
+package com.ktg.iscs.mapper;
+
+import com.ktg.common.mapper.BaseMapperX;
+import com.ktg.iscs.domain.IsLotoStation;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 电柜Mapper接口
+ *
+ * @author cgj
+ * @date 2024-12-19
+ */
+@Mapper
+public interface IsLotoStationMapper extends BaseMapperX<IsLotoStation> {
+
+}

ktg-iscs/src/main/java/com/ktg/iscs/mapper/IsMachineryMapper.java

@@ -0,0 +1,21 @@
+package com.ktg.iscs.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ktg.common.mapper.BaseMapperX;
+import com.ktg.iscs.domain.IsMachinery;
+import com.ktg.iscs.domain.vo.machinery.IsMachineryVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 设备工艺Mapper接口
+ *
+ * @author cgj
+ * @date 2024-12-19
+ */
+@Mapper
+public interface IsMachineryMapper extends BaseMapperX<IsMachinery> {
+
+    Page<IsMachineryVO> getIsMachineryPage(Page<IsMachinery> page, @Param(value = "isMachinery") IsMachinery isMachinery);
+
+}

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

@@ -1,66 +0,0 @@
-package com.ktg.iscs.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-import com.ktg.iscs.domain.IsDeviceTechnology;
-import com.ktg.iscs.domain.vo.technology.IsDeviceTechnologyVO;
-
-/**
- * 设备工艺Service接口
- *
- * @author cgj
- * @date 2024-12-17
- */
-public interface IIsDeviceTechnologyService extends IService<IsDeviceTechnology>
-{
-    /**
-     * 查询设备工艺
-     *
-     * @param technologyId 设备工艺主键
-     * @return 设备工艺
-     */
-    IsDeviceTechnology selectIsDeviceTechnologyByTechnologyId(Long technologyId);
-
-    /**
-     * 查询设备工艺列表
-     *
-     * @param isDeviceTechnology 设备工艺
-     * @return 设备工艺集合
-     */
-    List<IsDeviceTechnology> selectIsDeviceTechnologyList(IsDeviceTechnology isDeviceTechnology);
-
-    /**
-     * 新增设备工艺
-     *
-     * @param isDeviceTechnology 设备工艺
-     * @return 结果
-     */
-    int insertIsDeviceTechnology(IsDeviceTechnology isDeviceTechnology);
-
-    /**
-     * 修改设备工艺
-     *
-     * @param isDeviceTechnology 设备工艺
-     * @return 结果
-     */
-    int updateIsDeviceTechnology(IsDeviceTechnology isDeviceTechnology);
-
-    /**
-     * 批量删除设备工艺
-     *
-     * @param technologyIds 需要删除的设备工艺主键集合
-     * @return 结果
-     */
-    int deleteIsDeviceTechnologyByTechnologyIds(String technologyIds);
-
-    /**
-     * 删除设备工艺信息
-     *
-     * @param technologyId 设备工艺主键
-     * @return 结果
-     */
-    int deleteIsDeviceTechnologyByTechnologyId(Long technologyId);
-
-    Page<IsDeviceTechnologyVO> getIsDeviceTechnologyPage(Page<IsDeviceTechnology> page, IsDeviceTechnology isDeviceTechnology);
-}

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

@@ -0,0 +1,14 @@
+package com.ktg.iscs.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ktg.iscs.domain.IsLotoStation;
+
+/**
+ * 电柜Service接口
+ *
+ * @author cgj
+ * @date 2024-12-19
+ */
+public interface IIsLotoStationService extends IService<IsLotoStation> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.ktg.iscs.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ktg.iscs.domain.IsMachinery;
+import com.ktg.iscs.domain.vo.machinery.IsMachineryVO;
+
+/**
+ * 设备工艺Service接口
+ *
+ * @author cgj
+ * @date 2024-12-19
+ */
+public interface IIsMachineryService extends IService<IsMachinery> {
+
+    Page<IsMachineryVO> getIsMachineryPage(Page<IsMachinery> page, IsMachinery isMachinery);
+
+}

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

@@ -1,108 +0,0 @@
-package com.ktg.iscs.service.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import java.util.List;
-import cn.hutool.core.lang.Assert;
-import com.ktg.common.core.text.Convert;
-import com.ktg.common.utils.DateUtils;
-import com.ktg.iscs.domain.vo.technology.IsDeviceTechnologyVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ktg.iscs.mapper.IsDeviceTechnologyMapper;
-import com.ktg.iscs.domain.IsDeviceTechnology;
-import com.ktg.iscs.service.IIsDeviceTechnologyService;
-
-/**
- * 设备工艺Service业务层处理
- *
- * @author cgj
- * @date 2024-12-17
- */
-@Service
-public class IsDeviceTechnologyServiceImpl extends ServiceImpl<IsDeviceTechnologyMapper, IsDeviceTechnology> implements IIsDeviceTechnologyService
-{
-    @Autowired
-    private IsDeviceTechnologyMapper isDeviceTechnologyMapper;
-
-    /**
-     * 查询设备工艺
-     *
-     * @param technologyId 设备工艺主键
-     * @return 设备工艺
-     */
-    @Override
-    public IsDeviceTechnology selectIsDeviceTechnologyByTechnologyId(Long technologyId)
-    {
-        return isDeviceTechnologyMapper.selectIsDeviceTechnologyByTechnologyId(technologyId);
-    }
-
-    /**
-     * 查询设备工艺列表
-     *
-     * @param isDeviceTechnology 设备工艺
-     * @return 设备工艺
-     */
-    @Override
-    public List<IsDeviceTechnology> selectIsDeviceTechnologyList(IsDeviceTechnology isDeviceTechnology)
-    {
-        return isDeviceTechnologyMapper.selectIsDeviceTechnologyList(isDeviceTechnology);
-    }
-
-    /**
-     * 新增设备工艺
-     *
-     * @param isDeviceTechnology 设备工艺
-     * @return 结果
-     */
-    @Override
-    public int insertIsDeviceTechnology(IsDeviceTechnology isDeviceTechnology)
-    {
-        isDeviceTechnology.setCreateTime(DateUtils.getNowDate());
-        return isDeviceTechnologyMapper.insertIsDeviceTechnology(isDeviceTechnology);
-    }
-
-    /**
-     * 修改设备工艺
-     *
-     * @param isDeviceTechnology 设备工艺
-     * @return 结果
-     */
-    @Override
-    public int updateIsDeviceTechnology(IsDeviceTechnology isDeviceTechnology)
-    {
-        isDeviceTechnology.setUpdateTime(DateUtils.getNowDate());
-        return isDeviceTechnologyMapper.updateIsDeviceTechnology(isDeviceTechnology);
-    }
-
-    /**
-     * 批量删除设备工艺
-     *
-     * @param technologyIds 需要删除的设备工艺主键
-     * @return 结果
-     */
-    @Override
-    public int deleteIsDeviceTechnologyByTechnologyIds(String technologyIds)
-    {
-        Assert.notBlank(technologyIds, "请选择需要删除的数据!");
-        Long[] longIds = Convert.toLongArray(technologyIds);
-        return isDeviceTechnologyMapper.deleteIsDeviceTechnologyByTechnologyIds(longIds);
-    }
-
-    /**
-     * 删除设备工艺信息
-     *
-     * @param technologyId 设备工艺主键
-     * @return 结果
-     */
-    @Override
-    public int deleteIsDeviceTechnologyByTechnologyId(Long technologyId)
-    {
-        return isDeviceTechnologyMapper.deleteIsDeviceTechnologyByTechnologyId(technologyId);
-    }
-
-    @Override
-    public Page<IsDeviceTechnologyVO> getIsDeviceTechnologyPage(Page<IsDeviceTechnology> page, IsDeviceTechnology isDeviceTechnology) {
-        return isDeviceTechnologyMapper.getIsDeviceTechnologyPage(page, isDeviceTechnology);
-    }
-}

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

@@ -0,0 +1,22 @@
+package com.ktg.iscs.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ktg.iscs.domain.IsLotoStation;
+import com.ktg.iscs.mapper.IsLotoStationMapper;
+import com.ktg.iscs.service.IIsLotoStationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电柜Service业务层处理
+ *
+ * @author cgj
+ * @date 2024-12-19
+ */
+@Service
+public class IsLotoStationServiceImpl extends ServiceImpl<IsLotoStationMapper, IsLotoStation> implements IIsLotoStationService {
+
+    @Autowired
+    private IsLotoStationMapper isLotoStationMapper;
+
+}

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

@@ -0,0 +1,28 @@
+package com.ktg.iscs.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ktg.iscs.domain.IsMachinery;
+import com.ktg.iscs.domain.vo.machinery.IsMachineryVO;
+import com.ktg.iscs.mapper.IsMachineryMapper;
+import com.ktg.iscs.service.IIsMachineryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 设备工艺Service业务层处理
+ *
+ * @author cgj
+ * @date 2024-12-19
+ */
+@Service
+public class IsMachineryServiceImpl extends ServiceImpl<IsMachineryMapper, IsMachinery> implements IIsMachineryService {
+
+    @Autowired
+    private IsMachineryMapper isMachineryMapper;
+
+    @Override
+    public Page<IsMachineryVO> getIsMachineryPage(Page<IsMachinery> page, IsMachinery isMachinery) {
+        return isMachineryMapper.getIsMachineryPage(page, isMachinery);
+    }
+}

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

@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ktg.iscs.mapper.IsDeviceTechnologyMapper">
-
-
-    <sql id="selectIsDeviceTechnologyVo">
-        select * from is_device_technology
-    </sql>
-
-    <select id="selectIsDeviceTechnologyList" parameterType="IsDeviceTechnology" resultType="IsDeviceTechnology">
-        <include refid="selectIsDeviceTechnologyVo"/>
-        <where>
-            <if test="technologyCode != null  and technologyCode != ''"> and technology_code = #{technologyCode}</if>
-            <if test="technologyName != null  and technologyName != ''"> and technology_name like concat('%', #{technologyName}, '%')</if>
-            <if test="technologyType != null  and technologyType != ''"> and technology_type = #{technologyType}</if>
-            <if test="workstationId != null "> and workstation_id = #{workstationId}</if>
-            <if test="technologyImg != null  and technologyImg != ''"> and technology_img = #{technologyImg}</if>
-            <if test="parentId != null "> and parent_id = #{parentId}</if>
-            <if test="ancestors != null  and ancestors != ''"> and ancestors = #{ancestors}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-        </where>
-    </select>
-
-    <select id="selectIsDeviceTechnologyByTechnologyId" parameterType="Long" resultType="IsDeviceTechnology">
-        <include refid="selectIsDeviceTechnologyVo"/>
-        where technology_id = #{technologyId}
-    </select>
-
-    <insert id="insertIsDeviceTechnology" parameterType="IsDeviceTechnology" useGeneratedKeys="true" keyProperty="technologyId">
-        insert into is_device_technology
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="technologyCode != null and technologyCode != ''">technology_code,</if>
-            <if test="technologyName != null and technologyName != ''">technology_name,</if>
-            <if test="technologyType != null">technology_type,</if>
-            <if test="workstationId != null">workstation_id,</if>
-            <if test="technologyImg != null">technology_img,</if>
-            <if test="parentId != null">parent_id,</if>
-            <if test="ancestors != null">ancestors,</if>
-            <if test="status != null">status,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="remark != null">remark,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="technologyCode != null and technologyCode != ''">#{technologyCode},</if>
-            <if test="technologyName != null and technologyName != ''">#{technologyName},</if>
-            <if test="technologyType != null">#{technologyType},</if>
-            <if test="workstationId != null">#{workstationId},</if>
-            <if test="technologyImg != null">#{technologyImg},</if>
-            <if test="parentId != null">#{parentId},</if>
-            <if test="ancestors != null">#{ancestors},</if>
-            <if test="status != null">#{status},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="remark != null">#{remark},</if>
-         </trim>
-    </insert>
-
-    <update id="updateIsDeviceTechnology" parameterType="IsDeviceTechnology">
-        update is_device_technology
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="technologyCode != null and technologyCode != ''">technology_code = #{technologyCode},</if>
-            <if test="technologyName != null and technologyName != ''">technology_name = #{technologyName},</if>
-            <if test="technologyType != null">technology_type = #{technologyType},</if>
-            <if test="workstationId != null">workstation_id = #{workstationId},</if>
-            <if test="technologyImg != null">technology_img = #{technologyImg},</if>
-            <if test="parentId != null">parent_id = #{parentId},</if>
-            <if test="ancestors != null">ancestors = #{ancestors},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="remark != null">remark = #{remark},</if>
-        </trim>
-        where technology_id = #{technologyId}
-    </update>
-
-    <delete id="deleteIsDeviceTechnologyByTechnologyId" parameterType="Long">
-        delete from is_device_technology where technology_id = #{technologyId}
-    </delete>
-
-    <delete id="deleteIsDeviceTechnologyByTechnologyIds" parameterType="String">
-        delete from is_device_technology where technology_id in
-        <foreach item="technologyId" collection="array" open="(" separator="," close=")">
-            #{technologyId}
-        </foreach>
-    </delete>
-
-    <select id="getIsDeviceTechnologyPage" resultType="com.ktg.iscs.domain.vo.technology.IsDeviceTechnologyVO">
-        SELECT
-            t.*,
-            w.workstation_name
-        FROM
-            is_device_technology t
-                LEFT JOIN is_workstation w ON w.workstation_id = t.workstation_id
-        <where>
-            <if test="isDeviceTechnology.technologyName != null and isDeviceTechnology.technologyName.trim != ''">
-                and t.technology_name like concat('%',#{isDeviceTechnology.technologyName},'%')
-            </if>
-            <if test="isDeviceTechnology.technologyCode != null and isDeviceTechnology.technologyCode.trim != ''">
-                and t.technology_code like concat('%',#{isDeviceTechnology.technologyCode},'%')
-            </if>
-        </where>
-        ORDER BY
-        t.technology_id DESC
-    </select>
-
-</mapper>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ktg.iscs.mapper.IsLotoStationMapper">
+
+</mapper>

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

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ktg.iscs.mapper.IsMachineryMapper">
+
+    <select id="getIsMachineryPage" resultType="com.ktg.iscs.domain.vo.machinery.IsMachineryVO">
+        SELECT
+        t.*,
+        w.workstation_name
+        FROM
+        is_machinery t
+        LEFT JOIN is_workstation w ON w.workstation_id = t.workstation_id
+        <where>
+            <if test="isMachinery.machineryName != null and isMachinery.machineryName.trim != ''">
+                and t.machinery_name like concat('%',#{isDeviceTechnology.machineryName},'%')
+            </if>
+            <if test="isMachinery.machineryCode != null and isMachinery.machineryCode.trim != ''">
+                and t.machinery_code like concat('%',#{isDeviceTechnology.machineryCode},'%')
+            </if>
+        </where>
+        ORDER BY
+        t.machinery_id DESC
+    </select>
+
+</mapper>

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

@@ -98,14 +98,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ws.workshop_name,
             wa.workarea_name,
             wn.workstation_name,
-            d.technology_name,
+            d.machinery_name,
             COUNT( p.record_id ) AS pointCount
         FROM
             is_sop s
             LEFT JOIN md_workshop ws ON ws.workshop_id = s.workshop_id
             LEFT JOIN is_workarea wa ON wa.workarea_id = s.workarea_id
             LEFT JOIN is_workstation wn ON wn.workstation_id = s.workstation_id
-            LEFT JOIN is_device_technology d ON d.technology_id = s.technology_id
+            LEFT JOIN is_machinery d ON d.machinery_id = s.machinery_id
             LEFT JOIN is_sop_points p ON p.sop_id = s.sop_id
         <where>
             <if test="dto.sopCode != null and dto.sopCode.trim != ''">
@@ -135,8 +135,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dto.workstationId != null">
                 and s.workstation_id = #{dto.workstationId}
             </if>
-            <if test="dto.technologyId != null">
-                and s.technology_id = #{dto.technologyId}
+            <if test="dto.machineryId != null">
+                and s.machinery_id = #{dto.machineryId}
             </if>
         </where>
         GROUP BY s.sop_id