From 595b0dcb119b9f594926ffaafafdb68799ae993b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 13 七月 2024 21:11:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java | 13 +-
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 2
cnas-server/src/main/java/com/yuanchu/mom/dto/DataConfigDto.java | 12 ++
inspect-server/src/main/java/com/yuanchu/mom/controller/InsFiberController.java | 1
cnas-server/src/main/resources/mapper/DataConfigMapper.xml | 18 +++
inspect-server/src/main/resources/mapper/StandardProductListMapper.xml | 3
cnas-server/src/main/java/com/yuanchu/mom/mapper/DataConfigMapper.java | 16 +++
inspect-server/src/main/resources/mapper/StandardTreeMapper.xml | 3
inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardProductListMapper.java | 2
inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java | 2
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 71 +++++++++++--
system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java | 7
cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java | 16 ++-
cnas-server/src/main/java/com/yuanchu/mom/service/DataConfigService.java | 16 +++
cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java | 21 ----
cnas-server/src/main/java/com/yuanchu/mom/service/impl/DataConfigServiceImpl.java | 20 ++++
cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java | 64 ++++++++++++
17 files changed, 233 insertions(+), 54 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
index 4020ab9..dda239a 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
@@ -175,11 +175,11 @@
InputStream inputStream = file.getInputStream();
List<StructureItemParameter> lists = new ArrayList<>();
AtomicReference<String> sample = new AtomicReference<>();
- ExcelUtil.readBySax(inputStream, 0, (i, l, list1) -> {
- if (i == 0 && l == 1) {
+ ExcelUtil.readBySax(inputStream, -1, (i, l, list1) -> {
+ if (l == 1) {
sample.set(list1.get(1) + "");
}
- if (i == 0 && l >= 1) {
+ if (l >= 1) {
StructureItemParameter str = new StructureItemParameter();
if (list1.get(1) == null) {
str.setSample(null);
@@ -340,14 +340,18 @@
str.setTemplateId(null);
}
try {
- if (list1.get(22) != null) {
+ if (list1.get(22) != null && list1.get(22) != "") {
str.setInspectionItemClass(list1.get(22) + "");
+ } else {
+ str.setInspectionItemClass(null);
}
} catch (Exception e) {
}
try {
- if (list1.get(23) != null) {
+ if (list1.get(23) != null && list1.get(23) != "") {
str.setInspectionItemClassEn(list1.get(23) + "");
+ } else {
+ str.setInspectionItemClassEn(null);
}
} catch (Exception e) {
}
@@ -363,7 +367,7 @@
structureItemParameterService.removeNoSample(sample.get());
// 濡傛灉鏁版嵁搴撻噷闈㈢殑鏁版嵁瀛樺湪閭ｄ箞灏辨墽琛屾洿鏂版嫹璐濇搷浣�
try {
- structureItemParameterService.saveBatch(lists);
+ structureItemParameterService.saveOrUpdateBatch(lists);
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("鏈嶅姟绔姤閿欏暒!!!");
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index a0e7e8c..14e33c1 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -1,27 +1,34 @@
package com.yuanchu.mom.controller;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
+import com.yuanchu.mom.dto.DataConfigDto;
import com.yuanchu.mom.dto.DeviceDto;
-import com.yuanchu.mom.dto.DeviceDto1;
+import com.yuanchu.mom.pojo.DataConfig;
import com.yuanchu.mom.pojo.Device;
+import com.yuanchu.mom.service.DataConfigService;
import com.yuanchu.mom.service.DeviceService;
+import com.yuanchu.mom.utils.DataAcquisition;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -36,6 +43,9 @@
@Value("${file.path}")
private String filePath;
+
+ @Autowired
+ private DataConfigService dataConfigService;
@ValueClassify("璁惧")
@ApiOperation(value = "鏌ヨ璁惧璇︽儏鍒楄〃")
@@ -134,22 +144,55 @@
return Result.success(deviceService.selectDeviceByCode(code));
}
- @ValueClassify("璁惧")
- @ApiOperation(value = "鏌ヨ鏁伴噰閰嶇疆")
- @PostMapping("/getNumberCollect")
- public Result<?> getNumberCollect(Integer id) {
- DeviceDto1 deviceDto1 = new DeviceDto1();
- BeanUtils.copyProperties(deviceService.getById(id),deviceDto1);
- return Result.success(deviceDto1);
+// @ValueClassify("璁惧")
+// @ApiOperation(value = "鏌ヨ鏁伴噰閰嶇疆")
+// @PostMapping("/getNumberCollect")
+// public Result<?> getNumberCollect(Integer id) {
+// DeviceDto1 deviceDto1 = new DeviceDto1();
+// BeanUtils.copyProperties(deviceService.getById(id),deviceDto1);
+// return Result.success(deviceDto1);
+// }
+//
+// @ValueClassify("璁惧")
+// @ApiOperation(value = "缁存姢鏁伴噰閰嶇疆")
+// @PostMapping("/numberCollect")
+// public Result<?> numberCollect(@RequestBody DeviceDto1 deviceDto1) {
+// Device device = new Device();
+// BeanUtils.copyProperties(deviceDto1,device);
+// return Result.success(deviceService.updateById(device));
+// }
+
+ @ValueAuth
+ @ApiModelProperty("/鏁伴噰")
+ @GetMapping("/text")
+ public Result<?> text(HttpServletRequest request) {
+ return Result.success(DataAcquisition.dataAcquisitionEntrance(request, new Device()));
}
@ValueClassify("璁惧")
@ApiOperation(value = "缁存姢鏁伴噰閰嶇疆")
- @PostMapping("/numberCollect")
- public Result<?> numberCollect(@RequestBody DeviceDto1 deviceDto1) {
- Device device = new Device();
- BeanUtils.copyProperties(deviceDto1,device);
- return Result.success(deviceService.updateById(device));
+ @PostMapping("/saveDataAcquisitionConfiguration")
+ public Result<?> saveDataAcquisitionConfiguration(@RequestBody DataConfigDto dataConfigList) {
+ dataConfigService.saveOrUpdateBatch(dataConfigList.getDataConfigList());
+ return Result.success();
+ }
+
+ @ValueClassify("璁惧")
+ @ApiOperation(value = "鏌ヨ鏁伴噰閰嶇疆")
+ @GetMapping("/queryDataAcquisitionConfiguration")
+ public Result<?> queryDataAcquisitionConfiguration(@RequestParam("deviceId") Integer deviceId, @RequestParam("insProductItem") String insProductItem) {
+ List<DataConfig> list = dataConfigService.list(Wrappers.<DataConfig>lambdaQuery()
+ .eq(DataConfig::getDeviceId, deviceId)
+ .eq(DataConfig::getInsProductItem, insProductItem));
+ return Result.success(list);
+ }
+
+ @ValueClassify("璁惧")
+ @ApiOperation(value = "鍒犻櫎鏁伴噰閰嶇疆")
+ @DeleteMapping("/deleteDataAcquisitionConfiguration")
+ public Result<?> deleteDataAcquisitionConfiguration(@RequestParam("id") Integer id) {
+ dataConfigService.removeById(id);
+ return Result.success();
}
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/dto/DataConfigDto.java b/cnas-server/src/main/java/com/yuanchu/mom/dto/DataConfigDto.java
new file mode 100644
index 0000000..2f60a45
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/dto/DataConfigDto.java
@@ -0,0 +1,12 @@
+package com.yuanchu.mom.dto;
+
+import com.yuanchu.mom.pojo.DataConfig;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataConfigDto {
+
+ private List<DataConfig> dataConfigList;
+}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/DataConfigMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/DataConfigMapper.java
new file mode 100644
index 0000000..c7184eb
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/mapper/DataConfigMapper.java
@@ -0,0 +1,16 @@
+package com.yuanchu.mom.mapper;
+
+import com.yuanchu.mom.pojo.DataConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2024-07-13 12:23:00
+ */
+public interface DataConfigMapper extends BaseMapper<DataConfig> {
+
+}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java
new file mode 100644
index 0000000..254d103
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java
@@ -0,0 +1,64 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2024-07-13 12:23:00
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("device_data_config")
+@ApiModel(value = "DataConfig瀵硅薄", description = "")
+public class DataConfig implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("涓婚敭id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("鏂囦欢鍚庣紑")
+ private String fileType;
+
+ @ApiModelProperty("閲囬泦鍦板潃")
+ private String collectUrl;
+
+ @ApiModelProperty("瀛樺偍鍦板潃")
+ private String storageUrl;
+
+ @ApiModelProperty("鍏紡")
+ private String formula;
+
+ @ApiModelProperty("鍙傜収X")
+ private String referx;
+
+ @ApiModelProperty("鍙傜収Y")
+ private String refery;
+
+ @ApiModelProperty("x")
+ private Integer x;
+
+ @ApiModelProperty("y")
+ private Integer y;
+
+ @ApiModelProperty("璁惧id")
+ private Integer deviceId;
+
+ @ApiModelProperty("妫�楠岄」鐩悕绉�")
+ private String insProductItem;
+}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
index f339927..6a2e465 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
@@ -118,25 +118,4 @@
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
-
- @ApiModelProperty(value = "IP")
- private String ip;
-
- @ApiModelProperty(value = "閲囬泦鍦板潃")
- private String collectUrl;
-
- @ApiModelProperty(value = "瀛樺偍鍦板潃")
- private String storageUrl;
-
- @ApiModelProperty(value = "鍙傜収")
- private String refer;
-
- @ApiModelProperty(value = "X")
- private String x;
-
- @ApiModelProperty(value = "Y")
- private String y;
-
- @ApiModelProperty(value = "鍏紡")
- private String formula;
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/DataConfigService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/DataConfigService.java
new file mode 100644
index 0000000..5ca0df5
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/DataConfigService.java
@@ -0,0 +1,16 @@
+package com.yuanchu.mom.service;
+
+import com.yuanchu.mom.pojo.DataConfig;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2024-07-13 12:23:00
+ */
+public interface DataConfigService extends IService<DataConfig> {
+
+}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DataConfigServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DataConfigServiceImpl.java
new file mode 100644
index 0000000..766cf89
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DataConfigServiceImpl.java
@@ -0,0 +1,20 @@
+package com.yuanchu.mom.service.impl;
+
+import com.yuanchu.mom.pojo.DataConfig;
+import com.yuanchu.mom.mapper.DataConfigMapper;
+import com.yuanchu.mom.service.DataConfigService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2024-07-13 12:23:00
+ */
+@Service
+public class DataConfigServiceImpl extends ServiceImpl<DataConfigMapper, DataConfig> implements DataConfigService {
+
+}
diff --git a/cnas-server/src/main/resources/mapper/DataConfigMapper.xml b/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
new file mode 100644
index 0000000..8730f30
--- /dev/null
+++ b/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
@@ -0,0 +1,18 @@
+<?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.yuanchu.mom.mapper.DataConfigMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.DataConfig">
+ <id column="id" property="id" />
+ <result column="file_type" property="fileType" />
+ <result column="collect_url" property="collectUrl" />
+ <result column="storage_url" property="storageUrl" />
+ <result column="formula" property="formula" />
+ <result column="referx" property="referx" />
+ <result column="refery" property="refery" />
+ <result column="x" property="x" />
+ <result column="y" property="y" />
+ </resultMap>
+
+</mapper>
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsFiberController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsFiberController.java
index 13713f7..82a564b 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsFiberController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsFiberController.java
@@ -18,5 +18,4 @@
@RestController
@RequestMapping("/insFiber")
public class InsFiberController {
-
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardProductListMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardProductListMapper.java
index 95b38a9..a95a131 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardProductListMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardProductListMapper.java
@@ -17,7 +17,7 @@
IPage<StandardProductList> standardProductListIPage(Integer id, String tree, IPage<StandardProductList> page, String laboratory, String insItem, String insItems);
- StandardProductList getOne(Integer standardMethodListId, String inspectionItem, String sample, String inspectionItemSubclass, String model);
+ StandardProductList getOne(Integer standardMethodListId, String inspectionItem, String sample, String inspectionItemSubclass, String model, String inspectionItemClass);
List<StandardProductList> selectDetail(@Param("standardMethodListId") Integer standardMethodListId, @Param("state") int state, @Param("model") String model);
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java
index 496ea7b..be5575d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java
@@ -41,7 +41,7 @@
String getLaboratory(String str);
- Integer getStructureItemParameterId(String sampleType, String item, String itemChild);
+ Integer getStructureItemParameterId(String sampleType, String item, String itemChild, String inspectionItemClass);
List<ProductDto> selectPList(String name);
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
index 8a3deb0..9ea8481 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
@@ -222,7 +222,7 @@
}
StandardProductList db_str;
try {
- db_str = standardProductListMapper.getOne(str.getStandardMethodListId(), str.getInspectionItem(), str.getSample(), str.getInspectionItemSubclass(), str.getModel());
+ db_str = standardProductListMapper.getOne(str.getStandardMethodListId(), str.getInspectionItem(), str.getSample(), str.getInspectionItemSubclass(), str.getModel(), str.getInspectionItemClass());
} catch (Exception e) {
throw new ErrorException("閲嶅鏌ヨ锛�" + str.getInspectionItem() + " " + str.getInspectionItemSubclass());
}
@@ -269,9 +269,9 @@
str.setState(1);
str.setTree(str.getFactory() + " - " + str.getLaboratory() + " - " + str.getSampleType() + " - " + str.getSample() + " - " + (str.getModel() == null ? "" : str.getModel()));
try {
- str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\"" + str.getSampleType() + "\"", str.getInspectionItem(), str.getInspectionItemSubclass()));
+ str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\"" + str.getSampleType() + "\"", str.getInspectionItem(), str.getInspectionItemSubclass(), str.getInspectionItemClass()));
} catch (Exception e) {
- str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\"" + str.getSampleType() + "\",\"" + str.getSample() + "\"", str.getInspectionItem(), str.getInspectionItemSubclass()));
+ str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\"" + str.getSampleType() + "\",\"" + str.getSample() + "\"", str.getInspectionItem(), str.getInspectionItemSubclass(), str.getInspectionItemClass()));
}
if (str.getStructureItemParameterId() == null) {
throw new ErrorException("妫�楠岄」鐩笉瀛樺湪锛�" + str.getInspectionItem() + " " + str.getInspectionItemSubclass());
@@ -350,7 +350,7 @@
}
StandardProductList db_str;
try {
- db_str = standardProductListMapper.getOne(str.getStandardMethodListId(), str.getInspectionItem(), str.getSample(), str.getInspectionItemSubclass(), str.getModel());
+ db_str = standardProductListMapper.getOne(str.getStandardMethodListId(), str.getInspectionItem(), str.getSample(), str.getInspectionItemSubclass(), str.getModel(), str.getInspectionItemClass());
} catch (Exception e) {
throw new ErrorException("閲嶅鏌ヨ锛�" + str.getInspectionItem() + " " + str.getInspectionItemSubclass());
}
@@ -361,7 +361,6 @@
if (list.get(10) != null) {
str.setMethodS(list.get(10) + "");
}
-
if (list.get(13) == null) {
str.setTell(null);
} else {
@@ -397,9 +396,9 @@
str.setState(1);
str.setTree(str.getFactory() + " - " + str.getLaboratory() + " - " + str.getSampleType() + " - " + str.getSample() + " - " + (str.getModel() == null ? "" : str.getModel()));
try {
- str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\"" + str.getSampleType() + "\"", str.getInspectionItem(), str.getInspectionItemSubclass()));
+ str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\"" + str.getSampleType() + "\"", str.getInspectionItem(), str.getInspectionItemSubclass(), str.getInspectionItemClass()));
} catch (Exception e) {
- str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\"" + str.getSampleType() + "\",\"" + str.getSample() + "\"", str.getInspectionItem(), str.getInspectionItemSubclass()));
+ str.setStructureItemParameterId(standardTreeMapper.getStructureItemParameterId("\"" + str.getSampleType() + "\",\"" + str.getSample() + "\"", str.getInspectionItem(), str.getInspectionItemSubclass(), str.getInspectionItemClass()));
}
if (str.getStructureItemParameterId() == null) {
throw new ErrorException("妫�楠岄」鐩笉瀛樺湪锛�" + str.getInspectionItem() + " " + str.getInspectionItemSubclass());
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 5b22c2d..f6c177f 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -305,6 +305,8 @@
select ip.id ip_id,
inspection_item,
inspection_item_en,
+ inspection_item_class,
+ inspection_item_class_en,
inspection_item_subclass,
inspection_item_subclass_en,
ip.factory ip_factory,
diff --git a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
index 932e582..3202056 100644
--- a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
@@ -61,6 +61,9 @@
<if test="model!=null">
and model = #{model}
</if>
+ <if test="inspectionItemClass != null and inspectionItemClass != ''">
+ and inspection_item_class = #{inspectionItemClass}
+ </if>
</select>
<select id="selectDetail" resultType="com.yuanchu.mom.pojo.StandardProductList">
select * from standard_product_list
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index 47e1cc0..90f8e50 100644
--- a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -308,6 +308,9 @@
<if test="itemChild != null and itemChild != ''">
and inspection_item_subclass = #{itemChild}
</if>
+ <if test="inspectionItemClass != null and inspectionItemClass != ''">
+ and inspection_item_class = #{inspectionItemClass}
+ </if>
<if test="itemChild == null or itemChild == ''">
and (inspection_item_subclass is null or inspection_item_subclass = '')
</if>
diff --git a/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java b/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java
index 8c9fc9a..cd06c0a 100644
--- a/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java
+++ b/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java
@@ -16,12 +16,13 @@
// 婕旂ず渚嬪瓙锛屾墽琛� main 鏂规硶鎺у埗鍙拌緭鍏ユā鍧楄〃鍚嶅洖杞﹁嚜鍔ㄧ敓鎴愬搴旈」鐩洰褰曚腑
public class CodeGenerator {
- public static String database_url = "jdbc:mysql://localhost:3306/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8";
+ public static String database_url = "jdbc:mysql://10.1.200.86:3306/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8";
public static String database_username = "root";
- public static String database_password= "123456";
+ public static String database_password= "zttZTT123!";
public static String author = "姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃";
public static String model_name = "/cnas-server"; // 濡傛灉涓哄垎甯冨紡濉瓙妯″潡鍚嶇О锛屽鏋滀笉鏄垎甯冨紡涓虹┖鍗冲彲
public static String setParent = "com.yuanchu.mom"; // 鍖呰矾寰�
+ public static String tablePrefix = "device_"; // 璁剧疆杩囨护琛ㄥ墠缂�
public static void main(String[] args) {
String projectPath = System.getProperty("user.dir");
FastAutoGenerator.create(database_url, database_username, database_password)
@@ -43,7 +44,7 @@
// 绛栫暐閰嶇疆
.strategyConfig(builder -> {
builder.addInclude(scanner("琛ㄥ悕锛屽涓┖鏍煎垎鍓�").split(" ")) // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addTablePrefix("sys_") // 璁剧疆杩囨护琛ㄥ墠缂�
+ .addTablePrefix(tablePrefix) // 璁剧疆杩囨护琛ㄥ墠缂�
// Entity 绛栫暐閰嶇疆
.entityBuilder()
.enableLombok() //寮�鍚� Lombok
--
Gitblit v1.9.3