opc完善

platform-dao/src/main/java/com/platform/dao/dto/tool/BatchToolLogDTO.java

@@ -10,6 +10,9 @@ import java.util.List;
 @Data
 public class BatchToolLogDTO implements Serializable {
 
+    /**
+     * 前台提交的检定记录
+     */
     private List<ToolLogDTO> toolLogDTOList;
 
     /**

platform-dao/src/main/java/com/platform/dao/vo/query/tool/ToolLogVO.java

@@ -6,6 +6,7 @@ import com.platform.common.bean.BaseDTO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import javax.validation.constraints.*;
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -20,65 +21,72 @@ import java.time.LocalDate;
 @Data
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
-public class ToolLogVO extends BaseVO implements Serializable{
+public class ToolLogVO extends BaseVO implements Serializable {
 
     /**
      * 主键
      */
-        private String id;
-        /**
+    private String id;
+    /**
      * 检验人
      */
-        private String checkUserId;
-        /**
+    private String checkUserId;
+    /**
      * 检验说明
      */
-        private String requirement;
-        /**
+    private String requirement;
+    /**
      * 备注
      */
-        private String remark;
-        /**
+    private String remark;
+    /**
      * 创建人
      */
-        private String createdUserId;
-        /**
+    private String createdUserId;
+    /**
      * 更新人
      */
-        private String updateUserId;
-        /**
+    private String updateUserId;
+    /**
      * 创建人名称
      */
-        private String createdUserName;
-        /**
+    private String createdUserName;
+    /**
      * 更新人名称
      */
-        private String updateUserName;
-        /**
+    private String updateUserName;
+    /**
      * 创建时间
      */
-        private LocalDateTime createdTime;
-        /**
+    private LocalDateTime createdTime;
+    /**
      * 更新时间
      */
-        private LocalDateTime updateTime;
-        /**
+    private LocalDateTime updateTime;
+    /**
      * 工器具id
      */
-        private String toolId;
-        /**
+    private String toolId;
+    /**
+     * 工器具名称
+     */
+    private String toolName;
+    /**
+     * 规格型号
+     */
+    private String ggxh;
+    /**
      * 检测日期
      */
-        private LocalDate checkDate;
-        /**
+    private LocalDate checkDate;
+    /**
      * 检定图片路径
      */
-        private String imgPath;
-        /**
+    private String imgPath;
+    /**
      * 检定文件路径
      */
-        private String filePath;
-    
+    private String filePath;
 
 
 }

platform-dao/src/main/resources/mapper/tool/ToolLogMapper.xml

@@ -92,8 +92,9 @@
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.tool.ToolLogDTO"
             resultType="com.platform.dao.vo.query.tool.ToolLogVO">
-        select log.*
+        select log.*, tool.name as toolName, tool.ggxh as ggxh
         from t_tool_log as log
+        Left JOIN t_tool as tool
         <where>
             <include refid="List_Condition"/>
         </where>

platform-rest/src/main/java/com/platform/rest/controller/remote/RemoteOpcController.java

@@ -45,6 +45,17 @@ public class RemoteOpcController {
         return new R<>(remoteMeasureService.getModelById(id));
     }
 
+    /**
+     * 通过id查询单条记录
+     *
+     * @param positionNum 主键
+     * @return R
+     */
+    @GetMapping("/positionNum/{positionNum}")
+    public R<RemoteOpc> getByPositionNum(@PathVariable("positionNum") String positionNum) {
+        return new R<>(remoteMeasureService.getModelByPositionNum(positionNum));
+    }
+
     /**
      * 新增记录
      *

platform-rest/src/main/java/com/platform/rest/controller/sb/SbMeasureLogController.java

@@ -32,7 +32,7 @@ import java.util.List;
 @RequestMapping("/sb/measure-logs")
 public class SbMeasureLogController {
 
-  private final SbMeasureLogService sbMeasureLogService;
+    private final SbMeasureLogService sbMeasureLogService;
 
     /**
      * 通过id查询标准
@@ -41,69 +41,69 @@ public class SbMeasureLogController {
      * @return R
      */
     @GetMapping("/{id}")
