代码优化

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

@@ -4,6 +4,7 @@ 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.TapholeAdminThreadLocal;
 import com.sckj.common.core.PageResult;
 import com.sckj.common.validate.commons.PageValidate;
 import com.sckj.iron.entity.TIronModel;
@@ -102,6 +103,7 @@ public class TIronModelServiceImpl extends ServiceImpl<TIronModelMapper, TIronMo
      */
     public void add(TIronModelCreateValidate createValidate) {
         TIronModel model = new TIronModel();
+        model.setCreateBy(String.valueOf(TapholeAdminThreadLocal.getAdminUsername()));
         model.setModelName(createValidate.getModelName());
         model.setModelExpression(createValidate.getModelExpression());
         model.setModelDesc(createValidate.getModelDesc());

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

@@ -81,8 +81,7 @@ public class TIronParamServiceImpl extends ServiceImpl<TIronParamMapper, TIronPa
             queryWrapper.lambda().eq(TIronParam::getParamUnit, searchValidate.getParamUnit());
         }
 
-        queryWrapper.orderByDesc("id");
-
+        queryWrapper.lambda().orderByAsc(TIronParam::getParamType,TIronParam::getId);
 
 
         IPage<TIronParam> iPage = tIronParamMapper.selectPage(new Page<>(page, limit), queryWrapper);
@@ -125,11 +124,12 @@ public class TIronParamServiceImpl extends ServiceImpl<TIronParamMapper, TIronPa
      */
     public void add(TIronParamCreateValidate createValidate) {
         TIronParam model = new TIronParam();
-        model.setCreateTime(new Date(System.currentTimeMillis()));
         model.setCreateBy(String.valueOf(TapholeAdminThreadLocal.getAdminUsername()));
         model.setParamType(createValidate.getParamType());
         model.setParamName(createValidate.getParamName());
         model.setParamValue(createValidate.getParamValue());
+        model.setParamDesc(createValidate.getParamDesc());
+        model.setParamUnit(createValidate.getParamUnit());
         tIronParamMapper.insert(model);
         refreshParams();
     }

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

@@ -5,6 +5,7 @@ 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.google.common.eventbus.AsyncEventBus;
+import com.sckj.common.TapholeAdminThreadLocal;
 import com.sckj.common.core.PageResult;
 import com.sckj.common.validate.commons.PageValidate;
 import com.sckj.iron.entity.TIronStep;
