微调

device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java

@@ -143,7 +143,7 @@ public class PqDevParam {
     @EqualsAndHashCode(callSuper = true)
     public static class UpdateParam extends PqDevParam {
 
-        @ApiModelProperty("id")
+        @ApiModelProperty(value = "id", required = true)
         @NotBlank(message = DeviceValidMessage.ID_NOT_BLANK)
         @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DeviceValidMessage.ID_FORMAT_ERROR)
         private String id;
@@ -160,8 +160,12 @@ public class PqDevParam {
         @Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = DeviceValidMessage.NAME_FORMAT_ERROR)
         private String name;
 
-        @ApiModelProperty("设备类型")
+        @ApiModelProperty(value = "设备模式，字典表（数字、模拟、比对）")
-        private String devType;
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DeviceValidMessage.PATTERN_FORMAT_ERROR)
+        private String pattern;
+
+        @ApiModelProperty("生产厂家")
+        private String manufacturer;
     }
 
     @Data

device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java

@@ -44,7 +44,11 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
     public Page<PqDev> listPqDevs(PqDevParam.QueryParam queryParam) {
         QueryWrapper<PqDev> queryWrapper = new QueryWrapper<>();
         if (ObjectUtil.isNotNull(queryParam)) {
-            queryWrapper.like(StrUtil.isNotBlank(queryParam.getName()), "pq_dev.name", queryParam.getName()).eq(StrUtil.isNotBlank(queryParam.getDevType()), "pq_dev.dev_type", queryParam.getDevType()).between(ObjectUtil.isAllNotEmpty(queryParam.getSearchBeginTime(), queryParam.getSearchEndTime()), "pq_dev.Create_Date", queryParam.getSearchBeginTime(), queryParam.getSearchEndTime());
+            queryWrapper
+                    .like(StrUtil.isNotBlank(queryParam.getName()), "pq_dev.name", queryParam.getName())
+                    .eq(StrUtil.isNotBlank(queryParam.getPattern()), "pq_dev.pattern", queryParam.getPattern())
+                    .eq(StrUtil.isNotBlank(queryParam.getManufacturer()), "pq_dev.manufacturer", queryParam.getManufacturer())
+                    .between(ObjectUtil.isAllNotEmpty(queryParam.getSearchBeginTime(), queryParam.getSearchEndTime()), "pq_dev.Create_Date", queryParam.getSearchBeginTime(), queryParam.getSearchEndTime());
             //排序
             if (ObjectUtil.isAllNotEmpty(queryParam.getSortBy(), queryParam.getOrderBy())) {
                 queryWrapper.orderBy(true, queryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy()));
@@ -121,7 +125,11 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
     public void exportPqDevData(PqDevParam.QueryParam queryParam) {
         QueryWrapper<PqDev> queryWrapper = new QueryWrapper<>();
         if (ObjectUtil.isNotNull(queryParam)) {
-            queryWrapper.like(StrUtil.isNotBlank(queryParam.getName()), "pq_dev.name", queryParam.getName()).eq(StrUtil.isNotBlank(queryParam.getDevType()), "pq_dev.dev_type", queryParam.getDevType()).between(ObjectUtil.isAllNotEmpty(queryParam.getSearchBeginTime(), queryParam.getSearchEndTime()), "pq_dev.Create_Date", queryParam.getSearchBeginTime(), queryParam.getSearchEndTime());
+            queryWrapper
+                    .like(StrUtil.isNotBlank(queryParam.getName()), "pq_dev.name", queryParam.getName())
+                    .eq(StrUtil.isNotBlank(queryParam.getPattern()), "pq_dev.pattern", queryParam.getPattern())
+                    .eq(StrUtil.isNotBlank(queryParam.getManufacturer()), "pq_dev.manufacturer", queryParam.getManufacturer())
+                    .between(ObjectUtil.isAllNotEmpty(queryParam.getSearchBeginTime(), queryParam.getSearchEndTime()), "pq_dev.Create_Date", queryParam.getSearchBeginTime(), queryParam.getSearchEndTime());
             //排序
             if (ObjectUtil.isAllNotEmpty(queryParam.getSortBy(), queryParam.getOrderBy())) {
                 queryWrapper.orderBy(true, queryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy()));

device/src/main/java/com/njcn/gather/device/script/pojo/param/PqScriptParam.java

@@ -31,6 +31,7 @@ public class PqScriptParam {
     /**
      * 检测脚本模式，字典表（数字、模拟、比对）
      */
+    @ApiModelProperty("模式")
     @NotBlank(message = DeviceValidMessage.PATTERN_NOT_BLANK)
     @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DeviceValidMessage.PATTERN_FORMAT_ERROR)
     private String pattern;
@@ -59,10 +60,14 @@ public class PqScriptParam {
         private String name;
 
         @ApiModelProperty("类型")
-        private String type;
+        private Integer type;
 
         @ApiModelProperty("值类型")
         private String valueType;
+
+        @ApiModelProperty("模式")
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DeviceValidMessage.PATTERN_FORMAT_ERROR)
+        private String pattern;
     }
 
     @Data

device/src/main/java/com/njcn/gather/device/script/service/impl/PqScriptServiceImpl.java

@@ -12,7 +12,6 @@ import com.njcn.gather.device.script.pojo.param.PqScriptParam;
 import com.njcn.gather.device.script.pojo.po.PqScript;
 import com.njcn.gather.device.script.service.IPqScriptDtlsService;
 import com.njcn.gather.device.script.service.IPqScriptService;
-import com.njcn.gather.system.dictionary.service.IDictDataService;
 import com.njcn.web.factory.PageFactory;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -32,15 +31,15 @@ import java.util.List;
 public class PqScriptServiceImpl extends ServiceImpl<PqScriptMapper, PqScript> implements IPqScriptService {
 
     private final IPqScriptDtlsService pqScriptDtlsService;
-    private final IDictDataService dictDataService;
 
     @Override
     public Page<PqScript> listPqScript(PqScriptParam.QueryParam param) {
         QueryWrapper<PqScript> queryWrapper = new QueryWrapper<>();
         if (ObjectUtil.isNotEmpty(param)) {
             queryWrapper.like(StrUtil.isNotBlank(param.getName()), "pq_script.name", param.getName())
-                    .eq(StrUtil.isNotBlank(param.getType()), "pq_script.type", param.getType())
+                    .eq(ObjectUtil.isNotNull(param.getType()), "pq_script.type", param.getType())
-                    .eq(StrUtil.isNotBlank(param.getValueType()), "pq_script.Value_Type", param.getValueType());
+                    .eq(StrUtil.isNotBlank(param.getValueType()), "pq_script.Value_Type", param.getValueType())
+                    .eq(StrUtil.isNotBlank(param.getPattern()), "pq_script.pattern", param.getPattern());
         }
         queryWrapper.eq("pq_script.state", DataStateEnum.ENABLE.getCode()).orderByAsc("pq_script.create_time");
         return this.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), queryWrapper);