-    public R<SbMeasureLog> getById(@PathVariable("id") String id){
+    public R<SbMeasureLog> getById(@PathVariable("id") String id) {
         return new R<>(sbMeasureLogService.getModelById(id));
     }
 
-  /**
-   * 新增记录
-   *
-   * @param checkStandardDTO 设备计量记录DTO
-   * @return R
-   */
-  @SysLog("新增设备计量记录")
-  @PostMapping
-  public R save(@Validated({AddGroup.class}) @RequestBody SbMeasureLogDTO checkStandardDTO) {
-      return new R<>(sbMeasureLogService.saveModelByDTO(checkStandardDTO));
-  }
-
-  @SysLog("批量新增设备计量记录")
-  @PostMapping("/batch")
-  public R saveBatch(@Validated({AddGroup.class}) @RequestBody SbMeasureLogDTO checkStandardDTO) {
-    sbMeasureLogService.saveBatchByDTO(checkStandardDTO);
-    return new R<>();
-  }
-
-  @SysLog("批量新增设备计量记录")
-  @PostMapping("/longYan/batch")
-  public R saveLongYanBatch(@RequestBody BatchSbMeasureLog batchSbMeasureLog) {
-    sbMeasureLogService.saveBatchMeasureLog(batchSbMeasureLog);
-    return new R<>();
-  }
-
-  @SysLog("批量设备在库")
-  @PostMapping("/longYan/in/batch")
-  public R inLongYanBatch(@RequestBody BatchSbMeasureLog batchSbMeasureLog) {
-    sbMeasureLogService.saveBatchIn(batchSbMeasureLog);
-    return new R<>();
-  }
-
-  /**
-   * 修改记录
-   *
-   * @param checkStandardDTO 设备计量记录DTO
-   * @return R
-   */
-  @SysLog("修改设备计量记录")
-  @PutMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('measure-log-edit')")
-  public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody SbMeasureLogDTO checkStandardDTO) {
-    sbMeasureLogService.modModelByDTO(checkStandardDTO);
-      return new R<>();
-  }
-
-  /**
-   * 通过id删除一条记录
-   *
-   * @param id 主键
-   * @return R
-   */
-  @SysLog("删除设备计量记录")
-  @DeleteMapping("/{id}")
-  public R removeById(@PathVariable String id){
-    sbMeasureLogService.deleteByPrimaryKey(id);
-    return new R<>();
-  }
+    /**
+     * 新增记录
+     *
+     * @param checkStandardDTO 设备计量记录DTO
+     * @return R
+     */
+    @SysLog("新增设备计量记录")
+    @PostMapping
+    public R save(@Validated({AddGroup.class}) @RequestBody SbMeasureLogDTO checkStandardDTO) {
+        return new R<>(sbMeasureLogService.saveModelByDTO(checkStandardDTO));
+    }
+
+    @SysLog("批量新增设备计量记录")
+    @PostMapping("/batch")
+    public R saveBatch(@Validated({AddGroup.class}) @RequestBody SbMeasureLogDTO checkStandardDTO) {
+        sbMeasureLogService.saveBatchByDTO(checkStandardDTO);
+        return new R<>();
+    }
+
+    @SysLog("批量新增设备计量记录")
+    @PostMapping("/longYan/batch")
+    public R saveLongYanBatch(@RequestBody BatchSbMeasureLog batchSbMeasureLog) {
+        sbMeasureLogService.saveBatchMeasureLog(batchSbMeasureLog);
+        return new R<>();
+    }
+
+    @SysLog("批量设备在库")
+    @PostMapping("/longYan/in/batch")
+    public R inLongYanBatch(@RequestBody BatchSbMeasureLog batchSbMeasureLog) {
+        sbMeasureLogService.saveBatchIn(batchSbMeasureLog);
+        return new R<>();
+    }
+
+    /**
+     * 修改记录
+     *
+     * @param checkStandardDTO 设备计量记录DTO
+     * @return R
+     */
+    @SysLog("修改设备计量记录")
+    @PutMapping("/{id}")
+    @PreAuthorize("@pms.hasPermission('measure-log-edit')")
+    public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody SbMeasureLogDTO checkStandardDTO) {
+        sbMeasureLogService.modModelByDTO(checkStandardDTO);
+        return new R<>();
+    }
+
+    /**
+     * 通过id删除一条记录
+     *
+     * @param id 主键
+     * @return R
+     */
+    @SysLog("删除设备计量记录")
+    @DeleteMapping("/{id}")
+    public R removeById(@PathVariable String id) {
+        sbMeasureLogService.deleteByPrimaryKey(id);
+        return new R<>();
+    }
 
     /**
      * 批量记录
@@ -113,53 +113,53 @@ public class SbMeasureLogController {
      */
     @SysLog("批量删除设备计量记录")
     @DeleteMapping("")