@@ -204,6 +205,7 @@ public class TIronStepServiceImpl extends ServiceImpl<TIronStepMapper, TIronStep
     
     public void add(TIronStepCreateValidate createValidate) {
         TIronStep model = new TIronStep();
+        model.setCreateBy(String.valueOf(TapholeAdminThreadLocal.getAdminUsername()));
         model.setStepId(createValidate.getStepId());
         model.setIdentifier(createValidate.getIdentifier());
         model.setRequired(createValidate.getRequired());

taphole-iron/src/main/java/com/sckj/iron/socketio/DeviceEventListener.java

@@ -35,8 +35,8 @@ import com.sckj.opc.entity.OPCData;
 import com.sckj.opc.service.OPCDataServiceImpl;
 import com.sckj.opc.utils.CustomUtil;
 import com.sckj.warn.entity.TAudio;
-import com.sckj.warn.service.ITExceptionLogService;
 import com.sckj.warn.service.impl.TAudioServiceImpl;
+import com.sckj.warn.service.impl.TExceptionLogServiceImpl;
 import com.sckj.warn.validate.TExceptionLogCreateValidate;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -106,7 +106,7 @@ public class DeviceEventListener extends EventListener { //
     OPCDataServiceImpl opcDataService;
 
     @Resource
-    ITExceptionLogService exceptionLogService;
+    TExceptionLogServiceImpl exceptionLogService;
 
     @Resource
     TAudioServiceImpl audioService;

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

@@ -42,4 +42,10 @@ public class TIronParamCreateValidate implements Serializable {
 
     @ApiModelProperty(value = "参数值")
     private String paramValue;
+
+    @ApiModelProperty(value = "参数值描述")
+    private String paramDesc;
+
+    @ApiModelProperty(value = "参数值单位")
+    private String paramUnit;
 }

taphole-opc/src/main/java/com/sckj/opc/entity/OPCPoint.java

@@ -55,4 +55,7 @@ public class OPCPoint {
     @ApiModelProperty(value = "数据类型")
     private String dataType;
 
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
 }

taphole-opc/src/main/java/com/sckj/opc/entity/OPCServer.java

@@ -65,4 +65,7 @@ public class OPCServer {
     @NotNull(message = "type参数缺失")
     private String type;
 
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
 }

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

@@ -4,6 +4,7 @@ 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.TapholeAdminThreadLocal;
 import com.sckj.common.core.PageResult;
 import com.sckj.common.validate.commons.PageValidate;
 import com.sckj.opc.dto.OPCPointDTO;
@@ -108,6 +109,7 @@ public class OPCPointServiceImpl extends ServiceImpl<OPCPointMapper, OPCPoint> {
 
     public void add(TOpcPointCreateValidate createValidate) {
         OPCPoint model = new OPCPoint();
+        model.setCreateBy(String.valueOf(TapholeAdminThreadLocal.getAdminUsername()));
         model.setNamespaceIndex(createValidate.getNamespaceIndex());
         model.setOpcServerId(createValidate.getOpcServerId());
         model.setStatus(createValidate.getStatus());

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

@@ -4,6 +4,7 @@ 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.TapholeAdminThreadLocal;
 import com.sckj.common.core.PageResult;
 import com.sckj.common.validate.commons.PageValidate;
 import com.sckj.opc.entity.OPCServer;
@@ -103,6 +104,7 @@ public class OPCServerServiceImpl extends ServiceImpl<OPCServerMapper, OPCServer
     
     public void add(TOpcServerCreateValidate createValidate) {
         OPCServer model = new OPCServer();
+        model.setCreateBy(String.valueOf(TapholeAdminThreadLocal.getAdminUsername()));
         model.setEndpointUrl(createValidate.getEndpointUrl());
         model.setApplicationName(createValidate.getApplicationName());
         model.setApplicationUri(createValidate.getApplicationUri());

taphole-warn/src/main/java/com/sckj/warn/controller/TAudioController.java

@@ -6,7 +6,7 @@ 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.warn.service.ITAudioService;
+import com.sckj.warn.service.impl.TAudioServiceImpl;
 import com.sckj.warn.validate.TAudioCreateValidate;
 import com.sckj.warn.validate.TAudioSearchValidate;
 import com.sckj.warn.validate.TAudioUpdateValidate;
@@ -26,7 +26,7 @@ import java.util.List;
 public class TAudioController {
 
     @Resource
-    ITAudioService iTAudioService;
+    TAudioServiceImpl iTAudioService;
 
     @GetMapping("/list")
     @ApiOperation(value="音频列表")

taphole-warn/src/main/java/com/sckj/warn/controller/TExceptionLogController.java

@@ -1,17 +1,17 @@
 package com.sckj.warn.controller;
 
 import com.sckj.common.aop.Log;
-import com.sckj.warn.service.ITExceptionLogService;
+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.warn.service.impl.TExceptionLogServiceImpl;
 import com.sckj.warn.validate.TExceptionLogCreateValidate;
-import com.sckj.warn.validate.TExceptionLogUpdateValidate;
 import com.sckj.warn.validate.TExceptionLogSearchValidate;
-import com.sckj.common.validate.commons.PageValidate;
-import com.sckj.warn.vo.TExceptionLogListedVo;
+import com.sckj.warn.validate.TExceptionLogUpdateValidate;
 import com.sckj.warn.vo.TExceptionLogDetailVo;
-import com.sckj.common.core.AjaxResult;
-import com.sckj.common.core.PageResult;
-import com.sckj.common.validator.annotation.IDMust;
+import com.sckj.warn.vo.TExceptionLogListedVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.HttpHeaders;
@@ -30,7 +30,7 @@ import java.util.List;
 public class TExceptionLogController {
 
     @Resource
-    ITExceptionLogService iTExceptionLogService;
+    TExceptionLogServiceImpl iTExceptionLogService;
 
     @GetMapping("/list")
     @ApiOperation(value="异常情况记录列表")

taphole-warn/src/main/java/com/sckj/warn/service/ITAudioService.java

@@ -1,87 +0,0 @@
-package com.sckj.warn.service;
-
-import com.sckj.common.core.AjaxResult;
-import com.sckj.common.validate.commons.PageValidate;
-import com.sckj.warn.validate.TAudioCreateValidate;
-import com.sckj.warn.validate.TAudioUpdateValidate;
-import com.sckj.warn.validate.TAudioSearchValidate;
-import com.sckj.warn.vo.TAudioListedVo;
-import com.sckj.warn.vo.TAudioDetailVo;
-import com.sckj.common.core.PageResult;
-
-import java.util.List;
-
-/**
- * 音频服务接口类
- * @author zhanghao
- */
-public interface ITAudioService {
-
-    /**
-     * 音频列表
-     *
-     * @author zhanghao
-     * @param pageValidate 分页参数
-     * @param searchValidate 搜索参数
-     * @return PageResult<TAudioListedVo>
-     */
-    PageResult<TAudioListedVo> list(PageValidate pageValidate, TAudioSearchValidate searchValidate);
-
-    /**
-     * 音频详情
-     *
-     * @author zhanghao
-     * @param id 主键ID
-     * @return TAudioDetailVo
-     */
-    TAudioDetailVo detail(Integer id);
-
-    /**
-     * 音频新增
-     *
-     * @author zhanghao
-     * @param createValidate 参数
-     */
-    void add(TAudioCreateValidate createValidate);
-
-    /**
-     * 音频编辑
-     *
-     * @author zhanghao
-     * @param updateValidate 参数
-     */
-    int edit(TAudioUpdateValidate updateValidate);
-
-    /**
-     * 音频启用状态修改
-     *
-     * @author zhanghao
-     * @param updateValidate 参数
-     */
-    AjaxResult<Object> status(TAudioUpdateValidate updateValidate);
-
-    /**
-     * 音频删除
-     *
-     * @author zhanghao
-     * @param id 主键ID
-     */
-    void del(Integer id);
-
-    /**
-     * 音频批量删除
-     *
-     * @author zhanghao
-     * @param ids 主键数组
-     */
-    AjaxResult<Object> del_ex(List<Long> ids);
-
-    /**
-     * 音频地址查询
-     *
-     * @author zhanghao
-     * @param id 主键ID
-     */
-    String searchPath(Long id);
-
-}

taphole-warn/src/main/java/com/sckj/warn/service/ITExceptionLogService.java

@@ -1,74 +0,0 @@
-package com.sckj.warn.service;
-
-import com.sckj.common.core.AjaxResult;
-import com.sckj.common.validate.commons.PageValidate;
-import com.sckj.warn.validate.TExceptionLogCreateValidate;
-import com.sckj.warn.validate.TExceptionLogUpdateValidate;
-import com.sckj.warn.validate.TExceptionLogSearchValidate;
-import com.sckj.warn.vo.TExceptionLogListedVo;
-import com.sckj.warn.vo.TExceptionLogDetailVo;
-import com.sckj.common.core.PageResult;
-
-import java.io.ByteArrayOutputStream;
-import java.util.List;
-
-/**
- * 异常情况记录服务接口类
- * @author zhanghao
- */
-public interface ITExceptionLogService {
-
-    /**
-     * 异常情况记录列表
-     *
-     * @author zhanghao
-     * @param pageValidate 分页参数
-     * @param searchValidate 搜索参数
-     * @return PageResult<TExceptionLogListedVo>
-     */
-    PageResult<TExceptionLogListedVo> list(PageValidate pageValidate, TExceptionLogSearchValidate searchValidate);
-
-    /**
-     * 异常情况记录详情
-     *
-     * @author zhanghao
-     * @param id 主键ID
-     * @return TExceptionLogDetailVo
-     */
-    TExceptionLogDetailVo detail(Integer id);
-
-    /**
-     * 异常情况记录新增
-     *
-     * @author zhanghao
-     * @param createValidate 参数
-     */
-    void add(TExceptionLogCreateValidate createValidate);
-
-    /**
-     * 异常情况记录编辑
-     *
-     * @author zhanghao
-     * @param updateValidate 参数
-     */
-    void edit(TExceptionLogUpdateValidate updateValidate);
-
-    /**
-     * 异常情况记录删除
-     *
-     * @author zhanghao
-     * @param id 主键ID
-     */
-    void del(Integer id);
-
-    AjaxResult<Object> del_ex(List<Long> ids);
-
-    /**
-     * 异常情况记录导出
-     *
-     * @author zhanghao
-     * @param searchValidate 搜索参数
-     */
-    ByteArrayOutputStream exportTExceptionLog(TExceptionLogSearchValidate searchValidate);
-
-}

taphole-warn/src/main/java/com/sckj/warn/service/impl/TAudioServiceImpl.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sckj.common.TapholeAdminThreadLocal;
 import com.sckj.common.core.AjaxResult;
 import com.sckj.common.validate.commons.PageValidate;
-import com.sckj.warn.service.ITAudioService;
 import com.sckj.warn.validate.TAudioCreateValidate;
 import com.sckj.warn.validate.TAudioUpdateValidate;
 import com.sckj.warn.validate.TAudioSearchValidate;
@@ -35,7 +34,7 @@ import java.util.*;
  * @author zhanghao
  */
 @Service
-public class TAudioServiceImpl extends ServiceImpl<TAudioMapper,TAudio> implements ITAudioService {
+public class TAudioServiceImpl extends ServiceImpl<TAudioMapper,TAudio>  {
 
     @Resource
     TAudioMapper tAudioMapper;
@@ -48,7 +47,6 @@ public class TAudioServiceImpl extends ServiceImpl<TAudioMapper,TAudio> implemen
      * @param searchValidate 搜索参数
      * @return PageResult<TAudioListedVo>
      */
-    @Override
     public PageResult<TAudioListedVo> list(PageValidate pageValidate, TAudioSearchValidate searchValidate) {
         Integer page  = pageValidate.getPageNo();
         Integer limit = pageValidate.getPageSize();
@@ -91,7 +89,7 @@ public class TAudioServiceImpl extends ServiceImpl<TAudioMapper,TAudio> implemen
      * @param id 主键参数
      * @return TAudio
      */
-    @Override
+    
     public TAudioDetailVo detail(Integer id) {
         TAudio model = tAudioMapper.selectOne(
                 new QueryWrapper<TAudio>()
@@ -112,7 +110,7 @@ public class TAudioServiceImpl extends ServiceImpl<TAudioMapper,TAudio> implemen
      * @author zhanghao
      * @param createValidate 参数
      */
-    @Override
+    
     public void add(TAudioCreateValidate createValidate) {
         TAudio model = new TAudio();
         model.setCreateTime(new Date(System.currentTimeMillis()));
@@ -133,7 +131,7 @@ public class TAudioServiceImpl extends ServiceImpl<TAudioMapper,TAudio> implemen
      * @author zhanghao
      * @param updateValidate 参数
      */
-    @Override
+    
     public int edit(TAudioUpdateValidate updateValidate) {
         TAudio model = tAudioMapper.selectOne(
                 new QueryWrapper<TAudio>()
@@ -160,7 +158,7 @@ public class TAudioServiceImpl extends ServiceImpl<TAudioMapper,TAudio> implemen
      * @author zhanghao
      * @param updateValidate 参数
      */
-    @Override
+    
     public AjaxResult<Object> status(TAudioUpdateValidate updateValidate) {
         TAudio model = tAudioMapper.selectOne(
                 new QueryWrapper<TAudio>()
@@ -197,7 +195,7 @@ public class TAudioServiceImpl extends ServiceImpl<TAudioMapper,TAudio> implemen
      * @author zhanghao
      * @param id 主键ID
      */
-    @Override
+    
     public void del(Integer id) {
         TAudio model = tAudioMapper.selectOne(
                 new QueryWrapper<TAudio>()
@@ -233,7 +231,7 @@ public class TAudioServiceImpl extends ServiceImpl<TAudioMapper,TAudio> implemen
      * @author zhanghao
      * @param ids 主键数组
      */
-    @Override
+    
     public AjaxResult<Object> del_ex(List<Long> ids) {
         List<TAudio> models = tAudioMapper.selectList(
                 new QueryWrapper<TAudio>()

taphole-warn/src/main/java/com/sckj/warn/service/impl/TExceptionLogServiceImpl.java

@@ -7,7 +7,6 @@ import com.sckj.common.core.AjaxResult;
 import com.sckj.common.util.StringUtils;
 import com.sckj.warn.entity.TAudio;
 import com.sckj.warn.dto.WarnDTO;
-import com.sckj.warn.service.ITExceptionLogService;
 import com.sckj.common.core.PageResult;
 import com.sckj.common.util.TimeUtils;
 import com.sckj.common.validate.commons.PageValidate;
@@ -41,7 +40,7 @@ import java.util.Map;
  * @author zhanghao
  */
 @Service
-public class TExceptionLogServiceImpl implements ITExceptionLogService {
+public class TExceptionLogServiceImpl  {
 
     @Resource
     TExceptionLogMapper tExceptionLogMapper;
@@ -54,7 +53,7 @@ public class TExceptionLogServiceImpl implements ITExceptionLogService {
      * @param searchValidate 搜索参数
      * @return PageResult<TExceptionLogListedVo>
      */
-    @Override
+    
     public PageResult<TExceptionLogListedVo> list(PageValidate pageValidate, TExceptionLogSearchValidate searchValidate) {
         Integer page  = pageValidate.getPageNo();
         Integer limit = pageValidate.getPageSize();
@@ -99,7 +98,7 @@ public class TExceptionLogServiceImpl implements ITExceptionLogService {
      * @param id 主键参数
      * @return TExceptionLog
      */
-    @Override
+    
     public TExceptionLogDetailVo detail(Integer id) {
         TExceptionLog model = tExceptionLogMapper.selectOne(
                 new QueryWrapper<TExceptionLog>()
@@ -119,7 +118,7 @@ public class TExceptionLogServiceImpl implements ITExceptionLogService {
      * @author zhanghao
      * @param createValidate 参数
      */
-    @Override
+    
     public void add(TExceptionLogCreateValidate createValidate) {
         TExceptionLog model = new TExceptionLog();
         model.setCreateTime(new Date(System.currentTimeMillis()));//gg
@@ -137,7 +136,7 @@ public class TExceptionLogServiceImpl implements ITExceptionLogService {
      * @author zhanghao
      * @param updateValidate 参数
      */
-    @Override
+    
     public void edit(TExceptionLogUpdateValidate updateValidate) {
         TExceptionLog model = tExceptionLogMapper.selectOne(
                 new QueryWrapper<TExceptionLog>()
@@ -156,7 +155,7 @@ public class TExceptionLogServiceImpl implements ITExceptionLogService {
      * @author zhanghao
      * @param id 主键ID
      */
-    @Override
+    
     public void del(Integer id) {
         TExceptionLog model = tExceptionLogMapper.selectOne(
                 new QueryWrapper<TExceptionLog>()
@@ -170,7 +169,7 @@ public class TExceptionLogServiceImpl implements ITExceptionLogService {
         tExceptionLogMapper.updateById(model);
     }
 
-    @Override
+    
     public AjaxResult<Object> del_ex(List<Long> ids) {
         List<TExceptionLog> models = tExceptionLogMapper.selectList(
                 new QueryWrapper<TExceptionLog>()

taphole-warn/src/main/java/com/sckj/warn/vo/TExceptionLogDetailVo.java

@@ -16,7 +16,7 @@ public class TExceptionLogDetailVo implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "异常类型（开口耗时、出铁时间、出铁量、流速、铁水温度变化）")
-    private Integer exceptionType;
+    private String exceptionType;
 
     @ApiModelProperty(value = "异常区域（铁口区域，目前只有1号铁口区域）")
     private String exceptionArea;