OPC订阅点、OPC服务器、出铁步骤、出铁参数优化

taphole-iron/src/main/java/com/sckj/iron/controller/TIronStepController.java

@@ -42,8 +42,8 @@ public class TIronStepController {
 
     @GetMapping("/detail")
     @ApiOperation(value="出铁步骤配置详情")
-    public AjaxResult<TIronStepDetailVo> detail(@Validated @IDMust() @RequestParam("id") String id) {
-        TIronStepDetailVo detail = iTIronStepService.detail(id);
+    public AjaxResult<TIronStepDetailVo> detail(String stepId) {
+        TIronStepDetailVo detail = iTIronStepService.detail(stepId);
         return AjaxResult.success(detail);
     }
 
@@ -66,8 +66,8 @@ public class TIronStepController {
     @Log(title = "出铁步骤配置删除")
     @PostMapping("/del")
     @ApiOperation(value="出铁步骤配置删除")
-    public AjaxResult<Object> del(@Validated @RequestBody IdValidate idValidate) {
-        iTIronStepService.del(idValidate.getId());
+    public AjaxResult<Object> del(@RequestBody String stepId) {
+        iTIronStepService.del(stepId);
         return AjaxResult.success();
     }
 
@@ -78,12 +78,6 @@ public class TIronStepController {
         return AjaxResult.success(iTIronStepService.getTreeSteps());
     }
 
-//    @GetMapping("/getLinkedMapSteps")
-//    @ApiOperation(value = "获取步骤")
-//    @NotLogin
-//    public AjaxResult getLinkedMapSteps() {
-//        return AjaxResult.success(iTIronStepService.getLinkedMapSteps());
-//    }
 
 
     @NotPower
@@ -117,28 +111,6 @@ public class TIronStepController {
         return AjaxResult.success(LocalDateTime.now());
     }
 
-//    @Log(title = "新增或者更新")
-//    @PostMapping("/saveOrUpdate")
-//    @ApiOperation(value = "新增或者更新")
-//    public AjaxResult saveOrUpdate(@Validated @RequestBody TIronStep tIronStep) {
-//        iTIronStepService.saveOrUpdate(tIronStep);
-//        return AjaxResult.success();
-//    }
-//
-//    @Log(title = "删除")
-//    @PostMapping("/del")
-//    @ApiOperation(value = "删除")
-//    public AjaxResult del(@Validated @RequestBody TIronStep tIronStep) {
-//        iTIronStepService.removeById(tIronStep);
-//        return AjaxResult.success();
-//    }
-//
-//    @GetMapping("/detail")
-//    @ApiOperation(value="详情")
-//    public AjaxResult detail(TIronStep tIronStep) {
-//        TIronStep detail = iTIronStepService.getById(tIronStep.getStepId());
-//        return AjaxResult.success(detail);
-//    }
 
 
 }

taphole-iron/src/main/java/com/sckj/iron/service/impl/TIronParamServiceImpl.java

@@ -77,6 +77,10 @@ public class TIronParamServiceImpl extends ServiceImpl<TIronParamMapper, TIronPa
             queryWrapper.lambda().eq(TIronParam::getStatus, searchValidate.getStatus());
         }
 
+        if(ObjectUtils.isNotEmpty(searchValidate.getParamUnit())){
+            queryWrapper.lambda().eq(TIronParam::getParamUnit, searchValidate.getParamUnit());
+        }
+
         queryWrapper.orderByDesc("id");
 
 
@@ -150,6 +154,7 @@ public class TIronParamServiceImpl extends ServiceImpl<TIronParamMapper, TIronPa
         model.setParamName(updateValidate.getParamName());
         model.setParamValue(updateValidate.getParamValue());
         model.setParamUnit(updateValidate.getParamUnit());
+        model.setParamDesc(updateValidate.getParamDesc());
         model.setStatus(updateValidate.getStatus());
         model.setSort(updateValidate.getSort());
         tIronParamMapper.updateById(model);

taphole-iron/src/main/java/com/sckj/iron/service/impl/TIronStepServiceImpl.java

@@ -15,6 +15,7 @@ import com.sckj.iron.validate.TIronStepUpdateValidate;
 import com.sckj.iron.vo.IronStepVO;
 import com.sckj.iron.vo.TIronStepDetailVo;
 import com.sckj.iron.vo.TIronStepListedVo;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
@@ -108,21 +109,58 @@ public class TIronStepServiceImpl extends ServiceImpl<TIronStepMapper, TIronStep
         Integer limit = pageValidate.getPageSize();
 
         QueryWrapper<TIronStep> queryWrapper = new QueryWrapper<>();
-        queryWrapper.orderByDesc(Arrays.asList("sort", "identifier"));
-
-        tIronStepMapper.setSearch(queryWrapper, searchValidate, new String[]{
-                "=:stepId@step_id:str",
-                "=:required:str",
-                "=:identifier:str",
-                "like:stepName@step_name:str",
-                "=:stepNameExpression@step_name_expression:str",
-                "=:stepCondition@step_condition:str",
-                "=:sort:int",
-                "=:nodeType@node_type:str",
-                "=:status:str",
-                "=:confirmMode@confirm_mode:str",
-                "like:pointName@point_name:str",
-        });
+
+        if(ObjectUtils.isNotEmpty(searchValidate.getStepId())){
+            queryWrapper.lambda().eq(TIronStep::getStepId, searchValidate.getStepId());
+        }
+        if(ObjectUtils.isNotEmpty(searchValidate.getRequired())){
+            queryWrapper.lambda().eq(TIronStep::getRequired, searchValidate.getRequired());
+        }
+        if(ObjectUtils.isNotEmpty(searchValidate.getIdentifier())){
+            queryWrapper.lambda().like(TIronStep::getIdentifier, searchValidate.getIdentifier());
+        }
+        if(ObjectUtils.isNotEmpty(searchValidate.getStepName())){
+            queryWrapper.lambda().like(TIronStep::getStepName, searchValidate.getStepName());
+        }
+        if(ObjectUtils.isNotEmpty(searchValidate.getStepNameExpression())){
+            queryWrapper.lambda().like(TIronStep::getStepNameExpression, searchValidate.getStepNameExpression());
+        }
+        if(ObjectUtils.isNotEmpty(searchValidate.getStepCondition())){
+            queryWrapper.lambda().like(TIronStep::getStepCondition, searchValidate.getStepCondition());
+        }
+        if(ObjectUtils.isNotEmpty(searchValidate.getSort())){
+            queryWrapper.lambda().eq(TIronStep::getSort, searchValidate.getSort());
+        }
+        if(ObjectUtils.isNotEmpty(searchValidate.getNodeType())){
+            queryWrapper.lambda().eq(TIronStep::getNodeType, searchValidate.getNodeType());
+        }
+        if(ObjectUtils.isNotEmpty(searchValidate.getStatus())){
+            queryWrapper.lambda().eq(TIronStep::getStatus, searchValidate.getStatus());
+        }
+        if(ObjectUtils.isNotEmpty(searchValidate.getConfirmMode())){
+            queryWrapper.lambda().eq(TIronStep::getConfirmMode, searchValidate.getConfirmMode());
+        }
+        if(ObjectUtils.isNotEmpty(searchValidate.getPointName())){
+            queryWrapper.lambda().like(TIronStep::getPointName, searchValidate.getPointName());
+        }
+
+        queryWrapper.orderByDesc(Arrays.asList("sort", "step_id"));
+
+//        tIronStepMapper.setSearch(queryWrapper, searchValidate, new String[]{
+//                "=:stepId@step_id:str",
+//                "=:required:str",
+//                "like:identifier@identifier:str",
+//                "like:stepName@step_name:str",
+//                "like:stepNameExpression@step_name_expression:str",
+//                "like:stepCondition@step_condition:str",
+//                "=:sort:int",
+//                "=:nodeType@node_type:str",
+//                "=:status:str",
+//                "=:confirmMode@confirm_mode:str",
+//                "like:pointName@point_name:str",
+//        });
+//
+
 
         IPage<TIronStep> iPage = tIronStepMapper.selectPage(new Page<>(page, limit), queryWrapper);
 
@@ -167,6 +205,7 @@ public class TIronStepServiceImpl extends ServiceImpl<TIronStepMapper, TIronStep
     public void add(TIronStepCreateValidate createValidate) {
         TIronStep model = new TIronStep();
         model.setStepId(createValidate.getStepId());
+        model.setIdentifier(createValidate.getIdentifier());
         model.setRequired(createValidate.getRequired());
         model.setStepName(createValidate.getStepName());
         model.setStepNameExpression(createValidate.getStepNameExpression());
@@ -189,7 +228,7 @@ public class TIronStepServiceImpl extends ServiceImpl<TIronStepMapper, TIronStep
     public void edit(TIronStepUpdateValidate updateValidate) {
         TIronStep model = tIronStepMapper.selectOne(
                 new QueryWrapper<TIronStep>()
-                        .eq("identifier",  updateValidate.getIdentifier())
+                        .eq("step_id",  updateValidate.getStepId())
                         .last("limit 1"));
 
         Assert.notNull(model, "数据不存在!");
@@ -215,10 +254,10 @@ public class TIronStepServiceImpl extends ServiceImpl<TIronStepMapper, TIronStep
      * @param id 主键ID
      */
     
-    public void del(Integer id) {
+    public void del(String id) {
         TIronStep model = tIronStepMapper.selectOne(
                 new QueryWrapper<TIronStep>()
-                        .eq("identifier", id)
+                        .eq("step_id", id)
                         .last("limit 1"));
 
         Assert.notNull(model, "数据不存在!");

taphole-iron/src/main/java/com/sckj/iron/validate/TIronParamSearchValidate.java

@@ -42,4 +42,7 @@ public class TIronParamSearchValidate implements Serializable {
     @ApiModelProperty(value = "状态")
     private String status;
 
+    @ApiModelProperty(value = "参数单位")
+    private String paramUnit;
+
 }

taphole-iron/src/main/java/com/sckj/iron/validate/TIronStepUpdateValidate.java

@@ -17,7 +17,6 @@ public class TIronStepUpdateValidate implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @IDMust(message = "identifier参数必传且需大于0")
     @NotNull(message = "stepId参数缺失")
     @ApiModelProperty(value = "")
     private String stepId;

taphole-opc/src/main/java/com/sckj/opc/controller/OPCPointController.java

@@ -6,11 +6,17 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sckj.common.aop.Log;
 import com.sckj.common.aop.NotLogin;
 import com.sckj.common.core.AjaxResult;
+import com.sckj.common.core.PageResult;
 import com.sckj.common.validate.commons.IdValidate;
 import com.sckj.common.validate.commons.PageValidate;
 import com.sckj.common.validator.annotation.IDMust;
 import com.sckj.opc.entity.OPCPoint;
 import com.sckj.opc.service.OPCPointServiceImpl;
+import com.sckj.opc.validate.TOpcPointCreateValidate;
+import com.sckj.opc.validate.TOpcPointSearchValidate;
+import com.sckj.opc.validate.TOpcPointUpdateValidate;
+import com.sckj.opc.vo.TOpcPointDetailVo;
+import com.sckj.opc.vo.TOpcPointListedVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
@@ -24,51 +30,48 @@ import javax.annotation.Resource;
 public class OPCPointController {
 
     @Resource
-    OPCPointServiceImpl opcPointService;
+    OPCPointServiceImpl iTOpcPointService;
 
-    @NotLogin
     @GetMapping("/list")
-    @ApiOperation(value = "列表")
-    public AjaxResult<Object> list(@Validated PageValidate pageValidate, @Validated OPCPoint opcPoint) {
-        QueryWrapper<OPCPoint> queryWrapper = new QueryWrapper<>(opcPoint);
-        IPage<OPCPoint> page = new Page<>(pageValidate.getPageNo(),pageValidate.getPageSize());
-        IPage<OPCPoint> result = opcPointService.page(page, queryWrapper);
-        return AjaxResult.success(result);
+    @ApiOperation(value="OPC订阅点列表")
+    public AjaxResult<PageResult<TOpcPointListedVo>> list(@Validated PageValidate pageValidate,
+                                                          @Validated TOpcPointSearchValidate searchValidate) {
+        PageResult<TOpcPointListedVo> list = iTOpcPointService.list(pageValidate, searchValidate);
+        return AjaxResult.success(list);
     }
 
     @GetMapping("/detail")
-    @ApiOperation(value = "详情")
-    public AjaxResult<OPCPoint> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
-        OPCPoint detail = opcPointService.getById(id);
+    @ApiOperation(value="OPC订阅点详情")
+    public AjaxResult<TOpcPointDetailVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+        TOpcPointDetailVo detail = iTOpcPointService.detail(id);
         return AjaxResult.success(detail);
     }
 
-    @Log(title = "新增")
+    @Log(title = "OPC订阅点新增")
     @PostMapping("/add")
-    @ApiOperation(value = "新增")
-    public AjaxResult<Object> add(@Validated @RequestBody OPCPoint opcPoint) {
-        opcPointService.save(opcPoint);
+    @ApiOperation(value="OPC订阅点新增")
+    public AjaxResult<Object> add(@Validated @RequestBody TOpcPointCreateValidate createValidate) {
+        iTOpcPointService.add(createValidate);
         return AjaxResult.success();
     }
 
-    @Log(title = "编辑")
+    @Log(title = "OPC订阅点编辑")
     @PostMapping("/edit")
-    @ApiOperation(value = "编辑")
-    public AjaxResult<Object> edit(@Validated @RequestBody OPCPoint opcPoint) {
-        opcPointService.saveOrUpdate(opcPoint);
+    @ApiOperation(value="OPC订阅点编辑")
+    public AjaxResult<Object> edit(@Validated @RequestBody TOpcPointUpdateValidate updateValidate) {
+        iTOpcPointService.edit(updateValidate);
         return AjaxResult.success();
     }
 
-    @Log(title = "删除")
+    @Log(title = "OPC订阅点删除")
     @PostMapping("/del")
-    @ApiOperation(value = "删除")
+    @ApiOperation(value="OPC订阅点删除")
     public AjaxResult<Object> del(@Validated @RequestBody IdValidate idValidate) {
-        opcPointService.removeById(idValidate.getId());
+        iTOpcPointService.del(idValidate.getId());
         return AjaxResult.success();
     }
 
 
 
 
-
 }

taphole-opc/src/main/java/com/sckj/opc/controller/OPCServerController.java

@@ -6,11 +6,17 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sckj.common.aop.Log;
 import com.sckj.common.aop.NotLogin;
 import com.sckj.common.core.AjaxResult;
+import com.sckj.common.core.PageResult;
 import com.sckj.common.validate.commons.IdValidate;
 import com.sckj.common.validate.commons.PageValidate;
 import com.sckj.common.validator.annotation.IDMust;
 import com.sckj.opc.entity.OPCServer;
 import com.sckj.opc.service.OPCServerServiceImpl;
+import com.sckj.opc.validate.TOpcServerCreateValidate;
+import com.sckj.opc.validate.TOpcServerSearchValidate;
+import com.sckj.opc.validate.TOpcServerUpdateValidate;
+import com.sckj.opc.vo.TOpcServerDetailVo;
+import com.sckj.opc.vo.TOpcServerListedVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
@@ -24,48 +30,47 @@ import javax.annotation.Resource;
 public class OPCServerController {
 
     @Resource
-    OPCServerServiceImpl opcServerService;
+    OPCServerServiceImpl iTOpcServerService;
 
-    @NotLogin
     @GetMapping("/list")
-    @ApiOperation(value = "列表")
-    public AjaxResult<Object> list(@Validated PageValidate pageValidate, @Validated OPCServer opcPoint) {
-        QueryWrapper<OPCServer> queryWrapper = new QueryWrapper<>(opcPoint);
-        IPage<OPCServer> page = new Page<>(pageValidate.getPageNo(),pageValidate.getPageSize());
-        IPage<OPCServer> result = opcServerService.page(page, queryWrapper);
-        return AjaxResult.success(result);
+    @ApiOperation(value="opc服务器列表")
+    public AjaxResult<PageResult<TOpcServerListedVo>> list(@Validated PageValidate pageValidate,
+                                                           @Validated TOpcServerSearchValidate searchValidate) {
+        PageResult<TOpcServerListedVo> list = iTOpcServerService.list(pageValidate, searchValidate);
+        return AjaxResult.success(list);
     }
 
     @GetMapping("/detail")
-    @ApiOperation(value = "详情")
-    public AjaxResult<OPCServer> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
-        OPCServer detail = opcServerService.getById(id);
+    @ApiOperation(value="opc服务器详情")
+    public AjaxResult<TOpcServerDetailVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+        TOpcServerDetailVo detail = iTOpcServerService.detail(id);
         return AjaxResult.success(detail);
     }
 
-    @Log(title = "新增")
+    @Log(title = "opc服务器新增")
     @PostMapping("/add")
-    @ApiOperation(value = "新增")
-    public AjaxResult<Object> add(@Validated @RequestBody OPCServer opcPoint) {
-        opcServerService.save(opcPoint);
+    @ApiOperation(value="opc服务器新增")
+    public AjaxResult<Object> add(@Validated @RequestBody TOpcServerCreateValidate createValidate) {
+        iTOpcServerService.add(createValidate);
         return AjaxResult.success();
     }
 
-    @Log(title = "编辑")
+    @Log(title = "opc服务器编辑")
     @PostMapping("/edit")
-    @ApiOperation(value = "编辑")
-    public AjaxResult<Object> edit(@Validated @RequestBody OPCServer opcPoint) {
-        opcServerService.saveOrUpdate(opcPoint);
+    @ApiOperation(value="opc服务器编辑")
+    public AjaxResult<Object> edit(@Validated @RequestBody TOpcServerUpdateValidate updateValidate) {
+        iTOpcServerService.edit(updateValidate);
         return AjaxResult.success();
     }
 
-    @Log(title = "删除")
+    @Log(title = "opc服务器删除")
     @PostMapping("/del")
-    @ApiOperation(value = "删除")
+    @ApiOperation(value="opc服务器删除")
     public AjaxResult<Object> del(@Validated @RequestBody IdValidate idValidate) {
-        opcServerService.removeById(idValidate.getId());
+        iTOpcServerService.del(idValidate.getId());
         return AjaxResult.success();
     }
 
 
+
 }

taphole-opc/src/main/java/com/sckj/opc/service/OPCPointServiceImpl.java

@@ -1,14 +1,26 @@
 package com.sckj.opc.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sckj.common.core.PageResult;
+import com.sckj.common.validate.commons.PageValidate;
 import com.sckj.opc.dto.OPCPointDTO;
 import com.sckj.opc.entity.OPCPoint;
 import com.sckj.opc.mapper.OPCPointMapper;
+import com.sckj.opc.validate.TOpcPointCreateValidate;
+import com.sckj.opc.validate.TOpcPointSearchValidate;
+import com.sckj.opc.validate.TOpcPointUpdateValidate;
+import com.sckj.opc.vo.TOpcPointDetailVo;
+import com.sckj.opc.vo.TOpcPointListedVo;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
 
 import javax.annotation.Resource;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Author feng
@@ -16,12 +28,142 @@ import java.util.Map;
  * @Description TODO
  */
 @Service
-public class OPCPointServiceImpl  extends ServiceImpl<OPCPointMapper, OPCPoint> {
+public class OPCPointServiceImpl extends ServiceImpl<OPCPointMapper, OPCPoint> {
 
     @Resource
-    OPCPointMapper opcPointMapper;
+    OPCPointMapper tOpcPointMapper;
 
-    public OPCPointDTO selectInfoWithServer(OPCPoint opcPoint){
-        return opcPointMapper.selectInfoWithServer(opcPoint);
+    public OPCPointDTO selectInfoWithServer(OPCPoint opcPoint) {
+        return tOpcPointMapper.selectInfoWithServer(opcPoint);
     }
+
+
+    /**
+     * OPC订阅点列表
+     *
+     * @param pageValidate   分页参数
+     * @param searchValidate 搜索参数
+     * @return PageResult<TOpcPointListedVo>
+     * @author LikeAdmin
+     */
+
+    public PageResult<TOpcPointListedVo> list(PageValidate pageValidate, TOpcPointSearchValidate searchValidate) {
+        Integer page = pageValidate.getPageNo();
+        Integer limit = pageValidate.getPageSize();
+
+        QueryWrapper<OPCPoint> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByDesc("id");
+
+        tOpcPointMapper.setSearch(queryWrapper, searchValidate, new String[]{
+                "=:namespaceIndex@namespace_index:int",
+                "=:opcServerId@opc_server_id:long",
+                "=:status:str",
+                "=:period:int",
+                "like:pointName@point_name:str",
+                "=:dataType@data_type:str",
+                "like:pointDesc@point_desc:str",
+                "=:opcProtocol@opc_protocol:str",
+                "=:remark:str",
+        });
+
+        IPage<OPCPoint> iPage = tOpcPointMapper.selectPage(new Page<>(page, limit), queryWrapper);
+
+        List<TOpcPointListedVo> list = new LinkedList<>();
+        for (OPCPoint item : iPage.getRecords()) {
+            TOpcPointListedVo vo = new TOpcPointListedVo();
+            BeanUtils.copyProperties(item, vo);
+            list.add(vo);
+        }
+
+        return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
+    }
+
+    /**
+     * OPC订阅点详情
+     *
+     * @param id 主键参数
+     * @return OPCPoint
+     * @author LikeAdmin
+     */
+
+    public TOpcPointDetailVo detail(Integer id) {
+        OPCPoint model = tOpcPointMapper.selectOne(
+                new QueryWrapper<OPCPoint>()
+                        .eq("id", id)
+                        .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在");
+
+        TOpcPointDetailVo vo = new TOpcPointDetailVo();
+        BeanUtils.copyProperties(model, vo);
+        return vo;
+    }
+
+    /**
+     * OPC订阅点新增
+     *
+     * @param createValidate 参数
+     * @author LikeAdmin
+     */
+
+    public void add(TOpcPointCreateValidate createValidate) {
+        OPCPoint model = new OPCPoint();
+        model.setNamespaceIndex(createValidate.getNamespaceIndex());
+        model.setOpcServerId(createValidate.getOpcServerId());
+        model.setStatus(createValidate.getStatus());
+        model.setPeriod(createValidate.getPeriod());
+        model.setPointName(createValidate.getPointName());
+        model.setDataType(createValidate.getDataType());
+        model.setPointDesc(createValidate.getPointDesc());
+        model.setOpcProtocol(createValidate.getOpcProtocol());
+        model.setRemark(createValidate.getRemark());
+        tOpcPointMapper.insert(model);
+    }
+
+    /**
+     * OPC订阅点编辑
+     *
+     * @param updateValidate 参数
+     * @author LikeAdmin
+     */
+
+    public void edit(TOpcPointUpdateValidate updateValidate) {
+        OPCPoint model = tOpcPointMapper.selectOne(
+                new QueryWrapper<OPCPoint>()
+                        .eq("id", updateValidate.getId())
+                        .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在!");
+
+        model.setId(updateValidate.getId());
+        model.setNamespaceIndex(updateValidate.getNamespaceIndex());
+        model.setOpcServerId(updateValidate.getOpcServerId());
+        model.setStatus(updateValidate.getStatus());
+        model.setPeriod(updateValidate.getPeriod());
+        model.setPointName(updateValidate.getPointName());
+        model.setDataType(updateValidate.getDataType());
+        model.setPointDesc(updateValidate.getPointDesc());
+        model.setOpcProtocol(updateValidate.getOpcProtocol());
+        model.setRemark(updateValidate.getRemark());
+        tOpcPointMapper.updateById(model);
+    }
+
+    /**
+     * OPC订阅点删除
+     *
+     * @param id 主键ID
+     * @author LikeAdmin
+     */
+
+    public void del(Integer id) {
+        OPCPoint model = tOpcPointMapper.selectOne(
+                new QueryWrapper<OPCPoint>()
+                        .eq("id", id)
+                        .last("limit 1"));
+
+        Assert.notNull(model, "数据不存在!");
+
+        tOpcPointMapper.delete(new QueryWrapper<OPCPoint>().eq("id", id));
+    }
+
 }

taphole-opc/src/main/java/com/sckj/opc/service/OPCServerServiceImpl.java

@@ -48,17 +48,16 @@ public class OPCServerServiceImpl extends ServiceImpl<OPCServerMapper, OPCServer
         queryWrapper.orderByDesc("id");
 
         tOpcServerMapper.setSearch(queryWrapper, searchValidate, new String[]{
-                "=:endpointUrl@endpoint_url:str",
+                "like:endpointUrl@endpoint_url:str",
                 "like:applicationName@application_name:str",
-                "=:applicationUri@application_uri:str",
-                "=:ip:str",
+                "like:applicationUri@application_uri:str",
+                "like:ip@ip:str",
                 "like:username:str",
-                "=:password:str",
                 "=:securityPolicy@security_policy:str",
-                "=:clsid:str",
+                "like:clsid@clsid:str",
                 "=:certPath@cert_path:str",
                 "=:status:str",
-                "=:remark:str",
+                "like:remark@remark:str",
                 "=:type:str",
         });
 

taphole-opc/src/main/java/com/sckj/opc/validate/TOpcPointUpdateValidate.java

@@ -18,7 +18,6 @@ public class TOpcPointUpdateValidate implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @IDMust(message = "id参数必传且需大于0")
     @ApiModelProperty(value = "")
     private Long id;
 

taphole-opc/src/main/java/com/sckj/opc/validate/TOpcServerCreateValidate.java

@@ -31,15 +31,15 @@ public class TOpcServerCreateValidate implements Serializable {
     private String ip;
 
     @NotNull(message = "username参数缺失")
-    @ApiModelProperty(value = "密码")
+    @ApiModelProperty(value = "用户名")
     private String username;
 
     @NotNull(message = "password参数缺失")
-    @ApiModelProperty(value = "用户名")
+    @ApiModelProperty(value = "密码")
     private String password;
 
     @NotNull(message = "securityPolicy参数缺失")
-    @ApiModelProperty(value = "安全策略(none、password、identified )")
+    @ApiModelProperty(value = "安全策略")
     private String securityPolicy;
 
     @NotNull(message = "clsid参数缺失")
@@ -47,11 +47,11 @@ public class TOpcServerCreateValidate implements Serializable {
     private String clsid;
 
     @NotNull(message = "certPath参数缺失")
-    @ApiModelProperty(value = "认证证书路径(暂不用,空表示不使用)D:/project/xiha/opcserver/D:/project/xiha/opcserver/")
+    @ApiModelProperty(value = "认证证书路径")
     private String certPath;
 
     @NotNull(message = "status参数缺失")
-    @ApiModelProperty(value = "状态（1正常 0停用）")
+    @ApiModelProperty(value = "状态")
     private String status;
 
     @NotNull(message = "remark参数缺失")

taphole-opc/src/main/java/com/sckj/opc/validate/TOpcServerSearchValidate.java

@@ -25,10 +25,10 @@ public class TOpcServerSearchValidate implements Serializable {
     @ApiModelProperty(value = "IP地址")
     private String ip;
 
-    @ApiModelProperty(value = "密码")
+    @ApiModelProperty(value = "用户名")
     private String username;
 
-    @ApiModelProperty(value = "用户名")
+    @ApiModelProperty(value = "密码")
     private String password;
 
     @ApiModelProperty(value = "安全策略(none、password、identified )")

taphole-opc/src/main/java/com/sckj/opc/validate/TOpcServerUpdateValidate.java

@@ -38,27 +38,27 @@ public class TOpcServerUpdateValidate implements Serializable {
     private String ip;
 
     @NotNull(message = "username参数缺失")
-    @ApiModelProperty(value = "密码")
+    @ApiModelProperty(value = "用户名")
     private String username;
 
     @NotNull(message = "password参数缺失")
-    @ApiModelProperty(value = "用户名")
+    @ApiModelProperty(value = "密码")
     private String password;
 
     @NotNull(message = "securityPolicy参数缺失")
-    @ApiModelProperty(value = "安全策略(none、password、identified )")
+    @ApiModelProperty(value = "安全策略")
     private String securityPolicy;
 
     @NotNull(message = "clsid参数缺失")
-    @ApiModelProperty(value = "KEPServer的注册表ID(暂不用)")
+    @ApiModelProperty(value = "注册表ID")
     private String clsid;
 
     @NotNull(message = "certPath参数缺失")
-    @ApiModelProperty(value = "认证证书路径(暂不用,空表示不使用)D:/project/xiha/opcserver/D:/project/xiha/opcserver/")
+    @ApiModelProperty(value = "认证证书路径")
     private String certPath;
 
     @NotNull(message = "status参数缺失")
-    @ApiModelProperty(value = "状态（1正常 0停用）")
+    @ApiModelProperty(value = "状态")
     private String status;
 
     @NotNull(message = "remark参数缺失")