-    public R removeIds(@RequestBody List<String> ids){
-      sbMeasureLogService.batchDelete(ids);
+    public R removeIds(@RequestBody List<String> ids) {
+        sbMeasureLogService.batchDelete(ids);
         return new R<>();
     }
 
-  /**
-   * 获取分页
-   *
-   * @param pageNum 当前页码
-   * @param pageSize 每页条数
-   * @param checkStandardDTO 设备计量记录DTO
-   * @return R
-   */
-  @GetMapping("/page")
-  public R<AbstractPageResultBean<SbMeasureLog>> query(SbMeasureLogDTO checkStandardDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
-      return new R<>(sbMeasureLogService.selectPageInfo(checkStandardDTO, pageNum, pageSize));
-  }
-
-  /**
-   * 获取列表
-   *
-   * @param checkStandardDTO 设备计量记录DTO
-   * @return R
-   */
-  @GetMapping("")
-  public R query(SbMeasureLogDTO checkStandardDTO) {
-      return new R<>(sbMeasureLogService.selectList(checkStandardDTO));
-  }
-
-  /**
+    /**
+     * 获取分页
+     *
+     * @param pageNum          当前页码
+     * @param pageSize         每页条数
+     * @param checkStandardDTO 设备计量记录DTO
+     * @return R
+     */
+    @GetMapping("/page")
+    public R<AbstractPageResultBean<SbMeasureLog>> query(SbMeasureLogDTO checkStandardDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+        return new R<>(sbMeasureLogService.selectPageInfo(checkStandardDTO, pageNum, pageSize));
+    }
+
+    /**
+     * 获取列表
+     *
+     * @param checkStandardDTO 设备计量记录DTO
+     * @return R
+     */
+    @GetMapping("")
+    public R query(SbMeasureLogDTO checkStandardDTO) {
+        return new R<>(sbMeasureLogService.selectList(checkStandardDTO));
+    }
+
+    /**
      * 设备计量记录导出
      *
      * @param checkStandardDTO 设备计量记录DTO
      * @return R
      */
-  @GetMapping("/export")
-  @SysLog("计量设备检定记录导出")
-  @PreAuthorize("@pms.hasPermission('measure-log-export') or @pms.hasPermission('check-polling-standards-export')")
-  public void export(HttpServletResponse response, SbMeasureLogDTO checkStandardDTO) {
-    List<SbMeasureLogVO> list = sbMeasureLogService.selectList(checkStandardDTO);
-    ExcelUtil.exportResponseDict(response, ExportSbMeasureLogVO.class, BeanConverterUtil.copyListProperties(list, ExportSbMeasureLogVO.class), "计量设备检定记录");
-  }
-
-  @GetMapping("/generate/init")
-  public R generateInit() {
-    sbMeasureLogService.generateInitLog();
-    return new R<>();
-  }
+    @GetMapping("/export")
+    @SysLog("计量设备检定记录导出")
+    @PreAuthorize("@pms.hasPermission('measure-log-export') or @pms.hasPermission('check-polling-standards-export')")
+    public void export(HttpServletResponse response, SbMeasureLogDTO checkStandardDTO) {
+        List<SbMeasureLogVO> list = sbMeasureLogService.selectList(checkStandardDTO);
+        ExcelUtil.exportResponseDict(response, ExportSbMeasureLogVO.class, BeanConverterUtil.copyListProperties(list, ExportSbMeasureLogVO.class), "计量设备检定记录");
+    }
+
+    @GetMapping("/generate/init")
+    public R generateInit() {
+        sbMeasureLogService.generateInitLog();
+        return new R<>();
+    }
 
 }

platform-rest/src/main/java/com/platform/rest/controller/tool/ToolLogController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import lombok.AllArgsConstructor;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.rest.log.annotation.SysLog;
+
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -32,68 +33,67 @@ import javax.servlet.http.HttpServletResponse;
 @RequestMapping("/tool/tool-logs")
 public class ToolLogController {
 
-  private final  ToolLogService toolLogService;
+    private final ToolLogService toolLogService;
 
-  /**
-   * 通过id查询单条记录
-   *
-   * @param id 主键
-   * @return R
-   */
-  @GetMapping("/{id}")
-  public R<ToolLog> getById(@PathVariable("id") String id){
-      return new R<>(toolLogService.getModelById(id));
-  }
+    /**
+     * 通过id查询单条记录
+     *
+     * @param id 主键
+     * @return R
+     */
+    @GetMapping("/{id}")
+    public R<ToolLog> getById(@PathVariable("id") String id) {
+        return new R<>(toolLogService.getModelById(id));
+    }
 
-  /**
-   * 新增记录
-   *
-   * @param toolLogDTO 工器具检定记录DTO
-   * @return R
-   */
-  @SysLog("新增工器具检定记录")
-  @PostMapping
-  @PreAuthorize("@pms.hasPermission('tool-tool-logs-add')")
-  public R save(@Validated({AddGroup.class}) @RequestBody ToolLogDTO toolLogDTO) {
-      return new R<>(toolLogService.saveModelByDTO(toolLogDTO));
-  }
+    /**
+     * 新增记录
+     *
+     * @param toolLogDTO 工器具检定记录DTO
+     * @return R
+     */
+    @SysLog("新增工器具检定记录")
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('tool-tool-logs-add')")
+    public R save(@Validated({AddGroup.class}) @RequestBody ToolLogDTO toolLogDTO) {
+        return new R<>(toolLogService.saveModelByDTO(toolLogDTO));
+    }
 
-  @SysLog("批量新增工器具检定记录")
-  @PostMapping("/batch")
-  public R saveLongYanBatch(@RequestBody BatchToolLogDTO batchToolLogDTO) {
-    toolLogService.saveBatchToolLog(batchToolLogDTO);
-    return new R<>();
-  }
+    @SysLog("批量新增工器具检定记录")
+    @PostMapping("/batch")
+    public R saveLongYanBatch(@RequestBody BatchToolLogDTO batchToolLogDTO) {
+        toolLogService.saveBatchToolLog(batchToolLogDTO);
+        return new R<>();
+    }
 
-  /**
-   * 修改记录
-   *
-   * @param toolLogDTO 工器具检定记录DTO
-   * @return R
-   */
-  @SysLog("修改工器具检定记录")
-  @PutMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('tool-tool-logs-edit')")
-  public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody ToolLogDTO toolLogDTO) {
-      toolLogService.modModelByDTO(toolLogDTO);
-      return new R<>();
-  }
+    /**
+     * 修改记录
+     *
+     * @param toolLogDTO 工器具检定记录DTO
+     * @return R
+     */
+    @SysLog("修改工器具检定记录")
+    @PutMapping("/{id}")
+    @PreAuthorize("@pms.hasPermission('tool-tool-logs-edit')")
+    public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody ToolLogDTO toolLogDTO) {
+        toolLogService.modModelByDTO(toolLogDTO);
+        return new R<>();
+    }
 
 
-                                                                                      
-  /**
-   * 通过id删除一条记录
-   *
-   * @param id 主键
-   * @return R
-   */
-  @SysLog("删除工器具检定记录")
-  @DeleteMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('tool-tool-logs-del')")
-  public R removeById(@PathVariable String id){
-    toolLogService.deleteByPrimaryKey(id);
-    return new R<>();
-  }
+    /**
+     * 通过id删除一条记录
+     *
+     * @param id 主键
+     * @return R
+     */
+    @SysLog("删除工器具检定记录")
+    @DeleteMapping("/{id}")
+    @PreAuthorize("@pms.hasPermission('tool-tool-logs-del')")
+    public R removeById(@PathVariable String id) {
+        toolLogService.deleteByPrimaryKey(id);
+        return new R<>();
+    }
 
     /**
      * 批量记录
@@ -104,47 +104,47 @@ public class ToolLogController {
     @SysLog("批量删除工器具检定记录")
     @DeleteMapping("")
     @PreAuthorize("@pms.hasPermission('tool-tool-logs-del')")
-    public R removeIds(@RequestBody List<String> ids){
+    public R removeIds(@RequestBody List<String> ids) {
         toolLogService.batchDelete(ids);
         return new R<>();
     }
 
-  /**
-   * 获取分页
-   *
-   * @param pageNum 当前页码
-   * @param pageSize 每页条数
-   * @param toolLogDTO 工器具检定记录DTO
-   * @return R
-   */
-  @GetMapping("/page")
-  public R<AbstractPageResultBean<ToolLogVO>> query(ToolLogDTO toolLogDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
-      return new R<>(toolLogService.selectPageList(toolLogDTO, pageNum, pageSize));
-  }
+    /**
+     * 获取分页
+     *
+     * @param pageNum    当前页码
+     * @param pageSize   每页条数
+     * @param toolLogDTO 工器具检定记录DTO
+     * @return R
+     */
+    @GetMapping("/page")
+    public R<AbstractPageResultBean<ToolLogVO>> query(ToolLogDTO toolLogDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+        return new R<>(toolLogService.selectPageList(toolLogDTO, pageNum, pageSize));
+    }
 
-  /**
-   * 获取列表
-   *
-   * @param toolLogDTO 工器具检定记录DTO
-   * @return R
-   */
-  @GetMapping("")
-  public R query(ToolLogDTO toolLogDTO) {
-      return new R<>(toolLogService.getModelListByDTO(toolLogDTO));
-  }
+    /**
+     * 获取列表
+     *
+     * @param toolLogDTO 工器具检定记录DTO
+     * @return R
+     */
+    @GetMapping("")
+    public R query(ToolLogDTO toolLogDTO) {
+        return new R<>(toolLogService.getModelListByDTO(toolLogDTO));
+    }
 
-  /**
+    /**
      * 工器具检定记录导出
      *
      * @param toolLogDTO 工器具检定记录DTO
      * @return R
      */
-  @GetMapping("/export")
-  @SysLog("工器具检定记录导出")
-  @PreAuthorize("@pms.hasPermission('tool-tool-logs-export')")
-  public void export(HttpServletResponse response, ToolLogDTO toolLogDTO) {
-    List<ToolLog> list = toolLogService.getModelListByDTO(toolLogDTO);
-    ExcelUtil.exportResponseDict(response, ExportToolLogVO.class, BeanConverterUtil.copyListProperties(list, ExportToolLogVO.class), "工器具检定记录");
-  }
+    @GetMapping("/export")
+    @SysLog("工器具检定记录导出")
+    @PreAuthorize("@pms.hasPermission('tool-tool-logs-export')")
+    public void export(HttpServletResponse response, ToolLogDTO toolLogDTO) {
+        List<ToolLog> list = toolLogService.getModelListByDTO(toolLogDTO);
+        ExcelUtil.exportResponseDict(response, ExportToolLogVO.class, BeanConverterUtil.copyListProperties(list, ExportToolLogVO.class), "工器具检定记录");
+    }
 
 }

platform-service/src/main/java/com/platform/service/remote/RemoteOpcService.java

@@ -56,5 +56,5 @@ public interface RemoteOpcService extends IBaseService<RemoteOpc, RemoteOpcDTO>
 
     void updateIds(List<String> ids, Integer updateType, Integer value);
 
-    Object selectListFromRedis(RemoteOpcDTO remoteMeasureDTO);
+    RemoteOpc getModelByPositionNum(String positionNum);
 }

platform-service/src/main/java/com/platform/service/remote/impl/RemoteOpcLogServiceImpl.java

@@ -36,8 +36,6 @@ import java.util.List;
 @Service("remoteOpcLogService")
 public class RemoteOpcLogServiceImpl extends BaseServiceImpl<RemoteOpcLogMapper, RemoteOpcLog, RemoteOpcLogDTO> implements RemoteOpcLogService {
 
-    private final SysDictMapper sysDictMapper;
-
     @Override
     public int batchDelete(List<String> ids) {
         Weekend<RemoteOpcLog> weekend = new Weekend<>(RemoteOpcLog.class);

platform-service/src/main/java/com/platform/service/remote/impl/RemoteOpcServiceImpl.java

@@ -61,18 +61,12 @@ public class RemoteOpcServiceImpl extends BaseServiceImpl<RemoteOpcMapper, Remot
         int count = mapper.selectCountByExample(weekend);
         // 不存在在设置点位信息
         if (count > 0) {
-            throw new BusinessException("该点位已经存在，无法新增，数量：" + count);
+            throw new BusinessException("该点位已经存在，无法新增，请点击查询进行修改，数量：" + count);
         }
         if (model.getAvFlag() == YesNoEnum.YES.getValue()) {
             model.setPositionNum(model.getDescription() + "_AV");
-              /* if (model.getPositionNum().lastIndexOf("_AV") < 0) {
-                throw new BusinessException("模拟量的点位后缀必须是_AV，请检查");
-            }*/
         } else {
             model.setPositionNum(model.getDescription() + "_DV");
-           /* if (model.getPositionNum().lastIndexOf("_DV") < 0) {
-                throw new BusinessException("数字量的点位后缀必须是_DV，请检查");
-            }*/
         }
         if (model.getXPosition() == null) {
             model.setXPosition(50);
@@ -226,12 +220,11 @@ public class RemoteOpcServiceImpl extends BaseServiceImpl<RemoteOpcMapper, Remot
     }
 
     @Override
-    public Object selectListFromRedis(RemoteOpcDTO remoteMeasureDTO) {
-        /*String jsonStr = RedisUtils.getString("opcList");
-        if (StringUtils.isNotBlank(jsonStr)) {
-            List<OpcResult> resultList = JSON.parseArray(jsonStr, OpcResult.class);
-        }*/
-        return null;
+    public RemoteOpc getModelByPositionNum(String positionNum) {
+        Weekend<RemoteOpc> weekend = new Weekend<>(RemoteOpc.class);
+        WeekendCriteria<RemoteOpc, Object> weekendCriteria = weekend.weekendCriteria();
+        weekendCriteria.andEqualTo(RemoteOpc::getPositionNum, positionNum);
+        return mapper.selectOneByExample(weekend);
     }
 
     public static void main(String[] args) {